X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_decoder.h;h=cfe5ff78c723786f86227d6af38321e89cb07c59;hb=36fb65749158643467beb8ebc82276b2b29412d1;hp=6b8715e85f590db3060c4f44f1f71077977ce5ba;hpb=7cdedeb7a01b51c5242cce94924f2ea246008e7d;p=palacios.git

diff --git a/palacios/include/palacios/vmm_decoder.h b/palacios/include/palacios/vmm_decoder.h
index 6b8715e..cfe5ff7 100644
--- a/palacios/include/palacios/vmm_decoder.h
+++ b/palacios/include/palacios/vmm_decoder.h
@@ -241,10 +241,14 @@ static inline v3_reg_t get_gpr_mask(struct guest_info * info) {
     return 0xffff;
     break;
   case PROTECTED:
+  case PROTECTED_PAE:
     return 0xffffffff;
+  case LONG:
+  case LONG_32_COMPAT:
+  case LONG_16_COMPAT:
   default:
-    V3_ASSERT(0);
-    return 0;
+    PrintError("Unsupported Address Mode\n");
+    return -1;
   }
 }
 
@@ -258,11 +262,20 @@ static inline addr_t get_addr_linear(struct guest_info * info, addr_t addr, stru
 	 break;*/
 
   case PROTECTED:
+  case PROTECTED_PAE:
+  case LONG_32_COMPAT:
     return addr + seg->base;
     break;
+
+  case LONG:
+    // In long mode the segment bases are disregarded (forced to 0), unless using 
+    // FS or GS, then the base addresses are added
+    return addr + seg->base;
+
+  case LONG_16_COMPAT:
   default:
-    V3_ASSERT(0);
-    return 0;
+    PrintError("Unsupported CPU Mode: %d\n", info->cpu_mode);
+    return -1;
   }
 }