mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-23 02:29:18 +00:00
Changes necessary to enable linking of archives without LLVM symbol tables.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17811 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
6238a85e4f
commit
766b793143
@ -77,11 +77,14 @@ bool GetBytecodeSymbols(const sys::Path& fileName,
|
||||
/// bytecode module defines. This is used for archiving and linking when only
|
||||
/// the list of symbols the module defines is needed and the bytecode is
|
||||
/// already in memory.
|
||||
/// @returns true on success, false if the bytecode can't be parsed
|
||||
/// @returns the ModuleProvider on success, 0 if the bytecode can't be parsed
|
||||
/// @brief Get a bytecode file's externally visibile defined global symbols.
|
||||
bool llvm::GetBytecodeSymbols(const unsigned char*Buffer, unsigned Length,
|
||||
const std::string& ModuleID,
|
||||
std::vector<std::string>& symbols);
|
||||
ModuleProvider* llvm::GetBytecodeSymbols(
|
||||
const unsigned char*Buffer, ///< The buffer to be parsed
|
||||
unsigned Length, ///< The length of \p Buffer
|
||||
const std::string& ModuleID, ///< An identifier for the module
|
||||
std::vector<std::string>& symbols ///< The symbols defined in the module
|
||||
);
|
||||
|
||||
} // End llvm namespace
|
||||
|
||||
|
@ -391,13 +391,58 @@ Archive::findModuleDefiningSymbol(const std::string& symbol) {
|
||||
// ModuleProviders that define those symbols.
|
||||
void
|
||||
Archive::findModulesDefiningSymbols(const std::set<std::string>& symbols,
|
||||
std::set<ModuleProvider*>& modules)
|
||||
std::set<ModuleProvider*>& result)
|
||||
{
|
||||
assert(mapfile && base && "Can't findModulesDefiningSymbols on new archive");
|
||||
if (symTab.empty()) {
|
||||
// We don't have a symbol table, so we must build it now but lets also
|
||||
// make sure that we populate the modules table as we do this to ensure
|
||||
// that we don't load them twice when findModuleDefiningSymbol is called
|
||||
// below.
|
||||
|
||||
// Get a pointer to the first file
|
||||
const char* At = ((const char*)base) + firstFileOffset;
|
||||
const char* End = ((const char*)base) + mapfile->size();
|
||||
|
||||
while ( At < End) {
|
||||
// Compute the offset to be put in the symbol table
|
||||
unsigned offset = At - base - firstFileOffset;
|
||||
|
||||
// Parse the file's header
|
||||
ArchiveMember* mbr = parseMemberHeader(At, End);
|
||||
|
||||
// If it contains symbols
|
||||
if (mbr->isBytecode() || mbr->isCompressedBytecode()) {
|
||||
// Get the symbols
|
||||
std::vector<std::string> symbols;
|
||||
ModuleProvider* MP = GetBytecodeSymbols((const unsigned char*)At,
|
||||
mbr->getSize(), mbr->getPath().get(),symbols);
|
||||
|
||||
if (MP) {
|
||||
// Insert the module's symbols into the symbol table
|
||||
for (std::vector<std::string>::iterator I = symbols.begin(),
|
||||
E=symbols.end(); I != E; ++I ) {
|
||||
symTab.insert(std::make_pair(*I,offset));
|
||||
}
|
||||
// Insert the ModuleProvider and the ArchiveMember into the table of
|
||||
// modules.
|
||||
modules.insert(std::make_pair(offset,std::make_pair(MP,mbr)));
|
||||
} else {
|
||||
throw std::string("Can't parse bytecode member: ") +
|
||||
mbr->getPath().get();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// At this point we have a valid symbol table (one way or another) so we
|
||||
// just use it to quickly find the symbols requested.
|
||||
|
||||
for (std::set<std::string>::const_iterator I=symbols.begin(),
|
||||
E=symbols.end(); I != E; ++I) {
|
||||
ModuleProvider* mp = findModuleDefiningSymbol(*I);
|
||||
if (mp) {
|
||||
modules.insert(mp);
|
||||
result.insert(mp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -197,8 +197,11 @@ Archive::writeMember(
|
||||
if (CreateSymbolTable &&
|
||||
(member.isBytecode() || member.isCompressedBytecode())) {
|
||||
std::vector<std::string> symbols;
|
||||
GetBytecodeSymbols((const unsigned char*)data,fSize,member.getPath().get(),
|
||||
symbols);
|
||||
ModuleProvider* MP = GetBytecodeSymbols(
|
||||
(const unsigned char*)data,fSize,member.getPath().get(), symbols);
|
||||
|
||||
// If the bytecode parsed successfully
|
||||
if ( MP ) {
|
||||
for (std::vector<std::string>::iterator SI = symbols.begin(),
|
||||
SE = symbols.end(); SI != SE; ++SI) {
|
||||
|
||||
@ -211,6 +214,12 @@ Archive::writeMember(
|
||||
numVbrBytes(filepos);
|
||||
}
|
||||
}
|
||||
// We don't need this module any more.
|
||||
delete MP;
|
||||
} else {
|
||||
throw std::string("Can't parse bytecode member: ") +
|
||||
member.getPath().get();
|
||||
}
|
||||
}
|
||||
|
||||
// Determine if we actually should compress this member
|
||||
|
@ -391,13 +391,58 @@ Archive::findModuleDefiningSymbol(const std::string& symbol) {
|
||||
// ModuleProviders that define those symbols.
|
||||
void
|
||||
Archive::findModulesDefiningSymbols(const std::set<std::string>& symbols,
|
||||
std::set<ModuleProvider*>& modules)
|
||||
std::set<ModuleProvider*>& result)
|
||||
{
|
||||
assert(mapfile && base && "Can't findModulesDefiningSymbols on new archive");
|
||||
if (symTab.empty()) {
|
||||
// We don't have a symbol table, so we must build it now but lets also
|
||||
// make sure that we populate the modules table as we do this to ensure
|
||||
// that we don't load them twice when findModuleDefiningSymbol is called
|
||||
// below.
|
||||
|
||||
// Get a pointer to the first file
|
||||
const char* At = ((const char*)base) + firstFileOffset;
|
||||
const char* End = ((const char*)base) + mapfile->size();
|
||||
|
||||
while ( At < End) {
|
||||
// Compute the offset to be put in the symbol table
|
||||
unsigned offset = At - base - firstFileOffset;
|
||||
|
||||
// Parse the file's header
|
||||
ArchiveMember* mbr = parseMemberHeader(At, End);
|
||||
|
||||
// If it contains symbols
|
||||
if (mbr->isBytecode() || mbr->isCompressedBytecode()) {
|
||||
// Get the symbols
|
||||
std::vector<std::string> symbols;
|
||||
ModuleProvider* MP = GetBytecodeSymbols((const unsigned char*)At,
|
||||
mbr->getSize(), mbr->getPath().get(),symbols);
|
||||
|
||||
if (MP) {
|
||||
// Insert the module's symbols into the symbol table
|
||||
for (std::vector<std::string>::iterator I = symbols.begin(),
|
||||
E=symbols.end(); I != E; ++I ) {
|
||||
symTab.insert(std::make_pair(*I,offset));
|
||||
}
|
||||
// Insert the ModuleProvider and the ArchiveMember into the table of
|
||||
// modules.
|
||||
modules.insert(std::make_pair(offset,std::make_pair(MP,mbr)));
|
||||
} else {
|
||||
throw std::string("Can't parse bytecode member: ") +
|
||||
mbr->getPath().get();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// At this point we have a valid symbol table (one way or another) so we
|
||||
// just use it to quickly find the symbols requested.
|
||||
|
||||
for (std::set<std::string>::const_iterator I=symbols.begin(),
|
||||
E=symbols.end(); I != E; ++I) {
|
||||
ModuleProvider* mp = findModuleDefiningSymbol(*I);
|
||||
if (mp) {
|
||||
modules.insert(mp);
|
||||
result.insert(mp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -197,8 +197,11 @@ Archive::writeMember(
|
||||
if (CreateSymbolTable &&
|
||||
(member.isBytecode() || member.isCompressedBytecode())) {
|
||||
std::vector<std::string> symbols;
|
||||
GetBytecodeSymbols((const unsigned char*)data,fSize,member.getPath().get(),
|
||||
symbols);
|
||||
ModuleProvider* MP = GetBytecodeSymbols(
|
||||
(const unsigned char*)data,fSize,member.getPath().get(), symbols);
|
||||
|
||||
// If the bytecode parsed successfully
|
||||
if ( MP ) {
|
||||
for (std::vector<std::string>::iterator SI = symbols.begin(),
|
||||
SE = symbols.end(); SI != SE; ++SI) {
|
||||
|
||||
@ -211,6 +214,12 @@ Archive::writeMember(
|
||||
numVbrBytes(filepos);
|
||||
}
|
||||
}
|
||||
// We don't need this module any more.
|
||||
delete MP;
|
||||
} else {
|
||||
throw std::string("Can't parse bytecode member: ") +
|
||||
member.getPath().get();
|
||||
}
|
||||
}
|
||||
|
||||
// Determine if we actually should compress this member
|
||||
|
@ -391,26 +391,27 @@ bool llvm::GetBytecodeSymbols(const sys::Path& fName,
|
||||
}
|
||||
}
|
||||
|
||||
bool llvm::GetBytecodeSymbols(const unsigned char*Buffer, unsigned Length,
|
||||
ModuleProvider*
|
||||
llvm::GetBytecodeSymbols(const unsigned char*Buffer, unsigned Length,
|
||||
const std::string& ModuleID,
|
||||
std::vector<std::string>& symbols) {
|
||||
|
||||
try {
|
||||
std::auto_ptr<ModuleProvider>
|
||||
AMP(getBytecodeBufferModuleProvider(Buffer, Length, ModuleID));
|
||||
ModuleProvider* MP =
|
||||
getBytecodeBufferModuleProvider(Buffer, Length, ModuleID);
|
||||
|
||||
// Get the module from the provider
|
||||
Module* M = AMP->releaseModule();
|
||||
Module* M = MP->materializeModule();
|
||||
|
||||
// Get the symbols
|
||||
getSymbols(M, symbols);
|
||||
|
||||
// Done with the module
|
||||
delete M;
|
||||
return true;
|
||||
return MP;
|
||||
|
||||
} catch (...) {
|
||||
return false;
|
||||
// Fall through
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
// vim: sw=2 ai
|
||||
|
Loading…
Reference in New Issue
Block a user