Changeset 14411 in vbox for trunk/src/recompiler

Timestamp:

Nov 20, 2008 1:26:47 PM (16 years ago)

Author:

vboxsync

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

39642

Message:

RDTSCP support added. Enabled only for AMD-V guests.

Location:

trunk/src/recompiler

Files:

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

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -480 +480 @@
 };
 
+/* CPUMGetGuestMsr args */
+static const REMPARMDESC g_aArgsCPUMGetGuestMsr[] =
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t), NULL },
+};
+
+/* CPUMGetGuestMsr args */
+static const REMPARMDESC g_aArgsCPUMSetGuestMsr[] =
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(uint64_t), NULL },
+};
+
 static const REMPARMDESC g_aArgsCPUMGetGuestCpuId[] =
 {
@@ -1043 +1058 @@
     { "CPUMSetChangedFlags",                    (void *)(uintptr_t)&CPUMSetChangedFlags,            &g_aArgsCPUMSetChangedFlags[0],             RT_ELEMENTS(g_aArgsCPUMSetChangedFlags),               REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "CPUMGetGuestCPL",                        (void *)(uintptr_t)&CPUMGetGuestCPL,                &g_aArgsCPUMGetGuestCpl[0],                 RT_ELEMENTS(g_aArgsCPUMGetGuestCpl),                   REMFNDESC_FLAGS_RET_INT,    sizeof(unsigned),   NULL },
+    { "CPUMGetGuestMsr",                        (void *)(uintptr_t)&CPUMGetGuestMsr,                &g_aArgsCPUMGetGuestMsr[0],                 RT_ELEMENTS(g_aArgsCPUMGetGuestMsr),                   REMFNDESC_FLAGS_RET_INT,    sizeof(uint64_t),   NULL },
+    { "CPUMSetGuestMsr",                        (void *)(uintptr_t)&CPUMSetGuestMsr,                &g_aArgsCPUMSetGuestMsr[0],                 RT_ELEMENTS(g_aArgsCPUMSetGuestMsr),                   REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "CPUMGetGuestCpuId",                      (void *)(uintptr_t)&CPUMGetGuestCpuId,              &g_aArgsCPUMGetGuestCpuId[0],               RT_ELEMENTS(g_aArgsCPUMGetGuestCpuId),                 REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "CPUMGetGuestEAX",                        (void *)(uintptr_t)&CPUMGetGuestEAX,                &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(uint32_t),   NULL },

trunk/src/recompiler/VBoxRecompiler.c

@@ -1773 +1773 @@
 #endif
 
-
     /*
      * Registers which are rarely changed and require special handling / order when changed.
@@ -4133 +4132 @@
     LogFlow(("cpu_apic_wrmsr: rc=%Rrc\n", rc)); NOREF(rc);
 }
+
+uint64_t cpu_rdmsr(CPUX86State *env, uint32_t msr)
+{
+    return CPUMGetGuestMsr(env->pVM, msr);
+}
+
+void cpu_wrmsr(CPUX86State *env, uint32_t msr, uint64_t val)
+{
+    CPUMSetGuestMsr(env->pVM, msr, val);
+}
+
 /* -+- I/O Ports -+- */
 

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

@@ -857 +857 @@
 void cpu_smm_update(CPUX86State *env);
 
+#ifdef VBOX
+uint64_t cpu_rdmsr(CPUX86State *env, uint32_t msr);
+void     cpu_wrmsr(CPUX86State *env, uint32_t msr, uint64_t val);
+#endif
+
 /* will be suppressed */
 void cpu_x86_update_cr0(CPUX86State *env, uint32_t new_cr0);

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

@@ -215 +215 @@
 void helper_sysret(int dflag);
 void helper_rdtsc(void);
+#ifdef VBOX
+void helper_rdtscp(void);
+#endif
 void helper_rdmsr(void);
 void helper_wrmsr(void);

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

@@ -3023 +3023 @@
 }
 
+#ifdef VBOX
+void helper_rdtscp(void)
+{
+    uint64_t val;
+
+    if ((env->cr[4] & CR4_TSD_MASK) && ((env->hflags & HF_CPL_MASK) != 0)) {
+        raise_exception(EXCP0D_GPF);
+    }
+
+    val = cpu_get_tsc(env);
+    EAX = (uint32_t)(val);
+    EDX = (uint32_t)(val >> 32);
+    ECX = cpu_rdmsr(env, MSR_K8_TSC_AUX);
+}
+#endif
+
 #if defined(CONFIG_USER_ONLY)
 void helper_wrmsr(void)
@@ -3106 +3122 @@
         break;
     }
+    case MSR_K8_TSC_AUX:
+        cpu_wrmsr(env, MSR_K8_TSC_AUX, val);
+        break;
 #endif /* VBOX */
     }
@@ -3170 +3189 @@
         break;
     }
+    case MSR_K8_TSC_AUX:
+        val = cpu_rdmsr(env, MSR_K8_TSC_AUX);
+        break;
 #endif /* VBOX */
     }

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

@@ -1055 +1055 @@
     helper_rdtsc();
 }
+
+#ifdef VBOX
+void OPPROTO op_rdtscp(void)
+{
+    helper_rdtscp();
+}
+#endif
 
 void OPPROTO op_cpuid(void)

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

@@ -5940 +5940 @@
         op = (modrm >> 3) & 7;
         rm = modrm & 7;
+
+#ifdef VBOX
+        /* 0f 01 f9 */
+        if (modrm == 0xf9)
+        {
+            if (!(s->cpuid_ext2_features & CPUID_EXT2_RDTSCP))
+                 goto illegal_op;
+            gen_jmp_im(pc_start - s->cs_base);
+            gen_op_rdtscp();
+            break;
+        }
+#endif
+
         switch(op) {
         case 0: /* sgdt */