vbox的更動 37675 路徑 trunk/src/recompiler/target-i386/op_helper.c

時間撮記:

2011-6-29 上午07:07:14 (14 年 以前)

作者:

vboxsync

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

72535

訊息:

rem: Synced with v0.12.5.

檔案:

• trunk/src/recompiler/target-i386/op_helper.c (修改) (19 筆差異)

trunk/src/recompiler/target-i386/op_helper.c ¶

@@ -675 +675 @@
 
 #ifdef VBOX
+
 /* Keep in sync with gen_check_external_event() */
 void helper_check_external_event()
@@ -695 +696 @@
         sync_seg(env, reg, env->segs[reg].newselector);
 }
+
 #endif /* VBOX */
 
@@ -714 +716 @@
 void helper_outb(uint32_t port, uint32_t data)
 {
+#ifndef VBOX
+    cpu_outb(port, data & 0xff);
+#else
     cpu_outb(env, port, data & 0xff);
+#endif
 }
 
 target_ulong helper_inb(uint32_t port)
 {
+#ifndef VBOX
+    return cpu_inb(port);
+#else
     return cpu_inb(env, port);
+#endif
 }
 
 void helper_outw(uint32_t port, uint32_t data)
 {
+#ifndef VBOX
+    cpu_outw(port, data & 0xffff);
+#else
     cpu_outw(env, port, data & 0xffff);
+#endif
 }
 
 target_ulong helper_inw(uint32_t port)
 {
+#ifndef VBOX
+    return cpu_inw(port);
+#else
     return cpu_inw(env, port);
+#endif
 }
 
 void helper_outl(uint32_t port, uint32_t data)
 {
+#ifndef VBOX
+    cpu_outl(port, data);
+#else
     cpu_outl(env, port, data);
+#endif
 }
 
 target_ulong helper_inl(uint32_t port)
 {
+#ifndef VBOX
+    return cpu_inl(port);
+#else
     return cpu_inl(env, port);
+#endif
 }
 
@@ -1406 +1432 @@
         cpu_x86_set_cpl(env, 3);
     }
-#ifdef CONFIG_KQEMU
-    if (kqemu_is_ok(env)) {
-        if (env->hflags & HF_LMA_MASK)
-            CC_OP = CC_OP_EFLAGS;
-        env->exception_index = -1;
-        cpu_loop_exit();
-    }
-#endif
 }
 #endif
 
 #ifdef VBOX
+
 /**
  * Checks and processes external VMM events.
@@ -1459 +1478 @@
     }
 }
+
 /* helper for recording call instruction addresses for later scanning */
 void helper_record_call()
@@ -1467 +1487 @@
         remR3RecordCall(env);
 }
+
 #endif /* VBOX */
 
@@ -2945 +2966 @@
         EIP = offset;
     }
-#ifdef CONFIG_KQEMU
-    if (kqemu_is_ok(env)) {
-        env->exception_index = -1;
-        cpu_loop_exit();
-    }
-#endif
 }
 
@@ -3094 +3109 @@
         if ((new_cs & 0x3) == 1 && (env->state & CPU_RAW_RING0))
         {
-#ifdef DEBUG
+# ifdef DEBUG
             printf("RPL 1 -> new_cs %04X -> %04X\n", new_cs, new_cs & 0xfffc);
-#endif
+# endif
             new_cs = new_cs & 0xfffc;
         }
@@ -3326 +3341 @@
     }
     env->hflags2 &= ~HF2_NMI_MASK;
-#ifdef CONFIG_KQEMU
-    if (kqemu_is_ok(env)) {
-        CC_OP = CC_OP_EFLAGS;
-        env->exception_index = -1;
-        cpu_loop_exit();
-    }
-#endif
 }
 
@@ -3338 +3346 @@
 {
     helper_ret_protected(shift, 0, addend);
-#ifdef CONFIG_KQEMU
-    if (kqemu_is_ok(env)) {
-        env->exception_index = -1;
-        cpu_loop_exit();
-    }
-#endif
 }
 
@@ -3416 +3418 @@
     ESP = ECX;
     EIP = EDX;
-#ifdef CONFIG_KQEMU
-    if (kqemu_is_ok(env)) {
-        env->exception_index = -1;
-        cpu_loop_exit();
-    }
-#endif
 }
 
@@ -3536 +3532 @@
 }
 
-#ifdef VBOX
 void helper_rdtscp(void)
 {
+#ifndef VBOX
+    helper_rdtsc();
+    ECX = (uint32_t)(env->tsc_aux);
+#else
     uint64_t val;
     if ((env->cr[4] & CR4_TSD_MASK) && ((env->hflags & HF_CPL_MASK) != 0)) {
@@ -3551 +3550 @@
     else
         ECX = 0;
-}
 #endif /* VBOX */
+}
 
 void helper_rdpmc(void)
@@ -3705 +3704 @@
             env->mcg_ctl = val;
         break;
+    case MSR_TSC_AUX:
+        env->tsc_aux = val;
+        break;
 # endif /* !VBOX */
     default:
@@ -3788 +3790 @@
         val = env->kernelgsbase;
         break;
-#endif
-#ifdef CONFIG_KQEMU
-    case MSR_QPI_COMMBASE:
-        if (env->kqemu_enabled) {
-            val = kqemu_comm_base;
-        } else {
-            val = 0;
-        }
-        break;
+# ifndef VBOX
+    case MSR_TSC_AUX:
+        val = env->tsc_aux;
+        break;
+# endif /*!VBOX*/
 #endif
 # ifndef VBOX
@@ -5010 +5008 @@
     target_ulong addr;
 
+    /* The operand must be 16 byte aligned */
+    if (ptr & 0xf) {
+        raise_exception(EXCP0D_GPF);
+    }
+
     fpus = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11;
     fptag = 0;
@@ -5065 +5068 @@
     CPU86_LDouble tmp;
     target_ulong addr;
+
+    /* The operand must be 16 byte aligned */
+    if (ptr & 0xf) {
+        raise_exception(EXCP0D_GPF);
+    }
 
     env->fpuc = lduw(ptr);
@@ -6732 +6740 @@
 }
 
-target_ulong helper_bsr(target_ulong t0)
+target_ulong helper_lzcnt(target_ulong t0, int wordsize)
 {
     int count;
     target_ulong res, mask;
 
+    if (wordsize > 0 && t0 == 0) {
+        return wordsize;
+    }
     res = t0;
     count = TARGET_LONG_BITS - 1;
@@ -6744 +6755 @@
         res <<= 1;
     }
+    if (wordsize > 0) {
+        return wordsize - 1 - count;
+    }
     return count;
 }
 
+target_ulong helper_bsr(target_ulong t0)
+{
+        return helper_lzcnt(t0, 0);
+}
 
 static int compute_all_eflags(void)