diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2020-11-13 12:43:25 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2020-11-13 12:45:43 +0000 |
| commit | 43cf067ff8b17b23e3dd0ba8e0214c55a140f700 (patch) | |
| tree | 67694da40a8166cfcaf5a1f749ba5ffd4c03a877 /target | |
| parent | 2fc5d01bb43049851a95c8a66df7ee33e3489b54 (diff) | |
hmp: Pass monitor to MonitorDef.get_value()
All of these callbacks use mon_get_cpu_env(). Pass the Monitor
pointer to them it in preparation for adding a monitor argument to
mon_get_cpu_env().
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201113114326.97663-3-kwolf@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/i386/monitor.c | 3 | ||||
| -rw-r--r-- | target/ppc/monitor.c | 12 | ||||
| -rw-r--r-- | target/sparc/monitor.c | 6 |
3 files changed, 14 insertions, 7 deletions
diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 5ca3cab4ec..fed4606aeb 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -601,7 +601,8 @@ void hmp_mce(Monitor *mon, const QDict *qdict) } } -static target_long monitor_get_pc(const struct MonitorDef *md, int val) +static target_long monitor_get_pc(Monitor *mon, const struct MonitorDef *md, + int val) { CPUArchState *env = mon_get_cpu_env(); return env->eip + env->segs[R_CS].base; diff --git a/target/ppc/monitor.c b/target/ppc/monitor.c index a5a177d717..9c0fc2b8c3 100644 --- a/target/ppc/monitor.c +++ b/target/ppc/monitor.c @@ -29,7 +29,8 @@ #include "monitor/hmp-target.h" #include "monitor/hmp.h" -static target_long monitor_get_ccr(const struct MonitorDef *md, int val) +static target_long monitor_get_ccr(Monitor *mon, const struct MonitorDef *md, + int val) { CPUArchState *env = mon_get_cpu_env(); unsigned int u; @@ -43,19 +44,22 @@ static target_long monitor_get_ccr(const struct MonitorDef *md, int val) return u; } -static target_long monitor_get_decr(const struct MonitorDef *md, int val) +static target_long monitor_get_decr(Monitor *mon, const struct MonitorDef *md, + int val) { CPUArchState *env = mon_get_cpu_env(); return cpu_ppc_load_decr(env); } -static target_long monitor_get_tbu(const struct MonitorDef *md, int val) +static target_long monitor_get_tbu(Monitor *mon, const struct MonitorDef *md, + int val) { CPUArchState *env = mon_get_cpu_env(); return cpu_ppc_load_tbu(env); } -static target_long monitor_get_tbl(const struct MonitorDef *md, int val) +static target_long monitor_get_tbl(Monitor *mon, const struct MonitorDef *md, + int val) { CPUArchState *env = mon_get_cpu_env(); return cpu_ppc_load_tbl(env); diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c index a7ea287cbc..bf979d6520 100644 --- a/target/sparc/monitor.c +++ b/target/sparc/monitor.c @@ -40,7 +40,8 @@ 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(); @@ -48,7 +49,8 @@ static target_long monitor_get_psr (const struct MonitorDef *md, int val) } #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(); return env->regwptr[val]; |