From a0b38d3cb18fad908b3f50b4c5470908a8bc68c1 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 15 Aug 2004 22:15:11 +0000 Subject: [PATCH] Code insertion methods now return void instead of an int. llvm-svn: 15780 --- .../Target/SparcV8/SparcV8RegisterInfo.cpp | 17 ++++++-------- llvm/lib/Target/SparcV8/SparcV8RegisterInfo.h | 18 +++++++-------- .../Target/SparcV9/SparcV9RegisterInfo.cpp | 6 ++--- llvm/lib/Target/SparcV9/SparcV9RegisterInfo.h | 6 ++--- llvm/lib/Target/X86/X86RegisterInfo.cpp | 23 ++++++++----------- llvm/lib/Target/X86/X86RegisterInfo.h | 20 ++++++++-------- 6 files changed, 42 insertions(+), 48 deletions(-) diff --git a/llvm/lib/Target/SparcV8/SparcV8RegisterInfo.cpp b/llvm/lib/Target/SparcV8/SparcV8RegisterInfo.cpp index ef4d1781d0b1..5e371bd87a3b 100644 --- a/llvm/lib/Target/SparcV8/SparcV8RegisterInfo.cpp +++ b/llvm/lib/Target/SparcV8/SparcV8RegisterInfo.cpp @@ -25,7 +25,7 @@ SparcV8RegisterInfo::SparcV8RegisterInfo() : SparcV8GenRegisterInfo(V8::ADJCALLSTACKDOWN, V8::ADJCALLSTACKUP) {} -int SparcV8RegisterInfo:: +void SparcV8RegisterInfo:: storeRegToStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator I, unsigned SrcReg, int FrameIdx) const { const TargetRegisterClass *RC = getRegClass(SrcReg); @@ -42,10 +42,9 @@ storeRegToStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator I, .addReg (SrcReg); else assert (0 && "Can't store this register to stack slot"); - return 1; } -int SparcV8RegisterInfo:: +void SparcV8RegisterInfo:: loadRegFromStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator I, unsigned DestReg, int FrameIdx) const { const TargetRegisterClass *RC = getRegClass(DestReg); @@ -58,21 +57,19 @@ loadRegFromStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator I, BuildMI (MBB, I, V8::LDDFri, 2, DestReg).addFrameIndex (FrameIdx) .addSImm (0); else - assert (0 && "Can't load this register from stack slot"); - return 1; + assert(0 && "Can't load this register from stack slot"); } -int SparcV8RegisterInfo::copyRegToReg(MachineBasicBlock &MBB, - MachineBasicBlock::iterator I, - unsigned DestReg, unsigned SrcReg, - const TargetRegisterClass *RC) const { +void SparcV8RegisterInfo::copyRegToReg(MachineBasicBlock &MBB, + MachineBasicBlock::iterator I, + unsigned DestReg, unsigned SrcReg, + const TargetRegisterClass *RC) const { if (RC == SparcV8::IntRegsRegisterClass) BuildMI (MBB, I, V8::ORrr, 2, DestReg).addReg (V8::G0).addReg (SrcReg); else if (RC == SparcV8::FPRegsRegisterClass) BuildMI (MBB, I, V8::FMOVS, 1, DestReg).addReg (SrcReg); else assert (0 && "Can't copy this register"); - return 1; } void SparcV8RegisterInfo:: diff --git a/llvm/lib/Target/SparcV8/SparcV8RegisterInfo.h b/llvm/lib/Target/SparcV8/SparcV8RegisterInfo.h index e4dcaccf2ccf..b53202edaf4f 100644 --- a/llvm/lib/Target/SparcV8/SparcV8RegisterInfo.h +++ b/llvm/lib/Target/SparcV8/SparcV8RegisterInfo.h @@ -26,17 +26,17 @@ struct SparcV8RegisterInfo : public SparcV8GenRegisterInfo { const TargetRegisterClass* getRegClassForType(const Type* Ty) const; /// Code Generation virtual methods... - int storeRegToStackSlot(MachineBasicBlock &MBB, - MachineBasicBlock::iterator MBBI, - unsigned SrcReg, int FrameIndex) const; - - int loadRegFromStackSlot(MachineBasicBlock &MBB, + void storeRegToStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI, - unsigned DestReg, int FrameIndex) const; + unsigned SrcReg, int FrameIndex) const; + + void loadRegFromStackSlot(MachineBasicBlock &MBB, + MachineBasicBlock::iterator MBBI, + unsigned DestReg, int FrameIndex) const; - int copyRegToReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI, - unsigned DestReg, unsigned SrcReg, - const TargetRegisterClass *RC) const; + void copyRegToReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI, + unsigned DestReg, unsigned SrcReg, + const TargetRegisterClass *RC) const; void eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB, diff --git a/llvm/lib/Target/SparcV9/SparcV9RegisterInfo.cpp b/llvm/lib/Target/SparcV9/SparcV9RegisterInfo.cpp index 1b0fc7276c8e..c4bcee0892d0 100644 --- a/llvm/lib/Target/SparcV9/SparcV9RegisterInfo.cpp +++ b/llvm/lib/Target/SparcV9/SparcV9RegisterInfo.cpp @@ -276,19 +276,19 @@ SparcV9RegisterInfo::SparcV9RegisterInfo () RegisterClasses + 5) { } -int SparcV9RegisterInfo::storeRegToStackSlot(MachineBasicBlock &MBB, +void SparcV9RegisterInfo::storeRegToStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI, unsigned SrcReg, int FrameIndex) const{ abort (); } -int SparcV9RegisterInfo::loadRegFromStackSlot(MachineBasicBlock &MBB, +void SparcV9RegisterInfo::loadRegFromStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI, unsigned DestReg, int FrameIndex) const { abort (); } -int SparcV9RegisterInfo::copyRegToReg(MachineBasicBlock &MBB, +void SparcV9RegisterInfo::copyRegToReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI, unsigned DestReg, unsigned SrcReg, const TargetRegisterClass *RC) const { diff --git a/llvm/lib/Target/SparcV9/SparcV9RegisterInfo.h b/llvm/lib/Target/SparcV9/SparcV9RegisterInfo.h index bd31bb1f5558..07bd29bb200e 100644 --- a/llvm/lib/Target/SparcV9/SparcV9RegisterInfo.h +++ b/llvm/lib/Target/SparcV9/SparcV9RegisterInfo.h @@ -25,13 +25,13 @@ struct SparcV9RegisterInfo : public MRegisterInfo { const unsigned *getCalleeSaveRegs() const; // The rest of these are stubs... for now. - int storeRegToStackSlot (MachineBasicBlock &MBB, + void storeRegToStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI, unsigned SrcReg, int FrameIndex) const; - int loadRegFromStackSlot (MachineBasicBlock &MBB, + void loadRegFromStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI, unsigned DestReg, int FrameIndex) const; - int copyRegToReg (MachineBasicBlock &MBB, + void copyRegToReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI, unsigned DestReg, unsigned SrcReg, const TargetRegisterClass *RC) const; diff --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp index 6890cbe97b9d..730988c9b09e 100644 --- a/llvm/lib/Target/X86/X86RegisterInfo.cpp +++ b/llvm/lib/Target/X86/X86RegisterInfo.cpp @@ -54,37 +54,34 @@ static unsigned getIdx(const TargetRegisterClass *RC) { } } -int X86RegisterInfo::storeRegToStackSlot(MachineBasicBlock &MBB, - MachineBasicBlock::iterator MI, - unsigned SrcReg, int FrameIdx) const { +void X86RegisterInfo::storeRegToStackSlot(MachineBasicBlock &MBB, + MachineBasicBlock::iterator MI, + unsigned SrcReg, int FrameIdx) const { static const unsigned Opcode[] = { X86::MOV8mr, X86::MOV16mr, X86::MOV32mr, X86::FSTP80m }; const TargetRegisterClass *RC = getRegClass(SrcReg); MachineInstr *I = addFrameReference(BuildMI(Opcode[getIdx(RC)], 5), FrameIdx).addReg(SrcReg); MBB.insert(MI, I); - return 1; } -int X86RegisterInfo::loadRegFromStackSlot(MachineBasicBlock &MBB, - MachineBasicBlock::iterator MI, - unsigned DestReg, int FrameIdx) const{ +void X86RegisterInfo::loadRegFromStackSlot(MachineBasicBlock &MBB, + MachineBasicBlock::iterator MI, + unsigned DestReg, int FrameIdx)const{ static const unsigned Opcode[] = { X86::MOV8rm, X86::MOV16rm, X86::MOV32rm, X86::FLD80m }; const TargetRegisterClass *RC = getRegClass(DestReg); unsigned OC = Opcode[getIdx(RC)]; MBB.insert(MI, addFrameReference(BuildMI(OC, 4, DestReg), FrameIdx)); - return 1; } -int X86RegisterInfo::copyRegToReg(MachineBasicBlock &MBB, - MachineBasicBlock::iterator MI, - unsigned DestReg, unsigned SrcReg, - const TargetRegisterClass *RC) const { +void X86RegisterInfo::copyRegToReg(MachineBasicBlock &MBB, + MachineBasicBlock::iterator MI, + unsigned DestReg, unsigned SrcReg, + const TargetRegisterClass *RC) const { static const unsigned Opcode[] = { X86::MOV8rr, X86::MOV16rr, X86::MOV32rr, X86::FpMOV }; MBB.insert(MI, BuildMI(Opcode[getIdx(RC)],1,DestReg).addReg(SrcReg)); - return 1; } static MachineInstr *MakeMInst(unsigned Opcode, unsigned FrameIndex, diff --git a/llvm/lib/Target/X86/X86RegisterInfo.h b/llvm/lib/Target/X86/X86RegisterInfo.h index 28395564bd11..1198e2ad337b 100644 --- a/llvm/lib/Target/X86/X86RegisterInfo.h +++ b/llvm/lib/Target/X86/X86RegisterInfo.h @@ -27,18 +27,18 @@ struct X86RegisterInfo : public X86GenRegisterInfo { const TargetRegisterClass* getRegClassForType(const Type* Ty) const; /// Code Generation virtual methods... - int storeRegToStackSlot(MachineBasicBlock &MBB, - MachineBasicBlock::iterator MI, - unsigned SrcReg, int FrameIndex) const; - - int loadRegFromStackSlot(MachineBasicBlock &MBB, + void storeRegToStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI, - unsigned DestReg, int FrameIndex) const; + unsigned SrcReg, int FrameIndex) const; + + void loadRegFromStackSlot(MachineBasicBlock &MBB, + MachineBasicBlock::iterator MI, + unsigned DestReg, int FrameIndex) const; - int copyRegToReg(MachineBasicBlock &MBB, - MachineBasicBlock::iterator MI, - unsigned DestReg, unsigned SrcReg, - const TargetRegisterClass *RC) const; + void copyRegToReg(MachineBasicBlock &MBB, + MachineBasicBlock::iterator MI, + unsigned DestReg, unsigned SrcReg, + const TargetRegisterClass *RC) const; /// foldMemoryOperand - If this target supports it, fold a load or store of /// the specified stack slot into the specified machine instruction for the