Changeset 14241 in vbox

Timestamp:

Nov 17, 2008 9:35:50 AM (16 years ago)

Author:

vboxsync

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

39377

Message:

support for virtual addresses in QEMU TLB, not yet functional (be back on that)

Location:

trunk/src/recompiler_new

Files:

• VBoxRecompiler.c (modified) (2 diffs)
• exec-all.h (modified) (2 diffs)

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -1389 +1389 @@
 
 
+#ifndef REM_PHYS_ADDR_IN_TLB
+void* remR3GCPhys2HCVirt(CPUState *env1, target_ulong physAddr)
+{
+    void* rv = NULL;
+    int rc;
+
+    rc = PGMPhysGCPhys2HCPtr(env1->pVM, (RTGCPHYS)physAddr, 1, &rv);
+    Assert (RT_SUCCESS(rc));
+
+    return rv;
+}
+
+target_ulong remR3HCVirt2GCPhys(CPUState *env1, void *addr)
+{
+    RTGCPHYS rv = 0;
+    int rc;
+
+    rc = PGMR3DbgR3Ptr2GCPhys(env1->pVM, (RTR3PTR)addr, &rv);
+    Assert (RT_SUCCESS(rc));
+
+    return (target_ulong)rv;
+}
+#endif
+
 /**
  * Called from tlb_protect_code in order to write monitor a code page.
@@ -2761 +2785 @@
     Assert(!pVM->rem.s.fIgnoreAll);
     pVM->rem.s.fIgnoreAll = true;
-
+#ifdef REM_PHYS_ADDR_IN_TLB
     cpu_register_physical_memory(GCPhys, cb, GCPhys);
+#else
+    cpu_register_physical_memory(GCPhys, cb, pvRam);
+#endif
 
     Assert(pVM->rem.s.fIgnoreAll);

trunk/src/recompiler_new/exec-all.h

@@ -384 +384 @@
 target_ulong remR3PhysGetPhysicalAddressCode(CPUState *env, target_ulong addr, CPUTLBEntry *pTLBEntry);
 #  if !defined(REM_PHYS_ADDR_IN_TLB)
-target_ulong remR3HCVirt2GCPhys(void *env, void *addr);
+target_ulong remR3HCVirt2GCPhys(CPUState *env1, void *addr);
 #  endif
 # endif
@@ -419 +419 @@
     return addr + env1->tlb_table[mmu_idx][page_index].addend;
 # elif defined(VBOX)
-    return remR3HCVirt2GCPhys(env, (void *)(addr + env1->tlb_table[mmu_idx][page_index].addend));
+    return remR3HCVirt2GCPhys(env1, (void *)(addr + env1->tlb_table[mmu_idx][page_index].addend));
 # else
     return addr + env1->tlb_table[mmu_idx][page_index].addend - (unsigned long)phys_ram_base;