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

Guard dynamic library loading.

Browse Source 
I did my best at implementing this for Win32, but I don't have a way to test it.
Can someone with access to a Win32 machine test/fix this?


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74188 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson
2009-06-25 18:12:44 +00:00
parent cbd5f0a6b9
commit f37feb954f
2 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/System/Win32/DynamicLibrary.inc
View File

@@ -67,6 +67,7 @@ extern "C" {
PVOID UserContext)
#endif
{
llvm::sys::SmartScopedWriter<true> Writer(&SymbolsLock);
// Ignore VC++ runtimes prior to 7.1. Somehow some of them get loaded
// into the process.
if (stricmp(ModuleName, "msvci70") != 0 &&
@@ -89,11 +90,13 @@ extern "C" {
}
DynamicLibrary::DynamicLibrary() : handle(0) {
SmartScopedWriter<true> Writer(&SymbolsLock);
handle = GetModuleHandle(NULL);
OpenedHandles.push_back((HMODULE)handle);
}
DynamicLibrary::~DynamicLibrary() {
llvm::sys::SmartScopedWriter<true> Writer(&SymbolsLock);
if (handle == 0)
return;
@@ -113,8 +116,9 @@ DynamicLibrary::~DynamicLibrary() {
}
bool DynamicLibrary::LoadLibraryPermanently(const char *filename,
std::string *ErrMsg) {
std::string *ErrMsg) {
if (filename) {
llvm::sys::SmartScopedWriter<true> Writer(&SymbolsLock);
HMODULE a_handle = LoadLibrary(filename);
if (a_handle == 0)
@@ -166,17 +170,24 @@ bool DynamicLibrary::LoadLibraryPermanently(const char *filename,
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())
SymbolsLock.reader_acquire();
std::map<std::string, void *>::iterator I = symbols.find(symbolName);
std::map<std::string, void *>::iterator E = symbols.end();
SymbolsLock.reader_release();
if (I != E)
return I->second;
// Now search the libraries.
SymbolsLock.writer_acquire();
for (std::vector<HMODULE>::iterator I = OpenedHandles.begin(),
E = OpenedHandles.end(); I != E; ++I) {
FARPROC ptr = GetProcAddress((HMODULE)*I, symbolName);
if (ptr)
if (ptr) {
SymbolsLock.writer_release();
return (void *) ptr;
}
}
SymbolsLock.writer_release();
#if defined(__MINGW32__)
{