diff --git a/bochs/cpu/paging.cc b/bochs/cpu/paging.cc
index 07be959e1..e787ebb53 100644
--- a/bochs/cpu/paging.cc
+++ b/bochs/cpu/paging.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: paging.cc,v 1.122 2008-04-21 20:17:45 sshwarts Exp $
+// $Id: paging.cc,v 1.123 2008-04-22 22:05:38 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -881,6 +881,10 @@ bx_phy_address BX_CPU_C::translate_linear(bx_address laddr, unsigned curr_pl, un
       // Note: when the PSE and PAE flags in CR4 are set, the
       //       processor generates a PF if the reserved bits are not zero.
 
+      if (pde & 0x0001e000) {
+        BX_PANIC(("PSE PDE 0x%08x: Only 32 bit physical address space is emulated !", pde));
+      }
+
       // Combined access is just access from the pde (no pte involved).
       combined_access = pde & 0x06; // U/S and R/W
       // make up the physical frame number
diff --git a/bochs/cpu/protect_ctrl.cc b/bochs/cpu/protect_ctrl.cc
index aa9f7fd25..7d98898d5 100644
--- a/bochs/cpu/protect_ctrl.cc
+++ b/bochs/cpu/protect_ctrl.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: protect_ctrl.cc,v 1.79 2008-04-16 22:08:46 sshwarts Exp $
+// $Id: protect_ctrl.cc,v 1.80 2008-04-22 22:05:38 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -133,15 +133,20 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::LAR_GvEw(bxInstruction_c *i)
     else {
       BX_WRITE_16BIT_REG(i->nnn(), dword2 & 0xff00);
     }
-    return;
   }
   else { /* system or gate segment */
     switch (descriptor.type) {
       case BX_SYS_SEGMENT_AVAIL_286_TSS:
-      case BX_SYS_SEGMENT_LDT:
       case BX_SYS_SEGMENT_BUSY_286_TSS:
       case BX_286_CALL_GATE:
       case BX_TASK_GATE:
+        if (long_mode()) {
+          BX_DEBUG(("LAR: descriptor type in not accepted in long mode"));
+          clear_ZF();
+          return;
+        }
+        /* fall through */
+      case BX_SYS_SEGMENT_LDT:
 #if BX_CPU_LEVEL >= 3
       case BX_SYS_SEGMENT_AVAIL_386_TSS:
       case BX_SYS_SEGMENT_BUSY_386_TSS:
@@ -149,7 +154,7 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::LAR_GvEw(bxInstruction_c *i)
 #endif
         break;
       default: /* rest not accepted types to LAR */
-        BX_DEBUG(("lar(): not accepted type"));
+        BX_DEBUG(("LAR: not accepted descriptor type"));
         clear_ZF();
         return;
     }
@@ -213,17 +218,22 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::LSL_GvEw(bxInstruction_c *i)
     switch (type) {
       case BX_SYS_SEGMENT_AVAIL_286_TSS:
       case BX_SYS_SEGMENT_BUSY_286_TSS:
+        if (long_mode()) {
+          clear_ZF();
+          return;
+        }
+        /* fall through */
       case BX_SYS_SEGMENT_LDT:
       case BX_SYS_SEGMENT_AVAIL_386_TSS:
       case BX_SYS_SEGMENT_BUSY_386_TSS:
-        limit32 = (dword1 & 0x0000ffff) | (dword2 & 0x000f0000);
-        if (dword2 & 0x00800000)
-          limit32 = (limit32 << 12) | 0x00000fff;
         if ((descriptor_dpl<CPL) || (descriptor_dpl<selector.rpl)) {
           clear_ZF();
           return;
         }
-        goto lsl_ok;
+        limit32 = (dword1 & 0x0000ffff) | (dword2 & 0x000f0000);
+        if (dword2 & 0x00800000)
+          limit32 = (limit32 << 12) | 0x00000fff;
+        break;
       default:
         clear_ZF();
         return;
@@ -233,19 +243,15 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::LSL_GvEw(bxInstruction_c *i)
     limit32 = (dword1 & 0x0000ffff) | (dword2 & 0x000f0000);
     if (dword2 & 0x00800000)
       limit32 = (limit32 << 12) | 0x00000fff;
-    if ((dword2 & 0x00000c00) == 0x00000c00) {
-      // conforming code segment, no check done
-      goto lsl_ok;
+    if ((dword2 & 0x00000c00) != 0x00000c00) {
+      // non-conforming code segment
+      if ((descriptor_dpl<CPL) || (descriptor_dpl<selector.rpl)) {
+        clear_ZF();
+        return;
+      }
     }
-
-    if ((descriptor_dpl<CPL) || (descriptor_dpl<selector.rpl)) {
-      clear_ZF();
-      return;
-    }
-    goto lsl_ok;
   }
 
-lsl_ok:
   /* all checks pass, limit32 is now byte granular, write to op1 */
   assert_ZF();
 
diff --git a/bochs/cpu/tasking.cc b/bochs/cpu/tasking.cc
index 43a15453b..6a5619b3f 100644
--- a/bochs/cpu/tasking.cc
+++ b/bochs/cpu/tasking.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: tasking.cc,v 1.53 2008-04-19 20:00:28 sshwarts Exp $
+// $Id: tasking.cc,v 1.54 2008-04-22 22:05:38 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -160,7 +160,6 @@ void BX_CPU_C::task_switch(bx_selector_t *tss_selector,
 
   // Gather info about old TSS
   if (BX_CPU_THIS_PTR tr.cache.type <= 3) {
-    // sanity check type: cannot have busy bit
     old_TSS_max = 43;
   }
   else {