Changeset 13020 in vbox for trunk/src/recompiler

Timestamp:

Oct 6, 2008 4:27:16 PM (17 years ago)

Author:

vboxsync

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

37459

Message:

Knut-compatibility fixes

Location:

trunk/src/recompiler

Files:

• VBoxREMWrapper.cpp (modified) (3 diffs)
• VBoxRecompiler.c (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[] =
+static const REMPARMDESC g_aArgsPDMApicWriteMSR[] =
 {
     { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
@@ -652 +652 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(uint64_t), NULL }
 };
-static const REMPARMDESC g_aArgsPDMApicRDMSR[] =
+static const REMPARMDESC g_aArgsPDMApicReadMSR[] =
 {
     { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
@@ -1079 +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 },
+    { "PDMApicWriteMSR",                        (void *)(uintptr_t)&PDMApicWriteMSR,                  &g_aArgsPDMApicWriteMSR[0],                   RT_ELEMENTS(g_aArgsPDMApicWriteMSR),                     REMFNDESC_FLAGS_RET_INT,    sizeof(int),           NULL },
+    { "PDMApicReadMSR",                         (void *)(uintptr_t)&PDMApicReadMSR,                  &g_aArgsPDMApicReadMSR[0],                   RT_ELEMENTS(g_aArgsPDMApicReadMSR),                     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

@@ -4090 +4090 @@
 {
     uint64_t value;
-    int rc = PDMApicRDMSR(env->pVM, 0/* cpu */, reg, &value);
-    if (rc != VINF_SUCCESS)
-    {
-        /** @todo: exception ? */
-        value = 0;
-    }
+    int rc = PDMApicReadMSR(env->pVM, 0/* cpu */, reg, &value);
+    if (VBOX_SUCCESS(rc))
+    {
+        LogFlow(("cpu_apic_rdms returns %#x\n", value));
+        return value;
+    }
+    /** @todo: exception ? */
+    LogFlow(("cpu_apic_rdms returns 0 (rc=%Vrc)\n", rc));
     return value;
 }
@@ -4101 +4103 @@
 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 ? */
-    }
+    int rc = PDMApicWriteMSR(env->pVM, 0 /* cpu */, reg, value);
+    /** @todo: exception if error ? */
+    LogFlow(("cpu_apic_wrmsr: rc=%Vrc\n", rc)); NOREF(rc);
 }
 /* -+- I/O Ports -+- */

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

@@ -3077 +3077 @@
         /* 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 ? */
-        }
+            /* @todo: exception ? */;
         break;
     }
@@ -3139 +3135 @@
         /* 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;
-        }
+        break;
     }
     }