Changeset 47309 in vbox for trunk/src/recompiler/target-i386

Timestamp:

Jul 22, 2013 2:42:08 PM (12 years ago)

Author:

vboxsync

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

87449

Message:

REM: Try set DESC_INTEL_UNUSED where applicable. Fixed values in DR6, mapped DR5 to DR7 and DR4 to DR6.

Location:

trunk/src/recompiler/target-i386

Files:

• cpu.h (modified) (2 diffs)
• op_helper.c (modified) (12 diffs)

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

@@ -116 +116 @@
 
 #define DESC_TSS_BUSY_MASK (1 << 9)
+#ifdef VBOX
+# define DESC_INTEL_UNUSABLE    RT_BIT_32(16+8) /**< Internal VT-x bit for NULL sectors. */
+#endif
 
 /* eflags masks */
@@ -949 +952 @@
     if (flags & DESC_P_MASK)
         flags |= DESC_A_MASK;           /* Make sure the A bit is set to avoid trouble. */
+    if (selector < 4U && (env->hflags & HF_CS64_MASK))
+        flags |= DESC_INTEL_UNUSABLE;
+    else
+        flags &= ~DESC_INTEL_UNUSABLE;
     sc->flags = flags;
     sc->newselector = 0;

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

@@ -274 +274 @@
     sc->flags = e2;
 #ifdef VBOX
+    sc->flags &= ~DESC_INTEL_UNUSABLE;
     sc->newselector = 0;
     sc->fVBoxFlags  = CPUMSELREG_FLAGS_VALID;
@@ -624 +625 @@
     env->ldt.flags = 0;
 #ifdef VBOX
+    env->ldt.flags = DESC_INTEL_UNUSABLE;
     env->ldt.fVBoxFlags  = CPUMSELREG_FLAGS_VALID;
     env->ldt.newselector = 0;
@@ -1326 +1328 @@
     if (new_stack) {
         ss = 0 | dpl;
+#ifndef VBOX
         cpu_x86_load_seg_cache(env, R_SS, ss, 0, 0, 0);
+#else
+        cpu_x86_load_seg_cache(env, R_SS, ss, 0, 0, dpl << DESC_DPL_SHIFT);
+#endif
     }
     ESP = esp;
@@ -2503 +2509 @@
         env->ldt.limit = 0;
 #ifdef VBOX
+        env->ldt.flags = DESC_INTEL_UNUSABLE;
         env->ldt.fVBoxFlags = CPUMSELREG_FLAGS_VALID;
         env->ldt.newselector = 0;
@@ -2569 +2576 @@
         env->tr.flags = 0;
 #ifdef VBOX
+        env->tr.flags = DESC_INTEL_UNUSABLE;
         env->tr.fVBoxFlags  = CPUMSELREG_FLAGS_VALID;
         env->tr.newselector = 0;
@@ -2645 +2653 @@
     if ((selector & 0xfffc) == 0) {
         /* null selector case */
+#ifndef VBOX
         if (seg_reg == R_SS
 #ifdef TARGET_X86_64
@@ -2652 +2661 @@
             raise_exception_err(EXCP0D_GPF, 0);
         cpu_x86_load_seg_cache(env, seg_reg, selector, 0, 0, 0);
+#else
+        if (seg_reg == R_SS) {
+            if (!(env->hflags & HF_CS64_MASK) || cpl == 3)
+                raise_exception_err(EXCP0D_GPF, 0);
+            e2 = (cpl << DESC_DPL_SHIFT) | DESC_INTEL_UNUSABLE;
+        } else {
+            e2 = DESC_INTEL_UNUSABLE;
+        }
+        cpu_x86_load_seg_cache(env, seg_reg, selector, 0, 0, e2);
+#endif
     } else {
 
@@ -3321 +3340 @@
 #endif
             {
+#if defined(VBOX) && defined(DEBUG)
+                Log(("NULL ss, rpl=%d\n", rpl));
+#endif
                 raise_exception_err(EXCP0D_GPF, 0);
             }
         } else {
             if ((new_ss & 3) != rpl)
+            {
+#if defined(VBOX) && defined(DEBUG)
+                Log(("new_ss=%x != rpl=%d\n", new_ss, rpl));
+#endif
                 raise_exception_err(EXCP0D_GPF, new_ss & 0xfffc);
+            }
             if (load_segment(&ss_e1, &ss_e2, new_ss) != 0)
+            {
+#if defined(VBOX) && defined(DEBUG)
+                Log(("new_ss=%x load error\n", new_ss));
+#endif
                 raise_exception_err(EXCP0D_GPF, new_ss & 0xfffc);
+            }
             if (!(ss_e2 & DESC_S_MASK) ||
                 (ss_e2 & DESC_CS_MASK) ||
                 !(ss_e2 & DESC_W_MASK))
+            {
+#if defined(VBOX) && defined(DEBUG)
+                Log(("new_ss=%x ss_e2=%#x bad type\n", new_ss, ss_e2));
+#endif
                 raise_exception_err(EXCP0D_GPF, new_ss & 0xfffc);
+            }
             dpl = (ss_e2 >> DESC_DPL_SHIFT) & 3;
             if (dpl != rpl)
+            {
+#if defined(VBOX) && defined(DEBUG)
+                Log(("SS.dpl=%u  !=  rpl=%u\n", dpl, rpl));
+#endif
                 raise_exception_err(EXCP0D_GPF, new_ss & 0xfffc);
+            }
             if (!(ss_e2 & DESC_P_MASK))
+            {
+#if defined(VBOX) && defined(DEBUG)
+                Log(("new_ss=%#x #NP\n", new_ss));
+#endif
                 raise_exception_err(EXCP0B_NOSEG, new_ss & 0xfffc);
+            }
 #ifdef VBOX
             if (!(e2 & DESC_A_MASK))
@@ -3419 +3466 @@
 
 #ifdef VBOX
+    Log(("iret (shift=%d new_eip=%#x)\n", shift, next_eip));
     e1 = e2 = 0; /** @todo Why do we do this? */
     remR3TrapClear(env->pVM);
@@ -3427 +3475 @@
 #ifdef TARGET_X86_64
         if (env->hflags & HF_LMA_MASK)
+        {
+#if defined(VBOX) && defined(DEBUG)
+            Log(("eflags.NT=1 on iret in long mode\n"));
+#endif
             raise_exception_err(EXCP0D_GPF, 0);
+        }
 #endif
         tss_selector = lduw_kernel(env->tr.base + 0);
@@ -3597 +3650 @@
         env->dr[reg] = t0;
         hw_breakpoint_insert(env, reg);
+# ifndef VBOX
     } else if (reg == 7) {
+# else
+    } else if (reg == 7 || reg == 5) {
+# endif
         for (i = 0; i < 4; i++)
             hw_breakpoint_remove(env, i);
@@ -3604 +3661 @@
             hw_breakpoint_insert(env, i);
     } else
+# ifndef VBOX
         env->dr[reg] = t0;
+# else
+        env->dr[6] = (t0 & ~RT_BIT_32(12)) | UINT32_C(0xffff0ff0); /* 4 is an alias for 6. */
+# endif
 }
 #endif