maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Link against libffi if available, fall back to "no external calls from 

interpreter mode" when it's not.

llvm-svn: 68937
This commit is contained in:
Nick Lewycky 2009-04-13 04:26:06 +00:00
parent e8f66b3ed0
commit e54da991d1
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/Makefile.config.in
View File

@ -289,6 +289,3 @@ endif
# Location of the plugin header file for gold.
BINUTILS_INCDIR := @BINUTILS_INCDIR@
# Can we use libFFI for the interpreter?
HAVE_FFI := @HAVE_FFI@

11
llvm/autoconf/configure.ac
View File

@ -737,8 +737,9 @@ AC_SEARCH_LIBS(dlopen,dl,AC_DEFINE([HAVE_DLOPEN],[1],
AC_MSG_WARN([dlopen() not found - disabling plugin support]))
dnl libffi is optional; used to call external functions from the interpreter
AC_CHECK_LIB(ffi,ffi_call,[have_libffi=1],
AC_MSG_WARN([libffi not found - disabling external calls from interpreter]))
AC_SEARCH_LIBS(ffi_call,ffi,AC_DEFINE([HAVE_FFI_CALL],[1],
[Define if libffi is available on this platform.]),
AC_MSG_WARN([libffi not found - disabling external calls from interpreter]))
dnl mallinfo is optional; the code can compile (minus features) without it
AC_SEARCH_LIBS(mallinfo,malloc,AC_DEFINE([HAVE_MALLINFO],[1],
@ -802,10 +803,8 @@ else
AC_SUBST(HAVE_PTHREAD, 0)
fi
dnl Once we know we have libffi, try to find ffi.h.
if test -n "$have_libffi" ; then
AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [AC_SUBST(HAVE_FFI, 1)])
fi
dnl Try to find ffi.h.
AC_CHECK_HEADERS([ffi.h ffi/ffi.h])
dnl===-----------------------------------------------------------------------===
dnl===

16
llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
View File

@ -33,13 +33,13 @@
#include <cmath>
#include <cstring>
#ifdef HAVE_FFI
#ifdef HAVE_FFI_CALL
#ifdef HAVE_FFI_H
#include <ffi.h>
#define USE_LIBFFI
#elif HAVE_FFI_FFI_H
#include <ffi/ffi.h>
#else
#error "Not sure where configure found ffi.h!"
#define USE_LIBFFI
#endif
#endif
@ -50,7 +50,7 @@ typedef GenericValue (*ExFunc)(const FunctionType *,
static ManagedStatic<std::map<const Function *, ExFunc> > ExportedFunctions;
static std::map<std::string, ExFunc> FuncNames;
#ifdef HAVE_FFI
#ifdef USE_LIBFFI
typedef void (*RawFunc)(void);
static ManagedStatic<std::map<const Function *, RawFunc> > RawFunctions;
#endif
@ -105,7 +105,7 @@ static ExFunc lookupFunction(const Function *F) {
return FnPtr;
}
#ifdef HAVE_FFI
#ifdef USE_LIBFFI
static ffi_type *ffiTypeFor(const Type *Ty) {
switch (Ty->getTypeID()) {
case Type::VoidTyID: return &ffi_type_void;
@ -240,7 +240,7 @@ static bool ffiInvoke(RawFunc Fn, Function *F,
return false;
}
#endif // HAVE_FFI
#endif // USE_LIBFFI
GenericValue Interpreter::callExternalFunction(Function *F,
const std::vector<GenericValue> &ArgVals) {
@ -253,7 +253,7 @@ GenericValue Interpreter::callExternalFunction(Function *F,
: FI->second)
return Fn(F->getFunctionType(), ArgVals);
#ifdef HAVE_FFI
#ifdef USE_LIBFFI
std::map<const Function *, RawFunc>::iterator RF = RawFunctions->find(F);
RawFunc RawFn;
if (RF == RawFunctions->end()) {
@ -268,7 +268,7 @@ GenericValue Interpreter::callExternalFunction(Function *F,
GenericValue Result;
if (RawFn != 0 && ffiInvoke(RawFn, F, ArgVals, getTargetData(), Result))
return Result;
#endif // HAVE_FFI
#endif // USE_LIBFFI
cerr << "Tried to execute an unknown external function: "
<< F->getType()->getDescription() << " " << F->getName() << "\n";