6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-15 04:30:12 +00:00
Code Issues Projects Releases Wiki Activity

* Make sure the string table gets read even if there isn't a foreign

Browse Source 
symbol table.
* Make sure we update the file pointer for each member when rebuilding the
  symbol table.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17812 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2004-11-15 01:40:20 +00:00
parent 766b793143
commit b323113b93
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Archive/ArchiveReader.cpp
View File

@ -309,18 +309,25 @@ Archive::loadSymbolTable() {
if (mbr->isForeignSymbolTable()) { if (mbr->isForeignSymbolTable()) {
// Skip the foreign symbol table, we don't do anything with it // Skip the foreign symbol table, we don't do anything with it
At += mbr->getSize(); At += mbr->getSize();
if (mbr->getSize() % 2 != 0)
At++;
delete mbr; delete mbr;
// See if there's a string table too // Read the next one
FirstFile = At;
mbr = parseMemberHeader(At,End);
if (mbr->isStringTable()) {
strtab.assign((const char*)mbr->getData(),mbr->getSize());
At += mbr->getSize();
delete mbr;
FirstFile = At; FirstFile = At;
mbr = parseMemberHeader(At,End); mbr = parseMemberHeader(At,End);
} }
if (mbr->isStringTable()) {
// Process the string table entry
strtab.assign((const char*)mbr->getData(),mbr->getSize());
At += mbr->getSize();
if (mbr->getSize() % 2 != 0)
At++;
delete mbr;
// Get the next one
FirstFile = At;
mbr = parseMemberHeader(At,End);
} }
// See if its the symbol table // See if its the symbol table
@ -432,6 +439,11 @@ Archive::findModulesDefiningSymbols(const std::set<std::string>& symbols,
mbr->getPath().get(); mbr->getPath().get();
} }
} }
// Go to the next file location
At += mbr->getSize();
if (mbr->getSize() % 2 != 0)
At++;
} }
} }

26
lib/Bytecode/Archive/ArchiveReader.cpp
View File

@ -309,18 +309,25 @@ Archive::loadSymbolTable() {
if (mbr->isForeignSymbolTable()) { if (mbr->isForeignSymbolTable()) {
// Skip the foreign symbol table, we don't do anything with it // Skip the foreign symbol table, we don't do anything with it
At += mbr->getSize(); At += mbr->getSize();
if (mbr->getSize() % 2 != 0)
At++;
delete mbr; delete mbr;
// See if there's a string table too // Read the next one
FirstFile = At;
mbr = parseMemberHeader(At,End);
if (mbr->isStringTable()) {
strtab.assign((const char*)mbr->getData(),mbr->getSize());
At += mbr->getSize();
delete mbr;
FirstFile = At; FirstFile = At;
mbr = parseMemberHeader(At,End); mbr = parseMemberHeader(At,End);
} }
if (mbr->isStringTable()) {
// Process the string table entry
strtab.assign((const char*)mbr->getData(),mbr->getSize());
At += mbr->getSize();
if (mbr->getSize() % 2 != 0)
At++;
delete mbr;
// Get the next one
FirstFile = At;
mbr = parseMemberHeader(At,End);
} }
// See if its the symbol table // See if its the symbol table
@ -432,6 +439,11 @@ Archive::findModulesDefiningSymbols(const std::set<std::string>& symbols,
mbr->getPath().get(); mbr->getPath().get();
} }
} }
// Go to the next file location
At += mbr->getSize();
if (mbr->getSize() % 2 != 0)
At++;
} }
} }