Honor CR0.WP in vTLB.

udosteinberg · Nov 2, 2012 · 85b0e55 · 85b0e55
1 parent 9e35d89
commit 85b0e55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/regs.cpp b/src/regs.cpp
@@ -398,7 +398,7 @@ void Exc_regs::write_cr (unsigned cr, mword val)
             toggled = get_cr0<T>() ^ val;
 
             if (!nst_on)
-                if (toggled & (Cpu::CR0_PG | Cpu::CR0_PE))
+                if (toggled & (Cpu::CR0_PG | Cpu::CR0_WP | Cpu::CR0_PE))
                     tlb_flush<T> (true);
 
             set_cr0<T> (val);

diff --git a/src/vtlb.cpp b/src/vtlb.cpp
@@ -33,6 +33,7 @@ size_t Vtlb::gwalk (Exc_regs *regs, mword gla, mword &gpa, mword &attr, mword &e
 
     bool pse = regs->cr4_shadow & (Cpu::CR4_PSE | Cpu::CR4_PAE);
     bool pge = regs->cr4_shadow &  Cpu::CR4_PGE;
+    bool wp  = regs->cr0_shadow &  Cpu::CR0_WP;
 
     unsigned lev = max();
 
@@ -56,6 +57,9 @@ size_t Vtlb::gwalk (Exc_regs *regs, mword gla, mword &gpa, mword &attr, mword &e
             continue;
         }
 
+        if (EXPECT_FALSE (!wp && error == ERR_W))
+            attr = (attr & ~TLB_U) | TLB_W;
+
         if (EXPECT_FALSE ((attr & error) != error)) {
             error |= ERR_P;
             return 0;