diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-13 13:40:23 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-13 13:40:23 +0000 |
| commit | 5ececc3a0b0086c6168e12f4d032809477b30fe5 (patch) | |
| tree | 6c898f1e442e1cc360cef48a9f93b8026931ac5f /target/sparc/monitor.c | |
| parent | 6980c128b5cbc1d2a1b85609bb4d1e006e65109e (diff) | |
| parent | e7cff9c68d4a46343861fbc3cc6b2a0b63b2dbb8 (diff) | |
| download | focaccia-qemu-5ececc3a0b0086c6168e12f4d032809477b30fe5.tar.gz focaccia-qemu-5ececc3a0b0086c6168e12f4d032809477b30fe5.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20201113' into staging
HMP fixes Kevin's HMP fixes # gpg: Signature made Fri 13 Nov 2020 13:04:36 GMT # gpg: using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7 # gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full] # Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7 * remotes/dgilbert/tags/pull-hmp-20201113: hmp: Pass monitor to mon_get_cpu_env() hmp: Pass monitor to MonitorDef.get_value() hmp: Pass monitor to mon_get_cpu() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/sparc/monitor.c')
| -rw-r--r-- | target/sparc/monitor.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c index a7ea287cbc..318413686a 100644 --- a/target/sparc/monitor.c +++ b/target/sparc/monitor.c @@ -30,7 +30,7 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) { - CPUArchState *env1 = mon_get_cpu_env(); + CPUArchState *env1 = mon_get_cpu_env(mon); if (!env1) { monitor_printf(mon, "No CPU available\n"); @@ -40,17 +40,19 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) } #ifndef TARGET_SPARC64 -static target_long monitor_get_psr (const struct MonitorDef *md, int val) +static target_long monitor_get_psr(Monitor *mon, const struct MonitorDef *md, + int val) { - CPUArchState *env = mon_get_cpu_env(); + CPUArchState *env = mon_get_cpu_env(mon); return cpu_get_psr(env); } #endif -static target_long monitor_get_reg(const struct MonitorDef *md, int val) +static target_long monitor_get_reg(Monitor *mon, const struct MonitorDef *md, + int val) { - CPUArchState *env = mon_get_cpu_env(); + CPUArchState *env = mon_get_cpu_env(mon); return env->regwptr[val]; } |