aboutsummaryrefslogtreecommitdiff
path: root/target-arm
diff options
context:
space:
mode:
authorEvgeny Voevodin <e.voevodin@samsung.com>2012-11-21 11:43:04 +0400
committerBlue Swirl <blauwirbel@gmail.com>2012-12-08 14:24:42 +0000
commit25983cad31969e3003eef77bc03a6700f46899d2 (patch)
tree91d1ec1c6693baa9cfa30e3d16b91b2652b80427 /target-arm
parentc3a43607d927e6a0ecce0b61e8297c1cfe604c14 (diff)
downloadqemu-25983cad31969e3003eef77bc03a6700f46899d2.zip
qemu-25983cad31969e3003eef77bc03a6700f46899d2.tar.gz
qemu-25983cad31969e3003eef77bc03a6700f46899d2.tar.bz2
TCG: Use gen_opc_pc from context instead of global variable.
Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-arm')
-rw-r--r--target-arm/translate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target-arm/translate.c b/target-arm/translate.c
index c42110a..8ea8bba 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -9840,7 +9840,7 @@ static inline void gen_intermediate_code_internal(CPUARMState *env,
while (lj < j)
gen_opc_instr_start[lj++] = 0;
}
- gen_opc_pc[lj] = dc->pc;
+ tcg_ctx.gen_opc_pc[lj] = dc->pc;
gen_opc_condexec_bits[lj] = (dc->condexec_cond << 4) | (dc->condexec_mask >> 1);
gen_opc_instr_start[lj] = 1;
gen_opc_icount[lj] = num_insns;
@@ -10043,6 +10043,6 @@ void cpu_dump_state(CPUARMState *env, FILE *f, fprintf_function cpu_fprintf,
void restore_state_to_opc(CPUARMState *env, TranslationBlock *tb, int pc_pos)
{
- env->regs[15] = gen_opc_pc[pc_pos];
+ env->regs[15] = tcg_ctx.gen_opc_pc[pc_pos];
env->condexec_bits = gen_opc_condexec_bits[pc_pos];
}