} else if (wsize == 4) {
flags = 0;
} else {
- /* as default we use the current CS size */
+ /* as default we use the current CS size */
flags = 0;
- if (env && !(env->segs[R_CS].flags & DESC_B_MASK))
- flags = 1;
+ if (env) {
+#ifdef TARGET_X86_64
+ if ((env->efer & MSR_EFER_LMA) &&
+ (env->segs[R_CS].flags & DESC_L_MASK))
+ flags = 2;
+ else
+#endif
+ if (!(env->segs[R_CS].flags & DESC_B_MASK))
+ flags = 1;
+ }
}
#endif
monitor_disas(env, addr, count, is_physical, flags);
term_printf(" ");
switch(format) {
case 'o':
- term_printf("%#*llo", max_digits, v);
+ term_printf("%#*" PRIo64, max_digits, v);
break;
case 'x':
- term_printf("0x%0*llx", max_digits, v);
+ term_printf("0x%0*" PRIx64, max_digits, v);
break;
case 'u':
- term_printf("%*llu", max_digits, v);
+ term_printf("%*" PRIu64, max_digits, v);
break;
case 'd':
- term_printf("%*lld", max_digits, v);
+ term_printf("%*" PRId64, max_digits, v);
break;
case 'c':
term_printc(v);
#else
switch(format) {
case 'o':
- term_printf("%#llo", val);
+ term_printf("%#" PRIo64, val);
break;
case 'x':
- term_printf("%#llx", val);
+ term_printf("%#" PRIx64, val);
break;
case 'u':
- term_printf("%llu", val);
+ term_printf("%" PRIu64, val);
break;
default:
case 'd':
- term_printf("%lld", val);
+ term_printf("%" PRId64, val);
break;
case 'c':
term_printc(val);
{ 0x09, "8" },
{ 0x0a, "9" },
{ 0x0b, "0" },
+ { 0x0c, "minus" },
+ { 0x0d, "equal" },
{ 0x0e, "backspace" },
{ 0x0f, "tab" },
{ 0x45, "num_lock" },
{ 0x46, "scroll_lock" },
+ { 0xb5, "kp_divide" },
+ { 0x37, "kp_multiply" },
+ { 0x4a, "kp_substract" },
+ { 0x4e, "kp_add" },
+ { 0x9c, "kp_enter" },
+ { 0x53, "kp_decimal" },
+
+ { 0x52, "kp_0" },
+ { 0x4f, "kp_1" },
+ { 0x50, "kp_2" },
+ { 0x51, "kp_3" },
+ { 0x4b, "kp_4" },
+ { 0x4c, "kp_5" },
+ { 0x4d, "kp_6" },
+ { 0x47, "kp_7" },
+ { 0x48, "kp_8" },
+ { 0x49, "kp_9" },
+
{ 0x56, "<" },
{ 0x57, "f11" },
static int get_keycode(const char *key)
{
const KeyDef *p;
+ char *endp;
+ int ret;
for(p = key_defs; p->name != NULL; p++) {
if (!strcmp(key, p->name))
return p->keycode;
}
+ if (strstart(key, "0x", NULL)) {
+ ret = strtoul(key, &endp, 0);
+ if (*endp == '\0' && ret >= 0x01 && ret <= 0xff)
+ return ret;
+ }
return -1;
}
total = qemu_time;
if (total == 0)
total = 1;
- term_printf("async time %lld (%0.3f)\n",
+ term_printf("async time %" PRId64 " (%0.3f)\n",
dev_time, dev_time / (double)ticks_per_sec);
- term_printf("qemu time %lld (%0.3f)\n",
+ term_printf("qemu time %" PRId64 " (%0.3f)\n",
qemu_time, qemu_time / (double)ticks_per_sec);
- term_printf("kqemu time %lld (%0.3f %0.1f%%) count=%lld int=%lld excp=%lld intr=%lld\n",
+ term_printf("kqemu time %" PRId64 " (%0.3f %0.1f%%) count=%" PRId64 " int=%" PRId64 " excp=%" PRId64 " intr=%" PRId64 "\n",
kqemu_time, kqemu_time / (double)ticks_per_sec,
kqemu_time / (double)total * 100.0,
kqemu_exec_count,
n = 0;
break;
default:
+#if TARGET_LONG_BITS == 64
+ n = strtoull(pch, &p, 0);
+#else
n = strtoul(pch, &p, 0);
+#endif
if (pch == p) {
expr_error("invalid char in expression");
}
int nb_args, i, len;
const char *ptype, *str;
term_cmd_t *cmd;
+ const KeyDef *key;
parse_cmdline(cmdline, &nb_args, args);
#ifdef DEBUG_COMPLETION
for(cmd = info_cmds; cmd->name != NULL; cmd++) {
cmd_completion(str, cmd->name);
}
+ } else if (!strcmp(cmd->name, "sendkey")) {
+ completion_index = strlen(str);
+ for(key = key_defs; key->name != NULL; key++) {
+ cmd_completion(str, key->name);
+ }
}
break;
default: