Merge remote-tracking branch 'remotes/berrange/tags/pull-io-next-2016-02-16-1' into...

[qemu.git] / target-i386 / helper.c

diff --git a/target-i386/helper.c b/target-i386/helper.c
index 24f58117ab7ba12e76ed0ce20aa8aca8aec3299b..3f60ec61222b1e0a93277920abd6d26dacb5c8a7 100644 (file)
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 

+#include "qemu/osdep.h"

 #include "cpu.h"
 #include "sysemu/kvm.h"
 #include "kvm_i386.h"
 #include "cpu.h"
 #include "sysemu/kvm.h"
 #include "kvm_i386.h"


@@ -646,6 +647,7 @@ void cpu_x86_update_cr3(CPUX86State *env, target_ulong new_cr3)
 void cpu_x86_update_cr4(CPUX86State *env, uint32_t new_cr4)
 {
     X86CPU *cpu = x86_env_get_cpu(env);
 void cpu_x86_update_cr4(CPUX86State *env, uint32_t new_cr4)
 {
     X86CPU *cpu = x86_env_get_cpu(env);

+    uint32_t hflags;

 
 #if defined(DEBUG_MMU)
     printf("CR4 update: CR4=%08x\n", (uint32_t)env->cr[4]);
 
 #if defined(DEBUG_MMU)
     printf("CR4 update: CR4=%08x\n", (uint32_t)env->cr[4]);


@@ -655,24 +657,29 @@ void cpu_x86_update_cr4(CPUX86State *env, uint32_t new_cr4)
          CR4_SMEP_MASK | CR4_SMAP_MASK)) {
         tlb_flush(CPU(cpu), 1);
     }
          CR4_SMEP_MASK | CR4_SMAP_MASK)) {
         tlb_flush(CPU(cpu), 1);
     }

+
+    /* Clear bits we're going to recompute.  */
+    hflags = env->hflags & ~(HF_OSFXSR_MASK | HF_SMAP_MASK);
+

     /* SSE handling */
     if (!(env->features[FEAT_1_EDX] & CPUID_SSE)) {
         new_cr4 &= ~CR4_OSFXSR_MASK;
     }
     /* SSE handling */
     if (!(env->features[FEAT_1_EDX] & CPUID_SSE)) {
         new_cr4 &= ~CR4_OSFXSR_MASK;
     }

-    env->hflags &= ~HF_OSFXSR_MASK;

     if (new_cr4 & CR4_OSFXSR_MASK) {
     if (new_cr4 & CR4_OSFXSR_MASK) {

-        env->hflags |= HF_OSFXSR_MASK;
+        hflags |= HF_OSFXSR_MASK;

     }
 
     if (!(env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_SMAP)) {
         new_cr4 &= ~CR4_SMAP_MASK;
     }
     }
 
     if (!(env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_SMAP)) {
         new_cr4 &= ~CR4_SMAP_MASK;
     }

-    env->hflags &= ~HF_SMAP_MASK;

     if (new_cr4 & CR4_SMAP_MASK) {
     if (new_cr4 & CR4_SMAP_MASK) {

-        env->hflags |= HF_SMAP_MASK;
+        hflags |= HF_SMAP_MASK;

     }
 
     env->cr[4] = new_cr4;
     }
 
     env->cr[4] = new_cr4;

+    env->hflags = hflags;
+
+    cpu_sync_bndcs_hflags(env);

 }
 
 #if defined(CONFIG_USER_ONLY)
 }
 
 #if defined(CONFIG_USER_ONLY)


@@ -860,7 +867,7 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr,
             /* Bits 20-13 provide bits 39-32 of the address, bit 21 is reserved.
              * Leave bits 20-13 in place for setting accessed/dirty bits below.
              */
             /* Bits 20-13 provide bits 39-32 of the address, bit 21 is reserved.
              * Leave bits 20-13 in place for setting accessed/dirty bits below.
              */

-            pte = pde | ((pde & 0x1fe000) << (32 - 13));
+            pte = pde | ((pde & 0x1fe000LL) << (32 - 13));

             rsvd_mask = 0x200000;
             goto do_check_protect_pse36;
         }
             rsvd_mask = 0x200000;
             goto do_check_protect_pse36;
         }


@@ -1055,7 +1062,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
         if (!(pde & PG_PRESENT_MASK))
             return -1;
         if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) {
         if (!(pde & PG_PRESENT_MASK))
             return -1;
         if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) {

-            pte = pde | ((pde & 0x1fe000) << (32 - 13));
+            pte = pde | ((pde & 0x1fe000LL) << (32 - 13));

             page_size = 4096 * 1024;
         } else {
             /* page directory entry */
             page_size = 4096 * 1024;
         } else {
             /* page directory entry */