diff options
| author | Richard Henderson | 2015-10-14 00:07:49 +0200 |
|---|---|---|
| committer | Richard Henderson | 2015-10-28 18:57:16 +0100 |
| commit | 522a0d4e3c0d397ffb45ec400d8cbd426dad9d17 (patch) | |
| tree | 47bf23d369e201fe8e982097a5fdd5437f88bdfa /target-arm | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into st... (diff) | |
| download | qemu-522a0d4e3c0d397ffb45ec400d8cbd426dad9d17.tar.gz qemu-522a0d4e3c0d397ffb45ec400d8cbd426dad9d17.tar.xz qemu-522a0d4e3c0d397ffb45ec400d8cbd426dad9d17.zip | |
target-*: Advance pc after recognizing a breakpoint
Some targets already had this within their logic, but make sure
it's present for all targets.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'target-arm')
| -rw-r--r-- | target-arm/translate-a64.c | 7 | ||||
| -rw-r--r-- | target-arm/translate.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 19f9d8d2c8..83b8376210 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -11096,8 +11096,11 @@ void gen_intermediate_code_a64(ARMCPU *cpu, TranslationBlock *tb) dc->is_jmp = DISAS_UPDATE; } else { gen_exception_internal_insn(dc, 0, EXCP_DEBUG); - /* Advance PC so that clearing the breakpoint will - invalidate this TB. */ + /* The address covered by the breakpoint must be + included in [tb->pc, tb->pc + tb->size) in order + to for it to be properly cleared -- thus we + increment the PC here so that the logic setting + tb->size below does the right thing. */ dc->pc += 4; goto done_generating; } diff --git a/target-arm/translate.c b/target-arm/translate.c index 6be2c728f0..b10a455e70 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -11378,8 +11378,11 @@ void gen_intermediate_code(CPUARMState *env, TranslationBlock *tb) dc->is_jmp = DISAS_UPDATE; } else { gen_exception_internal_insn(dc, 0, EXCP_DEBUG); - /* Advance PC so that clearing the breakpoint will - invalidate this TB. */ + /* The address covered by the breakpoint must be + included in [tb->pc, tb->pc + tb->size) in order + to for it to be properly cleared -- thus we + increment the PC here so that the logic setting + tb->size below does the right thing. */ /* TODO: Advance PC by correct instruction length to * avoid disassembler error messages */ dc->pc += 2; |