1. Tidy up jump table info.

[oota-llvm.git] / lib / ExecutionEngine / JIT / Intercept.cpp

diff --git a/lib/ExecutionEngine/JIT/Intercept.cpp b/lib/ExecutionEngine/JIT/Intercept.cpp
index 8ed9447159655e45ebb774956bef22a87f6e2558..f370e5bb0a83a84f3d0e4484c75cdb289007cae7 100644 (file)
--- a/lib/ExecutionEngine/JIT/Intercept.cpp
+++ b/lib/ExecutionEngine/JIT/Intercept.cpp
@@ -1,10 +1,10 @@
 //===-- Intercept.cpp - System function interception routines -------------===//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
 // This file was developed by the LLVM research group and is distributed under
 // the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+//
 //===----------------------------------------------------------------------===//
 //
 // If a function call occurs to an external function, the JIT is designed to use
@@ -16,9 +16,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "JIT.h"
-#include "Support/DynamicLinker.h"
-#include <iostream>
-#include <sys/stat.h>
+#include "llvm/System/DynamicLibrary.h"
+#include "llvm/Config/config.h"
 using namespace llvm;
 
 // AtExitHandlers - List of functions to call when the program exits,
@@ -46,17 +45,20 @@ static void runAtExitHandlers() {
 // strategy of making these functions work differently when inlined vs. when
 // not inlined, and hiding their real definitions in a separate archive file
 // that the dynamic linker can't see. For more info, search for
-// 'libc_nonshared.a' on Google, or read http://llvm.cs.uiuc.edu/PR274.
+// 'libc_nonshared.a' on Google, or read http://llvm.org/PR274.
 #if defined(__linux__)
+#if defined(HAVE_SYS_STAT_H)
+#include <sys/stat.h>
+#endif
 void *FunctionPointers[] = {
-  (void *) stat,
-  (void *) fstat,
-  (void *) lstat,
-  (void *) stat64,
-  (void *) fstat64,
-  (void *) lstat64,
-  (void *) atexit,
-  (void *) mknod
+  (void *)(intptr_t) stat,
+  (void *)(intptr_t) fstat,
+  (void *)(intptr_t) lstat,
+  (void *)(intptr_t) stat64,
+  (void *)(intptr_t) fstat64,
+  (void *)(intptr_t) lstat64,
+  (void *)(intptr_t) atexit,
+  (void *)(intptr_t) mknod
 };
 #endif // __linux__
 
@@ -81,26 +83,39 @@ static int jit_atexit(void (*Fn)(void)) {
 }
 
 //===----------------------------------------------------------------------===//
-// 
+//
 /// getPointerToNamedFunction - This method returns the address of the specified
-/// function by using the dynamic loader interface.  As such it is only useful 
+/// function by using the dynamic loader interface.  As such it is only useful
 /// for resolving library symbols, not code generated symbols.
 ///
 void *JIT::getPointerToNamedFunction(const std::string &Name) {
-  // Check to see if this is one of the functions we want to intercept...
-  if (Name == "exit") return (void*)&jit_exit;
-  if (Name == "atexit") return (void*)&jit_atexit;
+  // Check to see if this is one of the functions we want to intercept.  Note,
+  // we cast to intptr_t here to silence a -pedantic warning that complains
+  // about casting a function pointer to a normal pointer.
+  if (Name == "exit") return (void*)(intptr_t)&jit_exit;
+  if (Name == "atexit") return (void*)(intptr_t)&jit_atexit;
 
   // If the program does not have a linked in __main function, allow it to run,
   // but print a warning.
-  if (Name == "__main") return (void*)&__mainFunc;
+  if (Name == "__main") return (void*)(intptr_t)&__mainFunc;
 
+  const char *NameStr = Name.c_str();
+  // If this is an asm specifier, skip the sentinal.
+  if (NameStr[0] == 1) ++NameStr;
+  
   // If it's an external function, look it up in the process image...
-  void *Ptr = GetAddressOfSymbol(Name);
+  void *Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr);
   if (Ptr) return Ptr;
+  
+  // If it wasn't found and if it starts with an underscore ('_') character, and
+  // has an asm specifier, try again without the underscore.
+  if (Name[0] == 1 && NameStr[0] == '_') {
+    Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr+1);
+    if (Ptr) return Ptr;
+  }
 
-  std::cerr << "ERROR: Program used external function '" << Name
-            << "' which could not be resolved!\n";
+  cerr << "ERROR: Program used external function '" << Name
+       << "' which could not be resolved!\n";
   abort();
   return 0;
 }