[llvm-commits] [llvm] r147938 - in /llvm/trunk: lib/Target/X86/X86FrameLowering.cpp test/CodeGen/X86/2012-01-10-UndefExceptionEdge.ll

[Jakob Stoklund Olesen]

Author: stoklund
Date: Wed Jan 11 03:08:04 2012
New Revision: 147938

URL: http://llvm.org/viewvc/llvm-project?rev=147938&view=rev
Log:
Fix undefined code and reenable test case.

I don't think the compact encoding code is right, but at least is has
defined behavior now.

Modified:
    llvm/trunk/lib/Target/X86/X86FrameLowering.cpp
    llvm/trunk/test/CodeGen/X86/2012-01-10-UndefExceptionEdge.ll

Modified: llvm/trunk/lib/Target/X86/X86FrameLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FrameLowering.cpp?rev=147938&r1=147937&r2=147938&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86FrameLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FrameLowering.cpp Wed Jan 11 03:08:04 2012
@@ -458,7 +458,7 @@
   // Encode the registers in the order they were saved, 3-bits per register. The
   // registers are numbered from 1 to 6.
   uint32_t RegEnc = 0;
-  for (int I = 0; I != 6; --I) {
+  for (int I = 0; I != 6; ++I) {
     unsigned Reg = SavedRegs[I];
     if (Reg == 0) break;
     int CURegNum = getCompactUnwindRegNum(CURegs, Reg);
@@ -470,7 +470,7 @@
     RegEnc |= (CURegNum & 0x7) << ((5 - I) * 3);
   }
 
-  assert((RegEnc & 0x7FFF) == RegEnc && "Invalid compact register encoding!");
+  assert((RegEnc & 0x3FFFF) == RegEnc && "Invalid compact register encoding!");
   return RegEnc;
 }
 

Modified: llvm/trunk/test/CodeGen/X86/2012-01-10-UndefExceptionEdge.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2012-01-10-UndefExceptionEdge.ll?rev=147938&r1=147937&r2=147938&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2012-01-10-UndefExceptionEdge.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2012-01-10-UndefExceptionEdge.ll Wed Jan 11 03:08:04 2012
@@ -1,5 +1,4 @@
-; RUN: true
-; DONT: llc < %s -disable-fp-elim
+; RUN: llc < %s -disable-fp-elim
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-n8:16:32-S128"
 target triple = "i386-apple-macosx10.7"