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

*Adjust prototypes for public interface. *Rewrite LinkInArchive to use symbol tables.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17772 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2004-11-14 22:02:27 +00:00
parent a70d84d40a
commit 8bbb17abe6
1 changed files with 38 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
lib/Linker/LinkArchives.cpp
View File

@ -12,10 +12,12 @@
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "gccld.h" #include "llvm/Linker.h"
#include "llvm/Module.h" #include "llvm/Module.h"
#include "llvm/ModuleProvider.h"
#include "llvm/PassManager.h" #include "llvm/PassManager.h"
#include "llvm/Bytecode/Reader.h" #include "llvm/Bytecode/Reader.h"
#include "llvm/Bytecode/Archive.h"
#include "llvm/Bytecode/WriteBytecodePass.h" #include "llvm/Bytecode/WriteBytecodePass.h"
#include "llvm/Target/TargetData.h" #include "llvm/Target/TargetData.h"
#include "llvm/Transforms/IPO.h" #include "llvm/Transforms/IPO.h"
@ -136,7 +138,7 @@ llvm::GetAllUndefinedSymbols(Module *M,
/// module it contains (wrapped in an auto_ptr), or 0 and set ErrorMessage if an /// module it contains (wrapped in an auto_ptr), or 0 and set ErrorMessage if an
/// error occurs. /// error occurs.
/// ///
std::auto_ptr<Module> llvm::LoadObject(const std::string &FN, static std::auto_ptr<Module> LoadObject(const std::string &FN,
std::string &ErrorMessage) { std::string &ErrorMessage) {
std::string ParserErrorMessage; std::string ParserErrorMessage;
Module *Result = ParseBytecodeFile(FN, &ParserErrorMessage); Module *Result = ParseBytecodeFile(FN, &ParserErrorMessage);
@ -161,9 +163,9 @@ std::auto_ptr<Module> llvm::LoadObject(const std::string &FN,
/// TRUE - An error occurred. /// TRUE - An error occurred.
/// FALSE - No errors. /// FALSE - No errors.
/// ///
static bool LinkInArchive(Module *M, bool llvm::LinkInArchive(Module *M,
const std::string &Filename, const std::string &Filename,
std::string &ErrorMessage, std::string* ErrorMessage,
bool Verbose) bool Verbose)
{ {
// Find all of the symbols currently undefined in the bytecode program. // Find all of the symbols currently undefined in the bytecode program.
@ -176,71 +178,45 @@ static bool LinkInArchive(Module *M,
return false; // No need to link anything in! return false; // No need to link anything in!
} }
// Load in the archive objects. // Open the archive file
if (Verbose) std::cerr << " Loading archive file '" << Filename << "'\n"; if (Verbose) std::cerr << " Loading archive file '" << Filename << "'\n";
std::vector<Module*> Objects; Archive* arch = Archive::OpenAndLoadSymbols(sys::Path(Filename));
if (ReadArchiveFile(Filename, Objects, &ErrorMessage))
return true;
// Figure out which symbols are defined by all of the modules in the archive.
std::vector<std::set<std::string> > DefinedSymbols;
DefinedSymbols.resize(Objects.size());
for (unsigned i = 0; i != Objects.size(); ++i) {
GetAllDefinedSymbols(Objects[i], DefinedSymbols[i]);
}
// While we are linking in object files, loop. // While we are linking in object files, loop.
bool Linked = true; while (true) {
while (Linked) { std::set<ModuleProvider*> Modules;
Linked = false; // Find the modules we need to link
arch->findModulesDefiningSymbols(UndefinedSymbols,Modules);
for (unsigned i = 0; i != Objects.size(); ++i) { // If we didn't find any more modules to link this time, we are done.
// Consider whether we need to link in this module... we only need to if (Modules.empty())
// link it in if it defines some symbol which is so far undefined. break;
//
const std::set<std::string> &DefSymbols = DefinedSymbols[i];
bool ObjectRequired = false; // Loop over all the ModuleProviders that we got back from the archive
for (std::set<ModuleProvider*>::iterator I=Modules.begin(), E=Modules.end();
I != E; ++I) {
// Get the module we must link in.
Module* aModule = (*I)->releaseModule();
std::cout << "Linked: " << aModule->getModuleIdentifier() << "\n";
// // Link it in
// If the object defines main() and the program currently has main() if (LinkModules(M, aModule, ErrorMessage)) {
// undefined, then automatically link in the module. Otherwise, look to // don't create a memory leak
// see if it defines a symbol that is currently undefined. delete aModule;
// delete arch;
if ((M->getMainFunction() == NULL) && return true; // Couldn't link in the right object file...
((DefSymbols.find ("main")) != DefSymbols.end())) {
ObjectRequired = true;
} else {
for (std::set<std::string>::iterator I = UndefinedSymbols.begin(),
E = UndefinedSymbols.end(); I != E; ++I)
if (DefSymbols.count(*I)) {
if (Verbose)
std::cerr << " Found object '"
<< Objects[i]->getModuleIdentifier ()
<< "' providing symbol '" << *I << "'...\n";
ObjectRequired = true;
break;
}
} }
// We DO need to link this object into the program...
if (ObjectRequired) {
if (LinkModules(M, Objects[i], &ErrorMessage))
return true; // Couldn't link in the right object file...
// Since we have linked in this object, delete it from the list of // Since we have linked in this object, throw it away now.
// objects to consider in this archive file. delete aModule;
std::swap(Objects[i], Objects.back());
std::swap(DefinedSymbols[i], DefinedSymbols.back());
Objects.pop_back();
DefinedSymbols.pop_back();
--i; // Do not skip an entry
// The undefined symbols set should have shrunk.
GetAllUndefinedSymbols(M, UndefinedSymbols);
Linked = true; // We have linked something in!
}
} }
// We have linked in a set of modules determined by the archive to satisfy
// our missing symbols. Linking in the new modules will have satisfied some
// symbols but may introduce additional missing symbols. We need to update
// the list of undefined symbols and try again until the archive doesn't
// have any modules that satisfy our symbols.
GetAllUndefinedSymbols(M, UndefinedSymbols);
} }
return false; return false;
@ -331,7 +307,7 @@ bool llvm::LinkFiles(const char *progname, Module *HeadModule,
if (Verbose) if (Verbose)
std::cerr << "Trying to link archive '" << Pathname << "'\n"; std::cerr << "Trying to link archive '" << Pathname << "'\n";
if (LinkInArchive(HeadModule, Pathname, ErrorMessage, Verbose)) { if (LinkInArchive(HeadModule, Pathname, &ErrorMessage, Verbose)) {
std::cerr << progname << ": Error linking in archive '" << Pathname std::cerr << progname << ": Error linking in archive '" << Pathname
<< "': " << ErrorMessage << "\n"; << "': " << ErrorMessage << "\n";
return true; return true;
@ -400,7 +376,7 @@ void llvm::LinkLibraries(const char *progname, Module *HeadModule,
std::cerr << "Trying to link archive '" << Pathname << "' (-l" std::cerr << "Trying to link archive '" << Pathname << "' (-l"
<< Libraries[i] << ")\n"; << Libraries[i] << ")\n";
if (LinkInArchive(HeadModule, Pathname, ErrorMessage, Verbose)) { if (LinkInArchive(HeadModule, Pathname, &ErrorMessage, Verbose)) {
std::cerr << progname << ": " << ErrorMessage std::cerr << progname << ": " << ErrorMessage
<< ": Error linking in archive '" << Pathname << "' (-l" << ": Error linking in archive '" << Pathname << "' (-l"
<< Libraries[i] << ")\n"; << Libraries[i] << ")\n";