* 'F' filename
* 'B' block device name
* 's' string (accept optional quote)
- * 'i' integer
+ * 'i' 32 bit integer
+ * 'l' target long (32 or 64 bit)
* '/' optional gdb-like print format (like "/10x")
*
* '?' optional type (for 'F', 's' and 'i')
cmd->handler();
}
-static void do_info_network(void)
+static void do_info_version(void)
{
- int i, j;
- NetDriverState *nd;
-
- for(i = 0; i < nb_nics; i++) {
- nd = &nd_table[i];
- term_printf("%d: ifname=%s macaddr=", i, nd->ifname);
- for(j = 0; j < 6; j++) {
- if (j > 0)
- term_printf(":");
- term_printf("%02x", nd->macaddr[j]);
- }
- term_printf("\n");
- }
+ term_printf("%s\n", QEMU_VERSION);
}
-
+
static void do_info_block(void)
{
bdrv_info();
static void do_info_registers(void)
{
#ifdef TARGET_I386
- cpu_dump_state(cpu_single_env, stdout, monitor_fprintf,
- X86_DUMP_FPU | X86_DUMP_CCOP);
+ cpu_dump_state(cpu_single_env, NULL, monitor_fprintf,
+ X86_DUMP_FPU);
#else
- cpu_dump_state(cpu_single_env, stdout, monitor_fprintf,
+ cpu_dump_state(cpu_single_env, NULL, monitor_fprintf,
0);
#endif
}
+static void do_info_jit(void)
+{
+ dump_exec_info(NULL, monitor_fprintf);
+}
+
static void do_info_history (void)
{
int i;
static void do_quit(void)
{
+#ifdef USE_KQEMU
+ kqemu_record_dump();
+#endif
exit(0);
}
}
while (len > 0) {
- term_printf("0x%08x:", addr);
+ term_printf(TARGET_FMT_lx ":", addr);
l = len;
if (l > line_size)
l = line_size;
v = lduw_raw(buf + i);
break;
case 4:
- v = ldl_raw(buf + i);
+ v = (uint32_t)ldl_raw(buf + i);
break;
case 8:
v = ldq_raw(buf + i);
}
}
-static void do_memory_dump(int count, int format, int size, int addr)
+#if TARGET_LONG_BITS == 64
+#define GET_TLONG(h, l) (((uint64_t)(h) << 32) | (l))
+#else
+#define GET_TLONG(h, l) (l)
+#endif
+
+static void do_memory_dump(int count, int format, int size,
+ uint32_t addrh, uint32_t addrl)
{
+ target_long addr = GET_TLONG(addrh, addrl);
memory_dump(count, format, size, addr, 0);
}
-static void do_physical_memory_dump(int count, int format, int size, int addr)
+static void do_physical_memory_dump(int count, int format, int size,
+ uint32_t addrh, uint32_t addrl)
+
{
+ target_long addr = GET_TLONG(addrh, addrl);
memory_dump(count, format, size, addr, 1);
}
-static void do_print(int count, int format, int size, int val)
+static void do_print(int count, int format, int size, unsigned int valh, unsigned int vall)
{
+ target_long val = GET_TLONG(valh, vall);
+#if TARGET_LONG_BITS == 32
switch(format) {
case 'o':
term_printf("%#o", val);
term_printc(val);
break;
}
+#else
+ switch(format) {
+ case 'o':
+ term_printf("%#llo", val);
+ break;
+ case 'x':
+ term_printf("%#llx", val);
+ break;
+ case 'u':
+ term_printf("%llu", val);
+ break;
+ default:
+ case 'd':
+ term_printf("%lld", val);
+ break;
+ case 'c':
+ term_printc(val);
+ break;
+ }
+#endif
term_printf("\n");
}
+static void do_sum(uint32_t start, uint32_t size)
+{
+ uint32_t addr;
+ uint8_t buf[1];
+ uint16_t sum;
+
+ sum = 0;
+ for(addr = start; addr < (start + size); addr++) {
+ cpu_physical_memory_rw(addr, buf, 1, 0);
+ /* BSD sum algorithm ('sum' Unix command) */
+ sum = (sum >> 1) | (sum << 15);
+ sum += buf[0];
+ }
+ term_printf("%05d\n", sum);
+}
+
typedef struct {
int keycode;
const char *name;
qemu_system_reset_request();
}
+static void do_system_powerdown(void)
+{
+ qemu_system_powerdown_request();
+}
+
#if defined(TARGET_I386)
static void print_pte(uint32_t addr, uint32_t pte, uint32_t mask)
{
static void mem_print(uint32_t *pstart, int *plast_prot,
uint32_t end, int prot)
{
- if (prot != *plast_prot) {
+ int prot1;
+ prot1 = *plast_prot;
+ if (prot != prot1) {
if (*pstart != -1) {
term_printf("%08x-%08x %08x %c%c%c\n",
*pstart, end, end - *pstart,
- prot & PG_USER_MASK ? 'u' : '-',
+ prot1 & PG_USER_MASK ? 'u' : '-',
'r',
- prot & PG_RW_MASK ? 'w' : '-');
+ prot1 & PG_RW_MASK ? 'w' : '-');
}
if (prot != 0)
*pstart = end;
}
#endif
+static void do_info_kqemu(void)
+{
+#ifdef USE_KQEMU
+ int val;
+ val = 0;
+ if (cpu_single_env)
+ val = cpu_single_env->kqemu_enabled;
+ term_printf("kqemu is %s\n", val ? "enabled" : "disabled");
+#else
+ term_printf("kqemu support is not compiled\n");
+#endif
+}
+
static term_cmd_t term_cmds[] = {
{ "help|?", "s?", do_help,
"[cmd]", "show the help" },
{ "gdbserver", "i?", do_gdbserver,
"[port]", "start gdbserver session (default port=1234)", },
#endif
- { "x", "/i", do_memory_dump,
+ { "x", "/l", do_memory_dump,
"/fmt addr", "virtual memory dump starting at 'addr'", },
- { "xp", "/i", do_physical_memory_dump,
+ { "xp", "/l", do_physical_memory_dump,
"/fmt addr", "physical memory dump starting at 'addr'", },
- { "p|print", "/i", do_print,
+ { "p|print", "/l", do_print,
"/fmt expr", "print expression value (use $reg for CPU register access)", },
{ "i", "/ii.", do_ioport_read,
"/fmt addr", "I/O port read" },
"keys", "send keys to the VM (e.g. 'sendkey ctrl-alt-f1')" },
{ "system_reset", "", do_system_reset,
"", "reset the system" },
+ { "system_powerdown", "", do_system_powerdown,
+ "", "send system power down event" },
+ { "sum", "ii", do_sum,
+ "addr size", "compute the checksum of a memory region" },
+ { "usb_add", "s", do_usb_add,
+ "device", "add USB device (e.g. 'host:bus.addr' or 'host:vendor_id:product_id')" },
+ { "usb_del", "s", do_usb_del,
+ "device", "remove USB device 'bus.addr'" },
{ NULL, NULL, },
};
static term_cmd_t info_cmds[] = {
+ { "version", "", do_info_version,
+ "", "show the version of qemu" },
{ "network", "", do_info_network,
"", "show the network state" },
{ "block", "", do_info_block,
{ "mem", "", mem_info,
"", "show the active virtual memory mappings", },
#endif
+ { "jit", "", do_info_jit,
+ "", "show dynamic compiler info", },
+ { "kqemu", "", do_info_kqemu,
+ "", "show kqemu information", },
+ { "usb", "", usb_info,
+ "", "show guest USB devices", },
+ { "usbhost", "", usb_host_info,
+ "", "show host USB devices", },
{ NULL, NULL, },
};
static const char *pch;
static jmp_buf expr_env;
+#define MD_TLONG 0
+#define MD_I32 1
+
typedef struct MonitorDef {
const char *name;
int offset;
- int (*get_value)(struct MonitorDef *md, int val);
+ target_long (*get_value)(struct MonitorDef *md, int val);
+ int type;
} MonitorDef;
#if defined(TARGET_I386)
-static int monitor_get_pc (struct MonitorDef *md, int val)
+static target_long monitor_get_pc (struct MonitorDef *md, int val)
{
- return cpu_single_env->eip + (long)cpu_single_env->segs[R_CS].base;
+ return cpu_single_env->eip + cpu_single_env->segs[R_CS].base;
}
#endif
#if defined(TARGET_PPC)
-static int monitor_get_ccr (struct MonitorDef *md, int val)
+static target_long monitor_get_ccr (struct MonitorDef *md, int val)
{
unsigned int u;
int i;
return u;
}
-static int monitor_get_msr (struct MonitorDef *md, int val)
+static target_long monitor_get_msr (struct MonitorDef *md, int val)
{
return (cpu_single_env->msr[MSR_POW] << MSR_POW) |
(cpu_single_env->msr[MSR_ILE] << MSR_ILE) |
(cpu_single_env->msr[MSR_LE] << MSR_LE);
}
-static int monitor_get_xer (struct MonitorDef *md, int val)
+static target_long monitor_get_xer (struct MonitorDef *md, int val)
{
return (cpu_single_env->xer[XER_SO] << XER_SO) |
(cpu_single_env->xer[XER_OV] << XER_OV) |
(cpu_single_env->xer[XER_BC] << XER_BC);
}
-static int monitor_get_decr (struct MonitorDef *md, int val)
+static target_long monitor_get_decr (struct MonitorDef *md, int val)
{
return cpu_ppc_load_decr(cpu_single_env);
}
-static int monitor_get_tbu (struct MonitorDef *md, int val)
+static target_long monitor_get_tbu (struct MonitorDef *md, int val)
{
return cpu_ppc_load_tbu(cpu_single_env);
}
-static int monitor_get_tbl (struct MonitorDef *md, int val)
+static target_long monitor_get_tbl (struct MonitorDef *md, int val)
{
return cpu_ppc_load_tbl(cpu_single_env);
}
#endif
#if defined(TARGET_SPARC)
-static int monitor_get_psr (struct MonitorDef *md, int val)
+#ifndef TARGET_SPARC64
+static target_long monitor_get_psr (struct MonitorDef *md, int val)
{
return GET_PSR(cpu_single_env);
}
+#endif
-static int monitor_get_reg(struct MonitorDef *md, int val)
+static target_long monitor_get_reg(struct MonitorDef *md, int val)
{
return cpu_single_env->regwptr[val];
}
#ifdef TARGET_I386
#define SEG(name, seg) \
- { name, offsetof(CPUState, segs[seg].selector) },\
+ { name, offsetof(CPUState, segs[seg].selector), NULL, MD_I32 },\
{ name ".base", offsetof(CPUState, segs[seg].base) },\
- { name ".limit", offsetof(CPUState, segs[seg].limit) },
+ { name ".limit", offsetof(CPUState, segs[seg].limit), NULL, MD_I32 },
{ "eax", offsetof(CPUState, regs[0]) },
{ "ecx", offsetof(CPUState, regs[1]) },
{ "ebp|fp", offsetof(CPUState, regs[5]) },
{ "esi", offsetof(CPUState, regs[6]) },
{ "edi", offsetof(CPUState, regs[7]) },
+#ifdef TARGET_X86_64
+ { "r8", offsetof(CPUState, regs[8]) },
+ { "r9", offsetof(CPUState, regs[9]) },
+ { "r10", offsetof(CPUState, regs[10]) },
+ { "r11", offsetof(CPUState, regs[11]) },
+ { "r12", offsetof(CPUState, regs[12]) },
+ { "r13", offsetof(CPUState, regs[13]) },
+ { "r14", offsetof(CPUState, regs[14]) },
+ { "r15", offsetof(CPUState, regs[15]) },
+#endif
{ "eflags", offsetof(CPUState, eflags) },
{ "eip", offsetof(CPUState, eip) },
SEG("cs", R_CS)
{ "pc", offsetof(CPUState, pc) },
{ "npc", offsetof(CPUState, npc) },
{ "y", offsetof(CPUState, y) },
+#ifndef TARGET_SPARC64
{ "psr", 0, &monitor_get_psr, },
{ "wim", offsetof(CPUState, wim) },
+#endif
{ "tbr", offsetof(CPUState, tbr) },
{ "fsr", offsetof(CPUState, fsr) },
{ "f0", offsetof(CPUState, fpr[0]) },
{ "f29", offsetof(CPUState, fpr[29]) },
{ "f30", offsetof(CPUState, fpr[30]) },
{ "f31", offsetof(CPUState, fpr[31]) },
+#ifdef TARGET_SPARC64
+ { "f32", offsetof(CPUState, fpr[32]) },
+ { "f34", offsetof(CPUState, fpr[34]) },
+ { "f36", offsetof(CPUState, fpr[36]) },
+ { "f38", offsetof(CPUState, fpr[38]) },
+ { "f40", offsetof(CPUState, fpr[40]) },
+ { "f42", offsetof(CPUState, fpr[42]) },
+ { "f44", offsetof(CPUState, fpr[44]) },
+ { "f46", offsetof(CPUState, fpr[46]) },
+ { "f48", offsetof(CPUState, fpr[48]) },
+ { "f50", offsetof(CPUState, fpr[50]) },
+ { "f52", offsetof(CPUState, fpr[52]) },
+ { "f54", offsetof(CPUState, fpr[54]) },
+ { "f56", offsetof(CPUState, fpr[56]) },
+ { "f58", offsetof(CPUState, fpr[58]) },
+ { "f60", offsetof(CPUState, fpr[60]) },
+ { "f62", offsetof(CPUState, fpr[62]) },
+ { "asi", offsetof(CPUState, asi) },
+ { "pstate", offsetof(CPUState, pstate) },
+ { "cansave", offsetof(CPUState, cansave) },
+ { "canrestore", offsetof(CPUState, canrestore) },
+ { "otherwin", offsetof(CPUState, otherwin) },
+ { "wstate", offsetof(CPUState, wstate) },
+ { "cleanwin", offsetof(CPUState, cleanwin) },
+ { "fprs", offsetof(CPUState, fprs) },
+#endif
#endif
{ NULL },
};
longjmp(expr_env, 1);
}
-static int get_monitor_def(int *pval, const char *name)
+static int get_monitor_def(target_long *pval, const char *name)
{
MonitorDef *md;
+ void *ptr;
+
for(md = monitor_defs; md->name != NULL; md++) {
if (compare_cmd(name, md->name)) {
if (md->get_value) {
*pval = md->get_value(md, md->offset);
} else {
- *pval = *(uint32_t *)((uint8_t *)cpu_single_env + md->offset);
+ ptr = (uint8_t *)cpu_single_env + md->offset;
+ switch(md->type) {
+ case MD_I32:
+ *pval = *(int32_t *)ptr;
+ break;
+ case MD_TLONG:
+ *pval = *(target_long *)ptr;
+ break;
+ default:
+ *pval = 0;
+ break;
+ }
}
return 0;
}
}
}
-static int expr_sum(void);
+static target_long expr_sum(void);
-static int expr_unary(void)
+static target_long expr_unary(void)
{
- int n;
+ target_long n;
char *p;
switch(*pch) {
}
-static int expr_prod(void)
+static target_long expr_prod(void)
{
- int val, val2, op;
-
+ target_long val, val2;
+ int op;
+
val = expr_unary();
for(;;) {
op = *pch;
return val;
}
-static int expr_logic(void)
+static target_long expr_logic(void)
{
- int val, val2, op;
+ target_long val, val2;
+ int op;
val = expr_prod();
for(;;) {
return val;
}
-static int expr_sum(void)
+static target_long expr_sum(void)
{
- int val, val2, op;
+ target_long val, val2;
+ int op;
val = expr_logic();
for(;;) {
return val;
}
-static int get_expr(int *pval, const char **pp)
+static int get_expr(target_long *pval, const char **pp)
{
pch = *pp;
if (setjmp(expr_env)) {
}
break;
case 'i':
+ case 'l':
{
- int val;
+ target_long val;
while (isspace(*p))
p++;
if (*typestr == '?' || *typestr == '.') {
if (get_expr(&val, &p))
goto fail;
add_num:
- if (nb_args >= MAX_ARGS)
- goto error_args;
- args[nb_args++] = (void *)val;
+ if (c == 'i') {
+ if (nb_args >= MAX_ARGS)
+ goto error_args;
+ args[nb_args++] = (void *)(int)val;
+ } else {
+ if ((nb_args + 1) >= MAX_ARGS)
+ goto error_args;
+#if TARGET_LONG_BITS == 64
+ args[nb_args++] = (void *)(int)((val >> 32) & 0xffffffff);
+#else
+ args[nb_args++] = (void *)0;
+#endif
+ args[nb_args++] = (void *)(int)(val & 0xffffffff);
+ }
}
break;
case '-':
projects / qemu.git / blobdiff