Changeset 13013 in vbox for trunk/src/recompiler

Timestamp:

Oct 6, 2008 2:48:49 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

37452

Message:

infrastructure work for X2APIC support

Location:

trunk/src/recompiler

Files:

• VBoxREMWrapper.cpp (modified) (3 diffs)
• VBoxRecompiler.c (modified) (1 diff)
• target-i386/cpu.h (modified) (2 diffs)
• target-i386/helper.c (modified) (2 diffs)

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -645 +645 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(uint8_t), NULL }
 };
+static const REMPARMDESC g_aArgsPDMApicWRMSR[] =
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(VMCPUID), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(uint64_t), NULL }
+};
+static const REMPARMDESC g_aArgsPDMApicRDMSR[] =
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(VMCPUID), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(uint64_t *), NULL }
+};
 static const REMPARMDESC g_aArgsPDMGetInterrupt[] =
 {
@@ -1004 +1018 @@
     { "REMR3NotifyInterruptClear",              (void *)&pfnREMR3NotifyInterruptClear,              &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
     { "REMR3NotifyTimerPending",                (void *)&pfnREMR3NotifyTimerPending,                &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
-    { "REMR3NotifyDmaPending",                  (void *)&pfnREMR3NotifyDmaPending,                  &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
+   { "REMR3NotifyDmaPending",                  (void *)&pfnREMR3NotifyDmaPending,                  &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
     { "REMR3NotifyQueuePending",                (void *)&pfnREMR3NotifyQueuePending,                &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
     { "REMR3NotifyFF",                          (void *)&pfnREMR3NotifyFF,                          &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
@@ -1065 +1079 @@
     { "PDMApicSetBase",                         (void *)(uintptr_t)&PDMApicSetBase,                 &g_aArgsPDMApicSetBase[0],                  RT_ELEMENTS(g_aArgsPDMApicSetBase),                    REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "PDMApicSetTPR",                          (void *)(uintptr_t)&PDMApicSetTPR,                  &g_aArgsPDMApicSetTPR[0],                   RT_ELEMENTS(g_aArgsPDMApicSetTPR),                     REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
+    { "PDMApicWRMSR",                           (void *)(uintptr_t)&PDMApicWRMSR,                  &g_aArgsPDMApicWRMSR[0],                   RT_ELEMENTS(g_aArgsPDMApicWRMSR),                     REMFNDESC_FLAGS_RET_INT,    sizeof(int),           NULL },
+    { "PDMApicRDMSR",                           (void *)(uintptr_t)&PDMApicRDMSR,                  &g_aArgsPDMApicRDMSR[0],                   RT_ELEMENTS(g_aArgsPDMApicRDMSR),                     REMFNDESC_FLAGS_RET_INT,    sizeof(int),           NULL },
     { "PDMR3DmaRun",                            (void *)(uintptr_t)&PDMR3DmaRun,                    &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "PDMGetInterrupt",                        (void *)(uintptr_t)&PDMGetInterrupt,                &g_aArgsPDMGetInterrupt[0],                 RT_ELEMENTS(g_aArgsPDMGetInterrupt),                   REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },

trunk/src/recompiler/VBoxRecompiler.c

@@ -4087 +4087 @@
 
 
+uint64_t cpu_apic_rdmsr(CPUX86State *env, uint32_t reg)
+{
+    uint64_t value;
+    int rc = PDMApicRDMSR(env->pVM, 0/* cpu */, reg, &value);
+    if (rc != VINF_SUCCESS)
+    {
+        /** @todo: exception ? */
+        value = 0;
+    }
+    return value;
+}
+
+void     cpu_apic_wrmsr(CPUX86State *env, uint32_t reg, uint64_t value)
+{
+    int rc = PDMApicWRMSR(env->pVM, 0 /* cpu */, reg, value);
+    if (rc != VINF_SUCCESS)
+    {
+        /** @todo: exception ? */
+    }
+}
 /* -+- I/O Ports -+- */
 

trunk/src/recompiler/target-i386/cpu.h

@@ -260 +260 @@
 #define MSR_EFER_NXE   (1 << 11)
 #define MSR_EFER_FFXSR (1 << 14)
+#define MSR_APIC_RANGE_START            0x800
+#define MSR_APIC_RANGE_END              0x900
 
 #define MSR_STAR                        0xc0000081
@@ -851 +853 @@
 uint8_t cpu_get_apic_tpr(CPUX86State *env);
 #endif
+uint64_t cpu_apic_rdmsr(CPUX86State *env, uint32_t reg);
+void     cpu_apic_wrmsr(CPUX86State *env, uint32_t reg, uint64_t value);
 void cpu_smm_update(CPUX86State *env);
 

trunk/src/recompiler/target-i386/helper.c

@@ -3073 +3073 @@
 #endif
     default:
-        /* XXX: exception ? */
-        break;
+    {
+        uint32_t ecx = (uint32_t)ECX;
+        /* In X2APIC specification this range is reserved for APIC control. */ 
+        if ((ecx >= MSR_APIC_RANGE_START) && (ecx < MSR_APIC_RANGE_END))
+        {
+            cpu_apic_wrmsr(env, ecx, val);
+        }
+        else 
+        {
+            /* @todo: exception ? */
+        }
+        break;
+    }
     }
 }
@@ -3124 +3135 @@
 #endif
     default:
-        /* XXX: exception ? */
-        val = 0;
-        break;
+    {
+        uint32_t ecx = (uint32_t)ECX;
+        /* In X2APIC specification this range is reserved for APIC control. */ 
+        if ((ecx >= MSR_APIC_RANGE_START) && (ecx < MSR_APIC_RANGE_END))
+        {
+            val = cpu_apic_rdmsr(env, ecx);
+        } 
+        else 
+        {
+            /** @todo: exception ? */
+            val = 0;
+            break;
+        }
+    }
     }
     EAX = (uint32_t)(val);