hmp: Pass monitor to mon_get_cpu_env()

kevmw · dagrh · commit e7cff9c68d4a · 2020-11-13T12:45:51.000Z
mon_get_cpu_env() is indirectly called monitor_parse_arguments() where the current monitor isn't set yet. Instead of using monitor_cur_env(), explicitly pass the Monitor pointer to the function. Without this fix, an HMP command like "x $pc" crashes like this: #0 0x0000555555caa01f in mon_get_cpu_sync (mon=0x0, synchronize=true) at ../monitor/misc.c:270 #1 0x0000555555caa141 in mon_get_cpu (mon=0x0) at ../monitor/misc.c:294 #2 0x0000555555caa158 in mon_get_cpu_env () at ../monitor/misc.c:299 #3 0x0000555555b19739 in monitor_get_pc (mon=0x555556ad2de0, md=0x5555565d2d40 <monitor_defs+1152>, val=0) at ../target/i386/monitor.c:607 #4 0x0000555555cadbec in get_monitor_def (mon=0x555556ad2de0, pval=0x7fffffffc208, name=0x7fffffffc220 "pc") at ../monitor/misc.c:1681 #5 0x000055555582ec4f in expr_unary (mon=0x555556ad2de0) at ../monitor/hmp.c:387 #6 0x000055555582edbb in expr_prod (mon=0x555556ad2de0) at ../monitor/hmp.c:421 #7 0x000055555582ee79 in expr_logic (mon=0x555556ad2de0) at ../monitor/hmp.c:455 #8 0x000055555582eefe in expr_sum (mon=0x555556ad2de0) at ../monitor/hmp.c:484 #9 0x000055555582efe8 in get_expr (mon=0x555556ad2de0, pval=0x7fffffffc418, pp=0x7fffffffc408) at ../monitor/hmp.c:511 #10 0x000055555582fcd4 in monitor_parse_arguments (mon=0x555556ad2de0, endp=0x7fffffffc890, cmd=0x555556675b50 <hmp_cmds+7920>) at ../monitor/hmp.c:876 #11 0x00005555558306a8 in handle_hmp_command (mon=0x555556ad2de0, cmdline=0x555556ada452 "$pc") at ../monitor/hmp.c:1087 #12 0x000055555582df14 in monitor_command_cb (opaque=0x555556ad2de0, cmdline=0x555556ada450 "x $pc", readline_opaque=0x0) at ../monitor/hmp.c:47 After this fix, nothing is left in monitor_parse_arguments() that can indirectly call monitor_cur(), so the fix is complete. Fixes: ff04108 Reported-by: lichun <lichun@ruijie.com.cn> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20201113114326.97663-4-kwolf@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h
@@ -41,7 +41,7 @@ struct MonitorDef {
 const MonitorDef *target_monitor_defs(void);
 int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval);
 
-CPUArchState *mon_get_cpu_env(void);
+CPUArchState *mon_get_cpu_env(Monitor *mon);
 CPUState *mon_get_cpu(Monitor *mon);
 
 void hmp_info_mem(Monitor *mon, const QDict *qdict);
diff --git a/monitor/misc.c b/monitor/misc.c
@@ -294,9 +294,9 @@ CPUState *mon_get_cpu(Monitor *mon)
     return mon_get_cpu_sync(mon, true);
 }
 
-CPUArchState *mon_get_cpu_env(void)
+CPUArchState *mon_get_cpu_env(Monitor *mon)
 {
-    CPUState *cs = mon_get_cpu(monitor_cur());
+    CPUState *cs = mon_get_cpu(mon);
 
     return cs ? cs->env_ptr : NULL;
 }
