From f020dfb43c0fbcd4a897f50c5772c8c8c09e7271 Mon Sep 17 00:00:00 2001 From: Alkis Evlogimenos Date: Fri, 27 Feb 2004 06:57:05 +0000 Subject: Rename SHL, SHR, SAR, SHLD and SHLR instructions to make them consistent with the rest and also pepare for the addition of their memory operand variants. llvm-svn: 11902 --- llvm/lib/Target/X86/InstSelectSimple.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'llvm/lib/Target/X86/InstSelectSimple.cpp') diff --git a/llvm/lib/Target/X86/InstSelectSimple.cpp b/llvm/lib/Target/X86/InstSelectSimple.cpp index 2c247c223a2..dd08b4ce6da 100644 --- a/llvm/lib/Target/X86/InstSelectSimple.cpp +++ b/llvm/lib/Target/X86/InstSelectSimple.cpp @@ -1776,17 +1776,17 @@ void ISel::emitShiftOperation(MachineBasicBlock *MBB, unsigned Class = getClass (ResultTy); static const unsigned ConstantOperand[][4] = { - { X86::SHRri8, X86::SHRri16, X86::SHRri32, X86::SHRDri32 }, // SHR - { X86::SARri8, X86::SARri16, X86::SARri32, X86::SHRDri32 }, // SAR - { X86::SHLri8, X86::SHLri16, X86::SHLri32, X86::SHLDri32 }, // SHL - { X86::SHLri8, X86::SHLri16, X86::SHLri32, X86::SHLDri32 }, // SAL = SHL + { X86::SHRri8, X86::SHRri16, X86::SHRri32, X86::SHRDrri32 }, // SHR + { X86::SARri8, X86::SARri16, X86::SARri32, X86::SHRDrri32 }, // SAR + { X86::SHLri8, X86::SHLri16, X86::SHLri32, X86::SHLDrri32 }, // SHL + { X86::SHLri8, X86::SHLri16, X86::SHLri32, X86::SHLDrri32 }, // SAL = SHL }; static const unsigned NonConstantOperand[][4] = { - { X86::SHRrr8, X86::SHRrr16, X86::SHRrr32 }, // SHR - { X86::SARrr8, X86::SARrr16, X86::SARrr32 }, // SAR - { X86::SHLrr8, X86::SHLrr16, X86::SHLrr32 }, // SHL - { X86::SHLrr8, X86::SHLrr16, X86::SHLrr32 }, // SAL = SHL + { X86::SHRrCL8, X86::SHRrCL16, X86::SHRrCL32 }, // SHR + { X86::SARrCL8, X86::SARrCL16, X86::SARrCL32 }, // SAR + { X86::SHLrCL8, X86::SHLrCL16, X86::SHLrCL32 }, // SHL + { X86::SHLrCL8, X86::SHLrCL16, X86::SHLrCL32 }, // SAL = SHL }; // Longs, as usual, are handled specially... @@ -1842,9 +1842,9 @@ void ISel::emitShiftOperation(MachineBasicBlock *MBB, unsigned TmpReg3 = makeAnotherReg(Type::IntTy); if (isLeftShift) { // TmpReg2 = shld inHi, inLo - BMI(MBB, IP, X86::SHLDrr32, 2, TmpReg2).addReg(SrcReg+1).addReg(SrcReg); + BMI(MBB, IP, X86::SHLDrrCL32,2,TmpReg2).addReg(SrcReg+1).addReg(SrcReg); // TmpReg3 = shl inLo, CL - BMI(MBB, IP, X86::SHLrr32, 1, TmpReg3).addReg(SrcReg); + BMI(MBB, IP, X86::SHLrCL32, 1, TmpReg3).addReg(SrcReg); // Set the flags to indicate whether the shift was by more than 32 bits. BMI(MBB, IP, X86::TESTri8, 2).addReg(X86::CL).addZImm(32); @@ -1857,9 +1857,9 @@ void ISel::emitShiftOperation(MachineBasicBlock *MBB, DestReg).addReg(TmpReg3).addReg(TmpReg); } else { // TmpReg2 = shrd inLo, inHi - BMI(MBB, IP, X86::SHRDrr32, 2, TmpReg2).addReg(SrcReg).addReg(SrcReg+1); + BMI(MBB, IP, X86::SHRDrrCL32,2,TmpReg2).addReg(SrcReg).addReg(SrcReg+1); // TmpReg3 = s[ah]r inHi, CL - BMI(MBB, IP, isSigned ? X86::SARrr32 : X86::SHRrr32, 1, TmpReg3) + BMI(MBB, IP, isSigned ? X86::SARrCL32 : X86::SHRrCL32, 1, TmpReg3) .addReg(SrcReg+1); // Set the flags to indicate whether the shift was by more than 32 bits. -- cgit v1.2.3