Changeset 4376 in vbox for trunk

Timestamp:

Aug 27, 2007 8:25:07 AM (17 years ago)

Author:

vboxsync

Message:

Removed obsolete and incorrect remR3SetPage.

Location:

trunk/src/recompiler

Files:

• VBoxRecompiler.c (modified) (1 diff)
• exec.c (modified) (1 diff)

trunk/src/recompiler/VBoxRecompiler.c

@@ -1365 +1365 @@
     }
     //RAWEx_ProfileStart(env, STATS_QEMU_TOTAL);
-}
-
-/**
- * Set page table/dir entry. (called from tlb_set_page)
- *
- * @param   env         Pointer to cpu environment.
- */
-void remR3SetPage(CPUState *env, CPUTLBEntry *pTLBEntry,  CPUTLBEntry *pTLBEntryIgnored, int prot, int is_user)
-{
-    target_ulong virt_addr;
-    if (env->pVM->rem.s.fIgnoreSetPage || env->pVM->rem.s.fIgnoreAll)
-        return;
-    Assert(env->pVM->rem.s.fInREM || env->pVM->rem.s.fInStateSync);
-
-#ifndef PGM_DYNAMIC_RAM_ALLOC
-    if(!is_user && !(env->state & CPU_RAW_RING0))
-        return; /* We are currently not interested in kernel pages */
-#endif
-
-#if !defined(PGM_DYNAMIC_RAM_ALLOC) && !defined(REM_PHYS_ADDR_IN_TLB)
-    Log2(("tlb_set_page_raw (r=%x|w=%x)-%x prot %x is_user %d phys base %x\n",
-          pTLBEntry->addr_read, pTLBEntry->addr_write, pTLBEntry->addend, prot, is_user, phys_ram_base));
-#else /* PGM_DYNAMIC_RAM_ALLOC */
-    Log2(("tlb_set_page_raw (r=%x|w=%x)-%x prot %x is_user %d\n",
-          pTLBEntry->addr_read, pTLBEntry->addr_write, pTLBEntry->addend, prot, is_user));
-#endif/* PGM_DYNAMIC_RAM_ALLOC */
-
-    /*
-     * Extract the virtual address.
-     */
-    if (prot & PAGE_WRITE)
-        virt_addr = pTLBEntry->addr_write;
-    else if (prot & PAGE_READ)
-        virt_addr = pTLBEntry->addr_read;
-    else
-        AssertMsgFailedReturnVoid(("tlb_set_page_raw unexpected protection flags %x\n", prot));
-    virt_addr &= TARGET_PAGE_MASK;
-
-    /*
-     * Update the control registers before calling PGMFlushPage.
-     */
-    PCPUMCTX pCtx = (PCPUMCTX)env->pVM->rem.s.pCtx;
-    pCtx->cr0 = env->cr[0];
-    pCtx->cr3 = env->cr[3];
-    pCtx->cr4 = env->cr[4];
-
-    /*
-     * Let PGM do the rest.
-     */
-    int rc = PGMInvalidatePage(env->pVM, (RTGCPTR)virt_addr);
-    if (VBOX_FAILURE(rc))
-    {
-#ifdef VBOX_STRICT
-        target_ulong addend = pTLBEntry->addend;
-        target_ulong phys_addr;
-
-        if (!(addend & IO_MEM_ROM))
-# ifdef REM_PHYS_ADDR_IN_TLB
-            phys_addr = virt_addr + addend;
-# elif defined(PGM_DYNAMIC_RAM_ALLOC)
-            phys_addr = remR3HCVirt2GCPhysInlined(env->pVM, (void *)(virt_addr + addend));
-# else
-            phys_addr = virt_addr - (uintptr_t)phys_ram_base + addend;
-# endif
-        else
-            phys_addr = addend;
-        AssertMsgFailed(("RAWEx_SetPageEntry %x %x %x %d failed!!\n", virt_addr, phys_addr, prot, is_user));
-#endif /* VBOX_STRICT */
-        VM_FF_SET(env->pVM, VM_FF_PGM_SYNC_CR3);
-    }
 }
 

trunk/src/recompiler/exec.c

@@ -1678 +1678 @@
 #ifdef VBOX
         /* inform raw mode about TLB page change */
-        /** @todo double check and fix this interface. OLD: remR3SetPage(env, &env->tlb_read[is_user][index], &env->tlb_write[is_user][index], prot, is_user); */
-        remR3SetPage(env, te, te, prot, is_user);
+        remR3FlushPage(env, vaddr);
 #endif
     }