@@ -1680,7 +1680,7 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const char *name)
             if (md->get_value) {
                 *pval = md->get_value(mon, md, md->offset);
             } else {
-                CPUArchState *env = mon_get_cpu_env();
+                CPUArchState *env = mon_get_cpu_env(mon);
                 ptr = (uint8_t *)env + md->offset;
                 switch(md->type) {
                 case MD_I32:
diff --git a/target/i386/monitor.c b/target/i386/monitor.c
@@ -222,7 +222,7 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict)
 {
     CPUArchState *env;
 
-    env = mon_get_cpu_env();
+    env = mon_get_cpu_env(mon);
     if (!env) {
         monitor_printf(mon, "No CPU available\n");
         return;
@@ -550,7 +550,7 @@ void hmp_info_mem(Monitor *mon, const QDict *qdict)
 {
     CPUArchState *env;
 
-    env = mon_get_cpu_env();
+    env = mon_get_cpu_env(mon);
     if (!env) {
         monitor_printf(mon, "No CPU available\n");
         return;
@@ -604,7 +604,7 @@ void hmp_mce(Monitor *mon, const QDict *qdict)
 static target_long monitor_get_pc(Monitor *mon, const struct MonitorDef *md,
                                   int val)
 {
-    CPUArchState *env = mon_get_cpu_env();
+    CPUArchState *env = mon_get_cpu_env(mon);
     return env->eip + env->segs[R_CS].base;
 }
 
diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c
@@ -12,7 +12,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");
diff --git a/target/nios2/monitor.c b/target/nios2/monitor.c
@@ -29,7 +29,7 @@
 
 void hmp_info_tlb(Monitor *mon, const QDict *qdict)
 {
-    CPUArchState *env1 = mon_get_cpu_env();
+    CPUArchState *env1 = mon_get_cpu_env(mon);
 
     dump_mmu(env1);
 }
diff --git a/target/ppc/monitor.c b/target/ppc/monitor.c
@@ -32,7 +32,7 @@
 static target_long monitor_get_ccr(Monitor *mon, const struct MonitorDef *md,
                                    int val)
 {
-    CPUArchState *env = mon_get_cpu_env();
+    CPUArchState *env = mon_get_cpu_env(mon);
     unsigned int u;
     int i;
 
@@ -47,27 +47,27 @@ static target_long monitor_get_ccr(Monitor *mon, const struct MonitorDef *md,
 static target_long monitor_get_decr(Monitor *mon, const struct MonitorDef *md,
                                     int val)
 {
-    CPUArchState *env = mon_get_cpu_env();
+    CPUArchState *env = mon_get_cpu_env(mon);
     return cpu_ppc_load_decr(env);
 }
 
 static target_long monitor_get_tbu(Monitor *mon, const struct MonitorDef *md,
                                    int val)
 {
-    CPUArchState *env = mon_get_cpu_env();
+    CPUArchState *env = mon_get_cpu_env(mon);
     return cpu_ppc_load_tbu(env);
 }
 
 static target_long monitor_get_tbl(Monitor *mon, const struct MonitorDef *md,
                                    int val)
 {
-    CPUArchState *env = mon_get_cpu_env();
+    CPUArchState *env = mon_get_cpu_env(mon);
     return cpu_ppc_load_tbl(env);
 }
 
 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");
diff --git a/target/riscv/monitor.c b/target/riscv/monitor.c
@@ -204,7 +204,7 @@ void hmp_info_mem(Monitor *mon, const QDict *qdict)
 {
     CPUArchState *env;
 
-    env = mon_get_cpu_env();
+    env = mon_get_cpu_env(mon);
     if (!env) {
         monitor_printf(mon, "No CPU available\n");
         return;
diff --git a/target/sh4/monitor.c b/target/sh4/monitor.c
@@ -41,7 +41,7 @@ static void print_tlb(Monitor *mon, int idx, tlb_t *tlb)
 
 void hmp_info_tlb(Monitor *mon, const QDict *qdict)
 {
-    CPUArchState *env = mon_get_cpu_env();
+    CPUArchState *env = mon_get_cpu_env(mon);
     int i;
 
     if (!env) {
diff --git 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");
@@ -43,7 +43,7 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict)
 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);
 }
@@ -52,7 +52,7 @@ static target_long monitor_get_psr(Monitor *mon, const struct MonitorDef *md,
 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];
 }
 
diff --git a/target/xtensa/monitor.c b/target/xtensa/monitor.c
@@ -29,7 +29,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");

Original file line number	Diff line number	Diff line change
`@@ -294,9 +294,9 @@ CPUState mon_get_cpu(Monitor mon)`
`294`	`294`	`return mon_get_cpu_sync(mon, true);`
`295`	`295`	`}`
`296`	`296`
`297`		`-CPUArchState *mon_get_cpu_env(void)`
	`297`	`+CPUArchState mon_get_cpu_env(Monitor mon)`
`298`	`298`	`{`
`299`		`- CPUState *cs = mon_get_cpu(monitor_cur());`
	`299`	`+ CPUState *cs = mon_get_cpu(mon);`
`300`	`300`
`301`	`301`	`return cs ? cs->env_ptr : NULL;`
`302`	`302`	`}`
`@@ -1680,7 +1680,7 @@ int get_monitor_def(Monitor mon, int64_t pval, const char *name)`
`1680`	`1680`	`if (md->get_value) {`
`1681`	`1681`	`*pval = md->get_value(mon, md, md->offset);`
`1682`	`1682`	`} else {`
`1683`		`- CPUArchState *env = mon_get_cpu_env();`
	`1683`	`+ CPUArchState *env = mon_get_cpu_env(mon);`
`1684`	`1684`	`ptr = (uint8_t *)env + md->offset;`
`1685`	`1685`	`switch(md->type) {`
`1686`	`1686`	`case MD_I32:`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ void hmp_info_tlb(Monitor mon, const QDict qdict)`
`222`	`222`	`{`
`223`	`223`	`CPUArchState *env;`
`224`	`224`
`225`		`- env = mon_get_cpu_env();`
	`225`	`+ env = mon_get_cpu_env(mon);`
`226`	`226`	`if (!env) {`
`227`	`227`	`monitor_printf(mon, "No CPU available\n");`
`228`	`228`	`return;`
`@@ -550,7 +550,7 @@ void hmp_info_mem(Monitor mon, const QDict qdict)`
`550`	`550`	`{`
`551`	`551`	`CPUArchState *env;`
`552`	`552`
`553`		`- env = mon_get_cpu_env();`
	`553`	`+ env = mon_get_cpu_env(mon);`
`554`	`554`	`if (!env) {`
`555`	`555`	`monitor_printf(mon, "No CPU available\n");`
`556`	`556`	`return;`
`@@ -604,7 +604,7 @@ void hmp_mce(Monitor mon, const QDict qdict)`
`604`	`604`	`static target_long monitor_get_pc(Monitor mon, const struct MonitorDef md,`
`605`	`605`	`int val)`
`606`	`606`	`{`
`607`		`- CPUArchState *env = mon_get_cpu_env();`
	`607`	`+ CPUArchState *env = mon_get_cpu_env(mon);`
`608`	`608`	`return env->eip + env->segs[R_CS].base;`
`609`	`609`	`}`
`610`	`610`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`void hmp_info_tlb(Monitor mon, const QDict qdict)`
`14`	`14`	`{`
`15`		`- CPUArchState *env1 = mon_get_cpu_env();`
	`15`	`+ CPUArchState *env1 = mon_get_cpu_env(mon);`
`16`	`16`
`17`	`17`	`if (!env1) {`
`18`	`18`	`monitor_printf(mon, "No CPU available\n");`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`
`30`	`30`	`void hmp_info_tlb(Monitor mon, const QDict qdict)`
`31`	`31`	`{`
`32`		`- CPUArchState *env1 = mon_get_cpu_env();`
	`32`	`+ CPUArchState *env1 = mon_get_cpu_env(mon);`
`33`	`33`
`34`	`34`	`dump_mmu(env1);`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`static target_long monitor_get_ccr(Monitor mon, const struct MonitorDef md,`
`33`	`33`	`int val)`
`34`	`34`	`{`
`35`		`- CPUArchState *env = mon_get_cpu_env();`
	`35`	`+ CPUArchState *env = mon_get_cpu_env(mon);`
`36`	`36`	`unsigned int u;`
`37`	`37`	`int i;`
`38`	`38`
`@@ -47,27 +47,27 @@ static target_long monitor_get_ccr(Monitor mon, const struct MonitorDef md,`
`47`	`47`	`static target_long monitor_get_decr(Monitor mon, const struct MonitorDef md,`
`48`	`48`	`int val)`
`49`	`49`	`{`
`50`		`- CPUArchState *env = mon_get_cpu_env();`
	`50`	`+ CPUArchState *env = mon_get_cpu_env(mon);`
`51`	`51`	`return cpu_ppc_load_decr(env);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`static target_long monitor_get_tbu(Monitor mon, const struct MonitorDef md,`
`55`	`55`	`int val)`
`56`	`56`	`{`
`57`		`- CPUArchState *env = mon_get_cpu_env();`
	`57`	`+ CPUArchState *env = mon_get_cpu_env(mon);`
`58`	`58`	`return cpu_ppc_load_tbu(env);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`static target_long monitor_get_tbl(Monitor mon, const struct MonitorDef md,`
`62`	`62`	`int val)`
`63`	`63`	`{`
`64`		`- CPUArchState *env = mon_get_cpu_env();`
	`64`	`+ CPUArchState *env = mon_get_cpu_env(mon);`
`65`	`65`	`return cpu_ppc_load_tbl(env);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`void hmp_info_tlb(Monitor mon, const QDict qdict)`
`69`	`69`	`{`
`70`		`- CPUArchState *env1 = mon_get_cpu_env();`
	`70`	`+ CPUArchState *env1 = mon_get_cpu_env(mon);`
`71`	`71`
`72`	`72`	`if (!env1) {`
`73`	`73`	`monitor_printf(mon, "No CPU available\n");`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ void hmp_info_mem(Monitor mon, const QDict qdict)`
`204`	`204`	`{`
`205`	`205`	`CPUArchState *env;`
`206`	`206`
`207`		`- env = mon_get_cpu_env();`
	`207`	`+ env = mon_get_cpu_env(mon);`
`208`	`208`	`if (!env) {`
`209`	`209`	`monitor_printf(mon, "No CPU available\n");`
`210`	`210`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static void print_tlb(Monitor mon, int idx, tlb_t tlb)`
`41`	`41`
`42`	`42`	`void hmp_info_tlb(Monitor mon, const QDict qdict)`
`43`	`43`	`{`
`44`		`- CPUArchState *env = mon_get_cpu_env();`
	`44`	`+ CPUArchState *env = mon_get_cpu_env(mon);`
`45`	`45`	`int i;`
`46`	`46`
`47`	`47`	`if (!env) {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`
`31`	`31`	`void hmp_info_tlb(Monitor mon, const QDict qdict)`
`32`	`32`	`{`
`33`		`- CPUArchState *env1 = mon_get_cpu_env();`
	`33`	`+ CPUArchState *env1 = mon_get_cpu_env(mon);`
`34`	`34`
`35`	`35`	`if (!env1) {`
`36`	`36`	`monitor_printf(mon, "No CPU available\n");`
`@@ -43,7 +43,7 @@ void hmp_info_tlb(Monitor mon, const QDict qdict)`
`43`	`43`	`static target_long monitor_get_psr(Monitor mon, const struct MonitorDef md,`
`44`	`44`	`int val)`
`45`	`45`	`{`
`46`		`- CPUArchState *env = mon_get_cpu_env();`
	`46`	`+ CPUArchState *env = mon_get_cpu_env(mon);`
`47`	`47`
`48`	`48`	`return cpu_get_psr(env);`
`49`	`49`	`}`
`@@ -52,7 +52,7 @@ static target_long monitor_get_psr(Monitor mon, const struct MonitorDef md,`
`52`	`52`	`static target_long monitor_get_reg(Monitor mon, const struct MonitorDef md,`
`53`	`53`	`int val)`
`54`	`54`	`{`
`55`		`- CPUArchState *env = mon_get_cpu_env();`
	`55`	`+ CPUArchState *env = mon_get_cpu_env(mon);`
`56`	`56`	`return env->regwptr[val];`
`57`	`57`	`}`
`58`	`58`