#define offsetof(type, field) ((size_t) &((type *)0)->field)
#endif
-#define TERM_CMD_BUF_SIZE 4095
-#define TERM_MAX_CMDS 64
-#define NB_COMPLETIONS_MAX 256
-
-#define IS_NORM 0
-#define IS_ESC 1
-#define IS_CSI 2
-
-#define printf do_not_use_printf
-
-static char term_cmd_buf[TERM_CMD_BUF_SIZE + 1];
-static int term_cmd_buf_index;
-static int term_cmd_buf_size;
-
-static char term_last_cmd_buf[TERM_CMD_BUF_SIZE + 1];
-static int term_last_cmd_buf_index;
-static int term_last_cmd_buf_size;
-
-static int term_esc_state;
-static int term_esc_param;
-
-static char *term_history[TERM_MAX_CMDS];
-static int term_hist_entry;
-static CharDriverState *monitor_hd;
-
-static int nb_completions;
-static int completion_index;
-static char *completions[NB_COMPLETIONS_MAX];
-
-
/*
* Supported types:
*
* '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')
const char *help;
} term_cmd_t;
+static CharDriverState *monitor_hd;
+
static term_cmd_t term_cmds[];
static term_cmd_t info_cmds[];
-static void add_completion(const char *str);
+static char term_outbuf[1024];
+static int term_outbuf_index;
-void term_printf(const char *fmt, ...)
+static void monitor_start_input(void);
+
+void term_flush(void)
+{
+ if (term_outbuf_index > 0) {
+ qemu_chr_write(monitor_hd, term_outbuf, term_outbuf_index);
+ term_outbuf_index = 0;
+ }
+}
+
+/* flush at every end of line or if the buffer is full */
+void term_puts(const char *str)
+{
+ int c;
+ for(;;) {
+ c = *str++;
+ if (c == '\0')
+ break;
+ term_outbuf[term_outbuf_index++] = c;
+ if (term_outbuf_index >= sizeof(term_outbuf) ||
+ c == '\n')
+ term_flush();
+ }
+}
+
+void term_vprintf(const char *fmt, va_list ap)
{
char buf[4096];
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ term_puts(buf);
+}
+
+void term_printf(const char *fmt, ...)
+{
va_list ap;
va_start(ap, fmt);
- vsnprintf(buf, sizeof(buf), fmt, ap);
- qemu_chr_write(monitor_hd, buf, strlen(buf));
+ term_vprintf(fmt, ap);
va_end(ap);
}
-void term_flush(void)
+static int monitor_fprintf(FILE *stream, const char *fmt, ...)
{
+ va_list ap;
+ va_start(ap, fmt);
+ term_vprintf(fmt, ap);
+ va_end(ap);
+ return 0;
}
static int compare_cmd(const char *name, const char *list)
int i;
for (i = 0; i < MAX_DISKS; i++) {
- if (bs_table[i])
+ if (bs_table[i]) {
bdrv_commit(bs_table[i]);
+ }
}
}
cmd->handler();
}
+static void do_info_version(void)
+{
+ term_printf("%s\n", QEMU_VERSION);
+}
+
static void do_info_network(void)
{
int i, j;
static void do_info_registers(void)
{
#ifdef TARGET_I386
- cpu_dump_state(cpu_single_env, stdout, X86_DUMP_FPU | X86_DUMP_CCOP);
+ cpu_dump_state(cpu_single_env, NULL, monitor_fprintf,
+ X86_DUMP_FPU | X86_DUMP_CCOP);
#else
- cpu_dump_state(cpu_single_env, stdout, 0);
+ 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;
-
- for (i = 0; i < TERM_MAX_CMDS; i++) {
- if (term_history[i] == NULL)
- break;
- term_printf("%d: '%s'\n", i, term_history[i]);
+ const char *str;
+
+ i = 0;
+ for(;;) {
+ str = readline_get_history(i);
+ if (!str)
+ break;
+ term_printf("%d: '%s'\n", i, str);
+ i++;
}
}
static void do_change(const char *device, const char *filename)
{
BlockDriverState *bs;
+ int i;
+ char password[256];
bs = bdrv_find(device);
if (!bs) {
if (eject_device(bs, 0) < 0)
return;
bdrv_open(bs, filename, 0);
+ if (bdrv_is_encrypted(bs)) {
+ term_printf("%s is encrypted.\n", device);
+ for(i = 0; i < 3; i++) {
+ monitor_readline("Password: ", 1, password, sizeof(password));
+ if (bdrv_set_key(bs, password) == 0)
+ break;
+ term_printf("invalid password\n");
+ }
+ }
}
static void do_screen_dump(const char *filename)
}
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");
}
qemu_system_reset_request();
}
+#if defined(TARGET_I386)
+static void print_pte(uint32_t addr, uint32_t pte, uint32_t mask)
+{
+ term_printf("%08x: %08x %c%c%c%c%c%c%c%c\n",
+ addr,
+ pte & mask,
+ pte & PG_GLOBAL_MASK ? 'G' : '-',
+ pte & PG_PSE_MASK ? 'P' : '-',
+ pte & PG_DIRTY_MASK ? 'D' : '-',
+ pte & PG_ACCESSED_MASK ? 'A' : '-',
+ pte & PG_PCD_MASK ? 'C' : '-',
+ pte & PG_PWT_MASK ? 'T' : '-',
+ pte & PG_USER_MASK ? 'U' : '-',
+ pte & PG_RW_MASK ? 'W' : '-');
+}
+
+static void tlb_info(void)
+{
+ CPUState *env = cpu_single_env;
+ int l1, l2;
+ uint32_t pgd, pde, pte;
+
+ if (!(env->cr[0] & CR0_PG_MASK)) {
+ term_printf("PG disabled\n");
+ return;
+ }
+ pgd = env->cr[3] & ~0xfff;
+ for(l1 = 0; l1 < 1024; l1++) {
+ cpu_physical_memory_read(pgd + l1 * 4, (uint8_t *)&pde, 4);
+ pde = le32_to_cpu(pde);
+ if (pde & PG_PRESENT_MASK) {
+ if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) {
+ print_pte((l1 << 22), pde, ~((1 << 20) - 1));
+ } else {
+ for(l2 = 0; l2 < 1024; l2++) {
+ cpu_physical_memory_read((pde & ~0xfff) + l2 * 4,
+ (uint8_t *)&pte, 4);
+ pte = le32_to_cpu(pte);
+ if (pte & PG_PRESENT_MASK) {
+ print_pte((l1 << 22) + (l2 << 12),
+ pte & ~PG_PSE_MASK,
+ ~0xfff);
+ }
+ }
+ }
+ }
+ }
+}
+
+static void mem_print(uint32_t *pstart, int *plast_prot,
+ uint32_t end, int 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,
+ prot1 & PG_USER_MASK ? 'u' : '-',
+ 'r',
+ prot1 & PG_RW_MASK ? 'w' : '-');
+ }
+ if (prot != 0)
+ *pstart = end;
+ else
+ *pstart = -1;
+ *plast_prot = prot;
+ }
+}
+
+static void mem_info(void)
+{
+ CPUState *env = cpu_single_env;
+ int l1, l2, prot, last_prot;
+ uint32_t pgd, pde, pte, start, end;
+
+ if (!(env->cr[0] & CR0_PG_MASK)) {
+ term_printf("PG disabled\n");
+ return;
+ }
+ pgd = env->cr[3] & ~0xfff;
+ last_prot = 0;
+ start = -1;
+ for(l1 = 0; l1 < 1024; l1++) {
+ cpu_physical_memory_read(pgd + l1 * 4, (uint8_t *)&pde, 4);
+ pde = le32_to_cpu(pde);
+ end = l1 << 22;
+ if (pde & PG_PRESENT_MASK) {
+ if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) {
+ prot = pde & (PG_USER_MASK | PG_RW_MASK | PG_PRESENT_MASK);
+ mem_print(&start, &last_prot, end, prot);
+ } else {
+ for(l2 = 0; l2 < 1024; l2++) {
+ cpu_physical_memory_read((pde & ~0xfff) + l2 * 4,
+ (uint8_t *)&pte, 4);
+ pte = le32_to_cpu(pte);
+ end = (l1 << 22) + (l2 << 12);
+ if (pte & PG_PRESENT_MASK) {
+ prot = pte & (PG_USER_MASK | PG_RW_MASK | PG_PRESENT_MASK);
+ } else {
+ prot = 0;
+ }
+ mem_print(&start, &last_prot, end, prot);
+ }
+ }
+ } else {
+ prot = 0;
+ mem_print(&start, &last_prot, end, prot);
+ }
+ }
+}
+#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" },
};
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,
"", "show i8259 (PIC) state", },
{ "pci", "", pci_info,
"", "show PCI info", },
+#if defined(TARGET_I386)
+ { "tlb", "", tlb_info,
+ "", "show virtual to physical memory mappings", },
+ { "mem", "", mem_info,
+ "", "show the active virtual memory mappings", },
+#endif
+ { "jit", "", do_info_jit,
+ "", "show dynamic compiler info", },
{ 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);
+ target_long (*get_value)(struct MonitorDef *md, int val);
+ int type;
} MonitorDef;
#if defined(TARGET_I386)
-static int monitor_get_pc (struct MonitorDef *md)
+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)
+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)
+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)
+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);
}
-uint32_t cpu_ppc_load_decr (CPUState *env);
-static int monitor_get_decr (struct MonitorDef *md)
+static target_long monitor_get_decr (struct MonitorDef *md, int val)
{
return cpu_ppc_load_decr(cpu_single_env);
}
-uint32_t cpu_ppc_load_tbu (CPUState *env);
-static int monitor_get_tbu (struct MonitorDef *md)
+static target_long monitor_get_tbu (struct MonitorDef *md, int val)
{
return cpu_ppc_load_tbu(cpu_single_env);
}
-uint32_t cpu_ppc_load_tbl (CPUState *env);
-static int monitor_get_tbl (struct MonitorDef *md)
+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 target_long monitor_get_psr (struct MonitorDef *md, int val)
+{
+ return GET_PSR(cpu_single_env);
+}
+
+static target_long monitor_get_reg(struct MonitorDef *md, int val)
+{
+ return cpu_single_env->regwptr[val];
+}
+#endif
+
static MonitorDef monitor_defs[] = {
#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]) },
{ "esp|sp", offsetof(CPUState, regs[4]) },
{ "ebp|fp", offsetof(CPUState, regs[5]) },
{ "esi", offsetof(CPUState, regs[6]) },
- { "esi", offsetof(CPUState, regs[7]) },
+ { "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)
SEG("ds", R_DS)
SEG("es", R_ES)
+ SEG("ss", R_SS)
SEG("fs", R_FS)
SEG("gs", R_GS)
{ "pc", 0, monitor_get_pc, },
{ "sr14", offsetof(CPUState, sr[14]) },
{ "sr15", offsetof(CPUState, sr[15]) },
/* Too lazy to put BATs and SPRs ... */
+#elif defined(TARGET_SPARC)
+ { "g0", offsetof(CPUState, gregs[0]) },
+ { "g1", offsetof(CPUState, gregs[1]) },
+ { "g2", offsetof(CPUState, gregs[2]) },
+ { "g3", offsetof(CPUState, gregs[3]) },
+ { "g4", offsetof(CPUState, gregs[4]) },
+ { "g5", offsetof(CPUState, gregs[5]) },
+ { "g6", offsetof(CPUState, gregs[6]) },
+ { "g7", offsetof(CPUState, gregs[7]) },
+ { "o0", 0, monitor_get_reg },
+ { "o1", 1, monitor_get_reg },
+ { "o2", 2, monitor_get_reg },
+ { "o3", 3, monitor_get_reg },
+ { "o4", 4, monitor_get_reg },
+ { "o5", 5, monitor_get_reg },
+ { "o6", 6, monitor_get_reg },
+ { "o7", 7, monitor_get_reg },
+ { "l0", 8, monitor_get_reg },
+ { "l1", 9, monitor_get_reg },
+ { "l2", 10, monitor_get_reg },
+ { "l3", 11, monitor_get_reg },
+ { "l4", 12, monitor_get_reg },
+ { "l5", 13, monitor_get_reg },
+ { "l6", 14, monitor_get_reg },
+ { "l7", 15, monitor_get_reg },
+ { "i0", 16, monitor_get_reg },
+ { "i1", 17, monitor_get_reg },
+ { "i2", 18, monitor_get_reg },
+ { "i3", 19, monitor_get_reg },
+ { "i4", 20, monitor_get_reg },
+ { "i5", 21, monitor_get_reg },
+ { "i6", 22, monitor_get_reg },
+ { "i7", 23, monitor_get_reg },
+ { "pc", offsetof(CPUState, pc) },
+ { "npc", offsetof(CPUState, npc) },
+ { "y", offsetof(CPUState, y) },
+ { "psr", 0, &monitor_get_psr, },
+ { "wim", offsetof(CPUState, wim) },
+ { "tbr", offsetof(CPUState, tbr) },
+ { "fsr", offsetof(CPUState, fsr) },
+ { "f0", offsetof(CPUState, fpr[0]) },
+ { "f1", offsetof(CPUState, fpr[1]) },
+ { "f2", offsetof(CPUState, fpr[2]) },
+ { "f3", offsetof(CPUState, fpr[3]) },
+ { "f4", offsetof(CPUState, fpr[4]) },
+ { "f5", offsetof(CPUState, fpr[5]) },
+ { "f6", offsetof(CPUState, fpr[6]) },
+ { "f7", offsetof(CPUState, fpr[7]) },
+ { "f8", offsetof(CPUState, fpr[8]) },
+ { "f9", offsetof(CPUState, fpr[9]) },
+ { "f10", offsetof(CPUState, fpr[10]) },
+ { "f11", offsetof(CPUState, fpr[11]) },
+ { "f12", offsetof(CPUState, fpr[12]) },
+ { "f13", offsetof(CPUState, fpr[13]) },
+ { "f14", offsetof(CPUState, fpr[14]) },
+ { "f15", offsetof(CPUState, fpr[15]) },
+ { "f16", offsetof(CPUState, fpr[16]) },
+ { "f17", offsetof(CPUState, fpr[17]) },
+ { "f18", offsetof(CPUState, fpr[18]) },
+ { "f19", offsetof(CPUState, fpr[19]) },
+ { "f20", offsetof(CPUState, fpr[20]) },
+ { "f21", offsetof(CPUState, fpr[21]) },
+ { "f22", offsetof(CPUState, fpr[22]) },
+ { "f23", offsetof(CPUState, fpr[23]) },
+ { "f24", offsetof(CPUState, fpr[24]) },
+ { "f25", offsetof(CPUState, fpr[25]) },
+ { "f26", offsetof(CPUState, fpr[26]) },
+ { "f27", offsetof(CPUState, fpr[27]) },
+ { "f28", offsetof(CPUState, fpr[28]) },
+ { "f29", offsetof(CPUState, fpr[29]) },
+ { "f30", offsetof(CPUState, fpr[30]) },
+ { "f31", offsetof(CPUState, fpr[31]) },
#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);
+ *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)) {
#define MAX_ARGS 16
-static void term_handle_command(const char *cmdline)
+static void monitor_handle_command(const char *cmdline)
{
const char *p, *pstart, *typestr;
char *q;
}
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 '-':
*pnb_args = nb_args;
}
-static void find_completion(const char *cmdline)
+void readline_find_completion(const char *cmdline)
{
const char *cmdname;
char *args[MAX_ARGS];
completion_index = strlen(str);
bdrv_iterate(block_completion_it, (void *)str);
break;
+ case 's':
+ /* XXX: more generic ? */
+ if (!strcmp(cmd->name, "info")) {
+ completion_index = strlen(str);
+ for(cmd = info_cmds; cmd->name != NULL; cmd++) {
+ cmd_completion(str, cmd->name);
+ }
+ }
+ break;
default:
break;
}
qemu_free(args[i]);
}
-static void term_show_prompt2(void)
-{
- term_printf("(qemu) ");
- fflush(stdout);
- term_last_cmd_buf_index = 0;
- term_last_cmd_buf_size = 0;
- term_esc_state = IS_NORM;
-}
-
-static void term_show_prompt(void)
-{
- term_show_prompt2();
- term_cmd_buf_index = 0;
- term_cmd_buf_size = 0;
-}
-
-/* update the displayed command line */
-static void term_update(void)
-{
- int i, delta;
-
- if (term_cmd_buf_size != term_last_cmd_buf_size ||
- memcmp(term_cmd_buf, term_last_cmd_buf, term_cmd_buf_size) != 0) {
- for(i = 0; i < term_last_cmd_buf_index; i++) {
- term_printf("\033[D");
- }
- term_cmd_buf[term_cmd_buf_size] = '\0';
- term_printf("%s", term_cmd_buf);
- term_printf("\033[K");
- memcpy(term_last_cmd_buf, term_cmd_buf, term_cmd_buf_size);
- term_last_cmd_buf_size = term_cmd_buf_size;
- term_last_cmd_buf_index = term_cmd_buf_size;
- }
- if (term_cmd_buf_index != term_last_cmd_buf_index) {
- delta = term_cmd_buf_index - term_last_cmd_buf_index;
- if (delta > 0) {
- for(i = 0;i < delta; i++) {
- term_printf("\033[C");
- }
- } else {
- delta = -delta;
- for(i = 0;i < delta; i++) {
- term_printf("\033[D");
- }
- }
- term_last_cmd_buf_index = term_cmd_buf_index;
- }
- term_flush();
-}
-
-static void term_insert_char(int ch)
-{
- if (term_cmd_buf_index < TERM_CMD_BUF_SIZE) {
- memmove(term_cmd_buf + term_cmd_buf_index + 1,
- term_cmd_buf + term_cmd_buf_index,
- term_cmd_buf_size - term_cmd_buf_index);
- term_cmd_buf[term_cmd_buf_index] = ch;
- term_cmd_buf_size++;
- term_cmd_buf_index++;
- }
-}
-
-static void term_backward_char(void)
-{
- if (term_cmd_buf_index > 0) {
- term_cmd_buf_index--;
- }
-}
-
-static void term_forward_char(void)
-{
- if (term_cmd_buf_index < term_cmd_buf_size) {
- term_cmd_buf_index++;
- }
-}
-
-static void term_delete_char(void)
-{
- if (term_cmd_buf_index < term_cmd_buf_size) {
- memmove(term_cmd_buf + term_cmd_buf_index,
- term_cmd_buf + term_cmd_buf_index + 1,
- term_cmd_buf_size - term_cmd_buf_index - 1);
- term_cmd_buf_size--;
- }
-}
-
-static void term_backspace(void)
+static int term_can_read(void *opaque)
{
- if (term_cmd_buf_index > 0) {
- term_backward_char();
- term_delete_char();
- }
+ return 128;
}
-static void term_bol(void)
+static void term_read(void *opaque, const uint8_t *buf, int size)
{
- term_cmd_buf_index = 0;
+ int i;
+ for(i = 0; i < size; i++)
+ readline_handle_byte(buf[i]);
}
-static void term_eol(void)
-{
- term_cmd_buf_index = term_cmd_buf_size;
-}
+static void monitor_start_input(void);
-static void term_up_char(void)
+static void monitor_handle_command1(void *opaque, const char *cmdline)
{
- int idx;
-
- if (term_hist_entry == 0)
- return;
- if (term_hist_entry == -1) {
- /* Find latest entry */
- for (idx = 0; idx < TERM_MAX_CMDS; idx++) {
- if (term_history[idx] == NULL)
- break;
- }
- term_hist_entry = idx;
- }
- term_hist_entry--;
- if (term_hist_entry >= 0) {
- pstrcpy(term_cmd_buf, sizeof(term_cmd_buf),
- term_history[term_hist_entry]);
- term_cmd_buf_index = term_cmd_buf_size = strlen(term_cmd_buf);
- }
+ monitor_handle_command(cmdline);
+ monitor_start_input();
}
-static void term_down_char(void)
+static void monitor_start_input(void)
{
- if (term_hist_entry == TERM_MAX_CMDS - 1 || term_hist_entry == -1)
- return;
- if (term_history[++term_hist_entry] != NULL) {
- pstrcpy(term_cmd_buf, sizeof(term_cmd_buf),
- term_history[term_hist_entry]);
- } else {
- term_hist_entry = -1;
- }
- term_cmd_buf_index = term_cmd_buf_size = strlen(term_cmd_buf);
+ readline_start("(qemu) ", 0, monitor_handle_command1, NULL);
}
-static void term_hist_add(const char *cmdline)
+void monitor_init(CharDriverState *hd, int show_banner)
{
- char *hist_entry, *new_entry;
- int idx;
-
- if (cmdline[0] == '\0')
- return;
- new_entry = NULL;
- if (term_hist_entry != -1) {
- /* We were editing an existing history entry: replace it */
- hist_entry = term_history[term_hist_entry];
- idx = term_hist_entry;
- if (strcmp(hist_entry, cmdline) == 0) {
- goto same_entry;
- }
- }
- /* Search cmdline in history buffers */
- for (idx = 0; idx < TERM_MAX_CMDS; idx++) {
- hist_entry = term_history[idx];
- if (hist_entry == NULL)
- break;
- if (strcmp(hist_entry, cmdline) == 0) {
- same_entry:
- new_entry = hist_entry;
- /* Put this entry at the end of history */
- memmove(&term_history[idx], &term_history[idx + 1],
- &term_history[TERM_MAX_CMDS] - &term_history[idx + 1]);
- term_history[TERM_MAX_CMDS - 1] = NULL;
- for (; idx < TERM_MAX_CMDS; idx++) {
- if (term_history[idx] == NULL)
- break;
- }
- break;
- }
- }
- if (idx == TERM_MAX_CMDS) {
- /* Need to get one free slot */
- free(term_history[0]);
- memcpy(term_history, &term_history[1],
- &term_history[TERM_MAX_CMDS] - &term_history[1]);
- term_history[TERM_MAX_CMDS - 1] = NULL;
- idx = TERM_MAX_CMDS - 1;
+ monitor_hd = hd;
+ if (show_banner) {
+ term_printf("QEMU %s monitor - type 'help' for more information\n",
+ QEMU_VERSION);
}
- if (new_entry == NULL)
- new_entry = strdup(cmdline);
- term_history[idx] = new_entry;
- term_hist_entry = -1;
+ qemu_chr_add_read_handler(hd, term_can_read, term_read, NULL);
+ monitor_start_input();
}
-/* completion support */
+/* XXX: use threads ? */
+/* modal monitor readline */
+static int monitor_readline_started;
+static char *monitor_readline_buf;
+static int monitor_readline_buf_size;
-static void add_completion(const char *str)
+static void monitor_readline_cb(void *opaque, const char *input)
{
- if (nb_completions < NB_COMPLETIONS_MAX) {
- completions[nb_completions++] = qemu_strdup(str);
- }
+ pstrcpy(monitor_readline_buf, monitor_readline_buf_size, input);
+ monitor_readline_started = 0;
}
-static void term_completion(void)
+void monitor_readline(const char *prompt, int is_password,
+ char *buf, int buf_size)
{
- int len, i, j, max_width, nb_cols;
- char *cmdline;
-
- nb_completions = 0;
-
- cmdline = qemu_malloc(term_cmd_buf_index + 1);
- if (!cmdline)
- return;
- memcpy(cmdline, term_cmd_buf, term_cmd_buf_index);
- cmdline[term_cmd_buf_index] = '\0';
- find_completion(cmdline);
- qemu_free(cmdline);
-
- /* no completion found */
- if (nb_completions <= 0)
- return;
- if (nb_completions == 1) {
- len = strlen(completions[0]);
- for(i = completion_index; i < len; i++) {
- term_insert_char(completions[0][i]);
- }
- /* extra space for next argument. XXX: make it more generic */
- if (len > 0 && completions[0][len - 1] != '/')
- term_insert_char(' ');
- } else {
- term_printf("\n");
- max_width = 0;
- for(i = 0; i < nb_completions; i++) {
- len = strlen(completions[i]);
- if (len > max_width)
- max_width = len;
- }
- max_width += 2;
- if (max_width < 10)
- max_width = 10;
- else if (max_width > 80)
- max_width = 80;
- nb_cols = 80 / max_width;
- j = 0;
- for(i = 0; i < nb_completions; i++) {
- term_printf("%-*s", max_width, completions[i]);
- if (++j == nb_cols || i == (nb_completions - 1)) {
- term_printf("\n");
- j = 0;
- }
- }
- term_show_prompt2();
+ if (is_password) {
+ qemu_chr_send_event(monitor_hd, CHR_EVENT_FOCUS);
}
-}
-
-/* return true if command handled */
-static void term_handle_byte(int ch)
-{
- switch(term_esc_state) {
- case IS_NORM:
- switch(ch) {
- case 1:
- term_bol();
- break;
- case 4:
- term_delete_char();
- break;
- case 5:
- term_eol();
- break;
- case 9:
- term_completion();
- break;
- case 10:
- case 13:
- term_cmd_buf[term_cmd_buf_size] = '\0';
- term_hist_add(term_cmd_buf);
- term_printf("\n");
- term_handle_command(term_cmd_buf);
- term_show_prompt();
- break;
- case 27:
- term_esc_state = IS_ESC;
- break;
- case 127:
- case 8:
- term_backspace();
- break;
- case 155:
- term_esc_state = IS_CSI;
- break;
- default:
- if (ch >= 32) {
- term_insert_char(ch);
- }
- break;
- }
- break;
- case IS_ESC:
- if (ch == '[') {
- term_esc_state = IS_CSI;
- term_esc_param = 0;
- } else {
- term_esc_state = IS_NORM;
- }
- break;
- case IS_CSI:
- switch(ch) {
- case 'A':
- case 'F':
- term_up_char();
- break;
- case 'B':
- case 'E':
- term_down_char();
- break;
- case 'D':
- term_backward_char();
- break;
- case 'C':
- term_forward_char();
- break;
- case '0' ... '9':
- term_esc_param = term_esc_param * 10 + (ch - '0');
- goto the_end;
- case '~':
- switch(term_esc_param) {
- case 1:
- term_bol();
- break;
- case 3:
- term_delete_char();
- break;
- case 4:
- term_eol();
- break;
- }
- break;
- default:
- break;
- }
- term_esc_state = IS_NORM;
- the_end:
- break;
- }
- term_update();
-}
-
-static int term_can_read(void *opaque)
-{
- return 128;
-}
-
-static void term_read(void *opaque, const uint8_t *buf, int size)
-{
- int i;
- for(i = 0; i < size; i++)
- term_handle_byte(buf[i]);
-}
-
-void monitor_init(CharDriverState *hd, int show_banner)
-{
- monitor_hd = hd;
- if (show_banner) {
- term_printf("QEMU %s monitor - type 'help' for more information\n",
- QEMU_VERSION);
- term_show_prompt();
+ readline_start(prompt, is_password, monitor_readline_cb, NULL);
+ monitor_readline_buf = buf;
+ monitor_readline_buf_size = buf_size;
+ monitor_readline_started = 1;
+ while (monitor_readline_started) {
+ main_loop_wait(10);
}
- term_hist_entry = -1;
- qemu_chr_add_read_handler(hd, term_can_read, term_read, NULL);
}
projects / qemu.git / blobdiff