From 67b915a5dd52a05f8030cd9edc005effd9c8eea5 Mon Sep 17 00:00:00 2001
From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 31 Mar 2004 23:37:16 +0000
Subject: win32 port (initial patch by kazu)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@692 c046a42c-6fe2-441c-8c8c-71466251a162
---
 target-i386/helper2.c        | 9 ++++-----
 target-i386/translate-copy.c | 9 ++++++---
 target-i386/translate.c      | 1 -
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'target-i386')

diff --git a/target-i386/helper2.c b/target-i386/helper2.c
index c9c9d7e36e..22e812e098 100644
--- a/target-i386/helper2.c
+++ b/target-i386/helper2.c
@@ -24,7 +24,6 @@
 #include <inttypes.h>
 #include <signal.h>
 #include <assert.h>
-#include <sys/mman.h>
 
 #include "cpu.h"
 #include "exec-all.h"
@@ -334,7 +333,7 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, uint32_t addr,
     if (!(env->cr[0] & CR0_PG_MASK)) {
         pte = addr;
         virt_addr = addr & TARGET_PAGE_MASK;
-        prot = PROT_READ | PROT_WRITE;
+        prot = PAGE_READ | PAGE_WRITE;
         page_size = 4096;
         goto do_mapping;
     }
@@ -409,17 +408,17 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, uint32_t addr,
     }
 
     /* the page can be put in the TLB */
-    prot = PROT_READ;
+    prot = PAGE_READ;
     if (pte & PG_DIRTY_MASK) {
         /* only set write access if already dirty... otherwise wait
            for dirty access */
         if (is_user) {
             if (ptep & PG_RW_MASK)
-                prot |= PROT_WRITE;
+                prot |= PAGE_WRITE;
         } else {
             if (!(env->cr[0] & CR0_WP_MASK) ||
                 (ptep & PG_RW_MASK))
-                prot |= PROT_WRITE;
+                prot |= PAGE_WRITE;
         }
     }
 
diff --git a/target-i386/translate-copy.c b/target-i386/translate-copy.c
index fb0bcaa3cf..69927915ee 100644
--- a/target-i386/translate-copy.c
+++ b/target-i386/translate-copy.c
@@ -17,15 +17,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "config.h"
+
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
-#include <signal.h>
 #include <assert.h>
-#include <sys/mman.h>
-#include <sys/ucontext.h>
 
 #include "cpu.h"
 #include "exec-all.h"
@@ -33,6 +32,10 @@
 
 #ifdef USE_CODE_COPY
 
+#include <signal.h>
+#include <sys/mman.h>
+#include <sys/ucontext.h>
+
 extern char exec_loop;
 
 /* operand size */
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 5866fe4095..3ef614652e 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -24,7 +24,6 @@
 #include <inttypes.h>
 #include <signal.h>
 #include <assert.h>
-#include <sys/mman.h>
 
 #include "cpu.h"
 #include "exec-all.h"
-- 
cgit v1.2.3