summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-07-07 22:27:31 +0000
committerChris Lattner <sabre@nondot.org>2010-07-07 22:27:31 +0000
commit9fc05227a2596c545b845ed9a72673995e49d16b (patch)
tree80e881778ade5df564b576347d6303c2849475d6 /utils
parentcc69e13a36b2238d8e0a2fc01463d16943c08936 (diff)
downloadllvm-9fc05227a2596c545b845ed9a72673995e49d16b.tar.gz
llvm-9fc05227a2596c545b845ed9a72673995e49d16b.tar.bz2
llvm-9fc05227a2596c545b845ed9a72673995e49d16b.tar.xz
Implement the major chunk of PR7195: support for 'callw'
in the integrated assembler. Still some discussion to be done. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@107825 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
-rw-r--r--utils/TableGen/EDEmitter.cpp1
-rw-r--r--utils/TableGen/X86RecognizableInstr.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/utils/TableGen/EDEmitter.cpp b/utils/TableGen/EDEmitter.cpp
index cfc13677c3..1c94ebfa10 100644
--- a/utils/TableGen/EDEmitter.cpp
+++ b/utils/TableGen/EDEmitter.cpp
@@ -347,6 +347,7 @@ static int X86TypeFromOpName(LiteralConstantEmitter *type,
LEA("lea64mem");
// all I
+ PCR("i16imm_pcrel");
PCR("i32imm_pcrel");
PCR("i64i32imm_pcrel");
PCR("brtarget8");
diff --git a/utils/TableGen/X86RecognizableInstr.cpp b/utils/TableGen/X86RecognizableInstr.cpp
index 19b51cb4d8..a041b62539 100644
--- a/utils/TableGen/X86RecognizableInstr.cpp
+++ b/utils/TableGen/X86RecognizableInstr.cpp
@@ -836,6 +836,7 @@ OperandType RecognizableInstr::typeFromString(const std::string &s,
TYPE("RST", TYPE_ST)
TYPE("i128mem", TYPE_M128)
TYPE("i64i32imm_pcrel", TYPE_REL64)
+ TYPE("i16imm_pcrel", TYPE_REL16)
TYPE("i32imm_pcrel", TYPE_REL32)
TYPE("SSECC", TYPE_IMM3)
TYPE("brtarget", TYPE_RELv)
@@ -955,6 +956,7 @@ OperandEncoding RecognizableInstr::relocationEncodingFromString
ENCODING("i64i8imm", ENCODING_IB)
ENCODING("i8imm", ENCODING_IB)
ENCODING("i64i32imm_pcrel", ENCODING_ID)
+ ENCODING("i16imm_pcrel", ENCODING_IW)
ENCODING("i32imm_pcrel", ENCODING_ID)
ENCODING("brtarget", ENCODING_Iv)
ENCODING("brtarget8", ENCODING_IB)