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

Timestamp:

Feb 2, 2012 5:26:39 PM (13 years ago)

Author:

vboxsync

Message:

REM: Fixed incorrect CR2 value for word or dword instruction fields crossing page boundraries. (Our bug, really ancient.)

File:

• trunk/src/recompiler/target-i386/translate.c (modified) (1 diff)

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

@@ -111 +111 @@
     return b;
 }
-#define ldub_code(a) ldub_code_raw(a)
+# define ldub_code(a) ldub_code_raw(a)
 
 uint16_t lduw_code_raw(target_ulong pc)
 {
-    return (ldub_code(pc+1) << 8) | ldub_code(pc);
-}
-#define lduw_code(a) lduw_code_raw(a)
+    uint16_t u16;
+    u16  = (uint16_t)ldub_code_raw(pc);
+    u16 |= (uint16_t)ldub_code_raw(pc + 1) << 8;
+    return u16;
+}
+# define lduw_code(a) lduw_code_raw(a)
 
 
 uint32_t ldl_code_raw(target_ulong pc)
 {
-    return (ldub_code(pc+3) << 24) | (ldub_code(pc+2) << 16) | (ldub_code(pc+1) << 8) | ldub_code(pc);
-}
-#define ldl_code(a) ldl_code_raw(a)
+    uint32_t u32;
+    u32  = (uint32_t)ldub_code_raw(pc);
+    u32 |= (uint32_t)ldub_code_raw(pc + 1) << 8;
+    u32 |= (uint32_t)ldub_code_raw(pc + 2) << 16;
+    u32 |= (uint32_t)ldub_code_raw(pc + 3) << 24;
+    return u32;
+}
+# define ldl_code(a) ldl_code_raw(a)
 
 #endif /* VBOX */