Changeset 1514 in vbox for trunk

Timestamp:

Mar 15, 2007 2:57:05 PM (18 years ago)

Author:

vboxsync

Message:

Update eip for each instruction. (makes it easier to generate exceptions)
Re-enabled null selector check during memory accesses.

Location:

trunk/src/recompiler/target-i386

Files:

• op.c (modified) (4 diffs)
• translate.c (modified) (3 diffs)

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

@@ -496 +496 @@
         sync_seg(env, idx, env->segs[idx].newselector);
     }
-#if 0
     /* Loading a null selector into a segment register is valid, but using it is most definitely not! */
     if (    (env->cr[0] & (CR0_PE_MASK|CR0_PG_MASK)) == (CR0_PE_MASK|CR0_PG_MASK)
@@ -505 +504 @@
         raise_exception(EXCP0D_GPF);
     }
-#endif
-
     A0 = (uint32_t)env->segs[idx].base;
+    FORCE_RET();
 #else
     A0 = (uint32_t)*(target_ulong *)((char *)env + PARAM1);
@@ -522 +520 @@
         sync_seg(env, idx, env->segs[idx].newselector);
     }
-#if 0
     /* Loading a null selector into a segment register is valid, but using it is most definitely not! */
     if (    (env->cr[0] & (CR0_PE_MASK|CR0_PG_MASK)) == (CR0_PE_MASK|CR0_PG_MASK)
@@ -531 +528 @@
         raise_exception(EXCP0D_GPF);
     }
-#endif
     A0 = (uint32_t)(A0 + env->segs[idx].base);
+    FORCE_RET();
 #else
     A0 = (uint32_t)(A0 + *(target_ulong *)((char *)env + PARAM1));

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

@@ -833 +833 @@
     gen_op_check_external_event();
 }
+
+static inline void gen_update_eip(target_ulong pc)
+{
+#ifdef TARGET_X86_64
+    if (pc == (uint32_t)pc) {
+        gen_op_movl_eip_im(pc);
+    } else if (pc == (int32_t)pc) {
+        gen_op_movq_eip_im(pc);
+    } else {
+        gen_op_movq_eip_im64(pc >> 32, pc);
+    }
+#else
+    gen_op_movl_eip_im(pc);
+#endif
+}
+
 #endif /* VBOX */
 
@@ -839 +855 @@
 #ifdef VBOX
     gen_check_external_event();
-#endif /* VBOX */
+#endif
 #ifdef TARGET_X86_64
     if (pc == (uint32_t)pc) {
@@ -3134 +3150 @@
 #endif
     s->rip_offset = 0; /* for relative ip address */
+
+#ifdef VBOX
+    /* Always update EIP. Otherwise one must be very careful with generated code that can raise exceptions. */
+    gen_update_eip(pc_start - s->cs_base);
+#endif
+
  next_byte:
     b = ldub_code(s->pc);