aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile6
-rw-r--r--hw/char/escc.c126
-rw-r--r--hw/input/ps2.c427
-rw-r--r--hw/input/virtio-input-hid.c144
-rw-r--r--include/ui/input.h18
-rw-r--r--linux-user/signal.c118
-rw-r--r--scripts/tracetool/__init__.py19
-rw-r--r--ui/input-keymap.c6
8 files changed, 133 insertions, 731 deletions
diff --git a/Makefile b/Makefile
index af31e8981f..7073b3d842 100644
--- a/Makefile
+++ b/Makefile
@@ -234,9 +234,13 @@ KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv
KEYCODEMAP_FILES = \
ui/input-keymap-atset1-to-qcode.c \
ui/input-keymap-linux-to-qcode.c \
+ ui/input-keymap-qcode-to-atset1.c \
+ ui/input-keymap-qcode-to-atset2.c \
+ ui/input-keymap-qcode-to-atset3.c \
+ ui/input-keymap-qcode-to-linux.c \
ui/input-keymap-qcode-to-qnum.c \
+ ui/input-keymap-qcode-to-sun.c \
ui/input-keymap-qnum-to-qcode.c \
- ui/input-keymap-qcode-to-linux.c \
ui/input-keymap-usb-to-qcode.c \
ui/input-keymap-win32-to-qcode.c \
ui/input-keymap-x11-to-qcode.c \
diff --git a/hw/char/escc.c b/hw/char/escc.c
index 3ab831a6a7..449bf2fc63 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -717,126 +717,6 @@ MemoryRegion *escc_init(hwaddr base, qemu_irq irqA, qemu_irq irqB,
return &d->mmio;
}
-static const uint8_t qcode_to_keycode[Q_KEY_CODE__MAX] = {
- [Q_KEY_CODE_SHIFT] = 99,
- [Q_KEY_CODE_SHIFT_R] = 110,
- [Q_KEY_CODE_ALT] = 19,
- [Q_KEY_CODE_ALT_R] = 13,
- [Q_KEY_CODE_CTRL] = 76,
- [Q_KEY_CODE_CTRL_R] = 76,
- [Q_KEY_CODE_ESC] = 29,
- [Q_KEY_CODE_1] = 30,
- [Q_KEY_CODE_2] = 31,
- [Q_KEY_CODE_3] = 32,
- [Q_KEY_CODE_4] = 33,
- [Q_KEY_CODE_5] = 34,
- [Q_KEY_CODE_6] = 35,
- [Q_KEY_CODE_7] = 36,
- [Q_KEY_CODE_8] = 37,
- [Q_KEY_CODE_9] = 38,
- [Q_KEY_CODE_0] = 39,
- [Q_KEY_CODE_MINUS] = 40,
- [Q_KEY_CODE_EQUAL] = 41,
- [Q_KEY_CODE_BACKSPACE] = 43,
- [Q_KEY_CODE_TAB] = 53,
- [Q_KEY_CODE_Q] = 54,
- [Q_KEY_CODE_W] = 55,
- [Q_KEY_CODE_E] = 56,
- [Q_KEY_CODE_R] = 57,
- [Q_KEY_CODE_T] = 58,
- [Q_KEY_CODE_Y] = 59,
- [Q_KEY_CODE_U] = 60,
- [Q_KEY_CODE_I] = 61,
- [Q_KEY_CODE_O] = 62,
- [Q_KEY_CODE_P] = 63,
- [Q_KEY_CODE_BRACKET_LEFT] = 64,
- [Q_KEY_CODE_BRACKET_RIGHT] = 65,
- [Q_KEY_CODE_RET] = 89,
- [Q_KEY_CODE_A] = 77,
- [Q_KEY_CODE_S] = 78,
- [Q_KEY_CODE_D] = 79,
- [Q_KEY_CODE_F] = 80,
- [Q_KEY_CODE_G] = 81,
- [Q_KEY_CODE_H] = 82,
- [Q_KEY_CODE_J] = 83,
- [Q_KEY_CODE_K] = 84,
- [Q_KEY_CODE_L] = 85,
- [Q_KEY_CODE_SEMICOLON] = 86,
- [Q_KEY_CODE_APOSTROPHE] = 87,
- [Q_KEY_CODE_GRAVE_ACCENT] = 42,
- [Q_KEY_CODE_BACKSLASH] = 88,
- [Q_KEY_CODE_Z] = 100,
- [Q_KEY_CODE_X] = 101,
- [Q_KEY_CODE_C] = 102,
- [Q_KEY_CODE_V] = 103,
- [Q_KEY_CODE_B] = 104,
- [Q_KEY_CODE_N] = 105,
- [Q_KEY_CODE_M] = 106,
- [Q_KEY_CODE_COMMA] = 107,
- [Q_KEY_CODE_DOT] = 108,
- [Q_KEY_CODE_SLASH] = 109,
- [Q_KEY_CODE_ASTERISK] = 47,
- [Q_KEY_CODE_SPC] = 121,
- [Q_KEY_CODE_CAPS_LOCK] = 119,
- [Q_KEY_CODE_F1] = 5,
- [Q_KEY_CODE_F2] = 6,
- [Q_KEY_CODE_F3] = 8,
- [Q_KEY_CODE_F4] = 10,
- [Q_KEY_CODE_F5] = 12,
- [Q_KEY_CODE_F6] = 14,
- [Q_KEY_CODE_F7] = 16,
- [Q_KEY_CODE_F8] = 17,
- [Q_KEY_CODE_F9] = 18,
- [Q_KEY_CODE_F10] = 7,
- [Q_KEY_CODE_NUM_LOCK] = 98,
- [Q_KEY_CODE_SCROLL_LOCK] = 23,
- [Q_KEY_CODE_KP_DIVIDE] = 46,
- [Q_KEY_CODE_KP_MULTIPLY] = 47,
- [Q_KEY_CODE_KP_SUBTRACT] = 71,
- [Q_KEY_CODE_KP_ADD] = 125,
- [Q_KEY_CODE_KP_ENTER] = 90,
- [Q_KEY_CODE_KP_DECIMAL] = 50,
- [Q_KEY_CODE_KP_0] = 94,
- [Q_KEY_CODE_KP_1] = 112,
- [Q_KEY_CODE_KP_2] = 113,
- [Q_KEY_CODE_KP_3] = 114,
- [Q_KEY_CODE_KP_4] = 91,
- [Q_KEY_CODE_KP_5] = 92,
- [Q_KEY_CODE_KP_6] = 93,
- [Q_KEY_CODE_KP_7] = 68,
- [Q_KEY_CODE_KP_8] = 69,
- [Q_KEY_CODE_KP_9] = 70,
- [Q_KEY_CODE_LESS] = 124,
- [Q_KEY_CODE_F11] = 9,
- [Q_KEY_CODE_F12] = 11,
- [Q_KEY_CODE_HOME] = 52,
- [Q_KEY_CODE_PGUP] = 96,
- [Q_KEY_CODE_PGDN] = 123,
- [Q_KEY_CODE_END] = 74,
- [Q_KEY_CODE_LEFT] = 24,
- [Q_KEY_CODE_UP] = 20,
- [Q_KEY_CODE_DOWN] = 27,
- [Q_KEY_CODE_RIGHT] = 28,
- [Q_KEY_CODE_INSERT] = 44,
- [Q_KEY_CODE_DELETE] = 66,
- [Q_KEY_CODE_STOP] = 1,
- [Q_KEY_CODE_AGAIN] = 3,
- [Q_KEY_CODE_PROPS] = 25,
- [Q_KEY_CODE_UNDO] = 26,
- [Q_KEY_CODE_FRONT] = 49,
- [Q_KEY_CODE_COPY] = 51,
- [Q_KEY_CODE_OPEN] = 72,
- [Q_KEY_CODE_PASTE] = 73,
- [Q_KEY_CODE_FIND] = 95,
- [Q_KEY_CODE_CUT] = 97,
- [Q_KEY_CODE_LF] = 111,
- [Q_KEY_CODE_HELP] = 118,
- [Q_KEY_CODE_META_L] = 120,
- [Q_KEY_CODE_META_R] = 122,
- [Q_KEY_CODE_COMPOSE] = 67,
- [Q_KEY_CODE_PRINT] = 22,
- [Q_KEY_CODE_SYSRQ] = 21,
-};
static void sunkbd_handle_event(DeviceState *dev, QemuConsole *src,
InputEvent *evt)
@@ -879,7 +759,11 @@ static void sunkbd_handle_event(DeviceState *dev, QemuConsole *src,
}
}
- keycode = qcode_to_keycode[qcode];
+ if (qcode > qemu_input_map_qcode_to_sun_len) {
+ return;
+ }
+
+ keycode = qemu_input_map_qcode_to_sun[qcode];
if (!key->down) {
keycode |= 0x80;
}
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index f388a23c8e..06f5d2ac4a 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -124,401 +124,6 @@ typedef struct {
uint8_t mouse_buttons;
} PS2MouseState;
-/* Table to convert from QEMU codes to scancodes. */
-static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] = {
- [0 ... Q_KEY_CODE__MAX - 1] = 0,
-
- [Q_KEY_CODE_A] = 0x1e,
- [Q_KEY_CODE_B] = 0x30,
- [Q_KEY_CODE_C] = 0x2e,
- [Q_KEY_CODE_D] = 0x20,
- [Q_KEY_CODE_E] = 0x12,
- [Q_KEY_CODE_F] = 0x21,
- [Q_KEY_CODE_G] = 0x22,
- [Q_KEY_CODE_H] = 0x23,
- [Q_KEY_CODE_I] = 0x17,
- [Q_KEY_CODE_J] = 0x24,
- [Q_KEY_CODE_K] = 0x25,
- [Q_KEY_CODE_L] = 0x26,
- [Q_KEY_CODE_M] = 0x32,
- [Q_KEY_CODE_N] = 0x31,
- [Q_KEY_CODE_O] = 0x18,
- [Q_KEY_CODE_P] = 0x19,
- [Q_KEY_CODE_Q] = 0x10,
- [Q_KEY_CODE_R] = 0x13,
- [Q_KEY_CODE_S] = 0x1f,
- [Q_KEY_CODE_T] = 0x14,
- [Q_KEY_CODE_U] = 0x16,
- [Q_KEY_CODE_V] = 0x2f,
- [Q_KEY_CODE_W] = 0x11,
- [Q_KEY_CODE_X] = 0x2d,
- [Q_KEY_CODE_Y] = 0x15,
- [Q_KEY_CODE_Z] = 0x2c,
- [Q_KEY_CODE_0] = 0x0b,
- [Q_KEY_CODE_1] = 0x02,
- [Q_KEY_CODE_2] = 0x03,
- [Q_KEY_CODE_3] = 0x04,
- [Q_KEY_CODE_4] = 0x05,
- [Q_KEY_CODE_5] = 0x06,
- [Q_KEY_CODE_6] = 0x07,
- [Q_KEY_CODE_7] = 0x08,
- [Q_KEY_CODE_8] = 0x09,
- [Q_KEY_CODE_9] = 0x0a,
- [Q_KEY_CODE_GRAVE_ACCENT] = 0x29,
- [Q_KEY_CODE_MINUS] = 0x0c,
- [Q_KEY_CODE_EQUAL] = 0x0d,
- [Q_KEY_CODE_BACKSLASH] = 0x2b,
- [Q_KEY_CODE_BACKSPACE] = 0x0e,
- [Q_KEY_CODE_SPC] = 0x39,
- [Q_KEY_CODE_TAB] = 0x0f,
- [Q_KEY_CODE_CAPS_LOCK] = 0x3a,
- [Q_KEY_CODE_SHIFT] = 0x2a,
- [Q_KEY_CODE_CTRL] = 0x1d,
- [Q_KEY_CODE_META_L] = 0xe05b,
- [Q_KEY_CODE_ALT] = 0x38,
- [Q_KEY_CODE_SHIFT_R] = 0x36,
- [Q_KEY_CODE_CTRL_R] = 0xe01d,
- [Q_KEY_CODE_META_R] = 0xe05c,
- [Q_KEY_CODE_ALT_R] = 0xe038,
- [Q_KEY_CODE_MENU] = 0xe05d,
- [Q_KEY_CODE_RET] = 0x1c,
- [Q_KEY_CODE_ESC] = 0x01,
- [Q_KEY_CODE_F1] = 0x3b,
- [Q_KEY_CODE_F2] = 0x3c,
- [Q_KEY_CODE_F3] = 0x3d,
- [Q_KEY_CODE_F4] = 0x3e,
- [Q_KEY_CODE_F5] = 0x3f,
- [Q_KEY_CODE_F6] = 0x40,
- [Q_KEY_CODE_F7] = 0x41,
- [Q_KEY_CODE_F8] = 0x42,
- [Q_KEY_CODE_F9] = 0x43,
- [Q_KEY_CODE_F10] = 0x44,
- [Q_KEY_CODE_F11] = 0x57,
- [Q_KEY_CODE_F12] = 0x58,
- /* special handling for Q_KEY_CODE_PRINT */
- [Q_KEY_CODE_SCROLL_LOCK] = 0x46,
- /* special handling for Q_KEY_CODE_PAUSE */
- [Q_KEY_CODE_BRACKET_LEFT] = 0x1a,
- [Q_KEY_CODE_INSERT] = 0xe052,
- [Q_KEY_CODE_HOME] = 0xe047,
- [Q_KEY_CODE_PGUP] = 0xe049,
- [Q_KEY_CODE_DELETE] = 0xe053,
- [Q_KEY_CODE_END] = 0xe04f,
- [Q_KEY_CODE_PGDN] = 0xe051,
- [Q_KEY_CODE_UP] = 0xe048,
- [Q_KEY_CODE_LEFT] = 0xe04b,
- [Q_KEY_CODE_DOWN] = 0xe050,
- [Q_KEY_CODE_RIGHT] = 0xe04d,
- [Q_KEY_CODE_NUM_LOCK] = 0x45,
- [Q_KEY_CODE_KP_DIVIDE] = 0xe035,
- [Q_KEY_CODE_KP_MULTIPLY] = 0x37,
- [Q_KEY_CODE_KP_SUBTRACT] = 0x4a,
- [Q_KEY_CODE_KP_ADD] = 0x4e,
- [Q_KEY_CODE_KP_ENTER] = 0xe01c,
- [Q_KEY_CODE_KP_DECIMAL] = 0x53,
- [Q_KEY_CODE_KP_0] = 0x52,
- [Q_KEY_CODE_KP_1] = 0x4f,
- [Q_KEY_CODE_KP_2] = 0x50,
- [Q_KEY_CODE_KP_3] = 0x51,
- [Q_KEY_CODE_KP_4] = 0x4b,
- [Q_KEY_CODE_KP_5] = 0x4c,
- [Q_KEY_CODE_KP_6] = 0x4d,
- [Q_KEY_CODE_KP_7] = 0x47,
- [Q_KEY_CODE_KP_8] = 0x48,
- [Q_KEY_CODE_KP_9] = 0x49,
- [Q_KEY_CODE_BRACKET_RIGHT] = 0x1b,
- [Q_KEY_CODE_SEMICOLON] = 0x27,
- [Q_KEY_CODE_APOSTROPHE] = 0x28,
- [Q_KEY_CODE_COMMA] = 0x33,
- [Q_KEY_CODE_DOT] = 0x34,
- [Q_KEY_CODE_SLASH] = 0x35,
-
- [Q_KEY_CODE_POWER] = 0x0e5e,
- [Q_KEY_CODE_SLEEP] = 0x0e5f,
- [Q_KEY_CODE_WAKE] = 0x0e63,
-
- [Q_KEY_CODE_AUDIONEXT] = 0xe019,
- [Q_KEY_CODE_AUDIOPREV] = 0xe010,
- [Q_KEY_CODE_AUDIOSTOP] = 0xe024,
- [Q_KEY_CODE_AUDIOPLAY] = 0xe022,
- [Q_KEY_CODE_AUDIOMUTE] = 0xe020,
- [Q_KEY_CODE_VOLUMEUP] = 0xe030,
- [Q_KEY_CODE_VOLUMEDOWN] = 0xe02e,
- [Q_KEY_CODE_MEDIASELECT] = 0xe06d,
- [Q_KEY_CODE_MAIL] = 0xe06c,
- [Q_KEY_CODE_CALCULATOR] = 0xe021,
- [Q_KEY_CODE_COMPUTER] = 0xe06b,
- [Q_KEY_CODE_FIND] = 0xe065,
- [Q_KEY_CODE_AC_HOME] = 0xe032,
- [Q_KEY_CODE_AC_BACK] = 0xe06a,
- [Q_KEY_CODE_AC_FORWARD] = 0xe069,
- [Q_KEY_CODE_STOP] = 0xe068,
- [Q_KEY_CODE_AC_REFRESH] = 0xe067,
- [Q_KEY_CODE_AC_BOOKMARKS] = 0xe066,
-
- [Q_KEY_CODE_ASTERISK] = 0x37,
- [Q_KEY_CODE_LESS] = 0x56,
- [Q_KEY_CODE_RO] = 0x73,
- [Q_KEY_CODE_HIRAGANA] = 0x70,
- [Q_KEY_CODE_HENKAN] = 0x79,
- [Q_KEY_CODE_YEN] = 0x7d,
- [Q_KEY_CODE_KP_COMMA] = 0x7e,
-};
-
-static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = {
- [0 ... Q_KEY_CODE__MAX - 1] = 0,
-
- [Q_KEY_CODE_A] = 0x1c,
- [Q_KEY_CODE_B] = 0x32,
- [Q_KEY_CODE_C] = 0x21,
- [Q_KEY_CODE_D] = 0x23,
- [Q_KEY_CODE_E] = 0x24,
- [Q_KEY_CODE_F] = 0x2b,
- [Q_KEY_CODE_G] = 0x34,
- [Q_KEY_CODE_H] = 0x33,
- [Q_KEY_CODE_I] = 0x43,
- [Q_KEY_CODE_J] = 0x3b,
- [Q_KEY_CODE_K] = 0x42,
- [Q_KEY_CODE_L] = 0x4b,
- [Q_KEY_CODE_M] = 0x3a,
- [Q_KEY_CODE_N] = 0x31,
- [Q_KEY_CODE_O] = 0x44,
- [Q_KEY_CODE_P] = 0x4d,
- [Q_KEY_CODE_Q] = 0x15,
- [Q_KEY_CODE_R] = 0x2d,
- [Q_KEY_CODE_S] = 0x1b,
- [Q_KEY_CODE_T] = 0x2c,
- [Q_KEY_CODE_U] = 0x3c,
- [Q_KEY_CODE_V] = 0x2a,
- [Q_KEY_CODE_W] = 0x1d,
- [Q_KEY_CODE_X] = 0x22,
- [Q_KEY_CODE_Y] = 0x35,
- [Q_KEY_CODE_Z] = 0x1a,
- [Q_KEY_CODE_0] = 0x45,
- [Q_KEY_CODE_1] = 0x16,
- [Q_KEY_CODE_2] = 0x1e,
- [Q_KEY_CODE_3] = 0x26,
- [Q_KEY_CODE_4] = 0x25,
- [Q_KEY_CODE_5] = 0x2e,
- [Q_KEY_CODE_6] = 0x36,
- [Q_KEY_CODE_7] = 0x3d,
- [Q_KEY_CODE_8] = 0x3e,
- [Q_KEY_CODE_9] = 0x46,
- [Q_KEY_CODE_GRAVE_ACCENT] = 0x0e,
- [Q_KEY_CODE_MINUS] = 0x4e,
- [Q_KEY_CODE_EQUAL] = 0x55,
- [Q_KEY_CODE_BACKSLASH] = 0x5d,
- [Q_KEY_CODE_BACKSPACE] = 0x66,
- [Q_KEY_CODE_SPC] = 0x29,
- [Q_KEY_CODE_TAB] = 0x0d,
- [Q_KEY_CODE_CAPS_LOCK] = 0x58,
- [Q_KEY_CODE_SHIFT] = 0x12,
- [Q_KEY_CODE_CTRL] = 0x14,
- [Q_KEY_CODE_META_L] = 0xe01f,
- [Q_KEY_CODE_ALT] = 0x11,
- [Q_KEY_CODE_SHIFT_R] = 0x59,
- [Q_KEY_CODE_CTRL_R] = 0xe014,
- [Q_KEY_CODE_META_R] = 0xe027,
- [Q_KEY_CODE_ALT_R] = 0xe011,
- [Q_KEY_CODE_MENU] = 0xe02f,
- [Q_KEY_CODE_RET] = 0x5a,
- [Q_KEY_CODE_ESC] = 0x76,
- [Q_KEY_CODE_F1] = 0x05,
- [Q_KEY_CODE_F2] = 0x06,
- [Q_KEY_CODE_F3] = 0x04,
- [Q_KEY_CODE_F4] = 0x0c,
- [Q_KEY_CODE_F5] = 0x03,
- [Q_KEY_CODE_F6] = 0x0b,
- [Q_KEY_CODE_F7] = 0x83,
- [Q_KEY_CODE_F8] = 0x0a,
- [Q_KEY_CODE_F9] = 0x01,
- [Q_KEY_CODE_F10] = 0x09,
- [Q_KEY_CODE_F11] = 0x78,
- [Q_KEY_CODE_F12] = 0x07,
- /* special handling for Q_KEY_CODE_PRINT */
- [Q_KEY_CODE_SCROLL_LOCK] = 0x7e,
- /* special handling for Q_KEY_CODE_PAUSE */
- [Q_KEY_CODE_BRACKET_LEFT] = 0x54,
- [Q_KEY_CODE_INSERT] = 0xe070,
- [Q_KEY_CODE_HOME] = 0xe06c,
- [Q_KEY_CODE_PGUP] = 0xe07d,
- [Q_KEY_CODE_DELETE] = 0xe071,
- [Q_KEY_CODE_END] = 0xe069,
- [Q_KEY_CODE_PGDN] = 0xe07a,
- [Q_KEY_CODE_UP] = 0xe075,
- [Q_KEY_CODE_LEFT] = 0xe06b,
- [Q_KEY_CODE_DOWN] = 0xe072,
- [Q_KEY_CODE_RIGHT] = 0xe074,
- [Q_KEY_CODE_NUM_LOCK] = 0x77,
- [Q_KEY_CODE_KP_DIVIDE] = 0xe04a,
- [Q_KEY_CODE_KP_MULTIPLY] = 0x7c,
- [Q_KEY_CODE_KP_SUBTRACT] = 0x7b,
- [Q_KEY_CODE_KP_ADD] = 0x79,
- [Q_KEY_CODE_KP_ENTER] = 0xe05a,
- [Q_KEY_CODE_KP_DECIMAL] = 0x71,
- [Q_KEY_CODE_KP_0] = 0x70,
- [Q_KEY_CODE_KP_1] = 0x69,
- [Q_KEY_CODE_KP_2] = 0x72,
- [Q_KEY_CODE_KP_3] = 0x7a,
- [Q_KEY_CODE_KP_4] = 0x6b,
- [Q_KEY_CODE_KP_5] = 0x73,
- [Q_KEY_CODE_KP_6] = 0x74,
- [Q_KEY_CODE_KP_7] = 0x6c,
- [Q_KEY_CODE_KP_8] = 0x75,
- [Q_KEY_CODE_KP_9] = 0x7d,
- [Q_KEY_CODE_BRACKET_RIGHT] = 0x5b,
- [Q_KEY_CODE_SEMICOLON] = 0x4c,
- [Q_KEY_CODE_APOSTROPHE] = 0x52,
- [Q_KEY_CODE_COMMA] = 0x41,
- [Q_KEY_CODE_DOT] = 0x49,
- [Q_KEY_CODE_SLASH] = 0x4a,
-
- [Q_KEY_CODE_POWER] = 0x0e37,
- [Q_KEY_CODE_SLEEP] = 0x0e3f,
- [Q_KEY_CODE_WAKE] = 0x0e5e,
-
- [Q_KEY_CODE_AUDIONEXT] = 0xe04d,
- [Q_KEY_CODE_AUDIOPREV] = 0xe015,
- [Q_KEY_CODE_AUDIOSTOP] = 0xe03b,
- [Q_KEY_CODE_AUDIOPLAY] = 0xe034,
- [Q_KEY_CODE_AUDIOMUTE] = 0xe023,
- [Q_KEY_CODE_VOLUMEUP] = 0xe032,
- [Q_KEY_CODE_VOLUMEDOWN] = 0xe021,
- [Q_KEY_CODE_MEDIASELECT] = 0xe050,
- [Q_KEY_CODE_MAIL] = 0xe048,
- [Q_KEY_CODE_CALCULATOR] = 0xe02b,
- [Q_KEY_CODE_COMPUTER] = 0xe040,
- [Q_KEY_CODE_FIND] = 0xe010,
- [Q_KEY_CODE_AC_HOME] = 0xe03a,
- [Q_KEY_CODE_AC_BACK] = 0xe038,
- [Q_KEY_CODE_AC_FORWARD] = 0xe030,
- [Q_KEY_CODE_STOP] = 0xe028,
- [Q_KEY_CODE_AC_REFRESH] = 0xe020,
- [Q_KEY_CODE_AC_BOOKMARKS] = 0xe018,
-
- [Q_KEY_CODE_ASTERISK] = 0x7c,
- [Q_KEY_CODE_LESS] = 0x61,
- [Q_KEY_CODE_SYSRQ] = 0x7f,
- [Q_KEY_CODE_RO] = 0x51,
- [Q_KEY_CODE_HIRAGANA] = 0x13,
- [Q_KEY_CODE_HENKAN] = 0x64,
- [Q_KEY_CODE_YEN] = 0x6a,
- [Q_KEY_CODE_KP_COMMA] = 0x6d,
-};
-
-static const uint16_t qcode_to_keycode_set3[Q_KEY_CODE__MAX] = {
- [0 ... Q_KEY_CODE__MAX - 1] = 0,
-
- [Q_KEY_CODE_A] = 0x1c,
- [Q_KEY_CODE_B] = 0x32,
- [Q_KEY_CODE_C] = 0x21,
- [Q_KEY_CODE_D] = 0x23,
- [Q_KEY_CODE_E] = 0x24,
- [Q_KEY_CODE_F] = 0x2b,
- [Q_KEY_CODE_G] = 0x34,
- [Q_KEY_CODE_H] = 0x33,
- [Q_KEY_CODE_I] = 0x43,
- [Q_KEY_CODE_J] = 0x3b,
- [Q_KEY_CODE_K] = 0x42,
- [Q_KEY_CODE_L] = 0x4b,
- [Q_KEY_CODE_M] = 0x3a,
- [Q_KEY_CODE_N] = 0x31,
- [Q_KEY_CODE_O] = 0x44,
- [Q_KEY_CODE_P] = 0x4d,
- [Q_KEY_CODE_Q] = 0x15,
- [Q_KEY_CODE_R] = 0x2d,
- [Q_KEY_CODE_S] = 0x1b,
- [Q_KEY_CODE_T] = 0x2c,
- [Q_KEY_CODE_U] = 0x3c,
- [Q_KEY_CODE_V] = 0x2a,
- [Q_KEY_CODE_W] = 0x1d,
- [Q_KEY_CODE_X] = 0x22,
- [Q_KEY_CODE_Y] = 0x35,
- [Q_KEY_CODE_Z] = 0x1a,
- [Q_KEY_CODE_0] = 0x45,
- [Q_KEY_CODE_1] = 0x16,
- [Q_KEY_CODE_2] = 0x1e,
- [Q_KEY_CODE_3] = 0x26,
- [Q_KEY_CODE_4] = 0x25,
- [Q_KEY_CODE_5] = 0x2e,
- [Q_KEY_CODE_6] = 0x36,
- [Q_KEY_CODE_7] = 0x3d,
- [Q_KEY_CODE_8] = 0x3e,
- [Q_KEY_CODE_9] = 0x46,
- [Q_KEY_CODE_GRAVE_ACCENT] = 0x0e,
- [Q_KEY_CODE_MINUS] = 0x4e,
- [Q_KEY_CODE_EQUAL] = 0x55,
- [Q_KEY_CODE_BACKSLASH] = 0x5c,
- [Q_KEY_CODE_BACKSPACE] = 0x66,
- [Q_KEY_CODE_SPC] = 0x29,
- [Q_KEY_CODE_TAB] = 0x0d,
- [Q_KEY_CODE_CAPS_LOCK] = 0x14,
- [Q_KEY_CODE_SHIFT] = 0x12,
- [Q_KEY_CODE_CTRL] = 0x11,
- [Q_KEY_CODE_META_L] = 0x8b,
- [Q_KEY_CODE_ALT] = 0x19,
- [Q_KEY_CODE_SHIFT_R] = 0x59,
- [Q_KEY_CODE_CTRL_R] = 0x58,
- [Q_KEY_CODE_META_R] = 0x8c,
- [Q_KEY_CODE_ALT_R] = 0x39,
- [Q_KEY_CODE_MENU] = 0x8d,
- [Q_KEY_CODE_RET] = 0x5a,
- [Q_KEY_CODE_ESC] = 0x08,
- [Q_KEY_CODE_F1] = 0x07,
- [Q_KEY_CODE_F2] = 0x0f,
- [Q_KEY_CODE_F3] = 0x17,
- [Q_KEY_CODE_F4] = 0x1f,
- [Q_KEY_CODE_F5] = 0x27,
- [Q_KEY_CODE_F6] = 0x2f,
- [Q_KEY_CODE_F7] = 0x37,
- [Q_KEY_CODE_F8] = 0x3f,
- [Q_KEY_CODE_F9] = 0x47,
- [Q_KEY_CODE_F10] = 0x4f,
- [Q_KEY_CODE_F11] = 0x56,
- [Q_KEY_CODE_F12] = 0x5e,
- [Q_KEY_CODE_PRINT] = 0x57,
- [Q_KEY_CODE_SCROLL_LOCK] = 0x5f,
- [Q_KEY_CODE_PAUSE] = 0x62,
- [Q_KEY_CODE_BRACKET_LEFT] = 0x54,
- [Q_KEY_CODE_INSERT] = 0x67,
- [Q_KEY_CODE_HOME] = 0x6e,
- [Q_KEY_CODE_PGUP] = 0x6f,
- [Q_KEY_CODE_DELETE] = 0x64,
- [Q_KEY_CODE_END] = 0x65,
- [Q_KEY_CODE_PGDN] = 0x6d,
- [Q_KEY_CODE_UP] = 0x63,
- [Q_KEY_CODE_LEFT] = 0x61,
- [Q_KEY_CODE_DOWN] = 0x60,
- [Q_KEY_CODE_RIGHT] = 0x6a,
- [Q_KEY_CODE_NUM_LOCK] = 0x76,
- [Q_KEY_CODE_KP_DIVIDE] = 0x4a,
- [Q_KEY_CODE_KP_MULTIPLY] = 0x7e,
- [Q_KEY_CODE_KP_SUBTRACT] = 0x4e,
- [Q_KEY_CODE_KP_ADD] = 0x7c,
- [Q_KEY_CODE_KP_ENTER] = 0x79,
- [Q_KEY_CODE_KP_DECIMAL] = 0x71,
- [Q_KEY_CODE_KP_0] = 0x70,
- [Q_KEY_CODE_KP_1] = 0x69,
- [Q_KEY_CODE_KP_2] = 0x72,
- [Q_KEY_CODE_KP_3] = 0x7a,
- [Q_KEY_CODE_KP_4] = 0x6b,
- [Q_KEY_CODE_KP_5] = 0x73,
- [Q_KEY_CODE_KP_6] = 0x74,
- [Q_KEY_CODE_KP_7] = 0x6c,
- [Q_KEY_CODE_KP_8] = 0x75,
- [Q_KEY_CODE_KP_9] = 0x7d,
- [Q_KEY_CODE_BRACKET_RIGHT] = 0x5b,
- [Q_KEY_CODE_SEMICOLON] = 0x4c,
- [Q_KEY_CODE_APOSTROPHE] = 0x52,
- [Q_KEY_CODE_COMMA] = 0x41,
- [Q_KEY_CODE_DOT] = 0x49,
- [Q_KEY_CODE_SLASH] = 0x4a,
-
- [Q_KEY_CODE_HIRAGANA] = 0x87,
- [Q_KEY_CODE_HENKAN] = 0x86,
- [Q_KEY_CODE_YEN] = 0x5d,
-};
-
static uint8_t translate_table[256] = {
0xff, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58,
0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59,
@@ -624,7 +229,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
PS2KbdState *s = (PS2KbdState *)dev;
InputKeyEvent *key = evt->u.key.data;
int qcode;
- uint16_t keycode;
+ uint16_t keycode = 0;
int mod;
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
@@ -706,7 +311,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
}
}
} else {
- keycode = qcode_to_keycode_set1[qcode];
+ if (qcode < qemu_input_map_qcode_to_atset1_len)
+ keycode = qemu_input_map_qcode_to_atset1[qcode];
if (keycode) {
if (keycode & 0xff00) {
ps2_put_keycode(s, keycode >> 8);
@@ -799,7 +405,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
}
}
} else {
- keycode = qcode_to_keycode_set2[qcode];
+ if (qcode < qemu_input_map_qcode_to_atset2_len)
+ keycode = qemu_input_map_qcode_to_atset2[qcode];
if (keycode) {
if (keycode & 0xff00) {
ps2_put_keycode(s, keycode >> 8);
@@ -814,7 +421,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
}
}
} else if (s->scancode_set == 3) {
- keycode = qcode_to_keycode_set3[qcode];
+ if (qcode < qemu_input_map_qcode_to_atset3_len)
+ keycode = qemu_input_map_qcode_to_atset3[qcode];
if (keycode) {
/* FIXME: break code should be configured on a key by key basis */
if (!key->down) {
@@ -1225,24 +833,21 @@ static void ps2_common_reset(PS2State *s)
static void ps2_common_post_load(PS2State *s)
{
PS2Queue *q = &s->queue;
- int size;
- int i;
- int tmp_data[PS2_QUEUE_SIZE];
+ uint8_t i, size;
+ uint8_t tmp_data[PS2_QUEUE_SIZE];
/* set the useful data buffer queue size, < PS2_QUEUE_SIZE */
- size = q->count > PS2_QUEUE_SIZE ? 0 : q->count;
+ size = (q->count < 0 || q->count > PS2_QUEUE_SIZE) ? 0 : q->count;
/* move the queue elements to the start of data array */
- if (size > 0) {
- for (i = 0; i < size; i++) {
- /* move the queue elements to the temporary buffer */
- tmp_data[i] = q->data[q->rptr];
- if (++q->rptr == 256) {
- q->rptr = 0;
- }
+ for (i = 0; i < size; i++) {
+ if (q->rptr < 0 || q->rptr >= sizeof(q->data)) {
+ q->rptr = 0;
}
- memcpy(q->data, tmp_data, size);
+ tmp_data[i] = q->data[q->rptr++];
}
+ memcpy(q->data, tmp_data, size);
+
/* reset rptr/wptr/count */
q->rptr = 0;
q->wptr = size;
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index e78faec0b1..bc5f9a2ed2 100644
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -22,139 +22,22 @@
/* ----------------------------------------------------------------- */
-static const unsigned int keymap_qcode[Q_KEY_CODE__MAX] = {
- [Q_KEY_CODE_ESC] = KEY_ESC,
- [Q_KEY_CODE_1] = KEY_1,
- [Q_KEY_CODE_2] = KEY_2,
- [Q_KEY_CODE_3] = KEY_3,
- [Q_KEY_CODE_4] = KEY_4,
- [Q_KEY_CODE_5] = KEY_5,
- [Q_KEY_CODE_6] = KEY_6,
- [Q_KEY_CODE_7] = KEY_7,
- [Q_KEY_CODE_8] = KEY_8,
- [Q_KEY_CODE_9] = KEY_9,
- [Q_KEY_CODE_0] = KEY_0,
- [Q_KEY_CODE_MINUS] = KEY_MINUS,
- [Q_KEY_CODE_EQUAL] = KEY_EQUAL,
- [Q_KEY_CODE_BACKSPACE] = KEY_BACKSPACE,
-
- [Q_KEY_CODE_TAB] = KEY_TAB,
- [Q_KEY_CODE_Q] = KEY_Q,
- [Q_KEY_CODE_W] = KEY_W,
- [Q_KEY_CODE_E] = KEY_E,
- [Q_KEY_CODE_R] = KEY_R,
- [Q_KEY_CODE_T] = KEY_T,
- [Q_KEY_CODE_Y] = KEY_Y,
- [Q_KEY_CODE_U] = KEY_U,
- [Q_KEY_CODE_I] = KEY_I,
- [Q_KEY_CODE_O] = KEY_O,
- [Q_KEY_CODE_P] = KEY_P,
- [Q_KEY_CODE_BRACKET_LEFT] = KEY_LEFTBRACE,
- [Q_KEY_CODE_BRACKET_RIGHT] = KEY_RIGHTBRACE,
- [Q_KEY_CODE_RET] = KEY_ENTER,
-
- [Q_KEY_CODE_CTRL] = KEY_LEFTCTRL,
- [Q_KEY_CODE_A] = KEY_A,
- [Q_KEY_CODE_S] = KEY_S,
- [Q_KEY_CODE_D] = KEY_D,
- [Q_KEY_CODE_F] = KEY_F,
- [Q_KEY_CODE_G] = KEY_G,
- [Q_KEY_CODE_H] = KEY_H,
- [Q_KEY_CODE_J] = KEY_J,
- [Q_KEY_CODE_K] = KEY_K,
- [Q_KEY_CODE_L] = KEY_L,
- [Q_KEY_CODE_SEMICOLON] = KEY_SEMICOLON,
- [Q_KEY_CODE_APOSTROPHE] = KEY_APOSTROPHE,
- [Q_KEY_CODE_GRAVE_ACCENT] = KEY_GRAVE,
-
- [Q_KEY_CODE_SHIFT] = KEY_LEFTSHIFT,
- [Q_KEY_CODE_BACKSLASH] = KEY_BACKSLASH,
- [Q_KEY_CODE_LESS] = KEY_102ND,
- [Q_KEY_CODE_Z] = KEY_Z,
- [Q_KEY_CODE_X] = KEY_X,
- [Q_KEY_CODE_C] = KEY_C,
- [Q_KEY_CODE_V] = KEY_V,
- [Q_KEY_CODE_B] = KEY_B,
- [Q_KEY_CODE_N] = KEY_N,
- [Q_KEY_CODE_M] = KEY_M,
- [Q_KEY_CODE_COMMA] = KEY_COMMA,
- [Q_KEY_CODE_DOT] = KEY_DOT,
- [Q_KEY_CODE_SLASH] = KEY_SLASH,
- [Q_KEY_CODE_SHIFT_R] = KEY_RIGHTSHIFT,
-
- [Q_KEY_CODE_ALT] = KEY_LEFTALT,
- [Q_KEY_CODE_SPC] = KEY_SPACE,
- [Q_KEY_CODE_CAPS_LOCK] = KEY_CAPSLOCK,
-
- [Q_KEY_CODE_F1] = KEY_F1,
- [Q_KEY_CODE_F2] = KEY_F2,
- [Q_KEY_CODE_F3] = KEY_F3,
- [Q_KEY_CODE_F4] = KEY_F4,
- [Q_KEY_CODE_F5] = KEY_F5,
- [Q_KEY_CODE_F6] = KEY_F6,
- [Q_KEY_CODE_F7] = KEY_F7,
- [Q_KEY_CODE_F8] = KEY_F8,
- [Q_KEY_CODE_F9] = KEY_F9,
- [Q_KEY_CODE_F10] = KEY_F10,
- [Q_KEY_CODE_NUM_LOCK] = KEY_NUMLOCK,
- [Q_KEY_CODE_SCROLL_LOCK] = KEY_SCROLLLOCK,
-
- [Q_KEY_CODE_KP_0] = KEY_KP0,
- [Q_KEY_CODE_KP_1] = KEY_KP1,
- [Q_KEY_CODE_KP_2] = KEY_KP2,
- [Q_KEY_CODE_KP_3] = KEY_KP3,
- [Q_KEY_CODE_KP_4] = KEY_KP4,
- [Q_KEY_CODE_KP_5] = KEY_KP5,
- [Q_KEY_CODE_KP_6] = KEY_KP6,
- [Q_KEY_CODE_KP_7] = KEY_KP7,
- [Q_KEY_CODE_KP_8] = KEY_KP8,
- [Q_KEY_CODE_KP_9] = KEY_KP9,
- [Q_KEY_CODE_KP_SUBTRACT] = KEY_KPMINUS,
- [Q_KEY_CODE_KP_ADD] = KEY_KPPLUS,
- [Q_KEY_CODE_KP_DECIMAL] = KEY_KPDOT,
- [Q_KEY_CODE_KP_ENTER] = KEY_KPENTER,
- [Q_KEY_CODE_KP_DIVIDE] = KEY_KPSLASH,
- [Q_KEY_CODE_KP_MULTIPLY] = KEY_KPASTERISK,
-
- [Q_KEY_CODE_F11] = KEY_F11,
- [Q_KEY_CODE_F12] = KEY_F12,
-
- [Q_KEY_CODE_CTRL_R] = KEY_RIGHTCTRL,
- [Q_KEY_CODE_SYSRQ] = KEY_SYSRQ,
- [Q_KEY_CODE_PRINT] = KEY_SYSRQ,
- [Q_KEY_CODE_PAUSE] = KEY_PAUSE,
- [Q_KEY_CODE_ALT_R] = KEY_RIGHTALT,
-
- [Q_KEY_CODE_HOME] = KEY_HOME,
- [Q_KEY_CODE_UP] = KEY_UP,
- [Q_KEY_CODE_PGUP] = KEY_PAGEUP,
- [Q_KEY_CODE_LEFT] = KEY_LEFT,
- [Q_KEY_CODE_RIGHT] = KEY_RIGHT,
- [Q_KEY_CODE_END] = KEY_END,
- [Q_KEY_CODE_DOWN] = KEY_DOWN,
- [Q_KEY_CODE_PGDN] = KEY_PAGEDOWN,
- [Q_KEY_CODE_INSERT] = KEY_INSERT,
- [Q_KEY_CODE_DELETE] = KEY_DELETE,
-
- [Q_KEY_CODE_META_L] = KEY_LEFTMETA,
- [Q_KEY_CODE_META_R] = KEY_RIGHTMETA,
- [Q_KEY_CODE_MENU] = KEY_MENU,
-};
-
-static const unsigned int keymap_button[INPUT_BUTTON__MAX] = {
+static const unsigned short keymap_button[INPUT_BUTTON__MAX] = {
[INPUT_BUTTON_LEFT] = BTN_LEFT,
[INPUT_BUTTON_RIGHT] = BTN_RIGHT,
[INPUT_BUTTON_MIDDLE] = BTN_MIDDLE,
[INPUT_BUTTON_WHEEL_UP] = BTN_GEAR_UP,
[INPUT_BUTTON_WHEEL_DOWN] = BTN_GEAR_DOWN,
+ [INPUT_BUTTON_SIDE] = BTN_SIDE,
+ [INPUT_BUTTON_EXTRA] = BTN_EXTRA,
};
-static const unsigned int axismap_rel[INPUT_AXIS__MAX] = {
+static const unsigned short axismap_rel[INPUT_AXIS__MAX] = {
[INPUT_AXIS_X] = REL_X,
[INPUT_AXIS_Y] = REL_Y,
};
-static const unsigned int axismap_abs[INPUT_AXIS__MAX] = {
+static const unsigned short axismap_abs[INPUT_AXIS__MAX] = {
[INPUT_AXIS_X] = ABS_X,
[INPUT_AXIS_Y] = ABS_Y,
};
@@ -162,7 +45,7 @@ static const unsigned int axismap_abs[INPUT_AXIS__MAX] = {
/* ----------------------------------------------------------------- */
static void virtio_input_key_config(VirtIOInput *vinput,
- const unsigned int *keymap,
+ const unsigned short *keymap,
size_t mapsize)
{
virtio_input_config keys;
@@ -202,9 +85,10 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src,
case INPUT_EVENT_KIND_KEY:
key = evt->u.key.data;
qcode = qemu_input_key_value_to_qcode(key->key);
- if (qcode && keymap_qcode[qcode]) {
+ if (qcode < qemu_input_map_qcode_to_linux_len &&
+ qemu_input_map_qcode_to_linux[qcode]) {
event.type = cpu_to_le16(EV_KEY);
- event.code = cpu_to_le16(keymap_qcode[qcode]);
+ event.code = cpu_to_le16(qemu_input_map_qcode_to_linux[qcode]);
event.value = cpu_to_le32(key->down ? 1 : 0);
virtio_input_send(vinput, &event);
} else {
@@ -216,8 +100,10 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src,
break;
case INPUT_EVENT_KIND_BTN:
btn = evt->u.btn.data;
- if (vhid->wheel_axis && (btn->button == INPUT_BUTTON_WHEEL_UP ||
- btn->button == INPUT_BUTTON_WHEEL_DOWN)) {
+ if (vhid->wheel_axis &&
+ (btn->button == INPUT_BUTTON_WHEEL_UP ||
+ btn->button == INPUT_BUTTON_WHEEL_DOWN) &&
+ btn->down) {
event.type = cpu_to_le16(EV_REL);
event.code = cpu_to_le16(REL_WHEEL);
event.value = cpu_to_le32(btn->button == INPUT_BUTTON_WHEEL_UP
@@ -395,8 +281,8 @@ static void virtio_keyboard_init(Object *obj)
vhid->handler = &virtio_keyboard_handler;
virtio_input_init_config(vinput, virtio_keyboard_config);
- virtio_input_key_config(vinput, keymap_qcode,
- ARRAY_SIZE(keymap_qcode));
+ virtio_input_key_config(vinput, qemu_input_map_qcode_to_linux,
+ qemu_input_map_qcode_to_linux_len);
}
static const TypeInfo virtio_keyboard_info = {
diff --git a/include/ui/input.h b/include/ui/input.h
index 05aab2db5c..ceb22b8eef 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -74,15 +74,27 @@ extern const guint16 qemu_input_map_atset1_to_qcode[];
extern const guint qemu_input_map_linux_to_qcode_len;
extern const guint16 qemu_input_map_linux_to_qcode[];
+extern const guint qemu_input_map_qcode_to_atset1_len;
+extern const guint16 qemu_input_map_qcode_to_atset1[];
+
+extern const guint qemu_input_map_qcode_to_atset2_len;
+extern const guint16 qemu_input_map_qcode_to_atset2[];
+
+extern const guint qemu_input_map_qcode_to_atset3_len;
+extern const guint16 qemu_input_map_qcode_to_atset3[];
+
+extern const guint qemu_input_map_qcode_to_linux_len;
+extern const guint16 qemu_input_map_qcode_to_linux[];
+
extern const guint qemu_input_map_qcode_to_qnum_len;
extern const guint16 qemu_input_map_qcode_to_qnum[];
+extern const guint qemu_input_map_qcode_to_sun_len;
+extern const guint16 qemu_input_map_qcode_to_sun[];
+
extern const guint qemu_input_map_qnum_to_qcode_len;
extern const guint16 qemu_input_map_qnum_to_qcode[];
-extern const guint qemu_input_map_qcode_to_linux_len;
-extern const guint16 qemu_input_map_qcode_to_linux[];
-
extern const guint qemu_input_map_usb_to_qcode_len;
extern const guint16 qemu_input_map_usb_to_qcode[];
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 5321f9e795..2db4507083 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -2764,29 +2764,29 @@ long do_rt_sigreturn(CPUSPARCState *env)
}
#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
-#define MC_TSTATE 0
-#define MC_PC 1
-#define MC_NPC 2
-#define MC_Y 3
-#define MC_G1 4
-#define MC_G2 5
-#define MC_G3 6
-#define MC_G4 7
-#define MC_G5 8
-#define MC_G6 9
-#define MC_G7 10
-#define MC_O0 11
-#define MC_O1 12
-#define MC_O2 13
-#define MC_O3 14
-#define MC_O4 15
-#define MC_O5 16
-#define MC_O6 17
-#define MC_O7 18
-#define MC_NGREG 19
+#define SPARC_MC_TSTATE 0
+#define SPARC_MC_PC 1
+#define SPARC_MC_NPC 2
+#define SPARC_MC_Y 3
+#define SPARC_MC_G1 4
+#define SPARC_MC_G2 5
+#define SPARC_MC_G3 6
+#define SPARC_MC_G4 7
+#define SPARC_MC_G5 8
+#define SPARC_MC_G6 9
+#define SPARC_MC_G7 10
+#define SPARC_MC_O0 11
+#define SPARC_MC_O1 12
+#define SPARC_MC_O2 13
+#define SPARC_MC_O3 14
+#define SPARC_MC_O4 15
+#define SPARC_MC_O5 16
+#define SPARC_MC_O6 17
+#define SPARC_MC_O7 18
+#define SPARC_MC_NGREG 19
typedef abi_ulong target_mc_greg_t;
-typedef target_mc_greg_t target_mc_gregset_t[MC_NGREG];
+typedef target_mc_greg_t target_mc_gregset_t[SPARC_MC_NGREG];
struct target_mc_fq {
abi_ulong *mcfq_addr;
@@ -2846,8 +2846,8 @@ void sparc64_set_context(CPUSPARCState *env)
goto do_sigsegv;
}
grp = &ucp->tuc_mcontext.mc_gregs;
- __get_user(pc, &((*grp)[MC_PC]));
- __get_user(npc, &((*grp)[MC_NPC]));
+ __get_user(pc, &((*grp)[SPARC_MC_PC]));
+ __get_user(npc, &((*grp)[SPARC_MC_NPC]));
if ((pc | npc) & 3) {
goto do_sigsegv;
}
@@ -2870,26 +2870,26 @@ void sparc64_set_context(CPUSPARCState *env)
}
env->pc = pc;
env->npc = npc;
- __get_user(env->y, &((*grp)[MC_Y]));
- __get_user(tstate, &((*grp)[MC_TSTATE]));
+ __get_user(env->y, &((*grp)[SPARC_MC_Y]));
+ __get_user(tstate, &((*grp)[SPARC_MC_TSTATE]));
env->asi = (tstate >> 24) & 0xff;
cpu_put_ccr(env, tstate >> 32);
cpu_put_cwp64(env, tstate & 0x1f);
- __get_user(env->gregs[1], (&(*grp)[MC_G1]));
- __get_user(env->gregs[2], (&(*grp)[MC_G2]));
- __get_user(env->gregs[3], (&(*grp)[MC_G3]));
- __get_user(env->gregs[4], (&(*grp)[MC_G4]));
- __get_user(env->gregs[5], (&(*grp)[MC_G5]));
- __get_user(env->gregs[6], (&(*grp)[MC_G6]));
- __get_user(env->gregs[7], (&(*grp)[MC_G7]));
- __get_user(env->regwptr[UREG_I0], (&(*grp)[MC_O0]));
- __get_user(env->regwptr[UREG_I1], (&(*grp)[MC_O1]));
- __get_user(env->regwptr[UREG_I2], (&(*grp)[MC_O2]));
- __get_user(env->regwptr[UREG_I3], (&(*grp)[MC_O3]));
- __get_user(env->regwptr[UREG_I4], (&(*grp)[MC_O4]));
- __get_user(env->regwptr[UREG_I5], (&(*grp)[MC_O5]));
- __get_user(env->regwptr[UREG_I6], (&(*grp)[MC_O6]));
- __get_user(env->regwptr[UREG_I7], (&(*grp)[MC_O7]));
+ __get_user(env->gregs[1], (&(*grp)[SPARC_MC_G1]));
+ __get_user(env->gregs[2], (&(*grp)[SPARC_MC_G2]));
+ __get_user(env->gregs[3], (&(*grp)[SPARC_MC_G3]));
+ __get_user(env->gregs[4], (&(*grp)[SPARC_MC_G4]));
+ __get_user(env->gregs[5], (&(*grp)[SPARC_MC_G5]));
+ __get_user(env->gregs[6], (&(*grp)[SPARC_MC_G6]));
+ __get_user(env->gregs[7], (&(*grp)[SPARC_MC_G7]));
+ __get_user(env->regwptr[UREG_I0], (&(*grp)[SPARC_MC_O0]));
+ __get_user(env->regwptr[UREG_I1], (&(*grp)[SPARC_MC_O1]));
+ __get_user(env->regwptr[UREG_I2], (&(*grp)[SPARC_MC_O2]));
+ __get_user(env->regwptr[UREG_I3], (&(*grp)[SPARC_MC_O3]));
+ __get_user(env->regwptr[UREG_I4], (&(*grp)[SPARC_MC_O4]));
+ __get_user(env->regwptr[UREG_I5], (&(*grp)[SPARC_MC_O5]));
+ __get_user(env->regwptr[UREG_I6], (&(*grp)[SPARC_MC_O6]));
+ __get_user(env->regwptr[UREG_I7], (&(*grp)[SPARC_MC_O7]));
__get_user(fp, &(ucp->tuc_mcontext.mc_fp));
__get_user(i7, &(ucp->tuc_mcontext.mc_i7));
@@ -2977,25 +2977,25 @@ void sparc64_get_context(CPUSPARCState *env)
}
/* XXX: tstate must be saved properly */
- // __put_user(env->tstate, &((*grp)[MC_TSTATE]));
- __put_user(env->pc, &((*grp)[MC_PC]));
- __put_user(env->npc, &((*grp)[MC_NPC]));
- __put_user(env->y, &((*grp)[MC_Y]));
- __put_user(env->gregs[1], &((*grp)[MC_G1]));
- __put_user(env->gregs[2], &((*grp)[MC_G2]));
- __put_user(env->gregs[3], &((*grp)[MC_G3]));
- __put_user(env->gregs[4], &((*grp)[MC_G4]));
- __put_user(env->gregs[5], &((*grp)[MC_G5]));
- __put_user(env->gregs[6], &((*grp)[MC_G6]));
- __put_user(env->gregs[7], &((*grp)[MC_G7]));
- __put_user(env->regwptr[UREG_I0], &((*grp)[MC_O0]));
- __put_user(env->regwptr[UREG_I1], &((*grp)[MC_O1]));
- __put_user(env->regwptr[UREG_I2], &((*grp)[MC_O2]));
- __put_user(env->regwptr[UREG_I3], &((*grp)[MC_O3]));
- __put_user(env->regwptr[UREG_I4], &((*grp)[MC_O4]));
- __put_user(env->regwptr[UREG_I5], &((*grp)[MC_O5]));
- __put_user(env->regwptr[UREG_I6], &((*grp)[MC_O6]));
- __put_user(env->regwptr[UREG_I7], &((*grp)[MC_O7]));
+ // __put_user(env->tstate, &((*grp)[SPARC_MC_TSTATE]));
+ __put_user(env->pc, &((*grp)[SPARC_MC_PC]));
+ __put_user(env->npc, &((*grp)[SPARC_MC_NPC]));
+ __put_user(env->y, &((*grp)[SPARC_MC_Y]));
+ __put_user(env->gregs[1], &((*grp)[SPARC_MC_G1]));
+ __put_user(env->gregs[2], &((*grp)[SPARC_MC_G2]));
+ __put_user(env->gregs[3], &((*grp)[SPARC_MC_G3]));
+ __put_user(env->gregs[4], &((*grp)[SPARC_MC_G4]));
+ __put_user(env->gregs[5], &((*grp)[SPARC_MC_G5]));
+ __put_user(env->gregs[6], &((*grp)[SPARC_MC_G6]));
+ __put_user(env->gregs[7], &((*grp)[SPARC_MC_G7]));
+ __put_user(env->regwptr[UREG_I0], &((*grp)[SPARC_MC_O0]));
+ __put_user(env->regwptr[UREG_I1], &((*grp)[SPARC_MC_O1]));
+ __put_user(env->regwptr[UREG_I2], &((*grp)[SPARC_MC_O2]));
+ __put_user(env->regwptr[UREG_I3], &((*grp)[SPARC_MC_O3]));
+ __put_user(env->regwptr[UREG_I4], &((*grp)[SPARC_MC_O4]));
+ __put_user(env->regwptr[UREG_I5], &((*grp)[SPARC_MC_O5]));
+ __put_user(env->regwptr[UREG_I6], &((*grp)[SPARC_MC_O6]));
+ __put_user(env->regwptr[UREG_I7], &((*grp)[SPARC_MC_O7]));
w_addr = TARGET_STACK_BIAS+env->regwptr[UREG_I6];
fp = i7 = 0;
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 0670ec17d5..1a9733da9a 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -75,6 +75,8 @@ class Arguments:
res = []
for arg in arg_str.split(","):
arg = arg.strip()
+ if not arg:
+ raise ValueError("Empty argument (did you forget to use 'void'?)")
if arg == 'void':
continue
@@ -173,7 +175,7 @@ class Event(object):
props : list of str
Property names.
fmt : str, list of str
- Event printing format (or formats).
+ Event printing format string(s).
args : Arguments
Event arguments.
orig : Event or None
@@ -237,9 +239,9 @@ class Event(object):
if "tcg-exec" in props:
raise ValueError("Invalid property 'tcg-exec'")
if "tcg" not in props and not isinstance(fmt, str):
- raise ValueError("Only events with 'tcg' property can have two formats")
+ raise ValueError("Only events with 'tcg' property can have two format strings")
if "tcg" in props and isinstance(fmt, str):
- raise ValueError("Events with 'tcg' property must have two formats")
+ raise ValueError("Events with 'tcg' property must have two format strings")
event = Event(name, props, fmt, args)
@@ -263,7 +265,7 @@ class Event(object):
_FMT = re.compile("(%[\d\.]*\w+|%.*PRI\S+)")
def formats(self):
- """List of argument print formats."""
+ """List conversion specifiers in the argument print format string."""
assert not isinstance(self.fmt, list)
return self._FMT.findall(self.fmt)
@@ -300,13 +302,18 @@ def read_events(fobj):
"""
events = []
- for line in fobj:
+ for lineno, line in enumerate(fobj, 1):
if not line.strip():
continue
if line.lstrip().startswith('#'):
continue
- event = Event.build(line)
+ try:
+ event = Event.build(line)
+ except ValueError as e:
+ arg0 = 'Error on line %d: %s' % (lineno, e.args[0])
+ e.args = (arg0,) + e.args[1:]
+ raise
# transform TCG-enabled events
if "tcg" not in event.properties:
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 95b1e0cbfa..3d4e66bab5 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -7,9 +7,13 @@
#include "ui/input-keymap-atset1-to-qcode.c"
#include "ui/input-keymap-linux-to-qcode.c"
+#include "ui/input-keymap-qcode-to-atset1.c"
+#include "ui/input-keymap-qcode-to-atset2.c"
+#include "ui/input-keymap-qcode-to-atset3.c"
+#include "ui/input-keymap-qcode-to-linux.c"
#include "ui/input-keymap-qcode-to-qnum.c"
+#include "ui/input-keymap-qcode-to-sun.c"
#include "ui/input-keymap-qnum-to-qcode.c"
-#include "ui/input-keymap-qcode-to-linux.c"
#include "ui/input-keymap-usb-to-qcode.c"
#include "ui/input-keymap-win32-to-qcode.c"
#include "ui/input-keymap-x11-to-qcode.c"
generated by cgit v1.2.3 (git 2.26.2) at 2025-01-31 07:05:01 +0000