Changeset 14425

Timestamp:

11/20/08 17:32:52 (2 months ago)

Author:

vboxsync

Message:

ported r39642 - Sander, please tell me to port such changes

Files:

• trunk/src/recompiler_new/VBoxRecompiler.c (modified) (1 diff)
• trunk/src/recompiler_new/target-i386/cpu.h (modified) (1 diff)
• trunk/src/recompiler_new/target-i386/translate.c (modified) (2 diffs)

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -4235 +4235 @@
-    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_new/target-i386/cpu.h

@@ -923 +923 @@
-uint64_t cpu_apic_rdmsr(CPUX86State *env, uint32_t reg);
-void     cpu_apic_wrmsr(CPUX86State *env, uint32_t reg, uint64_t value);
+uint64_t cpu_rdmsr(CPUX86State *env, uint32_t msr); 
+void     cpu_wrmsr(CPUX86State *env, uint32_t msr, uint64_t val); 
-#endif
-void cpu_smm_update(CPUX86State *env);

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

@@ -641 +641 @@
-
-    /* For other segments this check is waste of time, and also TCG is unable to cope with this code,
- segments, as expects alive temps
-
+/stack segments, as expects alive cpu_T[0]
+ 
-        return;
-
@@ -7642 +7642 @@
-        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);
+            tcg_gen_helper_0_0(helper_rdtscp);
+            break;
+        }
+#endif
-        switch(op) {
-        case 0: /* sgdt */