Changeset 17342 in vbox for trunk

Timestamp:

Mar 4, 2009 12:24:58 PM (16 years ago)

Author:

vboxsync

Message:

REM: remove excessive assertions, as new HVA -> PGA works just fine

Location:

trunk/src/recompiler_new

Files:

• cpu-all.h (modified) (1 diff)
• exec-all.h (modified) (2 diffs)
• exec.c (modified) (1 diff)

trunk/src/recompiler_new/cpu-all.h

@@ -272 +272 @@
 #ifndef REM_PHYS_ADDR_IN_TLB
 void       *remR3TlbGCPhys2Ptr(CPUState *env1, target_ulong physAddr, int fWritable);
-target_ulong remR3HCVirt2GCPhys(CPUState *env1, void *addr);
 #endif
 

trunk/src/recompiler_new/exec-all.h

@@ -380 +380 @@
 # ifdef VBOX
 target_ulong remR3PhysGetPhysicalAddressCode(CPUState *env, target_ulong addr, CPUTLBEntry *pTLBEntry, target_phys_addr_t ioTLBEntry);
-#  if !defined(REM_PHYS_ADDR_IN_TLB)
-target_ulong remR3HCVirt2GCPhys(CPUState *env1, void *addr);
-#  endif
 # endif
 /* NOTE: this function can trigger an exception */
@@ -419 +416 @@
 # elif defined(VBOX)
     Assert(env1->phys_addends[mmu_idx][page_index] != -1);
-    /** @todo: nike: will remove this assert along with remR3HCVirt2GCPhys() soon */
-    Assert(remR3HCVirt2GCPhys(env1, (void *)(uintptr_t)(addr + env1->tlb_table[mmu_idx][page_index].addend)) == addr + env1->phys_addends[mmu_idx][page_index]);
     return addr + env1->phys_addends[mmu_idx][page_index];
 # else

trunk/src/recompiler_new/exec.c

@@ -2085 +2085 @@
         Assert(phys_addend != -1);
         ram_addr = (tlb_entry->addr_write & TARGET_PAGE_MASK) + phys_addend;
-        
-        /** @todo: nike: will remove this assert along with remR3HCVirt2GCPhys() soon */
-        Assert(ram_addr == remR3HCVirt2GCPhys(first_cpu, (void*)((tlb_entry->addr_write & TARGET_PAGE_MASK) + tlb_entry->addend)));
 #endif
         if (!cpu_physical_memory_is_dirty(ram_addr)) {