From 18247736894073c2fb1677f7d46762a092cacc36 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 17 Apr 2009 22:40:38 +0000 Subject: [PATCH] Recommit r69335 and r69336. These were not causing problems. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@69394 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86InstrInfo.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp index e123ae7e24a..ccec7b1c32c 100644 --- a/lib/Target/X86/X86InstrInfo.cpp +++ b/lib/Target/X86/X86InstrInfo.cpp @@ -667,6 +667,7 @@ bool X86InstrInfo::isMoveInstr(const MachineInstr& MI, default: return false; case X86::MOV8rr: + case X86::MOV8rr_NOREX: case X86::MOV16rr: case X86::MOV32rr: case X86::MOV64rr: @@ -1664,9 +1665,10 @@ bool X86InstrInfo::copyRegToReg(MachineBasicBlock &MBB, } else if (DestRC == &X86::GR16RegClass) { Opc = X86::MOV16rr; } else if (DestRC == &X86::GR8RegClass) { - // Copying two or from a physical H register requires a NOREX move. - // Otherwise use a normal move. - if (isHReg(DestReg) || isHReg(SrcReg)) + // Copying two or from a physical H register on x86-64 requires a NOREX + // move. Otherwise use a normal move. + if ((isHReg(DestReg) || isHReg(SrcReg)) && + TM.getSubtarget().is64Bit()) Opc = X86::MOV8rr_NOREX; else Opc = X86::MOV8rr; -- 2.11.0