diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-08 21:39:44 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-08 21:39:44 +0000 |
| commit | 232e5537e476c463f5e6e2e9ae31f6e2da9ebfe9 (patch) | |
| tree | fe9fc4a6bf46d1d2a6fce3287b7e92f2f37f5665 /target/m68k/monitor.c | |
| parent | 4bd797af6f5bc9f7114030695716d199dceafa6e (diff) | |
| parent | cc5230267678c26b7f96157086f45fd8a347eb21 (diff) | |
Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.12-pull-request' into staging
# gpg: Signature made Thu 04 Jan 2018 16:37:32 GMT
# gpg: using RSA key 0xF30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier/tags/m68k-for-2.12-pull-request:
target/m68k: fix m68k_cpu_dump_state()
target/m68k: add the Interrupt Stack Pointer
target/m68k: add andi/ori/eori to SR/CCR
target/m68k: add 680x0 "move to SR" instruction
target/m68k: move CCR/SR functions
target/m68k: implement fsave/frestore
target/m68k: add reset
target/m68k: add cpush/cinv
target/m68k: softmmu cleanup
target/m68k: add move16
target/m68k: add chk and chk2
target/m68k: manage 680x0 stack frames
target/m68k: add CPU_LOG_INT trace
target/m68k: use insn_pc to generate instruction fault address
linux-user, m68k: correctly manage SR in context
target/m68k: fix gen_get_ccr()
target-m68k: sync CC_OP before gen_jmp_tb()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/m68k/monitor.c')
| -rw-r--r-- | target/m68k/monitor.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index 5605323a81..52781e85f0 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -30,6 +30,7 @@ static const MonitorDef monitor_defs[] = { { "sr", offsetof(CPUM68KState, sr) }, { "ssp", offsetof(CPUM68KState, sp[0]) }, { "usp", offsetof(CPUM68KState, sp[1]) }, + { "isp", offsetof(CPUM68KState, sp[2]) }, { NULL }, }; |