[llvm-commits] [llvm] r49702 - in /llvm/tags/Apple/llvmCore-2030-04: ./ lib/ExecutionEngine/JIT/JITEmitter.cpp lib/Target/X86/X86Subtarget.h

[Bill Wendling]

Author: void
Date: Mon Apr 14 20:44:02 2008
New Revision: 49702

URL: http://llvm.org/viewvc/llvm-project?rev=49702&view=rev
Log:
llvmCore-2030-02 + r49566

Added:
    llvm/tags/Apple/llvmCore-2030-04/
      - copied from r49668, llvm/tags/Apple/llvmCore-2030-03/
Modified:
    llvm/tags/Apple/llvmCore-2030-04/lib/ExecutionEngine/JIT/JITEmitter.cpp
    llvm/tags/Apple/llvmCore-2030-04/lib/Target/X86/X86Subtarget.h

Modified: llvm/tags/Apple/llvmCore-2030-04/lib/ExecutionEngine/JIT/JITEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2030-04/lib/ExecutionEngine/JIT/JITEmitter.cpp?rev=49702&r1=49668&r2=49702&view=diff

==============================================================================
--- llvm/tags/Apple/llvmCore-2030-04/lib/ExecutionEngine/JIT/JITEmitter.cpp (original)
+++ llvm/tags/Apple/llvmCore-2030-04/lib/ExecutionEngine/JIT/JITEmitter.cpp Mon Apr 14 20:44:02 2008
@@ -233,8 +233,7 @@
   if (!idx) {
     idx = ++nextGOTIndex;
     revGOTMap[addr] = idx;
-    DOUT << "Adding GOT entry " << idx
-         << " for addr " << addr << "\n";
+    DOUT << "Adding GOT entry " << idx << " for addr " << addr << "\n";
   }
   return idx;
 }
@@ -612,11 +611,15 @@
     ? CPE.Val.MachineCPVal->getType() : CPE.Val.ConstVal->getType();
   Size += TheJIT->getTargetData()->getABITypeSize(Ty);
 
-  ConstantPoolBase = allocateSpace(Size, 1 << MCP->getConstantPoolAlignment());
+  unsigned Align = 1 << MCP->getConstantPoolAlignment();
+  ConstantPoolBase = allocateSpace(Size, Align);
   ConstantPool = MCP;
 
   if (ConstantPoolBase == 0) return;  // Buffer overflow.
 
+  DOUT << "JIT: Emitted constant pool at [" << ConstantPoolBase
+       << "] (size: " << Size << ", alignment: " << Align << ")\n";
+
   // Initialize the memory for all of the constant pool entries.
   for (unsigned i = 0, e = Constants.size(); i != e; ++i) {
     void *CAddr = (char*)ConstantPoolBase+Constants[i].Offset;
@@ -627,6 +630,7 @@
       abort();
     }
     TheJIT->InitializeMemory(Constants[i].Val.ConstVal, CAddr);
+    DOUT << "JIT:   CP" << i << " at [" << CAddr << "]\n";
   }
 }
 

Modified: llvm/tags/Apple/llvmCore-2030-04/lib/Target/X86/X86Subtarget.h
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2030-04/lib/Target/X86/X86Subtarget.h?rev=49702&r1=49668&r2=49702&view=diff

==============================================================================
--- llvm/tags/Apple/llvmCore-2030-04/lib/Target/X86/X86Subtarget.h (original)
+++ llvm/tags/Apple/llvmCore-2030-04/lib/Target/X86/X86Subtarget.h Mon Apr 14 20:44:02 2008
@@ -119,8 +119,9 @@
   bool hasSSE2() const { return X86SSELevel >= SSE2; }
   bool hasSSE3() const { return X86SSELevel >= SSE3; }
   bool hasSSSE3() const { return X86SSELevel >= SSSE3; }
-  bool hasSSE41() const { return X86SSELevel >= SSE41; }
-  bool hasSSE42() const { return X86SSELevel >= SSE42; }
+  // Temporarily disabling SSE4.
+  bool hasSSE41() const { return false && X86SSELevel >= SSE41; }
+  bool hasSSE42() const { return false && X86SSELevel >= SSE42; }
   bool has3DNow() const { return X863DNowLevel >= ThreeDNow; }
   bool has3DNowA() const { return X863DNowLevel >= ThreeDNowA; }