From 85026d937558b1ab5f8e84ee756ed925459085e2 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper@gmail.com>
Date: Thu, 16 Jan 2014 07:36:58 +0000
Subject: Allow x86 mov instructions to/from memory with absolute address to be
 encoded and disassembled with a segment override prefix. Fixes PR16962.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199364 91177308-0d34-0410-b5e6-96231b3b80d8
---
 utils/TableGen/X86RecognizableInstr.cpp | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'utils')

diff --git a/utils/TableGen/X86RecognizableInstr.cpp b/utils/TableGen/X86RecognizableInstr.cpp
index 986fd8b8f3..019610e147 100644
--- a/utils/TableGen/X86RecognizableInstr.cpp
+++ b/utils/TableGen/X86RecognizableInstr.cpp
@@ -59,11 +59,11 @@ namespace X86Local {
     MRMDestMem  = 4,
     MRMSrcReg   = 5,
     MRMSrcMem   = 6,
+    RawFrmMemOffs = 7,
     MRM0r = 16, MRM1r = 17, MRM2r = 18, MRM3r = 19,
     MRM4r = 20, MRM5r = 21, MRM6r = 22, MRM7r = 23,
     MRM0m = 24, MRM1m = 25, MRM2m = 26, MRM3m = 27,
     MRM4m = 28, MRM5m = 29, MRM6m = 30, MRM7m = 31,
-    MRMInitReg  = 32,
     RawFrmImm8  = 43,
     RawFrmImm16 = 44,
 #define MAP(from, to) MRM_##from = to,
@@ -631,6 +631,7 @@ void RecognizableInstr::emitInstructionSpecifier() {
   unsigned physicalOperandIndex = 0;
 
   switch (Form) {
+  default: llvm_unreachable("Unhandled form");
   case X86Local::RawFrm:
     // Operand 1 (optional) is an address or immediate.
     // Operand 2 (optional) is an immediate.
@@ -639,6 +640,10 @@ void RecognizableInstr::emitInstructionSpecifier() {
     HANDLE_OPTIONAL(relocation)
     HANDLE_OPTIONAL(immediate)
     break;
+  case X86Local::RawFrmMemOffs:
+    // Operand 1 is an address.
+    HANDLE_OPERAND(relocation);
+    break;
   case X86Local::AddRegFrm:
     // Operand 1 is added to the opcode.
     // Operand 2 (optional) is an address.
@@ -840,7 +845,30 @@ void RecognizableInstr::emitInstructionSpecifier() {
       HANDLE_OPERAND(relocation)
     }
     break;
-  case X86Local::MRMInitReg:
+  case X86Local::MRM_C1:
+  case X86Local::MRM_C2:
+  case X86Local::MRM_C3:
+  case X86Local::MRM_C4:
+  case X86Local::MRM_C8:
+  case X86Local::MRM_C9:
+  case X86Local::MRM_CA:
+  case X86Local::MRM_CB:
+  case X86Local::MRM_E8:
+  case X86Local::MRM_F0:
+  case X86Local::MRM_F9:
+  case X86Local::MRM_D0:
+  case X86Local::MRM_D1:
+  case X86Local::MRM_D4:
+  case X86Local::MRM_D5:
+  case X86Local::MRM_D6:
+  case X86Local::MRM_D8:
+  case X86Local::MRM_D9:
+  case X86Local::MRM_DA:
+  case X86Local::MRM_DB:
+  case X86Local::MRM_DC:
+  case X86Local::MRM_DD:
+  case X86Local::MRM_DE:
+  case X86Local::MRM_DF:
     // Ignored.
     break;
   }
-- 
cgit v1.2.3