Changeset 9792 in vbox

Timestamp:

Jun 18, 2008 3:19:19 PM (17 years ago)

Author:

vboxsync

Message:

Byte, word and dword access to r8-r15.

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore.cpp (modified) (3 diffs)
• DisasmReg.cpp (modified) (3 diffs)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -2142 +2142 @@
 #if !defined(DIS_CORE_ONLY) && defined(LOG_ENABLED)
 static const char *szModRMReg8[]      = {"AL", "CL", "DL", "BL", "AH", "CH", "DH", "BH"};
-static const char *szModRMReg8_64[]   = {"AL", "CL", "DL", "BL", "AH", "CH", "DH", "BH", "R8L", "R9L", "R10L", "R11L", "R12L", "R13L", "R14L", "R15L"};
+static const char *szModRMReg8_64[]   = {"AL", "CL", "DL", "BL", "AH", "CH", "DH", "BH", "R8B", "R9B", "R10B", "R11B", "R12B", "R13B", "R14B", "R15B"};
 static const char *szModRMReg16[]     = {"AX", "CX", "DX", "BX", "SP", "BP", "SI", "DI"};
+static const char *szModRMReg16_64[]  = {"AX", "CX", "DX", "BX", "SP", "BP", "SI", "DI", "R8W", "R9W", "R10W", "R11W", "R12W", "R13W", "R14W", "R15W"};
 static const char *szModRMReg32[]     = {"EAX", "ECX", "EDX", "EBX", "ESP", "EBP", "ESI", "EDI"};
+static const char *szModRMReg32_64[]  = {"EAX", "ECX", "EDX", "EBX", "ESP", "EBP", "ESI", "EDI", "R8D", "R9D", "R10D", "R11D", "R12D", "R13D", "R14D", "R15D"};
 static const char *szModRMReg64[]     = {"RAX", "RCX", "RDX", "RBX", "RSP", "RBP", "RSI", "RDI", "R8", "R9", "R10", "R11", "R12", "R13", "R14", "R15"};
 static const char *szModRMReg1616[8]  = {"BX+SI", "BX+DI", "BP+SI", "BP+DI", "SI", "DI", "BP", "BX"};
@@ -2196 +2198 @@
 
     case OP_PARM_w:
-        disasmAddString(pParam->szParam, szModRMReg16[idx]);
+#if !defined(DIS_CORE_ONLY) && defined(LOG_ENABLED)
+        if (idx > RT_ELEMENTS(szModRMReg8))
+            disasmAddString(pParam->szParam, szModRMReg16_64[idx]);
+        else
+            disasmAddString(pParam->szParam, szModRMReg16[idx]);
+#endif
         pParam->flags |= USE_REG_GEN16;
         pParam->base.reg_gen = idx;
@@ -2202 +2209 @@
 
     case OP_PARM_d:
-        disasmAddString(pParam->szParam, szModRMReg32[idx]);
+#if !defined(DIS_CORE_ONLY) && defined(LOG_ENABLED)
+        if (idx > RT_ELEMENTS(szModRMReg8))
+            disasmAddString(pParam->szParam, szModRMReg32_64[idx]);
+        else
+            disasmAddString(pParam->szParam, szModRMReg32[idx]);
+#endif
         pParam->flags |= USE_REG_GEN32;
         pParam->base.reg_gen = idx;

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -95 +95 @@
     RT_OFFSETOF(CPUMCTXCORE, ebp),        /* USE_REG_EBP */
     RT_OFFSETOF(CPUMCTXCORE, esi),        /* USE_REG_ESI */
-    RT_OFFSETOF(CPUMCTXCORE, edi)         /* USE_REG_EDI */
+    RT_OFFSETOF(CPUMCTXCORE, edi),        /* USE_REG_EDI */
+    RT_OFFSETOF(CPUMCTXCORE, r8),         /* USE_REG_R8  : dword access */
+    RT_OFFSETOF(CPUMCTXCORE, r9),         /* USE_REG_R9  : dword access */
+    RT_OFFSETOF(CPUMCTXCORE, r10),        /* USE_REG_R10 : dword access */
+    RT_OFFSETOF(CPUMCTXCORE, r11),        /* USE_REG_R11 : dword access */
+    RT_OFFSETOF(CPUMCTXCORE, r12),        /* USE_REG_R12 : dword access */
+    RT_OFFSETOF(CPUMCTXCORE, r13),        /* USE_REG_R13 : dword access */
+    RT_OFFSETOF(CPUMCTXCORE, r14),        /* USE_REG_R14 : dword access */
+    RT_OFFSETOF(CPUMCTXCORE, r15)         /* USE_REG_R15 : dword access */
 };
 
@@ -118 +126 @@
     RT_OFFSETOF(CPUMCTXCORE, ebp),        /* USE_REG_BP */
     RT_OFFSETOF(CPUMCTXCORE, esi),        /* USE_REG_SI */
-    RT_OFFSETOF(CPUMCTXCORE, edi)         /* USE_REG_DI */
+    RT_OFFSETOF(CPUMCTXCORE, edi),        /* USE_REG_DI */
+    RT_OFFSETOF(CPUMCTXCORE, r8),         /* USE_REG_R8  : word access */
+    RT_OFFSETOF(CPUMCTXCORE, r9),         /* USE_REG_R9  : word access */
+    RT_OFFSETOF(CPUMCTXCORE, r10),        /* USE_REG_R10 : word access */
+    RT_OFFSETOF(CPUMCTXCORE, r11),        /* USE_REG_R11 : word access */
+    RT_OFFSETOF(CPUMCTXCORE, r12),        /* USE_REG_R12 : word access */
+    RT_OFFSETOF(CPUMCTXCORE, r13),        /* USE_REG_R13 : word access */
+    RT_OFFSETOF(CPUMCTXCORE, r14),        /* USE_REG_R14 : word access */
+    RT_OFFSETOF(CPUMCTXCORE, r15)         /* USE_REG_R15 : word access */
 };
 
@@ -141 +157 @@
     RT_OFFSETOF(CPUMCTXCORE, ecx) + 1,    /* USE_REG_CH */
     RT_OFFSETOF(CPUMCTXCORE, edx) + 1,    /* USE_REG_DH */
-    RT_OFFSETOF(CPUMCTXCORE, ebx) + 1     /* USE_REG_BH */
+    RT_OFFSETOF(CPUMCTXCORE, ebx) + 1,    /* USE_REG_BH */
+    RT_OFFSETOF(CPUMCTXCORE, r8),         /* USE_REG_R8  : byte access */
+    RT_OFFSETOF(CPUMCTXCORE, r9),         /* USE_REG_R9  : byte access */
+    RT_OFFSETOF(CPUMCTXCORE, r10),        /* USE_REG_R10 : byte access */
+    RT_OFFSETOF(CPUMCTXCORE, r11),        /* USE_REG_R11 : byte access */
+    RT_OFFSETOF(CPUMCTXCORE, r12),        /* USE_REG_R12 : byte access */
+    RT_OFFSETOF(CPUMCTXCORE, r13),        /* USE_REG_R13 : byte access */
+    RT_OFFSETOF(CPUMCTXCORE, r14),        /* USE_REG_R14 : byte access */
+    RT_OFFSETOF(CPUMCTXCORE, r15)         /* USE_REG_R15 : byte access */
 };