VirtualBox

Changeset 13442

Show
Ignore:
Timestamp:
10/21/08 15:34:03 (3 months ago)
Author:
vboxsync
Message:

debug MSVC build fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/recompiler_new/VBoxRecompiler.c

    r13383 r13442  
    15611561        if (!s_aRegisters[uTrap]) 
    15621562        { 
     1563            char szStatName[64]; 
    15631564            s_aRegisters[uTrap] = true; 
    1564             char szStatName[64]; 
    15651565            RTStrPrintf(szStatName, sizeof(szStatName), "/REM/Trap/0x%02X", uTrap); 
    15661566            STAM_REG(env->pVM, &s_aStatTrap[uTrap], STAMTYPE_COUNTER, szStatName, STAMUNIT_OCCURENCES, "Trap stats."); 
     
    16511651    int                     rc;  
    16521652 
     1653    STAM_PROFILE_START(&pVM->rem.s.StatsState, a); 
    16531654    Log2(("REMR3State:\n")); 
    1654     STAM_PROFILE_START(&pVM->rem.s.StatsState, a); 
    16551655          
    16561656    pCtx = pVM->rem.s.pCtx; 
     
    21002100    unsigned          i; 
    21012101 
     2102    STAM_PROFILE_START(&pVM->rem.s.StatsStateBack, a); 
    21022103    Log2(("REMR3StateBack:\n")); 
    21032104    Assert(pVM->rem.s.fInREM); 
    2104     STAM_PROFILE_START(&pVM->rem.s.StatsStateBack, a); 
     2105     
    21052106        /* 
    21062107     * Copy back the registers. 
     
    26722673REMR3DECL(void) REMR3NotifyPhysRamRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, unsigned fFlags) 
    26732674{ 
     2675    uint32_t cbBitmap; 
     2676    int rc; 
    26742677    Log(("REMR3NotifyPhysRamRegister: GCPhys=%VGp cb=%d fFlags=%d\n", GCPhys, cb, fFlags)); 
    26752678    VM_ASSERT_EMT(pVM); 
     
    26952698        phys_ram_dirty = RTMemPageAlloc(_4G >> PAGE_SHIFT); 
    26962699        AssertReleaseMsg(phys_ram_dirty, ("failed to allocate %d bytes of dirty bytes\n", _4G >> PAGE_SHIFT)); 
    2697         uint32_t cbBitmap = RT_ALIGN_32(phys_ram_dirty_size, PAGE_SIZE); 
    2698         int rc = RTMemProtect(phys_ram_dirty + cbBitmap, (_4G >> PAGE_SHIFT) - cbBitmap, RTMEM_PROT_NONE); 
     2700        cbBitmap = RT_ALIGN_32(phys_ram_dirty_size, PAGE_SIZE); 
     2701        rc = RTMemProtect(phys_ram_dirty + cbBitmap, (_4G >> PAGE_SHIFT) - cbBitmap, RTMEM_PROT_NONE); 
    26992702        AssertRC(rc); 
    27002703        phys_ram_dirty += cbBitmap - phys_ram_dirty_size; 
     
    30073010{ 
    30083011#ifdef VBOX_STRICT 
     3012    unsigned long off; 
    30093013    if (pVM->rem.s.cHandlerNotifications) 
    30103014        REMR3ReplayHandlerNotifications(pVM); 
    30113015 
    3012     unsigned long off = get_phys_page_offset(GCPhys); 
     3016    off = get_phys_page_offset(GCPhys); 
    30133017    return (off & PAGE_OFFSET_MASK) == pVM->rem.s.iHandlerMemType 
    30143018        || (off & PAGE_OFFSET_MASK) == pVM->rem.s.iMMIOMemType 

© 2008 Sun Microsystems, Inc.
ContactPrivacy policy