diff options
| -rw-r--r-- | tools/edis/EDOperand.cpp | 3 | ||||
| -rw-r--r-- | utils/TableGen/EDEmitter.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/edis/EDOperand.cpp b/tools/edis/EDOperand.cpp index ca8bac1c5b..d63c1c6bfb 100644 --- a/tools/edis/EDOperand.cpp +++ b/tools/edis/EDOperand.cpp @@ -233,6 +233,8 @@ int EDOperand::isMemory() { default: return 0; case kOperandTypeX86Memory: + case kOperandTypeX86PCRelative: + case kOperandTypeX86EffectiveAddress: case kOperandTypeARMSoReg: case kOperandTypeARMSoImm: case kOperandTypeARMAddrMode2: @@ -243,6 +245,7 @@ int EDOperand::isMemory() { case kOperandTypeARMAddrMode5: case kOperandTypeARMAddrMode6: case kOperandTypeARMAddrModePC: + case kOperandTypeARMBranchTarget: case kOperandTypeThumbAddrModeS1: case kOperandTypeThumbAddrModeS2: case kOperandTypeThumbAddrModeS4: diff --git a/utils/TableGen/EDEmitter.cpp b/utils/TableGen/EDEmitter.cpp index 4c9db8ccdd..d3bf60e1c8 100644 --- a/utils/TableGen/EDEmitter.cpp +++ b/utils/TableGen/EDEmitter.cpp @@ -316,12 +316,10 @@ static int X86TypeFromOpName(LiteralConstantEmitter *type, IMM("i16imm"); IMM("i16i8imm"); IMM("i32imm"); - IMM("i32imm_pcrel"); IMM("i32i8imm"); IMM("i64imm"); IMM("i64i8imm"); IMM("i64i32imm"); - IMM("i64i32imm_pcrel"); IMM("SSECC"); // all R, I, R, I, R @@ -350,6 +348,8 @@ static int X86TypeFromOpName(LiteralConstantEmitter *type, LEA("lea64mem"); // all I + PCR("i32imm_pcrel"); + PCR("i64i32imm_pcrel"); PCR("brtarget8"); PCR("offset8"); PCR("offset16"); |