[llvm-commits] [llvm] r74523 - in /llvm/trunk: lib/Target/X86/X86FloatingPoint.cpp test/CodeGen/X86/inline-asm-fpstack4.ll

[Rafael Espindola]

Author: rafael
Date: Tue Jun 30 07:18:16 2009
New Revision: 74523

URL: http://llvm.org/viewvc/llvm-project?rev=74523&view=rev
Log:
Fix PR4484.
This was caused by me confounding FP0 and ST(0).


Added:
    llvm/trunk/test/CodeGen/X86/inline-asm-fpstack4.ll
Modified:
    llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp

Modified: llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp?rev=74523&r1=74522&r2=74523&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FloatingPoint.cpp Tue Jun 30 07:18:16 2009
@@ -990,16 +990,18 @@
   }
   case X86::FpSET_ST0_32:
   case X86::FpSET_ST0_64:
-  case X86::FpSET_ST0_80:
+  case X86::FpSET_ST0_80: {
+    unsigned RegOnTop = getStackEntry(0);
     // FpSET_ST0_80 is generated by copyRegToReg for both function return
     // and inline assembly with the "st" constrain. In the latter case,
-    // it is possible for FP0 to be alive after this instruction.
-    if (!MI->killsRegister(X86::FP0)) {
+    // it is possible for ST(0) to be alive after this instruction.
+    if (!MI->killsRegister(X86::FP0 + RegOnTop)) {
       // Duplicate ST0
       duplicateToTop(0, 7 /*temp register*/, I);
     }
     --StackTop;   // "Forget" we have something on the top of stack!
     break;
+  }
   case X86::FpSET_ST1_32:
   case X86::FpSET_ST1_64:
   case X86::FpSET_ST1_80:

Added: llvm/trunk/test/CodeGen/X86/inline-asm-fpstack4.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/inline-asm-fpstack4.ll?rev=74523&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/inline-asm-fpstack4.ll (added)
+++ llvm/trunk/test/CodeGen/X86/inline-asm-fpstack4.ll Tue Jun 30 07:18:16 2009
@@ -0,0 +1,15 @@
+; RUN: llvm-as < %s | llc -march=x86 > %t
+; PR4484
+
+declare x86_fp80 @ceil()
+
+declare void @test(x86_fp80)
+
+define void @test2(x86_fp80 %a) {
+entry:
+	%0 = call x86_fp80 @ceil()
+	call void asm sideeffect "fistpl $0", "{st},~{st}"(x86_fp80 %a)
+	call void @test(x86_fp80 %0)
+	ret void
+}
+