wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use SubRegIndex in SystemZ. 

Anton, please review the change to SystemZAsmPrinter.cpp. It could be a bug.

llvm-svn: 104515
This commit is contained in:
Jakob Stoklund Olesen 2010-05-24 17:43:01 +00:00
parent 5d56769fb6
commit 8a57aeca2a
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp
View File

@ -124,9 +124,9 @@ void SystemZAsmPrinter::printOperand(const MachineInstr *MI, int OpNum,
unsigned Reg = MO.getReg(); unsigned Reg = MO.getReg();
if (Modifier && strncmp(Modifier, "subreg", 6) == 0) { if (Modifier && strncmp(Modifier, "subreg", 6) == 0) {
if (strncmp(Modifier + 7, "even", 4) == 0) if (strncmp(Modifier + 7, "even", 4) == 0)
Reg = TM.getRegisterInfo()->getSubReg(Reg, SystemZ::SUBREG_EVEN); Reg = TM.getRegisterInfo()->getSubReg(Reg, SystemZ::subreg_even32);
else if (strncmp(Modifier + 7, "odd", 3) == 0) else if (strncmp(Modifier + 7, "odd", 3) == 0)
Reg = TM.getRegisterInfo()->getSubReg(Reg, SystemZ::SUBREG_ODD); Reg = TM.getRegisterInfo()->getSubReg(Reg, SystemZ::subreg_odd32);
else else
assert(0 && "Invalid subreg modifier"); assert(0 && "Invalid subreg modifier");
} }

11
llvm/lib/Target/SystemZ/SystemZRegisterInfo.h
View File

@ -1,4 +1,4 @@
//===- SystemZRegisterInfo.h - SystemZ Register Information Impl ----*- C++ -*-===// //===-- SystemZRegisterInfo.h - SystemZ Register Information ----*- C++ -*-===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
// //
@ -19,15 +19,6 @@
namespace llvm { namespace llvm {
namespace SystemZ {
/// SubregIndex - The index of various sized subregister classes. Note that
/// these indices must be kept in sync with the class indices in the
/// SystemZRegisterInfo.td file.
enum SubregIndex {
SUBREG_32BIT = 1, SUBREG_EVEN = 1, SUBREG_ODD = 2
};
}
class SystemZSubtarget; class SystemZSubtarget;
class SystemZInstrInfo; class SystemZInstrInfo;
class Type; class Type;

12
llvm/lib/Target/SystemZ/SystemZRegisterInfo.td
View File

@ -145,11 +145,13 @@ def F15L : FPRL<15, "f15", [F15S]>, DwarfRegNum<[31]>;
// Status register // Status register
def PSW : SystemZReg<"psw">; def PSW : SystemZReg<"psw">;
def subreg_32bit : PatLeaf<(i32 1)>; let Namespace = "SystemZ" in {
def subreg_even32 : PatLeaf<(i32 1)>; def subreg_32bit : SubRegIndex { let NumberHack = 1; }
def subreg_odd32 : PatLeaf<(i32 2)>; def subreg_even32 : SubRegIndex { let NumberHack = 1; }
def subreg_even : PatLeaf<(i32 3)>; def subreg_odd32 : SubRegIndex { let NumberHack = 2; }
def subreg_odd : PatLeaf<(i32 4)>; def subreg_even : SubRegIndex { let NumberHack = 3; }
def subreg_odd : SubRegIndex { let NumberHack = 4; }
}
def : SubRegSet<1, [R0D, R1D, R2D, R3D, R4D, R5D, R6D, R7D, def : SubRegSet<1, [R0D, R1D, R2D, R3D, R4D, R5D, R6D, R7D,
R8D, R9D, R10D, R11D, R12D, R13D, R14D, R15D], R8D, R9D, R10D, R11D, R12D, R13D, R14D, R15D],