[llvm-commits] [parallel] CVS: llvm/lib/ExecutionEngine/JIT/Emitter.cpp JIT.cpp TargetSelect.cpp

[Misha Brukman]

Changes in directory llvm/lib/ExecutionEngine/JIT:

Emitter.cpp updated: 1.38 -> 1.38.2.1
JIT.cpp updated: 1.31 -> 1.31.2.1
TargetSelect.cpp updated: 1.2 -> 1.2.2.1

---
Log message:

Merge from trunk

---
Diffs of the changes:  (+13 -9)

Index: llvm/lib/ExecutionEngine/JIT/Emitter.cpp
diff -u llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.38 llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.38.2.1
--- llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.38	Fri Dec 19 21:36:47 2003
+++ llvm/lib/ExecutionEngine/JIT/Emitter.cpp	Mon Mar  1 17:58:13 2004
@@ -72,10 +72,9 @@
   abort();
 #endif
 
+  int fd = -1;
 #if defined(__linux__)
-#define fd 0
-#else
-#define fd -1
+  fd = 0;
 #endif
   
   unsigned mmapFlags = MAP_PRIVATE|MAP_ANONYMOUS;


Index: llvm/lib/ExecutionEngine/JIT/JIT.cpp
diff -u llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.31 llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.31.2.1
--- llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.31	Fri Dec 26 00:13:47 2003
+++ llvm/lib/ExecutionEngine/JIT/JIT.cpp	Mon Mar  1 17:58:13 2004
@@ -110,7 +110,12 @@
     return Addr;   // Check if function already code gen'd
 
   // Make sure we read in the function if it exists in this Module
-  MP->materializeFunction(F);
+  try {
+    MP->materializeFunction(F);
+  } catch (...) {
+    std::cerr << "Error parsing bytecode file!\n";
+    abort();
+  }
 
   if (F->isExternal()) {
     void *Addr = getPointerToNamedFunction(F->getName());


Index: llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp
diff -u llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp:1.2 llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp:1.2.2.1
--- llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp:1.2	Sun Dec 28 03:44:37 2003
+++ llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp	Mon Mar  1 17:58:13 2004
@@ -28,7 +28,7 @@
 #endif
 
 namespace {
-  enum ArchName { x86, Sparc };
+  enum ArchName { x86, SparcV9 };
 
 #ifndef NO_JITS_ENABLED
   cl::opt<ArchName>
@@ -38,13 +38,13 @@
                   clEnumVal(x86, "  IA-32 (Pentium and above)"),
 #endif
 #ifdef ENABLE_SPARC_JIT
-                  clEnumValN(Sparc, "sparc", "  Sparc-V9"),
+                  clEnumValN(SparcV9, "sparcv9", "  Sparc-V9"),
 #endif
                   0),
 #if defined(ENABLE_X86_JIT)
   cl::init(x86)
 #elif defined(ENABLE_SPARC_JIT)
-  cl::init(Sparc)
+  cl::init(SparcV9)
 #endif
        );
 #endif /* NO_JITS_ENABLED */
@@ -69,8 +69,8 @@
     break;
 #endif
 #ifdef ENABLE_SPARC_JIT
-  case Sparc:
-    TargetMachineAllocator = allocateSparcTargetMachine;
+  case SparcV9:
+    TargetMachineAllocator = allocateSparcV9TargetMachine;
     break;
 #endif
   default: