Changeset 13382

Timestamp:

10/19/08 22:45:30 (3 months ago)

Author:

vboxsync

Message:

more MSVC-related stuff

Files:

• trunk/src/recompiler_new/VBoxRecompiler.c (modified) (62 diffs)
• trunk/src/recompiler_new/bswap.h (modified) (6 diffs)
• trunk/src/recompiler_new/cpu-all.h (modified) (29 diffs)
• trunk/src/recompiler_new/cpu-exec.c (modified) (1 diff)
• trunk/src/recompiler_new/exec-all.h (modified) (9 diffs)
• trunk/src/recompiler_new/exec.c (modified) (22 diffs)
• trunk/src/recompiler_new/hostregs_helper.h (modified) (1 diff)
• trunk/src/recompiler_new/osdep.h (modified) (3 diffs)
• trunk/src/recompiler_new/softmmu_header.h (modified) (11 diffs)
• trunk/src/recompiler_new/softmmu_template.h (modified) (2 diffs)
• trunk/src/recompiler_new/target-i386/cpu.h (modified) (6 diffs)
• trunk/src/recompiler_new/target-i386/exec.h (modified) (19 diffs)
• trunk/src/recompiler_new/translate-all.c (modified) (1 diff)

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -245 +245 @@
-    uint32_t u32Dummy;
-    unsigned i;
+    int rc;
-
-    /*
@@ -276 +277 @@
-
-    /* ctx. */
-int 
+
-    if (VBOX_FAILURE(rc))
-    {
@@ -451 +452 @@
-static DECLCALLBACK(int) remR3Save(PVM pVM, PSSMHANDLE pSSM)
-{
-    LogFlow(("remR3Save:\n"));
-
-    /*
-     * Save the required CPU Env bits.
@@ -458 +457 @@
-     */
-    PREM pRem = &pVM->rem.s;
+    LogFlow(("remR3Save:\n"));
-    Assert(!pRem->fInREM);
-    SSMR3PutU32(pSSM,   pRem->Env.hflags);
@@ -482 +482 @@
-    uint32_t u32Dummy;
-    uint32_t fRawRing0 = false;
+    uint32_t u32Sep;
+    int rc;
+    PREM pRem;
-    LogFlow(("remR3Load:\n"));
-
@@ -509 +512 @@
-     * (Not much because we're never in REM when doing the save.)
-     */
-PREM 
+
-    Assert(!pRem->fInREM);
-    SSMR3GetU32(pSSM,   &pRem->Env.hflags);
@@ -519 +522 @@
-    }
-
-
-
+
-    if (VBOX_FAILURE(rc))
-        return rc;
@@ -536 +538 @@
-    if (u32Version == REM_SAVED_STATE_VERSION_VER1_6)
-    {
+        unsigned i;
+    
-        /*
-         * Load the REM stuff.
@@ -547 +551 @@
-            return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
-        }
-        unsigned i;
-        for (i = 0; i < pRem->cInvalidatedPages; i++)
-            SSMR3GetGCPtr(pSSM, &pRem->aGCPtrInvalidatedPages[i]);
@@ -608 +611 @@
-REMR3DECL(int) REMR3Step(PVM pVM)
-{
+    int         rc, interrupt_request;
+    RTGCPTR     GCPtrPC;
+    bool        fBp;
+ 
-    /*
-     * Lock the REM - we don't wanna have anyone interrupting us
@@ -613 +620 @@
-     * pending interrupts and suchlike.
-     */
- int
+
-    Assert(!(interrupt_request & ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXIT | CPU_INTERRUPT_EXITTB | CPU_INTERRUPT_TIMER  | CPU_INTERRUPT_EXTERNAL_HARD | CPU_INTERRUPT_EXTERNAL_EXIT | CPU_INTERRUPT_EXTERNAL_TIMER)));
-    pVM->rem.s.Env.interrupt_request = 0;
@@ -621 +628 @@
-     * If we're standing at a breakpoint, that have to be disabled before we start stepping.
-     */
-RTGCPTR     
-bool        
+
+
-
-    /*
@@ -629 +636 @@
-     * just flip it on and off to make sure it moves
-     */
-int 
+
-    if (rc == EXCP_DEBUG)
-    {
@@ -728 +735 @@
-REMR3DECL(int) REMR3EmulateInstruction(PVM pVM)
-{
+    int rc, rc2;
-    Log2(("REMR3EmulateInstruction: (cs:eip=%04x:%08x)\n", CPUMGetGuestCS(pVM), CPUMGetGuestEIP(pVM)));
-
@@ -739 +747 @@
-     * Sync the state and enable single instruction / single stepping.
-     */
-int 
+
-    if (VBOX_SUCCESS(rc))
-    {
@@ -951 +959 @@
-#endif
-        pVM->rem.s.Env.interrupt_request = interrupt_request;
-int 
+
-        AssertRC(rc2);
-    }
@@ -975 +983 @@
-REMR3DECL(int) REMR3Run(PVM pVM)
-{
+    int rc;
-    Log2(("REMR3Run: (cs:eip=%04x:%VGv)\n", pVM->rem.s.Env.segs[R_CS].selector, pVM->rem.s.Env.eip));
-    Assert(pVM->rem.s.fInREM);
-
-    TMNotifyStartOfExecution(pVM);
-int 
+
-    TMNotifyEndOfExecution(pVM);
-    switch (rc)
@@ -1104 +1113 @@
-    /* !!! THIS MUST BE IN SYNC WITH emR3Reschedule !!! */
-    /* !!! THIS MUST BE IN SYNC WITH emR3Reschedule !!! */
+    uint32_t u32CR0;
-
-    /* Update counter. */
@@ -1110 +1120 @@
-    if (HWACCMIsEnabled(env->pVM))
-    {
+        CPUMCTX Ctx;
+
-        env->state |= CPU_RAW_HWACC;
-
@@ -1115 +1127 @@
-         * Create partial context for HWACCMR3CanExecuteGuest
-         */
-        CPUMCTX Ctx;
-        Ctx.cr0            = env->cr[0];
-        Ctx.cr3            = env->cr[3];
@@ -1215 +1226 @@
-    }
-
-int32_t u
+
-    if ((u32CR0 & (X86_CR0_PG | X86_CR0_PE)) != (X86_CR0_PG | X86_CR0_PE))
-    {
@@ -1344 +1355 @@
-{
-    PVM pVM = env->pVM;
+    PCPUMCTX pCtx;
+    int rc;
-
-    /*
@@ -1359 +1372 @@
-     * Update the control registers before calling PGMFlushPage.
-     */
-PCPUMCTX 
+
-    pCtx->cr0 = env->cr[0];
-    pCtx->cr3 = env->cr[3];
@@ -1367 +1380 @@
-     * Let PGM do the rest.
-     */
-int 
+
-    if (VBOX_FAILURE(rc))
-    {
@@ -1426 +1439 @@
-{
-    PVM pVM = env->pVM;
+    PCPUMCTX pCtx;
-
-    /*
@@ -1445 +1459 @@
-     * Update the control registers before calling PGMR3FlushTLB.
-     */
-PCPUMCTX 
+
-    pCtx->cr0 = env->cr[0];
-    pCtx->cr3 = env->cr[3];
@@ -1466 +1480 @@
-    int rc;
-    PVM pVM = env->pVM;
+    PCPUMCTX pCtx;
-
-    /*
@@ -1479 +1494 @@
-     * as it may need to map whatever cr3 is pointing to.
-     */
-PCPUMCTX 
+
-    pCtx->cr0 = env->cr[0];
-    pCtx->cr3 = env->cr[3];
@@ -1628 +1643 @@
-REMR3DECL(int)  REMR3State(PVM pVM, bool fFlushTBs)
-{
+    register const CPUMCTX *pCtx;
+    register unsigned       fFlags;
+    bool                    fHiddenSelRegsValid;
+    unsigned                i;
+    TRPMEVENT               enmType;
+    uint8_t                 u8TrapNo;
+    int                     rc; 
+
-    Log2(("REMR3State:\n"));
-    STAM_PROFILE_START(&pVM->rem.s.StatsState, a);
-
-
-
-
+
+
+
-
-    Assert(!pVM->rem.s.fInREM);
@@ -1716 +1738 @@
-    if (pVM->rem.s.cInvalidatedPages)
-    {
+        RTUINT i;
+        
-        pVM->rem.s.fIgnoreInvlPg = true;
-        RTUINT i;
-        for (i = 0; i < pVM->rem.s.cInvalidatedPages; i++)
-        {
@@ -1976 +1999 @@
-     */
-    pVM->rem.s.Env.exception_index = -1; /** @todo this won't work :/ */
-
-
-
+
-    if (VBOX_SUCCESS(rc))
-    {
@@ -2076 +2097 @@
-REMR3DECL(int) REMR3StateBack(PVM pVM)
-{
+    register PCPUMCTX pCtx = pVM->rem.s.pCtx;
+    unsigned          i;
+
-    Log2(("REMR3StateBack:\n"));
-    Assert(pVM->rem.s.fInREM);
-    STAM_PROFILE_START(&pVM->rem.s.StatsStateBack, a);
-
-
-
-
+
-     * Copy back the registers.
-     * This is done in the order they are declared in the CPUMCTX structure.
@@ -2269 +2290 @@
-        &&  pVM->rem.s.Env.exception_index < 256)
-    {
+        int rc;
+
-        Log(("REMR3StateBack: Pending trap %x %d\n", pVM->rem.s.Env.exception_index, pVM->rem.s.Env.exception_is_int));
-int 
+
-        AssertRC(rc);
-        switch (pVM->rem.s.Env.exception_index)
@@ -2301 +2324 @@
-static void remR3StateUpdate(PVM pVM)
-{
-    Assert(pVM->rem.s.fInREM);
-    register PCPUMCTX pCtx = pVM->rem.s.pCtx;
-    unsigned          i;
-
+    Assert(pVM->rem.s.fInREM);
+    
-    /*
-     * Copy back the registers.
@@ -2492 +2516 @@
-REMR3DECL(void) REMR3A20Set(PVM pVM, bool fEnable)
-{
+    bool fSaved;
+
-    LogFlow(("REMR3A20Set: fEnable=%d\n", fEnable));
-    VM_ASSERT_EMT(pVM);
-
-bool 
+
-    pVM->rem.s.fIgnoreAll = fSaved || !pVM->rem.s.fInREM;
-
@@ -2512 +2538 @@
-REMR3DECL(void) REMR3ReplayInvalidatedPages(PVM pVM)
-{
+    RTUINT i;
+    
-    VM_ASSERT_EMT(pVM);
-
@@ -2526 +2554 @@
-     */
-    pVM->rem.s.fIgnoreInvlPg = true;
-    RTUINT i;
-    for (i = 0; i < pVM->rem.s.cInvalidatedPages; i++)
-    {
@@ -2545 +2572 @@
-REMR3DECL(void) REMR3ReplayHandlerNotifications(PVM pVM)
-{
+    /*
+     * Replay the flushes.
+     */
+    RTUINT i;
+    const RTUINT c = pVM->rem.s.cHandlerNotifications;
+    
-    LogFlow(("REMR3ReplayInvalidatedPages:\n"));
-    VM_ASSERT_EMT(pVM);
-
-    /*
-     * Replay the flushes.
-     */
-    RTUINT i;
-    const RTUINT c = pVM->rem.s.cHandlerNotifications;
-    pVM->rem.s.cHandlerNotifications = 0;
-    for (i = 0; i < c; i++)
@@ -2745 +2773 @@
-    int rc;
-    PVM pVM = cpu_single_env->pVM;
+    const RTGCPHYS GCPhys = physaddr;
-
-    LogFlow(("remR3GrowDynRange %VGp\n", physaddr));
-    const RTGCPHYS GCPhys = physaddr;
-    rc = PGM3PhysGrowRange(pVM, &GCPhys);
-    if (VBOX_SUCCESS(rc))
@@ -3274 +3302 @@
-static void     remR3MMIOWriteU8(void *pvVM, target_phys_addr_t GCPhys, uint32_t u32)
-{
+    int rc;
-    Log2(("remR3MMIOWriteU8: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
-int 
+
-    AssertMsg(rc == VINF_SUCCESS, ("rc=%Vrc\n", rc)); NOREF(rc);
-}
@@ -3282 +3311 @@
-static void     remR3MMIOWriteU16(void *pvVM, target_phys_addr_t GCPhys, uint32_t u32)
-{
+    int rc;
-    Log2(("remR3MMIOWriteU16: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
-int 
+
-    AssertMsg(rc == VINF_SUCCESS, ("rc=%Vrc\n", rc)); NOREF(rc);
-}
@@ -3290 +3320 @@
-static void     remR3MMIOWriteU32(void *pvVM, target_phys_addr_t GCPhys, uint32_t u32)
-{
+    int rc;
-    Log2(("remR3MMIOWriteU32: GCPhys=%VGp u32=%#x\n", GCPhys, u32));
-int 
+
-    AssertMsg(rc == VINF_SUCCESS, ("rc=%Vrc\n", rc)); NOREF(rc);
-}
@@ -3303 +3334 @@
-static uint32_t remR3HandlerReadU8(void *pvVM, target_phys_addr_t GCPhys)
-{
+    uint8_t u8;
-    Log2(("remR3HandlerReadU8: GCPhys=%VGp\n", GCPhys));
-    uint8_t u8;
-    PGMPhysRead((PVM)pvVM, GCPhys, &u8, sizeof(u8));
-    return u8;
@@ -3311 +3342 @@
-static uint32_t remR3HandlerReadU16(void *pvVM, target_phys_addr_t GCPhys)
-{
+    uint16_t u16;
-    Log2(("remR3HandlerReadU16: GCPhys=%VGp\n", GCPhys));
-    uint16_t u16;
-    PGMPhysRead((PVM)pvVM, GCPhys, &u16, sizeof(u16));
-    return u16;
@@ -3319 +3350 @@
-static uint32_t remR3HandlerReadU32(void *pvVM, target_phys_addr_t GCPhys)
-{
+    uint32_t u32;
-    Log2(("remR3HandlerReadU32: GCPhys=%VGp\n", GCPhys));
-    uint32_t u32;
-    PGMPhysRead((PVM)pvVM, GCPhys, &u32, sizeof(u32));
-    return u32;
@@ -3434 +3465 @@
-bool remR3DisasBlock(CPUState *env, int f32BitCode, int nrInstructions, char *pszPrefix)
-{
-
+
+
+
+
+
-
-    /*
@@ -3446 +3481 @@
-     * We don't care to much about cross page correctness presently.
-     */
-
-
+
-    if (f32BitCode && (env->cr[0] & (X86_CR0_PE | X86_CR0_PG)) == (X86_CR0_PE | X86_CR0_PG))
-    {
@@ -3453 +3487 @@
-
-        /* convert eip to physical address. */
-int 
-    
-    
-    
-    
+
+
+
+
+
-        if (VBOX_FAILURE(rc))
-        {
@@ -3469 +3503 @@
-    {
-        /* physical address */
-int 
+
-        if (VBOX_FAILURE(rc))
-            return false;
@@ -3477 +3511 @@
-     * Disassemble.
-     */
-
-
+
-    Cpu.mode = f32BitCode ? CPUMODE_32BIT : CPUMODE_16BIT;
-    Cpu.pfnReadBytes = NULL;            /** @todo make cs:eip reader for the disassembler. */
@@ -3518 +3551 @@
-{
-#ifdef USE_OLD_DUMP_AND_DISASSEMBLY
-
+
+
+
+
+
+
+
+
-
-    /* Doesn't work in long mode. */
@@ -3543 +3583 @@
-     * We don't care to much about cross page correctness presently.
-     */
-
-
+
-    if ((env->cr[0] & (X86_CR0_PE | X86_CR0_PG)) == (X86_CR0_PE | X86_CR0_PG))
-    {
@@ -3573 +3612 @@
-     * Disassemble.
-     */
-
-
+
-    Cpu.mode = f32BitCode ? CPUMODE_32BIT : CPUMODE_16BIT;
-    Cpu.pfnReadBytes = NULL;            /** @todo make cs:eip reader for the disassembler. */
@@ -3580 +3618 @@
-    //Cpu.dwUserData[1] = (uintptr_t)pvPC;
-    //Cpu.dwUserData[2] = GCPtrPC;
-    char szOutput[256];
-    uint32_t    cbOp;
-    if (RT_FAILURE(DISInstr(&Cpu, (uintptr_t)pvPC, off, &cbOp, &szOutput[0])))
-        return false;
@@ -3691 +3727 @@
-    {
-        PVM pVM = cpu_single_env->pVM;
+        RTSEL cs;
+        RTGCUINTPTR eip;
-
-        /*
@@ -3701 +3739 @@
-         */
-        RTLogPrintf("Guest Code: PC=%VGp #VGp (%VGp) bytes fFlags=%d\n", uCode, cb, cb, fFlags);
-RTSEL 
-RTGCUINTPTR 
+
+
-        for (;;)
-        {
@@ -4120 +4158 @@
-void cpu_outb(CPUState *env, int addr, int val)
-{
+    int rc;
+
-    if (addr != 0x80 && addr != 0x70 && addr != 0x61)
-        Log2(("cpu_outb: addr=%#06x val=%#x\n", addr, val));
-
-int 
+
-    if (RT_LIKELY(rc == VINF_SUCCESS))
-        return;
@@ -4152 +4192 @@
-void cpu_outl(CPUState *env, int addr, int val)
-{
+    int rc;
-    Log2(("cpu_outl: addr=%#06x val=%#x\n", addr, val));
-int 
+
-    if (RT_LIKELY(rc == VINF_SUCCESS))
-        return;
@@ -4286 +4327 @@
-void cpu_abort(CPUState *env, const char *pszFormat, ...)
-{
+    va_list args;
+    PVM pVM;
+    
-    /*
-     * Bitch about it.
-     */
+#ifndef _MSC_VER
+    /** @todo: MSVC is right - it's not valid C */
-    RTLogFlags(NULL, "nodisabled nobuffered");
-
+
-    va_start(args, pszFormat);
-    RTLogPrintf("fatal error in recompiler cpu: %N\n", pszFormat, &args);
@@ -4302 +4348 @@
-     * the EMs failure handling.
-     */
-PVM 
+
-    if (pVM->rem.s.fInREM)
-        REMR3StateBack(pVM);
@@ -4318 +4364 @@
-static void remAbort(int rc, const char *pszTip)
-{
+    PVM pVM;
+
-    /*
-     * Bitch about it.
@@ -4327 +4375 @@
-     * Jump back to where we entered the recompiler.
-     */
-PVM 
+
-    if (pVM->rem.s.fInREM)
-        REMR3StateBack(pVM);

trunk/src/recompiler_new/bswap.h

@@ -79 +79 @@
-
-#ifndef bswap16 /* BSD endian.h clash */
+#ifndef VBOX
-static inline uint16_t bswap16(uint16_t x)
+#else
+DECLINLINE(uint16_t) bswap16(uint16_t x)
+#endif
-{
-    return bswap_16(x);
@@ -86 +90 @@
-
-#ifndef bswap32 /* BSD endian.h clash */
+#ifndef VBOX
-static inline uint32_t bswap32(uint32_t x)
+#else
+DECLINLINE(uint32_t) bswap32(uint32_t x)
+#endif
-{
-    return bswap_32(x);
@@ -93 +101 @@
-
-#ifndef bswap64 /* BSD endian.h clash. */
+#ifndef VBOX
-static inline uint64_t bswap64(uint64_t x)
+#else
+DECLINLINE(uint64_t) bswap64(uint64_t x)
+#endif
-{
-    return bswap_64(x);
@@ -99 +111 @@
-#endif
-
+#ifndef VBOX
-static inline void bswap16s(uint16_t *s)
+#else
+DECLINLINE(void) bswap16s(uint16_t *s)
+#endif
-{
-    *s = bswap16(*s);
-}
-
+#ifndef VBOX
-static inline void bswap32s(uint32_t *s)
+#else
+DECLINLINE(void) bswap32s(uint32_t *s)
+#endif
-{
-    *s = bswap32(*s);
-}
-
+#ifndef VBOX
-static inline void bswap64s(uint64_t *s)
+#else
+DECLINLINE(void) bswap64s(uint64_t *s)
+#endif
-{
-    *s = bswap64(*s);
@@ -126 +150 @@
-#endif
-
+#ifndef VBOX
-#define CPU_CONVERT(endian, size, type)\
-static inline type endian ## size ## _to_cpu(type v)\
@@ -156 +181 @@
-     *p = cpu_to_ ## endian ## size(v);\
-}
+#else  /* VBOX */
+#define CPU_CONVERT(endian, size, type)\
+DECLINLINE(type) endian ## size ## _to_cpu(type v)\
+{\
+    return endian ## _bswap(v, size);\
+}\
+\
+DECLINLINE(type) cpu_to_ ## endian ## size(type v)\
+{\
+    return endian ## _bswap(v, size);\
+}\
+\
+DECLINLINE(void) endian ## size ## _to_cpus(type *p)\
+{\
+    endian ## _bswaps(p, size)\
+}\
+\
+DECLINLINE(void) cpu_to_ ## endian ## size ## s(type *p)\
+{\
+    endian ## _bswaps(p, size)\
+}\
+\
+DECLINLINE(type) endian ## size ## _to_cpup(const type *p)\
+{\
+    return endian ## size ## _to_cpu(*p);\
+}\
+\
+DECLINLINE(void) cpu_to_ ## endian ## size ## w(type *p, type v)\
+{\
+     *p = cpu_to_ ## endian ## size(v);\
+}
+#endif /* VBOX */
-
-CPU_CONVERT(be, 16, uint16_t)

trunk/src/recompiler_new/cpu-all.h

@@ -32 +32 @@
-#ifdef VBOX
-# ifndef LOG_GROUP
-#  include <VBox/log.h>
-#  define LOG_GROUP LOG_GROUP_REM
-# endif
+# include <VBox/log.h>
-# include <VBox/pgm.h> /* PGM_DYNAMIC_RAM_ALLOC */
-#endif
@@ -95 +95 @@
-#else
-
+#ifndef VBOX
-static inline uint16_t tswap16(uint16_t s)
+#else
+DECLINLINE(uint16_t) tswap16(uint16_t s)
+#endif
-{
-    return s;
-}
-
+#ifndef VBOX
-static inline uint32_t tswap32(uint32_t s)
+#else
+DECLINLINE(uint32_t) tswap32(uint32_t s)
+#endif
-{
-    return s;
-}
-
+#ifndef VBOX
-static inline uint64_t tswap64(uint64_t s)
+#else
+DECLINLINE(uint64_t) tswap64(uint64_t s)
+#endif
-{
-    return s;
-}
-
+#ifndef VBOX
-static inline void tswap16s(uint16_t *s)
-
-
-
+
+
+
+
+
+
+
-static inline void tswap32s(uint32_t *s)
-
-
-
+
+
+
+
+
+
+
-static inline void tswap64s(uint64_t *s)
+#else
+DECLINLINE(void) tswap64s(uint64_t *s)
+#endif
-{
-}
@@ -249 +273 @@
-#endif
-
-static inline int
+DECLINLINE(int)
-{
-    VBOX_CHECK_ADDR(ptr);
@@ -255 +279 @@
-}
-
-static inline int
+DECLINLINE(int)
-{
-    VBOX_CHECK_ADDR(ptr);
@@ -261 +285 @@
-}
-
-static inline void
+DECLINLINE(void)
-{
-    VBOX_CHECK_ADDR(ptr);
@@ -267 +291 @@
-}
-
-static inline int
+DECLINLINE(int)
-{
-    VBOX_CHECK_ADDR(ptr);
@@ -273 +297 @@
-}
-
-static inline int
+DECLINLINE(int)
-{
-    VBOX_CHECK_ADDR(ptr);
@@ -279 +303 @@
-}
-
-static inline void
+DECLINLINE(void)
-{
-    VBOX_CHECK_ADDR(ptr);
@@ -285 +309 @@
-}
-
-static inline int
+DECLINLINE(int)
-{
-    VBOX_CHECK_ADDR(ptr);
@@ -291 +315 @@
-}
-
-static inline void
+DECLINLINE(void)
-{
-    VBOX_CHECK_ADDR(ptr);
@@ -297 +321 @@
-}
-
-static inline void
+DECLINLINE(void)
-{
-    VBOX_CHECK_ADDR(ptr);
@@ -303 +327 @@
-}
-
-static inline uint64_t
+DECLINLINE(uint64_t)
-{
-    VBOX_CHECK_ADDR(ptr);
@@ -313 +337 @@
-/* float access */
-
-static inline float32
+DECLINLINE(float32)
-{
-    union {
@@ -323 +347 @@
-}
-
-static inline void
+DECLINLINE(void)
-{
-    union {
@@ -333 +357 @@
-}
-
-static inline float64
+DECLINLINE(float64)
-{
-    CPU_DoubleU u;
-    u.l.lower = ldl_le_p(ptr);
-
+(uint8_t*)
-    return u.d;
-}
-
-static inline void
+DECLINLINE(void)
-{
-    CPU_DoubleU u;
-    u.d = v;
-    stl_le_p(ptr, u.l.lower);
-
+(uint8_t*)
-}
-
@@ -549 +573 @@
-#if !defined(WORDS_BIGENDIAN) || defined(WORDS_ALIGNED)
-
+#ifndef VBOX
-static inline int lduw_be_p(void *ptr)
-{
@@ -563 +588 @@
-#endif
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-static inline int ldsw_be_p(void *ptr)
-{
@@ -578 +620 @@
-#endif
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-static inline int ldl_be_p(void *ptr)
-{
@@ -593 +652 @@
-#endif
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-static inline uint64_t ldq_be_p(void *ptr)
+#else
+DECLINLINE(uint64_t) ldq_be_p(void *ptr)
+#endif
-{
-    uint32_t a,b;
-    a = ldl_be_p(ptr);
-
+(uint8_t*)
-    return (((uint64_t)a<<32)|b);
-}
-
+#ifndef VBOX
-static inline void stw_be_p(void *ptr, int v)
-{
@@ -615 +695 @@
-#endif
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-static inline void stl_be_p(void *ptr, int v)
-{
@@ -631 +728 @@
-#endif
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-static inline void stq_be_p(void *ptr, uint64_t v)
+#else
+DECLINLINE(void) stq_be_p(void *ptr, uint64_t v)
+#endif
-{
-    stl_be_p(ptr, v >> 32);
-
+(uint8_t*)
-}
-
-/* float access */
-
+
-static inline float32 ldfl_be_p(void *ptr)
+#else
+DECLINLINE(float32) ldfl_be_p(void *ptr)
+#endif
-{
-    union {
@@ -650 +771 @@
-}
-
+#ifndef VBOX
-static inline void stfl_be_p(void *ptr, float32 v)
+#else
+DECLINLINE(void) stfl_be_p(void *ptr, float32 v)
+#endif
-{
-    union {
@@ -660 +785 @@
-}
-
+#ifndef VBOX
-static inline float64 ldfq_be_p(void *ptr)
+#else
+DECLINLINE(float64) ldfq_be_p(void *ptr)
+#endif
-{
-    CPU_DoubleU u;
-    u.l.upper = ldl_be_p(ptr);
-
+(uint8_t*)
-    return u.d;
-}
-
+#ifndef VBOX
-static inline void stfq_be_p(void *ptr, float64 v)
+#else
+DECLINLINE(void) stfq_be_p(void *ptr, float64 v)
+#endif
-{
-    CPU_DoubleU u;
-    u.d = v;
-    stl_be_p(ptr, u.l.upper);
-
+(uint8_t*)
-}
-
@@ -1103 +1236 @@
-void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
-                            int len, int is_write);
+#ifndef VBOX
-static inline void cpu_physical_memory_read(target_phys_addr_t addr,
-                                            uint8_t *buf, int len)
+#else
+DECLINLINE(void) cpu_physical_memory_read(target_phys_addr_t addr,
+                                          uint8_t *buf, int len)
+#endif
-{
-    cpu_physical_memory_rw(addr, bu