#include "Win32.h"
#ifdef __MINGW32__
-#include <imagehlp.h>
+ #include <imagehlp.h>
#else
-#include <dbghelp.h>
+ #include <dbghelp.h>
#endif
-#pragma comment(lib, "dbghelp.lib")
+#ifdef __MINGW32__
+ #if (HAVE_LIBIMAGEHLP != 1)
+ #error "libimagehlp.a should be present"
+ #endif
+#else
+ #pragma comment(lib, "dbghelp.lib")
+#endif
namespace llvm {
using namespace sys;
stricmp(ModuleName, "msvcp60") != 0 &&
stricmp(ModuleName, "msvcp70") != 0 &&
stricmp(ModuleName, "msvcr70") != 0 &&
+#ifndef __MINGW32__
+ // Mingw32 uses msvcrt.dll by default. Don't ignore it.
+ // Otherwise, user should be aware, what he's doing :)
stricmp(ModuleName, "msvcrt") != 0 &&
+#endif
stricmp(ModuleName, "msvcrt20") != 0 &&
stricmp(ModuleName, "msvcrt40") != 0) {
OpenedHandles.push_back((HMODULE)ModuleBase);
OpenedHandles.push_back((HMODULE)handle);
}
-DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) {
- HMODULE a_handle = LoadLibrary(filename);
-
- if (a_handle == 0)
- ThrowError(std::string(filename) + ": Can't open : ");
-
- handle = a_handle;
- OpenedHandles.push_back(a_handle);
-}
-
DynamicLibrary::~DynamicLibrary() {
if (handle == 0)
return;
}
}
-void DynamicLibrary::LoadLibraryPermanently(const char* filename) {
+#ifdef __MINGW32__
+ #define EXPLICIT_SYMBOL(SYM) \
+ if (!strcmp(symbolName, #SYM)) return (void*)&SYM
+ #define EXPLICIT_SYMBOL2(SYMFROM, SYMTO) \
+ if (!strcmp(symbolName, #SYMFROM)) return (void*)&SYMTO
+ #define EXPLICIT_SYMBOL_DEF(SYM) \
+ extern "C" { extern void *SYM; }
+
+ EXPLICIT_SYMBOL_DEF(_alloca);
+#endif
+
+bool DynamicLibrary::LoadLibraryPermanently(const char *filename,
+ std::string *ErrMsg) {
if (filename) {
HMODULE a_handle = LoadLibrary(filename);
- if (a_handle == 0)
- ThrowError(std::string(filename) + ": Can't open : ");
+ if (a_handle == 0)
+ return MakeErrMsg(ErrMsg, std::string(filename) + ": Can't open : ");
- OpenedHandles.push_back(a_handle);
+ OpenedHandles.push_back(a_handle);
} else {
- // When no file is specified, enumerate all DLLs and EXEs in the
+ // When no file is specified, enumerate all DLLs and EXEs in the
// process.
EnumerateLoadedModules(GetCurrentProcess(), ELM_Callback, 0);
}
// Because we don't remember the handle, we will never free it; hence,
// it is loaded permanently.
+ return false;
}
void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
+ // First check symbols added via AddSymbol().
+ std::map<std::string, void *>::iterator I = g_symbols.find(symbolName);
+ if (I != g_symbols.end())
+ return I->second;
+
+ // Now search the libraries.
for (std::vector<HMODULE>::iterator I = OpenedHandles.begin(),
E = OpenedHandles.end(); I != E; ++I) {
FARPROC ptr = GetProcAddress((HMODULE)*I, symbolName);
return (void *) ptr;
}
+#ifdef __MINGW32__
+ {
+ EXPLICIT_SYMBOL(_alloca);
+ EXPLICIT_SYMBOL2(alloca, _alloca);
+#undef EXPLICIT_SYMBOL
+#undef EXPLICIT_SYMBOL2
+#undef EXPLICIT_SYMBOL_DEF
+ }
+#endif
+
return 0;
}