6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-27 14:34:58 +00:00
Code Issues Projects Releases Wiki Activity

[MCJIT] Turn the getSymbolAddress free function created in r218626 into a static

Browse Source 
member of RTDyldMemoryManager (and rename to getSymbolAddressInProcess).

The functionality this provides is very specific to RTDyldMemoryManager, so it
makes sense to keep it in that class to avoid accidental re-use.

No functional change.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218741 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Lang Hames 2014-10-01 04:11:13 +00:00
parent b69f873ee1
commit e2ef4419a8
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/ExecutionEngine/RTDyldMemoryManager.h
View File

@ -24,8 +24,6 @@ namespace llvm {
class ExecutionEngine;
class ObjectImage;
uint64_t getSymbolAddress(const std::string &Name);
// RuntimeDyld clients often want to handle the memory management of
// what gets placed where. For JIT clients, this is the subset of
// JITMemoryManager required for dynamic loading of binaries.
@ -78,10 +76,14 @@ public:
virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size);
/// This method returns the address of the specified function or variable in
/// the current process.
static uint64_t getSymbolAddressInProcess(const std::string &Name);
/// This method returns the address of the specified function or variable.
/// It is used to resolve symbols during module linking.
virtual uint64_t getSymbolAddress(const std::string &Name) {
return llvm::getSymbolAddress(Name);
return getSymbolAddressInProcess(Name);
}
/// This method returns the address of the specified function. As such it is

3
lib/ExecutionEngine/RTDyldMemoryManager.cpp
View File

@ -210,7 +210,8 @@ ARM_MATH_IMPORTS(ARM_MATH_DECL)
#undef ARM_MATH_DECL
#endif
uint64_t getSymbolAddress(const std::string &Name) {
uint64_t
RTDyldMemoryManager::getSymbolAddressInProcess(const std::string &Name) {
// This implementation assumes that the host program is the target.
// Clients generating code for a remote target should implement their own
// memory manager.

9
unittests/ExecutionEngine/ExecutionEngineTest.cpp
View File

@ -140,7 +140,8 @@ TEST_F(ExecutionEngineTest, LookupWithMangledName) {
// Demonstrate that getSymbolAddress accepts mangled names and always strips
// the leading underscore.
EXPECT_EQ(reinterpret_cast<uint64_t>(&x), getSymbolAddress("_x"));
EXPECT_EQ(reinterpret_cast<uint64_t>(&x),
RTDyldMemoryManager::getSymbolAddressInProcess("_x"));
}
TEST_F(ExecutionEngineTest, LookupWithMangledAndDemangledSymbol) {
@ -151,7 +152,8 @@ TEST_F(ExecutionEngineTest, LookupWithMangledAndDemangledSymbol) {
// Lookup the demangled name first, even if there's a demangled symbol that
// matches the input already.
EXPECT_EQ(reinterpret_cast<uint64_t>(&x), getSymbolAddress("_x"));
EXPECT_EQ(reinterpret_cast<uint64_t>(&x),
RTDyldMemoryManager::getSymbolAddressInProcess("_x"));
}
TEST_F(ExecutionEngineTest, LookupwithDemangledName) {
@ -159,7 +161,8 @@ TEST_F(ExecutionEngineTest, LookupwithDemangledName) {
llvm::sys::DynamicLibrary::AddSymbol("_x", &_x);
// But do fallback to looking up a demangled name if there's no ambiguity
EXPECT_EQ(reinterpret_cast<uint64_t>(&_x), getSymbolAddress("_x"));
EXPECT_EQ(reinterpret_cast<uint64_t>(&_x),
RTDyldMemoryManager::getSymbolAddressInProcess("_x"));
}
}