6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-17 04:24:00 +00:00
Code Issues Projects Releases Wiki Activity

Change LoadLibraryPermanently to not throw an exception.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29048 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2006-07-07 17:12:36 +00:00
parent b26d39eae5
commit adcbce0ad4
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/System/DynamicLibrary.cpp
View File

@ -18,7 +18,8 @@
// Collection of symbol name/value pairs to be searched prior to any libraries.
static std::map<std::string, void *> g_symbols;
void llvm::sys::DynamicLibrary::AddSymbol(const char* symbolName, void *symbolValue) {
void llvm::sys::DynamicLibrary::AddSymbol(const char* symbolName,
void *symbolValue) {
g_symbols[symbolName] = symbolValue;
}
@ -99,20 +100,25 @@ DynamicLibrary::~DynamicLibrary() {
}
}
void DynamicLibrary::LoadLibraryPermanently(const char* filename) {
bool DynamicLibrary::LoadLibraryPermanently(const char *Filename,
std::string *ErrMsg) {
check_ltdl_initialization();
lt_dlhandle a_handle = lt_dlopen(filename);
lt_dlhandle a_handle = lt_dlopen(Filename);
if (a_handle == 0)
a_handle = lt_dlopenext(filename);
a_handle = lt_dlopenext(Filename);
if (a_handle == 0)
throw std::string("Can't open :") +
(filename ? filename : "<current process>") + ": " + lt_dlerror();
if (a_handle == 0) {
if (ErrMsg)
*ErrMsg = std::string("Can't open :") +
(Filename ? Filename : "<current process>") + ": " + lt_dlerror();
return true;
}
lt_dlmakeresident(a_handle);
OpenedHandles.push_back(a_handle);
return false;
}
void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {