diff options
| author | Stephen Hines <srhines@google.com> | 2012-08-22 17:56:25 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2012-08-23 19:15:15 -0700 |
| commit | d62cdbe700ab288e9ad447824066edb7d17167d9 (patch) | |
| tree | 6447bcda49256a30c9eb7f740d16a5179624e3dd /lib/Target | |
| parent | 31675153bd2d7617db8cb6aeb58054934c7b9f73 (diff) | |
| download | external_llvm-d62cdbe700ab288e9ad447824066edb7d17167d9.zip external_llvm-d62cdbe700ab288e9ad447824066edb7d17167d9.tar.gz external_llvm-d62cdbe700ab288e9ad447824066edb7d17167d9.tar.bz2 | |
Add new files for Mips + fixups for merge to upstream r162314.
Change-Id: Ib545c0c991575c14b0b74e3b8fd4cc8c789b25d0
Diffstat (limited to 'lib/Target')
| -rw-r--r-- | lib/Target/ARM/ARMJITInfo.cpp | 6 | ||||
| -rw-r--r-- | lib/Target/Mips/Android.mk | 9 | ||||
| -rw-r--r-- | lib/Target/Mips/AsmParser/Android.mk | 1 |
3 files changed, 12 insertions, 4 deletions
diff --git a/lib/Target/ARM/ARMJITInfo.cpp b/lib/Target/ARM/ARMJITInfo.cpp index 357fc3f..a812e21 100644 --- a/lib/Target/ARM/ARMJITInfo.cpp +++ b/lib/Target/ARM/ARMJITInfo.cpp @@ -314,9 +314,9 @@ void ARMJITInfo::relocate(void *Function, MachineRelocation *MR, *((intptr_t*)RelocPos) |= (ARM_AM::getSOImmValRot((unsigned)SoImmVal) >> 1) << ARMII::SoRotImmShift; *((intptr_t*)RelocPos) |= ARM_AM::getSOImmValImm((unsigned)SoImmVal); - // Set register Rn to PC. - *((intptr_t*)RelocPos) |= - getARMRegisterNumbering(ARM::PC) << ARMII::RegRnShift; + // Set register Rn to PC (which is register 15 on all architectures). + // FIXME: This avoids the need for register info in the JIT class. + *((intptr_t*)RelocPos) |= 15 << ARMII::RegRnShift; break; } case ARM::reloc_arm_pic_jt: diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk index 6bf146a..11e8997 100644 --- a/lib/Target/Mips/Android.mk +++ b/lib/Target/Mips/Android.mk @@ -15,6 +15,7 @@ mips_codegen_SRC_FILES := \ MipsAsmPrinter.cpp \ MipsCodeEmitter.cpp \ MipsDelaySlotFiller.cpp \ + MipsELFWriterInfo.cpp \ MipsFrameLowering.cpp \ MipsInstrInfo.cpp \ MipsISelDAGToDAG.cpp \ @@ -25,9 +26,15 @@ mips_codegen_SRC_FILES := \ MipsMCInstLower.cpp \ MipsRegisterInfo.cpp \ MipsSubtarget.cpp \ + MipsSEFrameLowering.cpp \ + MipsSEInstrInfo.cpp \ + MipsSERegisterInfo.cpp \ MipsTargetMachine.cpp \ MipsTargetObjectFile.cpp \ - MipsSelectionDAGInfo.cpp + MipsSelectionDAGInfo.cpp \ + Mips16FrameLowering.cpp \ + Mips16InstrInfo.cpp \ + Mips16RegisterInfo.cpp # For the host # ===================================================== diff --git a/lib/Target/Mips/AsmParser/Android.mk b/lib/Target/Mips/AsmParser/Android.mk index e219f36..7d1817d 100644 --- a/lib/Target/Mips/AsmParser/Android.mk +++ b/lib/Target/Mips/AsmParser/Android.mk @@ -10,6 +10,7 @@ mips_asm_parser_SRC_FILES := \ mips_asm_parser_C_INCLUDES := $(LOCAL_PATH)/.. mips_asm_parser_TBLGEN_TABLES := \ + MipsGenAsmMatcher.inc \ MipsGenInstrInfo.inc \ MipsGenRegisterInfo.inc \ MipsGenSubtargetInfo.inc |