vbox的更動 15774 路徑 trunk/src/recompiler_new

時間撮記:

2008-12-31 上午10:57:14 (16 年 以前)

作者:

vboxsync

訊息:

REM: fixed situation when REM have to execute code
on monitored pages (and thus FreeBSD guests)

位置:

trunk/src/recompiler_new

檔案:

• VBoxRecompiler.c (修改) (2 筆差異)
• exec-all.h (修改) (2 筆差異)

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -1313 +1313 @@
         return (void *)((uintptr_t)pv | 2);
     return pv;
-    //return (void *)((uintptr_t)pv | 2);
 }
 
@@ -2975 +2974 @@
  * @param   pTLBEntry   The TLB entry.
  */
-target_ulong remR3PhysGetPhysicalAddressCode(CPUState *env, target_ulong addr, CPUTLBEntry *pTLBEntry)
+target_ulong remR3PhysGetPhysicalAddressCode(CPUState*          env, 
+                                             target_ulong       addr, 
+                                             CPUTLBEntry*       pTLBEntry,
+                                             target_phys_addr_t ioTLBEntry)
 {
     PVM pVM = env->pVM;
-    if ((pTLBEntry->addr_code & ~TARGET_PAGE_MASK) == pVM->rem.s.iHandlerMemType)
-    {
-        target_ulong ret = pTLBEntry->addend + addr;
-        AssertMsg2("remR3PhysGetPhysicalAddressCode: addr=%RGv addr_code=%RGv addend=%RGp ret=%RGp\n",
-                   (RTGCPTR)addr, (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, ret);
+
+    if ((ioTLBEntry & ~TARGET_PAGE_MASK) == pVM->rem.s.iHandlerMemType)
+    {
+        /* If code memory is being monitored, appropriate IOTLB entry will have 
+           handler IO type, and addend will provide real physical address, no 
+           matter if we store VA in TLB or not, as handlers are always passed PA */
+        target_ulong ret = (ioTLBEntry & TARGET_PAGE_MASK) + addr;
         return ret;
     }
-    LogRel(("\nTrying to execute code with memory type addr_code=%RGv addend=%RGp at %RGv! (iHandlerMemType=%#x iMMIOMemType=%#x)\n"
+    LogRel(("\nTrying to execute code with memory type addr_code=%RGv addend=%RGp at %RGv! (iHandlerMemType=%#x iMMIOMemType=%#x IOTLB=%RGp)\n"
             "*** handlers\n",
-            (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, (RTGCPTR)addr, pVM->rem.s.iHandlerMemType, pVM->rem.s.iMMIOMemType));
+            (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, (RTGCPTR)addr, pVM->rem.s.iHandlerMemType, pVM->rem.s.iMMIOMemType, (RTGCPHYS)ioTLBEntry));
     DBGFR3Info(pVM, "handlers", NULL, DBGFR3InfoLogRelHlp());
     LogRel(("*** mmio\n"));

trunk/src/recompiler_new/exec-all.h

@@ -382 +382 @@
 #else
 # ifdef VBOX
-target_ulong remR3PhysGetPhysicalAddressCode(CPUState *env, target_ulong addr, CPUTLBEntry *pTLBEntry);
+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);
@@ -408 +408 @@
 # ifdef VBOX
         /* deal with non-MMIO access handlers. */
-        return remR3PhysGetPhysicalAddressCode(env1, addr, &env1->tlb_table[mmu_idx][page_index]);
+        return remR3PhysGetPhysicalAddressCode(env1, addr, 
+                                               &env1->tlb_table[mmu_idx][page_index],
+                                               env1->iotlb[mmu_idx][page_index]);
 # elif defined(TARGET_SPARC) || defined(TARGET_MIPS)
         do_unassigned_access(addr, 0, 1, 0, 4);