From 43cf067ff8b17b23e3dd0ba8e0214c55a140f700 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 13 Nov 2020 12:43:25 +0100 Subject: 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 Message-Id: <20201113114326.97663-3-kwolf@redhat.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- target/ppc/monitor.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'target/ppc') 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); -- cgit v1.2.3-55-g7522