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

Better const handling for RuntimeDyld and MCJIT. 

mapSectionAddress() wasn't consistent.

llvm-svn: 163843
This commit is contained in:
Jim Grosbach 2012-09-13 21:50:06 +00:00
parent 0b1a96a876
commit 6d61397c73
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/llvm/ExecutionEngine/ExecutionEngine.h
View File

@ -244,7 +244,7 @@ public:
/// Map the address of a JIT section as returned from the memory manager /// Map the address of a JIT section as returned from the memory manager
/// to the address in the target process as the running code will see it. /// to the address in the target process as the running code will see it.
/// This is the address which will be used for relocation resolution. /// This is the address which will be used for relocation resolution.
virtual void mapSectionAddress(void *LocalAddress, uint64_t TargetAddress) { virtual void mapSectionAddress(const void *LocalAddress, uint64_t TargetAddress) {
llvm_unreachable("Re-mapping of section addresses not supported with this " llvm_unreachable("Re-mapping of section addresses not supported with this "
"EE!"); "EE!");
} }

2
llvm/include/llvm/ExecutionEngine/RuntimeDyld.h
View File

@ -84,7 +84,7 @@ public:
/// Map the address of a JIT section as returned from the memory manager /// Map the address of a JIT section as returned from the memory manager
/// to the address in the target process as the running code will see it. /// to the address in the target process as the running code will see it.
/// This is the address which will be used for relocation resolution. /// This is the address which will be used for relocation resolution.
void mapSectionAddress(void *LocalAddress, uint64_t TargetAddress); void mapSectionAddress(const void *LocalAddress, uint64_t TargetAddress);
StringRef getErrorString(); StringRef getErrorString();
}; };

3
llvm/lib/ExecutionEngine/MCJIT/MCJIT.h
View File

@ -71,7 +71,8 @@ public:
/// Map the address of a JIT section as returned from the memory manager /// Map the address of a JIT section as returned from the memory manager
/// to the address in the target process as the running code will see it. /// to the address in the target process as the running code will see it.
/// This is the address which will be used for relocation resolution. /// This is the address which will be used for relocation resolution.
virtual void mapSectionAddress(void *LocalAddress, uint64_t TargetAddress) { virtual void mapSectionAddress(const void *LocalAddress,
uint64_t TargetAddress) {
Dyld.mapSectionAddress(LocalAddress, TargetAddress); Dyld.mapSectionAddress(LocalAddress, TargetAddress);
} }

4
llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
View File

@ -48,7 +48,7 @@ void RuntimeDyldImpl::resolveRelocations() {
} }
} }
void RuntimeDyldImpl::mapSectionAddress(void *LocalAddress, void RuntimeDyldImpl::mapSectionAddress(const void *LocalAddress,
uint64_t TargetAddress) { uint64_t TargetAddress) {
for (unsigned i = 0, e = Sections.size(); i != e; ++i) { for (unsigned i = 0, e = Sections.size(); i != e; ++i) {
if (Sections[i].Address == LocalAddress) { if (Sections[i].Address == LocalAddress) {
@ -492,7 +492,7 @@ void RuntimeDyld::reassignSectionAddress(unsigned SectionID,
Dyld->reassignSectionAddress(SectionID, Addr); Dyld->reassignSectionAddress(SectionID, Addr);
} }
void RuntimeDyld::mapSectionAddress(void *LocalAddress, void RuntimeDyld::mapSectionAddress(const void *LocalAddress,
uint64_t TargetAddress) { uint64_t TargetAddress) {
Dyld->mapSectionAddress(LocalAddress, TargetAddress); Dyld->mapSectionAddress(LocalAddress, TargetAddress);
} }

2
llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
View File

@ -287,7 +287,7 @@ public:
void reassignSectionAddress(unsigned SectionID, uint64_t Addr); void reassignSectionAddress(unsigned SectionID, uint64_t Addr);
void mapSectionAddress(void *LocalAddress, uint64_t TargetAddress); void mapSectionAddress(const void *LocalAddress, uint64_t TargetAddress);
// Is the linker in an error state? // Is the linker in an error state?
bool hasError() { return HasError; } bool hasError() { return HasError; }