X86: Add segmentation checks for ldt related descriptors and selectors.

2 files changed, 14 insertions, 2 deletions

diff --git a/src/arch/x86/isa/microasm.isa b/src/arch/x86/isa/microasm.isa
index 00baed768..c7c6dae2e 100644
--- a/src/arch/x86/isa/microasm.isa
+++ b/src/arch/x86/isa/microasm.isa
@@ -87,7 +87,7 @@ let {{
     # Add in symbols for the various checks of segment selectors.
     for check in ("NoCheck", "CSCheck", "CallGateCheck", "IntGateCheck",
                   "SoftIntGateCheck", "SSCheck", "IretCheck", "IntCSCheck",
-                  "TRCheck", "TSSCheck"):
+                  "TRCheck", "TSSCheck", "InGDTCheck", "LDTCheck"):
         assembler.symbols[check] = "Seg%s" % check
 
     for reg in ("TR", "IDTR"):
diff --git a/src/arch/x86/isa/microops/regop.isa b/src/arch/x86/isa/microops/regop.isa
index d5eb59f11..f9bc82119 100644
--- a/src/arch/x86/isa/microops/regop.isa
+++ b/src/arch/x86/isa/microops/regop.isa
@@ -235,7 +235,7 @@ output header {{
     enum SegmentSelectorCheck {
       SegNoCheck, SegCSCheck, SegCallGateCheck, SegIntGateCheck,
       SegSoftIntGateCheck, SegSSCheck, SegIretCheck, SegIntCSCheck,
-      SegTRCheck, SegTSSCheck
+      SegTRCheck, SegTSSCheck, SegInGDTCheck, SegLDTCheck
     };
 
     enum LongModeDescriptorType {
@@ -1174,6 +1174,18 @@ let {{
                     fault = new GeneralProtection(selector);
                 }
                 break;
+              case SegInGDTCheck:
+                if (selector.ti) {
+                    fault = new GeneralProtection(selector);
+                }
+                break;
+              case SegLDTCheck:
+                if (!desc.p) {
+                    fault = new SegmentNotPresent(selector);
+                } else if (desc.type != 0x2) {
+                    fault = new GeneralProtection(selector);
+                }
+                break;
               default:
                 panic("Undefined segment check type.\\n");
             }