From a04159166b880b505ccadc16f2fe84169806883d Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Thu, 15 Aug 2019 09:46:44 +0100 Subject: target/arm: Replace s->pc with s->base.pc_next MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We must update s->base.pc_next when we return from the translate_insn hook to the main translator loop. By incrementing s->base.pc_next immediately after reading the insn word, "pc_next" contains the address of the next instruction throughout translation. All remaining uses of s->pc are referencing the address of the next insn, so this is now a simple global replacement. Remove the "s->pc" field. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-id: 20190807045335.1361-7-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/translate.h | 1 - 1 file changed, 1 deletion(-) (limited to 'target/arm/translate.h') diff --git a/target/arm/translate.h b/target/arm/translate.h index 53ac50b..64304c9 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -10,7 +10,6 @@ typedef struct DisasContext { DisasContextBase base; const ARMISARegisters *isar; - target_ulong pc; /* The address of the current instruction being translated. */ target_ulong pc_curr; target_ulong page_start; -- cgit v1.1