Changeset 15173 in vbox for trunk/src/recompiler_new

Timestamp:

Dec 9, 2008 2:05:12 PM (16 years ago)

Author:

vboxsync

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

40582

Message:

an attempt to fix MacOS alignment issues

Location:

trunk/src/recompiler_new

Files:

• softmmu_template.h (modified) (6 diffs)
• target-i386/op_helper.c (modified) (1 diff)
• tcg/i386/tcg-target.c (modified) (6 diffs)

trunk/src/recompiler_new/softmmu_template.h

@@ -33 +33 @@
 #define USUFFIX q
 #define DATA_TYPE uint64_t
-#define DATA_TYPE_PROMOUTED uint64_t
+#define DATA_TYPE_PROMOTED uint64_t
 #elif DATA_SIZE == 4
 #define SUFFIX l
@@ -39 +39 @@
 #define DATA_TYPE uint32_t
 #ifdef VBOX
-#define DATA_TYPE_PROMOUTED RTCCUINTREG
+#define DATA_TYPE_PROMOTED RTCCUINTREG
 #endif
 #elif DATA_SIZE == 2
@@ -46 +46 @@
 #define DATA_TYPE uint16_t
 #ifdef VBOX
-#define DATA_TYPE_PROMOUTED RTCCUINTREG
+#define DATA_TYPE_PROMOTED RTCCUINTREG
 #endif
 #elif DATA_SIZE == 1
@@ -53 +53 @@
 #define DATA_TYPE uint8_t
 #ifdef VBOX
-#define DATA_TYPE_PROMOUTED RTCCUINTREG
+#define DATA_TYPE_PROMOTED RTCCUINTREG
 #endif
 #else
@@ -115 +115 @@
    that valid value takes the whole register, why gcc after 4.3 may
    use only lower part of register for smaller types. So force promoution. */
-DATA_TYPE_PROMOUTED REGPARM 
+DATA_TYPE_PROMOTED REGPARM 
 glue(glue(__ld, SUFFIX), MMUSUFFIX)(target_ulong addr,
                                     int mmu_idx)
@@ -367 +367 @@
 
 #ifdef VBOX
-#undef DATA_TYPE_PROMOUTED
+#undef DATA_TYPE_PROMOTED
 #endif
 #undef READ_ACCESS_TYPE

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

@@ -5454 +5454 @@
 #endif
 
+#if defined(VBOX) && defined(REM_PHYS_ADDR_IN_TLB)
+/* This code assumes real physical address always fit into host CPU reg,
+   which is wrong in general, but true for our current use cases. */   
+RTCCUINTREG REGPARM __ldb_vbox_phys(RTCCUINTREG addr)
+{
+    return remR3PhysReadS8(addr);
+}
+RTCCUINTREG REGPARM __ldub_vbox_phys(RTCCUINTREG addr)
+{
+    return remR3PhysReadU8(addr);
+}
+void REGPARM __stb_vbox_phys(RTCCUINTREG addr, RTCCUINTREG val)
+{
+    remR3PhysWriteU8(addr, val);
+}
+RTCCUINTREG REGPARM __ldw_vbox_phys(RTCCUINTREG addr)
+{
+    return remR3PhysReadS16(addr);
+}
+RTCCUINTREG REGPARM __lduw_vbox_phys(RTCCUINTREG addr)
+{
+    return remR3PhysReadU16(addr);
+}
+void REGPARM __stw_vbox_phys(RTCCUINTREG addr, RTCCUINTREG val)
+{
+    remR3PhysWriteU16(addr, val);
+}
+RTCCUINTREG REGPARM __ldl_vbox_phys(RTCCUINTREG addr)
+{
+     return remR3PhysReadS32(addr);
+}
+RTCCUINTREG REGPARM __ldul_vbox_phys(RTCCUINTREG addr)
+{
+     return remR3PhysReadU32(addr);
+}
+void REGPARM __stl_vbox_phys(RTCCUINTREG addr, RTCCUINTREG val)
+{
+    remR3PhysWriteU32(addr, val);
+}
+uint64_t REGPARM __ldq_vbox_phys(RTCCUINTREG addr)
+{
+     return remR3PhysReadU64(addr);
+}
+void REGPARM __stq_vbox_phys(RTCCUINTREG addr, uint64_t val)
+{
+    remR3PhysWriteU64(addr, val);
+}
+#endif
+
 /* try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not

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

@@ -48 +48 @@
     TCG_REG_ECX,
     TCG_REG_EBX,
-#ifndef VBOX
     TCG_REG_ESI,
-#endif
     TCG_REG_EDI,
     TCG_REG_EBP,
@@ -549 +547 @@
 #if defined(VBOX) && defined(REM_PHYS_ADDR_IN_TLB)
 static void *vbox_ld_helpers[] = {
-    remR3PhysReadU8,
-    remR3PhysReadU16,
-    remR3PhysReadU32,
-    remR3PhysReadU64,
-    remR3PhysReadS8,
-    remR3PhysReadS16,
-    remR3PhysReadS32,
-    remR3PhysReadS64,
+    __ldub_vbox_phys,
+    __lduw_vbox_phys,
+    __ldul_vbox_phys,
+    __ldq_vbox_phys,
+    __ldb_vbox_phys,
+    __ldw_vbox_phys,
+    __ldl_vbox_phys,
+    __ldq_vbox_phys,
 };
 
 static void *vbox_st_helpers[] = {
-    remR3PhysWriteU8,
-    remR3PhysWriteU16,
-    remR3PhysWriteU32,
-    remR3PhysWriteU64
+    __stb_vbox_phys,
+    __stw_vbox_phys,
+    __stl_vbox_phys,
+    __stq_vbox_phys
 };
 
@@ -575 +573 @@
     /* out parameter (address), note that phys address is always 64-bit */
     AssertMsg(sizeof(RTGCPHYS) == 8, ("Physical address must be 64-bits, update caller\n"));
