aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--disas.c70
-rw-r--r--disas.h1
-rw-r--r--monitor.c893
3 files changed, 843 insertions, 121 deletions
diff --git a/disas.c b/disas.c
index f048348f5c..e315299ccf 100644
--- a/disas.c
+++ b/disas.c
@@ -1,12 +1,12 @@
/* General "disassemble this chunk" code. Used for debugging. */
#include "config.h"
#include "dis-asm.h"
-#include "disas.h"
#include "elf.h"
#include <errno.h>
#include "cpu.h"
#include "exec-all.h"
+#include "disas.h"
/* Filled in by elfload.c. Simplistic, but will do for now. */
unsigned int disas_num_syms;
@@ -219,3 +219,71 @@ const char *lookup_symbol(void *orig_addr)
}
return "";
}
+
+#if !defined(CONFIG_USER_ONLY)
+
+static int monitor_disas_is_physical;
+
+static int
+monitor_read_memory (memaddr, myaddr, length, info)
+ bfd_vma memaddr;
+ bfd_byte *myaddr;
+ int length;
+ struct disassemble_info *info;
+{
+ if (monitor_disas_is_physical) {
+ cpu_physical_memory_rw(memaddr, myaddr, length, 0);
+ } else {
+ cpu_memory_rw_debug(cpu_single_env, memaddr,myaddr, length, 0);
+ }
+ return 0;
+}
+
+void monitor_disas(target_ulong pc, int nb_insn, int is_physical, int flags)
+{
+ FILE *out;
+ int count, i;
+ struct disassemble_info disasm_info;
+ int (*print_insn)(bfd_vma pc, disassemble_info *info);
+
+ out = stdout;
+
+ INIT_DISASSEMBLE_INFO(disasm_info, out, fprintf);
+
+ monitor_disas_is_physical = is_physical;
+ disasm_info.read_memory_func = monitor_read_memory;
+
+ disasm_info.buffer_vma = pc;
+
+#ifdef TARGET_WORDS_BIGENDIAN
+ disasm_info.endian = BFD_ENDIAN_BIG;
+#else
+ disasm_info.endian = BFD_ENDIAN_LITTLE;
+#endif
+#if defined(TARGET_I386)
+ if (!flags)
+ disasm_info.mach = bfd_mach_i386_i386;
+ else
+ disasm_info.mach = bfd_mach_i386_i8086;
+ print_insn = print_insn_i386;
+#elif defined(TARGET_ARM)
+ print_insn = print_insn_arm;
+#elif defined(TARGET_SPARC)
+ print_insn = print_insn_sparc;
+#elif defined(TARGET_PPC)
+ print_insn = print_insn_ppc;
+#else
+ fprintf(out, "Asm output not supported on this arch\n");
+ return;
+#endif
+
+ for(i = 0; i < nb_insn; i++) {
+ fprintf(out, "0x%08lx: ", (unsigned long)pc);
+ count = print_insn(pc, &disasm_info);
+ fprintf(out, "\n");
+ if (count < 0)
+ break;
+ pc += count;
+ }
+}
+#endif
diff --git a/disas.h b/disas.h
index 916b1357a6..c4a251ff8f 100644
--- a/disas.h
+++ b/disas.h
@@ -3,6 +3,7 @@
/* Disassemble this for me please... (debugging). */
void disas(FILE *out, void *code, unsigned long size, int is_host, int flags);
+void monitor_disas(target_ulong pc, int nb_insn, int is_physical, int flags);
/* Look up symbol for debugging purpose. Returns "" if unknown. */
const char *lookup_symbol(void *orig_addr);
diff --git a/monitor.c b/monitor.c
index 1aabd3ddd5..fc05746a5d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -22,11 +22,15 @@
* THE SOFTWARE.
*/
#include "vl.h"
+#include "disas.h"
//#define DEBUG
+#ifndef offsetof
+#define offsetof(type, field) ((size_t) &((type *)0)->field)
+#endif
+
#define TERM_CMD_BUF_SIZE 4095
-#define MAX_ARGS 64
#define IS_NORM 0
#define IS_ESC 1
@@ -40,9 +44,22 @@ static int term_cmd_buf_size;
static int term_esc_state;
static int term_esc_param;
+/*
+ * Supported types:
+ *
+ * 'F' filename
+ * 's' string (accept optional quote)
+ * 'i' integer
+ * '/' optional gdb-like print format (like "/10x")
+ *
+ * '?' optional type (for 'F', 's' and 'i')
+ *
+ */
+
typedef struct term_cmd_t {
const char *name;
- void (*handler)(int argc, const char **argv);
+ const char *args_type;
+ void (*handler)();
const char *params;
const char *help;
} term_cmd_t;
@@ -110,12 +127,12 @@ static void help_cmd(const char *name)
}
}
-static void do_help(int argc, const char **argv)
+static void do_help(const char *name)
{
- help_cmd(argv[1]);
+ help_cmd(name);
}
-static void do_commit(int argc, const char **argv)
+static void do_commit(void)
{
int i;
@@ -125,26 +142,24 @@ static void do_commit(int argc, const char **argv)
}
}
-static void do_info(int argc, const char **argv)
+static void do_info(const char *item)
{
term_cmd_t *cmd;
- const char *item;
- if (argc < 2)
+ if (!item)
goto help;
- item = argv[1];
for(cmd = info_cmds; cmd->name != NULL; cmd++) {
- if (compare_cmd(argv[1], cmd->name))
+ if (compare_cmd(item, cmd->name))
goto found;
}
help:
- help_cmd(argv[0]);
+ help_cmd("info");
return;
found:
- cmd->handler(argc, argv);
+ cmd->handler();
}
-static void do_info_network(int argc, const char **argv)
+static void do_info_network(void)
{
int i, j;
NetDriverState *nd;
@@ -161,12 +176,21 @@ static void do_info_network(int argc, const char **argv)
}
}
-static void do_info_block(int argc, const char **argv)
+static void do_info_block(void)
{
bdrv_info();
}
-static void do_quit(int argc, const char **argv)
+static void do_info_registers(void)
+{
+#ifdef TARGET_I386
+ cpu_dump_state(cpu_single_env, stdout, X86_DUMP_FPU | X86_DUMP_CCOP);
+#else
+ cpu_dump_state(cpu_single_env, stdout, 0);
+#endif
+}
+
+static void do_quit(void)
{
exit(0);
}
@@ -189,26 +213,13 @@ static int eject_device(BlockDriverState *bs, int force)
return 0;
}
-static void do_eject(int argc, const char **argv)
+static void do_eject(int force, const char *filename)
{
BlockDriverState *bs;
- const char **parg;
- int force;
- parg = argv + 1;
- if (!*parg) {
- fail:
- help_cmd(argv[0]);
- return;
- }
- force = 0;
- if (!strcmp(*parg, "-f")) {
- force = 1;
- parg++;
- }
- if (!*parg)
- goto fail;
- bs = bdrv_find(*parg);
+ term_printf("%d %s\n", force, filename);
+
+ bs = bdrv_find(filename);
if (!bs) {
term_printf("device not found\n");
return;
@@ -216,90 +227,68 @@ static void do_eject(int argc, const char **argv)
eject_device(bs, force);
}
-static void do_change(int argc, const char **argv)
+static void do_change(const char *device, const char *filename)
{
BlockDriverState *bs;
- if (argc != 3) {
- help_cmd(argv[0]);
- return;
- }
- bs = bdrv_find(argv[1]);
+ bs = bdrv_find(device);
if (!bs) {
term_printf("device not found\n");
return;
}
if (eject_device(bs, 0) < 0)
return;
- bdrv_open(bs, argv[2], 0);
+ bdrv_open(bs, filename, 0);
}
-static void do_screen_dump(int argc, const char **argv)
+static void do_screen_dump(const char *filename)
{
- if (argc != 2) {
- help_cmd(argv[0]);
- return;
- }
- vga_screen_dump(argv[1]);
+ vga_screen_dump(filename);
}
-static void do_log(int argc, const char **argv)
+static void do_log(const char *items)
{
int mask;
- if (argc != 2)
- goto help;
- if (!strcmp(argv[1], "none")) {
+ if (!strcmp(items, "none")) {
mask = 0;
} else {
- mask = cpu_str_to_log_mask(argv[1]);
+ mask = cpu_str_to_log_mask(items);
if (!mask) {
- help:
- help_cmd(argv[0]);
+ help_cmd("log");
return;
}
}
cpu_set_log(mask);
}
-static void do_savevm(int argc, const char **argv)
+static void do_savevm(const char *filename)
{
- if (argc != 2) {
- help_cmd(argv[0]);
- return;
- }
- if (qemu_savevm(argv[1]) < 0)
- term_printf("I/O error when saving VM to '%s'\n", argv[1]);
+ if (qemu_savevm(filename) < 0)
+ term_printf("I/O error when saving VM to '%s'\n", filename);
}
-static void do_loadvm(int argc, const char **argv)
+static void do_loadvm(const char *filename)
{
- if (argc != 2) {
- help_cmd(argv[0]);
- return;
- }
- if (qemu_loadvm(argv[1]) < 0)
- term_printf("I/O error when loading VM from '%s'\n", argv[1]);
+ if (qemu_loadvm(filename) < 0)
+ term_printf("I/O error when loading VM from '%s'\n", filename);
}
-static void do_stop(int argc, const char **argv)
+static void do_stop(void)
{
vm_stop(EXCP_INTERRUPT);
}
-static void do_cont(int argc, const char **argv)
+static void do_cont(void)
{
vm_start();
}
#ifdef CONFIG_GDBSTUB
-static void do_gdbserver(int argc, const char **argv)
+static void do_gdbserver(int has_port, int port)
{
- int port;
-
- port = DEFAULT_GDBSTUB_PORT;
- if (argc >= 2)
- port = atoi(argv[1]);
+ if (!has_port)
+ port = DEFAULT_GDBSTUB_PORT;
if (gdbserver_start(port) < 0) {
qemu_printf("Could not open gdbserver socket on port %d\n", port);
} else {
@@ -308,90 +297,754 @@ static void do_gdbserver(int argc, const char **argv)
}
#endif
+static void term_printc(int c)
+{
+ term_printf("'");
+ switch(c) {
+ case '\'':
+ term_printf("\\'");
+ break;
+ case '\\':
+ term_printf("\\\\");
+ break;
+ case '\n':
+ term_printf("\\n");
+ break;
+ case '\r':
+ term_printf("\\r");
+ break;
+ default:
+ if (c >= 32 && c <= 126) {
+ term_printf("%c", c);
+ } else {
+ term_printf("\\x%02x", c);
+ }
+ break;
+ }
+ term_printf("'");
+}
+
+static void memory_dump(int count, int format, int wsize,
+ target_ulong addr, int is_physical)
+{
+ int nb_per_line, l, line_size, i, max_digits, len;
+ uint8_t buf[16];
+ uint64_t v;
+
+ if (format == 'i') {
+ int flags;
+ flags = 0;
+#ifdef TARGET_I386
+ /* we use the current CS size */
+ if (!(cpu_single_env->segs[R_CS].flags & DESC_B_MASK))
+ flags = 1;
+#endif
+ monitor_disas(addr, count, is_physical, flags);
+ return;
+ }
+
+ len = wsize * count;
+ if (wsize == 1)
+ line_size = 8;
+ else
+ line_size = 16;
+ nb_per_line = line_size / wsize;
+ max_digits = 0;
+
+ switch(format) {
+ case 'o':
+ max_digits = (wsize * 8 + 2) / 3;
+ break;
+ default:
+ case 'x':
+ max_digits = (wsize * 8) / 4;
+ break;
+ case 'u':
+ case 'd':
+ max_digits = (wsize * 8 * 10 + 32) / 33;
+ break;
+ case 'c':
+ wsize = 1;
+ break;
+ }
+
+ while (len > 0) {
+ term_printf("0x%08x:", addr);
+ l = len;
+ if (l > line_size)
+ l = line_size;
+ if (is_physical) {
+ cpu_physical_memory_rw(addr, buf, l, 0);
+ } else {
+ cpu_memory_rw_debug(cpu_single_env, addr, buf, l, 0);
+ }
+ i = 0;
+ while (i < l) {
+ switch(wsize) {
+ default:
+ case 1:
+ v = ldub_raw(buf + i);
+ break;
+ case 2:
+ v = lduw_raw(buf + i);
+ break;
+ case 4:
+ v = ldl_raw(buf + i);
+ break;
+ case 8:
+ v = ldq_raw(buf + i);
+ break;
+ }
+ term_printf(" ");
+ switch(format) {
+ case 'o':
+ term_printf("%#*llo", max_digits, v);
+ break;
+ case 'x':
+ term_printf("0x%0*llx", max_digits, v);
+ break;
+ case 'u':
+ term_printf("%*llu", max_digits, v);
+ break;
+ case 'd':
+ term_printf("%*lld", max_digits, v);
+ break;
+ case 'c':
+ term_printc(v);
+ break;
+ }
+ i += wsize;
+ }
+ term_printf("\n");
+ addr += l;
+ len -= l;
+ }
+}
+
+static void do_memory_dump(int count, int format, int size, int addr)
+{
+ memory_dump(count, format, size, addr, 0);
+}
+
+static void do_physical_memory_dump(int count, int format, int size, int addr)
+{
+ memory_dump(count, format, size, addr, 1);
+}
+
+static void do_print(int count, int format, int size, int val)
+{
+ switch(format) {
+ case 'o':
+ term_printf("%#o", val);
+ break;
+ case 'x':
+ term_printf("%#x", val);
+ break;
+ case 'u':
+ term_printf("%u", val);
+ break;
+ default:
+ case 'd':
+ term_printf("%d", val);
+ break;
+ case 'c':
+ term_printc(val);
+ break;
+ }
+ term_printf("\n");
+}
+
static term_cmd_t term_cmds[] = {
- { "help|?", do_help,
+ { "help|?", "s?", do_help,
"[cmd]", "show the help" },
- { "commit", do_commit,
+ { "commit", "", do_commit,
"", "commit changes to the disk images (if -snapshot is used)" },
- { "info", do_info,
+ { "info", "s?", do_info,
"subcommand", "show various information about the system state" },
- { "q|quit", do_quit,
+ { "q|quit", "", do_quit,
"", "quit the emulator" },
- { "eject", do_eject,
+ { "eject", "-fs", do_eject,
"[-f] device", "eject a removable media (use -f to force it)" },
- { "change", do_change,
+ { "change", "sF", do_change,
"device filename", "change a removable media" },
- { "screendump", do_screen_dump,
+ { "screendump", "F", do_screen_dump,
"filename", "save screen into PPM image 'filename'" },
- { "log", do_log,
+ { "log", "s", do_log,
"item1[,...]", "activate logging of the specified items to '/tmp/qemu.log'" },
- { "savevm", do_savevm,
+ { "savevm", "F", do_savevm,
"filename", "save the whole virtual machine state to 'filename'" },
- { "loadvm", do_loadvm,
+ { "loadvm", "F", do_loadvm,
"filename", "restore the whole virtual machine state from 'filename'" },
- { "stop", do_stop, "", "stop emulation", },
- { "c|cont", do_cont, "", "resume emulation", },
+ { "stop", "", do_stop,
+ "", "stop emulation", },
+ { "c|cont", "", do_cont,
+ "", "resume emulation", },
#ifdef CONFIG_GDBSTUB
- { "gdbserver", do_gdbserver, "[port]", "start gdbserver session (default port=1234)", },
+ { "gdbserver", "i?", do_gdbserver,
+ "[port]", "start gdbserver session (default port=1234)", },
#endif
+ { "x", "/i", do_memory_dump,
+ "/fmt addr", "virtual memory dump starting at 'addr'", },
+ { "xp", "/i", do_physical_memory_dump,
+ "/fmt addr", "physical memory dump starting at 'addr'", },
+ { "p|print", "/i", do_print,
+ "/fmt expr", "print expression value (use $reg for CPU register access)", },
{ NULL, NULL, },
};
static term_cmd_t info_cmds[] = {
- { "network", do_info_network,
+ { "network", "", do_info_network,
"", "show the network state" },
- { "block", do_info_block,
+ { "block", "", do_info_block,
"", "show the block devices" },
+ { "registers", "", do_info_registers,
+ "", "show the cpu registers" },
{ NULL, NULL, },
};
-static void term_handle_command(char *cmdline)
+/*******************************************************************/
+
+static const char *pch;
+static jmp_buf expr_env;
+
+typedef struct MonitorDef {
+ const char *name;
+ int offset;
+ int (*get_value)(struct MonitorDef *md);
+} MonitorDef;
+
+static MonitorDef monitor_defs[] = {
+#ifdef TARGET_I386
+ { "eax", offsetof(CPUState, regs[0]) },
+ { "ecx", offsetof(CPUState, regs[1]) },
+ { "edx", offsetof(CPUState, regs[2]) },
+ { "ebx", offsetof(CPUState, regs[3]) },
+ { "esp|sp", offsetof(CPUState, regs[4]) },
+ { "ebp|fp", offsetof(CPUState, regs[5]) },
+ { "esi", offsetof(CPUState, regs[6]) },
+ { "esi", offsetof(CPUState, regs[7]) },
+ { "eflags", offsetof(CPUState, eflags) },
+ { "eip|pc", offsetof(CPUState, eip) },
+#endif
+ { NULL },
+};
+
+static void expr_error(const char *fmt)
+{
+ term_printf(fmt);
+ term_printf("\n");
+ longjmp(expr_env, 1);
+}
+
+static int get_monitor_def(int *pval, const char *name)
+{
+ MonitorDef *md;
+ for(md = monitor_defs; md->name != NULL; md++) {
+ if (compare_cmd(name, md->name)) {
+ if (md->get_value) {
+ *pval = md->get_value(md);
+ } else {
+ *pval = *(uint32_t *)((uint8_t *)cpu_single_env + md->offset);
+ }
+ return 0;
+ }
+ }
+ return -1;
+}
+
+static void next(void)
+{
+ if (pch != '\0') {
+ pch++;
+ while (isspace(*pch))
+ pch++;
+ }
+}
+
+static int expr_sum(void);
+
+static int expr_unary(void)
+{
+ int n;
+ char *p;
+
+ switch(*pch) {
+ case '+':
+ next();
+ n = expr_unary();
+ break;
+ case '-':
+ next();
+ n = -expr_unary();
+ break;
+ case '~':
+ next();
+ n = ~expr_unary();
+ break;
+ case '(':
+ next();
+ n = expr_sum();
+ if (*pch != ')') {
+ expr_error("')' expected");
+ }
+ next();
+ break;
+ case '$':
+ {
+ char buf[128], *q;
+
+ pch++;
+ q = buf;
+ while ((*pch >= 'a' && *pch <= 'z') ||
+ (*pch >= 'A' && *pch <= 'Z') ||
+ (*pch >= '0' && *pch <= '9') ||
+ *pch == '_') {
+ if ((q - buf) < sizeof(buf) - 1)
+ *q++ = *pch;
+ pch++;
+ }
+ while (isspace(*pch))
+ pch++;
+ *q = 0;
+ if (get_monitor_def(&n, buf))
+ expr_error("unknown register");
+ }
+ break;
+ case '\0':
+ expr_error("unexpected end of expression");
+ n = 0;
+ break;
+ default:
+ n = strtoul(pch, &p, 0);
+ if (pch == p) {
+ expr_error("invalid char in expression");
+ }
+ pch = p;
+ while (isspace(*pch))
+ pch++;
+ break;
+ }
+ return n;
+}
+
+
+static int expr_prod(void)
+{
+ int val, val2, op;
+
+ val = expr_unary();
+ for(;;) {
+ op = *pch;
+ if (op != '*' && op != '/' && op != '%')
+ break;
+ next();
+ val2 = expr_unary();
+ switch(op) {
+ default:
+ case '*':
+ val *= val2;
+ break;
+ case '/':
+ case '%':
+ if (val2 == 0)
+ expr_error("divison by zero");
+ if (op == '/')
+ val /= val2;
+ else
+ val %= val2;
+ break;
+ }
+ }
+ return val;
+}
+
+static int expr_logic(void)
+{
+ int val, val2, op;
+
+ val = expr_prod();
+ for(;;) {
+ op = *pch;
+ if (op != '&' && op != '|' && op != '^')
+ break;
+ next();
+ val2 = expr_prod();
+ switch(op) {
+ default:
+ case '&':
+ val &= val2;
+ break;
+ case '|':
+ val |= val2;
+ break;
+ case '^':
+ val ^= val2;
+ break;
+ }
+ }
+ return val;
+}
+
+static int expr_sum(void)
{
- char *p, *pstart;
- int argc;
- const char *args[MAX_ARGS + 1];
+ int val, val2, op;
+
+ val = expr_logic();
+ for(;;) {
+ op = *pch;
+ if (op != '+' && op != '-')
+ break;
+ next();
+ val2 = expr_logic();
+ if (op == '+')
+ val += val2;
+ else
+ val -= val2;
+ }
+ return val;
+}
+
+static int get_expr(int *pval, const char **pp)
+{
+ pch = *pp;
+ if (setjmp(expr_env)) {
+ *pp = pch;
+ return -1;
+ }
+ while (isspace(*pch))
+ pch++;
+ *pval = expr_sum();
+ *pp = pch;
+ return 0;
+}
+
+static int get_str(char *buf, int buf_size, const char **pp)
+{
+ const char *p;
+ char *q;
+ int c;
+
+ p = *pp;
+ while (isspace(*p))
+ p++;
+ if (*p == '\0') {
+ fail:
+ *pp = p;
+ return -1;
+ }
+ q = buf;
+ if (*p == '\"') {
+ p++;
+ while (*p != '\0' && *p != '\"') {
+ if (*p == '\\') {
+ p++;
+ c = *p++;
+ switch(c) {
+ case 'n':
+ c = '\n';
+ break;
+ case 'r':
+ c = '\r';
+ break;
+ case '\\':
+ case '\'':
+ case '\"':
+ break;
+ default:
+ qemu_printf("unsupported escape code: '\\%c'\n", c);
+ goto fail;
+ }
+ if ((q - buf) < buf_size - 1) {
+ *q++ = c;
+ }
+ } else {
+ if ((q - buf) < buf_size - 1) {
+ *q++ = *p;
+ }
+ p++;
+ }
+ }
+ if (*p != '\"') {
+ qemu_printf("untermintated string\n");
+ goto fail;
+ }
+ p++;
+ } else {
+ while (*p != '\0' && !isspace(*p)) {
+ if ((q - buf) < buf_size - 1) {
+ *q++ = *p;
+ }
+ p++;
+ }
+ *q = '\0';
+ }
+ *pp = p;
+ return 0;
+}
+
+static int default_fmt_format = 'x';
+static int default_fmt_size = 4;
+
+#define MAX_ARGS 16
+
+static void term_handle_command(const char *cmdline)
+{
+ const char *p, *pstart, *typestr;
+ char *q;
+ int c, nb_args, len, i, has_arg;
term_cmd_t *cmd;
+ char cmdname[256];
+ char buf[1024];
+ void *str_allocated[MAX_ARGS];
+ void *args[MAX_ARGS];
#ifdef DEBUG
term_printf("command='%s'\n", cmdline);
#endif
- /* split command in words */
- argc = 0;
+ /* extract the command name */
p = cmdline;
+ q = cmdname;
+ while (isspace(*p))
+ p++;
+ if (*p == '\0')
+ return;
+ pstart = p;
+ while (*p != '\0' && *p != '/' && !isspace(*p))
+ p++;
+ len = p - pstart;
+ if (len > sizeof(cmdname) - 1)
+ len = sizeof(cmdname) - 1;
+ memcpy(cmdname, pstart, len);
+ cmdname[len] = '\0';
+
+ /* find the command */
+ for(cmd = term_cmds; cmd->name != NULL; cmd++) {
+ if (compare_cmd(cmdname, cmd->name))
+ goto found;
+ }
+ term_printf("unknown command: '%s'\n", cmdname);
+ return;
+ found:
+
+ for(i = 0; i < MAX_ARGS; i++)
+ str_allocated[i] = NULL;
+
+ /* parse the parameters */
+ typestr = cmd->args_type;
+ nb_args = 0;
for(;;) {
- while (isspace(*p))
- p++;
- if (*p == '\0')
+ c = *typestr;
+ if (c == '\0')
break;
- pstart = p;
- while (*p != '\0' && !isspace(*p))
- p++;
- args[argc] = pstart;
- argc++;
- if (argc >= MAX_ARGS)
+ typestr++;
+ switch(c) {
+ case 'F':
+ case 's':
+ {
+ int ret;
+ char *str;
+
+ while (isspace(*p))
+ p++;
+ if (*typestr == '?') {
+ typestr++;
+ if (*p == '\0') {
+ /* no optional string: NULL argument */
+ str = NULL;
+ goto add_str;
+ }
+ }
+ ret = get_str(buf, sizeof(buf), &p);
+ if (ret < 0) {
+ if (c == 'F')
+ term_printf("%s: filename expected\n", cmdname);
+ else
+ term_printf("%s: string expected\n", cmdname);
+ goto fail;
+ }
+ str = qemu_malloc(strlen(buf) + 1);
+ strcpy(str, buf);
+ str_allocated[nb_args] = str;
+ add_str:
+ if (nb_args >= MAX_ARGS) {
+ error_args:
+ term_printf("%s: too many arguments\n", cmdname);
+ goto fail;
+ }
+ args[nb_args++] = str;
+ }
break;
- if (*p == '\0')
+ case '/':
+ {
+ int count, format, size;
+
+ while (isspace(*p))
+ p++;
+ if (*p == '/') {
+ /* format found */
+ p++;
+ count = 1;
+ if (isdigit(*p)) {
+ count = 0;
+ while (isdigit(*p)) {
+ count = count * 10 + (*p - '0');
+ p++;
+ }
+ }
+ size = -1;
+ format = -1;
+ for(;;) {
+ switch(*p) {
+ case 'o':
+ case 'd':
+ case 'u':
+ case 'x':
+ case 'i':
+ case 'c':
+ format = *p++;
+ break;
+ case 'b':
+ size = 1;
+ p++;
+ break;
+ case 'h':
+ size = 2;
+ p++;
+ break;
+ case 'w':
+ size = 4;
+ p++;
+ break;
+ case 'g':
+ case 'L':
+ size = 8;
+ p++;
+ break;
+ default:
+ goto next;
+ }
+ }
+ next:
+ if (*p != '\0' && !isspace(*p)) {
+ term_printf("invalid char in format: '%c'\n", *p);
+ goto fail;
+ }
+ if (size < 0)
+ size = default_fmt_size;
+ if (format < 0)
+ format = default_fmt_format;
+ default_fmt_size = size;
+ default_fmt_format = format;
+ } else {
+ count = 1;
+ format = default_fmt_format;
+ size = default_fmt_size;
+ }
+ if (nb_args + 3 > MAX_ARGS)
+ goto error_args;
+ args[nb_args++] = (void*)count;
+ args[nb_args++] = (void*)format;
+ args[nb_args++] = (void*)size;
+ }
+ break;
+ case 'i':
+ {
+ int val;
+ while (isspace(*p))
+ p++;
+ if (*typestr == '?') {
+ typestr++;
+ if (*p == '\0')
+ has_arg = 0;
+ else
+ has_arg = 1;
+ if (nb_args >= MAX_ARGS)
+ goto error_args;
+ args[nb_args++] = (void *)has_arg;
+ if (!has_arg) {
+ if (nb_args >= MAX_ARGS)
+ goto error_args;
+ val = -1;
+ goto add_num;
+ }
+ }
+ if (get_expr(&val, &p))
+ goto fail;
+ add_num:
+ if (nb_args >= MAX_ARGS)
+ goto error_args;
+ args[nb_args++] = (void *)val;
+ }
break;
- *p++ = '\0';
+ case '-':
+ {
+ int has_option;
+ /* option */
+
+ c = *typestr++;
+ if (c == '\0')
+ goto bad_type;
+ while (isspace(*p))
+ p++;
+ has_option = 0;
+ if (*p == '-') {
+ p++;
+ if (*p != c) {
+ term_printf("%s: unsupported option -%c\n",
+ cmdname, *p);
+ goto fail;
+ }
+ p++;
+ has_option = 1;
+ }
+ if (nb_args >= MAX_ARGS)
+ goto error_args;
+ args[nb_args++] = (void *)has_option;
+ }
+ break;
+ default:
+ bad_type:
+ term_printf("%s: unknown type '%c'\n", cmdname, c);
+ goto fail;
+ }
}
- args[argc] = NULL;
-#ifdef DEBUG
- for(i=0;i<argc;i++) {
- term_printf(" '%s'", args[i]);
+ /* check that all arguments were parsed */
+ while (isspace(*p))
+ p++;
+ if (*p != '\0') {
+ term_printf("%s: extraneous characters at the end of line\n",
+ cmdname);
+ goto fail;
}
- term_printf("\n");
-#endif
- if (argc <= 0)
- return;
- for(cmd = term_cmds; cmd->name != NULL; cmd++) {
- if (compare_cmd(args[0], cmd->name))
- goto found;
+
+ switch(nb_args) {
+ case 0:
+ cmd->handler();
+ break;
+ case 1:
+ cmd->handler(args[0]);
+ break;
+ case 2:
+ cmd->handler(args[0], args[1]);
+ break;
+ case 3:
+ cmd->handler(args[0], args[1], args[2]);
+ break;
+ case 4:
+ cmd->handler(args[0], args[1], args[2], args[3]);
+ break;
+ case 5:
+ cmd->handler(args[0], args[1], args[2], args[3], args[4]);
+ break;
+ default:
+ term_printf("unsupported number of arguments: %d\n", nb_args);
+ goto fail;
}
- term_printf("unknown command: '%s'\n", args[0]);
+ fail:
+ for(i = 0; i < MAX_ARGS; i++)
+ qemu_free(str_allocated[i]);
return;
- found:
- cmd->handler(argc, args);
}
static void term_show_prompt(void)
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-27 10:13:52 +0000