diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-28 20:10:22 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-28 20:10:22 +0000 |
| commit | 331c5e2091009f170554fed4ef884aeea871e4bb (patch) | |
| tree | 47bf23d369e201fe8e982097a5fdd5437f88bdfa /target-s390x/translate.c | |
| parent | 496fedddce9a575111df4f912fb9e361037531ed (diff) | |
| parent | 522a0d4e3c0d397ffb45ec400d8cbd426dad9d17 (diff) | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20151028' into staging
Breakpoint fixes
# gpg: Signature made Wed 28 Oct 2015 17:58:52 GMT using RSA key ID 4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
* remotes/rth/tags/pull-tcg-20151028:
target-*: Advance pc after recognizing a breakpoint
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-s390x/translate.c')
| -rw-r--r-- | target-s390x/translate.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 05d51fe84a..c79a2cb57a 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -5360,6 +5360,11 @@ void gen_intermediate_code(CPUS390XState *env, struct TranslationBlock *tb) if (unlikely(cpu_breakpoint_test(cs, dc.pc, BP_ANY))) { status = EXIT_PC_STALE; do_debug = true; + /* 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 += 2; break; } |