-# ifdef RT_OS_DARWIN
-    tgen_arithi(s, ARITH_SUB, TCG_REG_ESP, 8);
-# endif
+
+#if 0
     tcg_out8(s, 0x6a); tcg_out8(s, 0x00); /* push $0 */
     tcg_out_push(s, addr_reg);
+#else
+    /* mov addr_reg, %eax */
+    tcg_out_mov(s, TCG_REG_EAX, addr_reg);
+#endif
 
     tcg_out_long_call(s, vbox_ld_helpers[index]);
@@ -589 +590 @@
     if (useReg2)
       tcg_out_mov(s, data_reg2, TCG_REG_EDX);
-
-    /* clean stack after us */
-# ifdef RT_OS_DARWIN
-    tcg_out_addi(s, TCG_REG_ESP, 16);
-# else
-    tcg_out_addi(s, TCG_REG_ESP, 8);
-# endif
 }
 
@@ -603 +597 @@
     int useReg2 = ((index & 3) == 3);
 
-    /** @todo:  should we make phys addess accessors fastcalls - probably not a big deal */
-# ifdef RT_OS_DARWIN
-    if (!useReg2)
-        tgen_arithi(s, ARITH_SUB, TCG_REG_ESP, 4);
-# endif
+#if 0
     /* out parameter (value2) */
     if (useReg2)
@@ -617 +607 @@
     tcg_out8(s, 0x6a); tcg_out8(s, 0x00); /* push $0 */
     tcg_out_push(s, addr_reg);
-
+#else
+    Assert(val_reg !=  TCG_REG_EAX && (!useReg2 || (val_reg2 != TCG_REG_EAX)));
+    /* mov addr_reg, %eax */
+    tcg_out_mov(s, TCG_REG_EAX, addr_reg);
+    Assert(!useReg2 || (val_reg2 != TCG_REG_EDX));
+    /* mov val_reg, %edx */
+    tcg_out_mov(s, TCG_REG_EDX, val_reg);    
+    if (useReg2)
+        tcg_out_mov(s, TCG_REG_ECX, val_reg2);
+
+#endif
     /* call it */
     tcg_out_long_call(s, vbox_st_helpers[index]);
 
     /* clean stack after us */
-# ifdef RT_OS_DARWIN
-    tcg_out_addi(s, TCG_REG_ESP, 16);
-# else
+#if 0
     tcg_out_addi(s, TCG_REG_ESP, 8 + (useReg2 ? 8 : 4));
 # endif