From 25983cad31969e3003eef77bc03a6700f46899d2 Mon Sep 17 00:00:00 2001 From: Evgeny Voevodin Date: Wed, 21 Nov 2012 11:43:04 +0400 Subject: TCG: Use gen_opc_pc from context instead of global variable. Signed-off-by: Evgeny Voevodin Signed-off-by: Blue Swirl --- target-arm/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target-arm/translate.c') 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]; } -- cgit v1.1