e7cff9c68d
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: ff04108a0e
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>
159 lines
4.4 KiB
C
159 lines
4.4 KiB
C
/*
|
|
* QEMU monitor
|
|
*
|
|
* Copyright (c) 2003-2004 Fabrice Bellard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "cpu.h"
|
|
#include "monitor/monitor.h"
|
|
#include "qemu/ctype.h"
|
|
#include "monitor/hmp-target.h"
|
|
#include "monitor/hmp.h"
|
|
|
|
static target_long monitor_get_ccr(Monitor *mon, const struct MonitorDef *md,
|
|
int val)
|
|
{
|
|
CPUArchState *env = mon_get_cpu_env(mon);
|
|
unsigned int u;
|
|
int i;
|
|
|
|
u = 0;
|
|
for (i = 0; i < 8; i++) {
|
|
u |= env->crf[i] << (32 - (4 * (i + 1)));
|
|
}
|
|
|
|
return u;
|
|
}
|
|
|
|
static target_long monitor_get_decr(Monitor *mon, const struct MonitorDef *md,
|
|
int val)
|
|
{
|
|
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(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(mon);
|
|
return cpu_ppc_load_tbl(env);
|
|
}
|
|
|
|
void hmp_info_tlb(Monitor *mon, const QDict *qdict)
|
|
{
|
|
CPUArchState *env1 = mon_get_cpu_env(mon);
|
|
|
|
if (!env1) {
|
|
monitor_printf(mon, "No CPU available\n");
|
|
return;
|
|
}
|
|
dump_mmu(env1);
|
|
}
|
|
|
|
const MonitorDef monitor_defs[] = {
|
|
{ "fpscr", offsetof(CPUPPCState, fpscr) },
|
|
/* Next instruction pointer */
|
|
{ "nip|pc", offsetof(CPUPPCState, nip) },
|
|
{ "lr", offsetof(CPUPPCState, lr) },
|
|
{ "ctr", offsetof(CPUPPCState, ctr) },
|
|
{ "decr", 0, &monitor_get_decr, },
|
|
{ "ccr|cr", 0, &monitor_get_ccr, },
|
|
/* Machine state register */
|
|
{ "xer", offsetof(CPUPPCState, xer) },
|
|
{ "msr", offsetof(CPUPPCState, msr) },
|
|
{ "tbu", 0, &monitor_get_tbu, },
|
|
{ "tbl", 0, &monitor_get_tbl, },
|
|
{ NULL },
|
|
};
|
|
|
|
const MonitorDef *target_monitor_defs(void)
|
|
{
|
|
return monitor_defs;
|
|
}
|
|
|
|
static int ppc_cpu_get_reg_num(const char *numstr, int maxnum, int *pregnum)
|
|
{
|
|
int regnum;
|
|
char *endptr = NULL;
|
|
|
|
if (!*numstr) {
|
|
return false;
|
|
}
|
|
|
|
regnum = strtoul(numstr, &endptr, 10);
|
|
if (*endptr || (regnum >= maxnum)) {
|
|
return false;
|
|
}
|
|
*pregnum = regnum;
|
|
|
|
return true;
|
|
}
|
|
|
|
int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval)
|
|
{
|
|
int i, regnum;
|
|
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
|
CPUPPCState *env = &cpu->env;
|
|
|
|
/* General purpose registers */
|
|
if ((qemu_tolower(name[0]) == 'r') &&
|
|
ppc_cpu_get_reg_num(name + 1, ARRAY_SIZE(env->gpr), ®num)) {
|
|
*pval = env->gpr[regnum];
|
|
return 0;
|
|
}
|
|
|
|
/* Floating point registers */
|
|
if ((qemu_tolower(name[0]) == 'f') &&
|
|
ppc_cpu_get_reg_num(name + 1, 32, ®num)) {
|
|
*pval = *cpu_fpr_ptr(env, regnum);
|
|
return 0;
|
|
}
|
|
|
|
/* Special purpose registers */
|
|
for (i = 0; i < ARRAY_SIZE(env->spr_cb); ++i) {
|
|
ppc_spr_t *spr = &env->spr_cb[i];
|
|
|
|
if (spr->name && (strcasecmp(name, spr->name) == 0)) {
|
|
*pval = env->spr[i];
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
/* Segment registers */
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
if ((strncasecmp(name, "sr", 2) == 0) &&
|
|
ppc_cpu_get_reg_num(name + 2, ARRAY_SIZE(env->sr), ®num)) {
|
|
*pval = env->sr[regnum];
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
return -EINVAL;
|
|
}
|