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-sh4 | |
| 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-sh4')
| -rw-r--r-- | target-sh4/translate.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/target-sh4/translate.c b/target-sh4/translate.c index f764bc2539..7bc621649a 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -1855,6 +1855,11 @@ void gen_intermediate_code(CPUSH4State * env, struct TranslationBlock *tb) tcg_gen_movi_i32(cpu_pc, ctx.pc); gen_helper_debug(cpu_env); ctx.bstate = BS_BRANCH; + /* 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. */ + ctx.pc += 2; break; } |