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

Tersified code:

Browse Source 
* Removed space between function name and its argument list
* Removed space between '&' and variable name
* Removed empty comment lines: `//'


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8750 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Misha Brukman 2003-09-29 22:26:24 +00:00
parent a61b19b80a
commit e676313966
2 changed files with 66 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
lib/Linker/LinkArchives.cpp
View File

@ -69,7 +69,7 @@ static inline bool FileExists(const std::string &FN) {
// TRUE - The file is an archive. // TRUE - The file is an archive.
// FALSE - The file is not an archive. // FALSE - The file is not an archive.
// //
static inline bool IsArchive (const std::string &filename) static inline bool IsArchive(const std::string &filename)
{ {
std::string ArchiveMagic("!<arch>\012"); std::string ArchiveMagic("!<arch>\012");
char buf[1 + ArchiveMagic.size()]; char buf[1 + ArchiveMagic.size()];
@ -98,10 +98,10 @@ static inline bool IsArchive (const std::string &filename)
// If the file is not found, an empty string is returned. // If the file is not found, an empty string is returned.
// //
static std::string static std::string
FindLib (const std::string & Filename, const std::vector<std::string> & Paths) FindLib(const std::string &Filename, const std::vector<std::string> &Paths)
{ {
// Determine if the pathname can be found as it stands. // Determine if the pathname can be found as it stands.
if (FileExists (Filename)) if (FileExists(Filename))
return Filename; return Filename;
// If that doesn't work, convert the name into a library name. // If that doesn't work, convert the name into a library name.
@ -112,13 +112,13 @@ FindLib (const std::string & Filename, const std::vector<std::string> & Paths)
for (unsigned Index = 0; Index != Paths.size(); ++Index) { for (unsigned Index = 0; Index != Paths.size(); ++Index) {
std::string Directory = Paths[Index] + "/"; std::string Directory = Paths[Index] + "/";
if (FileExists (Directory + LibName + ".bc")) if (FileExists(Directory + LibName + ".bc"))
return Directory + LibName + ".bc"; return Directory + LibName + ".bc";
if (FileExists (Directory + LibName + ".so")) if (FileExists(Directory + LibName + ".so"))
return Directory + LibName + ".so"; return Directory + LibName + ".so";
if (FileExists (Directory + LibName + ".a")) if (FileExists(Directory + LibName + ".a"))
return Directory + LibName + ".a"; return Directory + LibName + ".a";
} }
@ -128,7 +128,7 @@ FindLib (const std::string & Filename, const std::vector<std::string> & Paths)
return std::string(); return std::string();
LibName = std::string(SearchPath) + "/" + LibName; LibName = std::string(SearchPath) + "/" + LibName;
if (FileExists (LibName)) if (FileExists(LibName))
return LibName; return LibName;
return std::string(); return std::string();
@ -151,7 +151,7 @@ FindLib (const std::string & Filename, const std::vector<std::string> & Paths)
// None. // None.
// //
void void
GetAllDefinedSymbols (Module *M, std::set<std::string> &DefinedSymbols) GetAllDefinedSymbols(Module *M, std::set<std::string> &DefinedSymbols)
{ {
for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I) for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
if (I->hasName() && !I->isExternal() && !I->hasInternalLinkage()) if (I->hasName() && !I->isExternal() && !I->hasInternalLinkage())
@ -228,7 +228,7 @@ GetAllUndefinedSymbols(Module *M, std::set<std::string> &UndefinedSymbols)
// If an error occurs, the pointer is 0. // If an error occurs, the pointer is 0.
// //
std::auto_ptr<Module> std::auto_ptr<Module>
LoadObject (const std::string & FN, std::string &OutErrorMessage) { LoadObject(const std::string & FN, std::string &OutErrorMessage) {
std::string ErrorMessage; std::string ErrorMessage;
Module *Result = ParseBytecodeFile(FN, &ErrorMessage); Module *Result = ParseBytecodeFile(FN, &ErrorMessage);
if (Result) return std::auto_ptr<Module>(Result); if (Result) return std::auto_ptr<Module>(Result);
@ -256,11 +256,10 @@ LoadObject (const std::string & FN, std::string &OutErrorMessage) {
// TRUE - An error occurred. // TRUE - An error occurred.
// FALSE - No errors. // FALSE - No errors.
// //
static bool static bool LinkInArchive(Module *M,
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.
@ -268,7 +267,7 @@ LinkInArchive (Module *M,
// no reason to link in any archive files. // no reason to link in any archive files.
// //
std::set<std::string> UndefinedSymbols; std::set<std::string> UndefinedSymbols;
GetAllUndefinedSymbols (M, UndefinedSymbols); GetAllUndefinedSymbols(M, UndefinedSymbols);
if (UndefinedSymbols.empty()) { if (UndefinedSymbols.empty()) {
if (Verbose) std::cerr << " No symbols undefined, don't link library!\n"; if (Verbose) std::cerr << " No symbols undefined, don't link library!\n";
return false; // No need to link anything in! return false; // No need to link anything in!
@ -279,14 +278,14 @@ LinkInArchive (Module *M,
// //
if (Verbose) std::cerr << " Loading '" << Filename << "'\n"; if (Verbose) std::cerr << " Loading '" << Filename << "'\n";
std::vector<Module*> Objects; std::vector<Module*> Objects;
if (ReadArchiveFile (Filename, Objects, &ErrorMessage)) if (ReadArchiveFile(Filename, Objects, &ErrorMessage))
return true; return true;
// //
// Figure out which symbols are defined by all of the modules in the archive. // Figure out which symbols are defined by all of the modules in the archive.
// //
std::vector<std::set<std::string> > DefinedSymbols; std::vector<std::set<std::string> > DefinedSymbols;
DefinedSymbols.resize (Objects.size()); DefinedSymbols.resize(Objects.size());
for (unsigned i = 0; i != Objects.size(); ++i) { for (unsigned i = 0; i != Objects.size(); ++i) {
GetAllDefinedSymbols(Objects[i], DefinedSymbols[i]); GetAllDefinedSymbols(Objects[i], DefinedSymbols[i]);
} }
@ -354,16 +353,15 @@ LinkInArchive (Module *M,
// TRUE - An error occurred. // TRUE - An error occurred.
// FALSE - No errors. // FALSE - No errors.
// //
static bool static bool LinkInFile(Module *HeadModule,
LinkInFile (Module *HeadModule, const std::string &Filename,
const std::string &Filename, std::string &ErrorMessage,
std::string &ErrorMessage, bool Verbose)
bool Verbose)
{ {
std::auto_ptr<Module> M(LoadObject(Filename, ErrorMessage)); std::auto_ptr<Module> M(LoadObject(Filename, ErrorMessage));
if (M.get() == 0) return true; if (M.get() == 0) return true;
if (Verbose) std::cerr << "Linking in '" << Filename << "'\n"; if (Verbose) std::cerr << "Linking in '" << Filename << "'\n";
return (LinkModules (HeadModule, M.get(), &ErrorMessage)); return LinkModules(HeadModule, M.get(), &ErrorMessage);
} }
// //
@ -407,7 +405,7 @@ bool LinkFiles(const char *progname,
for (unsigned i = 1; i < Files.size(); ++i) { for (unsigned i = 1; i < Files.size(); ++i) {
// Determine where this file lives. // Determine where this file lives.
if (FileExists (Files[i])) { if (FileExists(Files[i])) {
Pathname = Files[i]; Pathname = Files[i];
} else { } else {
if (SearchPath == NULL) { if (SearchPath == NULL) {
@ -416,32 +414,30 @@ bool LinkFiles(const char *progname,
} }
Pathname = std::string(SearchPath)+"/"+Files[i]; Pathname = std::string(SearchPath)+"/"+Files[i];
if (!FileExists (Pathname)) { if (!FileExists(Pathname)) {
std::cerr << "Cannot find " << Files[i]; std::cerr << "Cannot find " << Files[i];
return true; return true;
} }
} }
//
// A user may specify an ar archive without -l, perhaps because it // A user may specify an ar archive without -l, perhaps because it
// is not installed as a library. Detect that and link the library. // is not installed as a library. Detect that and link the library.
//
if (IsArchive(Pathname)) { if (IsArchive(Pathname)) {
if (Verbose) if (Verbose)
std::cerr << "Linking archive '" << Files[i] << "'\n"; std::cerr << "Linking archive '" << Files[i] << "'\n";
if (LinkInArchive (HeadModule, Pathname, ErrorMessage, Verbose)) { if (LinkInArchive(HeadModule, Pathname, ErrorMessage, Verbose)) {
PrintAndReturn(progname, ErrorMessage, PrintAndReturn(progname, ErrorMessage,
": Error linking in '" + Files[i] + "'"); ": Error linking in '" + Files[i] + "'");
return true; return true;
} }
} else { } else {
if (Verbose) if (Verbose)
std::cerr << "Linking file '" << Files[i] << "'\n"; std::cerr << "Linking file '" << Files[i] << "'\n";
if (LinkInFile (HeadModule, Pathname, ErrorMessage, Verbose)) { if (LinkInFile(HeadModule, Pathname, ErrorMessage, Verbose)) {
PrintAndReturn(progname, ErrorMessage, PrintAndReturn(progname, ErrorMessage,
": error linking in '" + Files[i] + "'"); ": error linking in '" + Files[i] + "'");
return true; return true;
} }
} }
@ -472,12 +468,12 @@ bool LinkFiles(const char *progname,
// FALSE - No error. // FALSE - No error.
// TRUE - Error. // TRUE - Error.
// //
bool LinkLibraries (const char *progname, bool LinkLibraries(const char *progname,
Module *HeadModule, Module *HeadModule,
const std::vector<std::string> &Libraries, const std::vector<std::string> &Libraries,
const std::vector<std::string> &LibPaths, const std::vector<std::string> &LibPaths,
bool Verbose, bool Verbose,
bool Native) bool Native)
{ {
// String in which to receive error messages. // String in which to receive error messages.
std::string ErrorMessage; std::string ErrorMessage;
@ -495,10 +491,8 @@ bool LinkLibraries (const char *progname,
} }
} }
//
// A user may specify an ar archive without -l, perhaps because it // A user may specify an ar archive without -l, perhaps because it
// is not installed as a library. Detect that and link the library. // is not installed as a library. Detect that and link the library.
//
if (IsArchive(Pathname)) { if (IsArchive(Pathname)) {
if (Verbose) if (Verbose)
std::cerr << "Linking archive '" << Libraries[i] << "'\n"; std::cerr << "Linking archive '" << Libraries[i] << "'\n";

72
tools/gccld/Linker.cpp
View File

@ -69,7 +69,7 @@ static inline bool FileExists(const std::string &FN) {
// TRUE - The file is an archive. // TRUE - The file is an archive.
// FALSE - The file is not an archive. // FALSE - The file is not an archive.
// //
static inline bool IsArchive (const std::string &filename) static inline bool IsArchive(const std::string &filename)
{ {
std::string ArchiveMagic("!<arch>\012"); std::string ArchiveMagic("!<arch>\012");
char buf[1 + ArchiveMagic.size()]; char buf[1 + ArchiveMagic.size()];
@ -98,10 +98,10 @@ static inline bool IsArchive (const std::string &filename)
// If the file is not found, an empty string is returned. // If the file is not found, an empty string is returned.
// //
static std::string static std::string
FindLib (const std::string & Filename, const std::vector<std::string> & Paths) FindLib(const std::string &Filename, const std::vector<std::string> &Paths)
{ {
// Determine if the pathname can be found as it stands. // Determine if the pathname can be found as it stands.
if (FileExists (Filename)) if (FileExists(Filename))
return Filename; return Filename;
// If that doesn't work, convert the name into a library name. // If that doesn't work, convert the name into a library name.
@ -112,13 +112,13 @@ FindLib (const std::string & Filename, const std::vector<std::string> & Paths)
for (unsigned Index = 0; Index != Paths.size(); ++Index) { for (unsigned Index = 0; Index != Paths.size(); ++Index) {
std::string Directory = Paths[Index] + "/"; std::string Directory = Paths[Index] + "/";
if (FileExists (Directory + LibName + ".bc")) if (FileExists(Directory + LibName + ".bc"))
return Directory + LibName + ".bc"; return Directory + LibName + ".bc";
if (FileExists (Directory + LibName + ".so")) if (FileExists(Directory + LibName + ".so"))
return Directory + LibName + ".so"; return Directory + LibName + ".so";
if (FileExists (Directory + LibName + ".a")) if (FileExists(Directory + LibName + ".a"))
return Directory + LibName + ".a"; return Directory + LibName + ".a";
} }
@ -128,7 +128,7 @@ FindLib (const std::string & Filename, const std::vector<std::string> & Paths)
return std::string(); return std::string();
LibName = std::string(SearchPath) + "/" + LibName; LibName = std::string(SearchPath) + "/" + LibName;
if (FileExists (LibName)) if (FileExists(LibName))
return LibName; return LibName;
return std::string(); return std::string();
@ -151,7 +151,7 @@ FindLib (const std::string & Filename, const std::vector<std::string> & Paths)
// None. // None.
// //
void void
GetAllDefinedSymbols (Module *M, std::set<std::string> &DefinedSymbols) GetAllDefinedSymbols(Module *M, std::set<std::string> &DefinedSymbols)
{ {
for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I) for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
if (I->hasName() && !I->isExternal() && !I->hasInternalLinkage()) if (I->hasName() && !I->isExternal() && !I->hasInternalLinkage())
@ -228,7 +228,7 @@ GetAllUndefinedSymbols(Module *M, std::set<std::string> &UndefinedSymbols)
// If an error occurs, the pointer is 0. // If an error occurs, the pointer is 0.
// //
std::auto_ptr<Module> std::auto_ptr<Module>
LoadObject (const std::string & FN, std::string &OutErrorMessage) { LoadObject(const std::string & FN, std::string &OutErrorMessage) {
std::string ErrorMessage; std::string ErrorMessage;
Module *Result = ParseBytecodeFile(FN, &ErrorMessage); Module *Result = ParseBytecodeFile(FN, &ErrorMessage);
if (Result) return std::auto_ptr<Module>(Result); if (Result) return std::auto_ptr<Module>(Result);
@ -256,11 +256,10 @@ LoadObject (const std::string & FN, std::string &OutErrorMessage) {
// TRUE - An error occurred. // TRUE - An error occurred.
// FALSE - No errors. // FALSE - No errors.
// //
static bool static bool LinkInArchive(Module *M,
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.
@ -268,7 +267,7 @@ LinkInArchive (Module *M,
// no reason to link in any archive files. // no reason to link in any archive files.
// //
std::set<std::string> UndefinedSymbols; std::set<std::string> UndefinedSymbols;
GetAllUndefinedSymbols (M, UndefinedSymbols); GetAllUndefinedSymbols(M, UndefinedSymbols);
if (UndefinedSymbols.empty()) { if (UndefinedSymbols.empty()) {
if (Verbose) std::cerr << " No symbols undefined, don't link library!\n"; if (Verbose) std::cerr << " No symbols undefined, don't link library!\n";
return false; // No need to link anything in! return false; // No need to link anything in!
@ -279,14 +278,14 @@ LinkInArchive (Module *M,
// //
if (Verbose) std::cerr << " Loading '" << Filename << "'\n"; if (Verbose) std::cerr << " Loading '" << Filename << "'\n";
std::vector<Module*> Objects; std::vector<Module*> Objects;
if (ReadArchiveFile (Filename, Objects, &ErrorMessage)) if (ReadArchiveFile(Filename, Objects, &ErrorMessage))
return true; return true;
// //
// Figure out which symbols are defined by all of the modules in the archive. // Figure out which symbols are defined by all of the modules in the archive.
// //
std::vector<std::set<std::string> > DefinedSymbols; std::vector<std::set<std::string> > DefinedSymbols;
DefinedSymbols.resize (Objects.size()); DefinedSymbols.resize(Objects.size());
for (unsigned i = 0; i != Objects.size(); ++i) { for (unsigned i = 0; i != Objects.size(); ++i) {
GetAllDefinedSymbols(Objects[i], DefinedSymbols[i]); GetAllDefinedSymbols(Objects[i], DefinedSymbols[i]);
} }
@ -354,16 +353,15 @@ LinkInArchive (Module *M,
// TRUE - An error occurred. // TRUE - An error occurred.
// FALSE - No errors. // FALSE - No errors.
// //
static bool static bool LinkInFile(Module *HeadModule,
LinkInFile (Module *HeadModule, const std::string &Filename,
const std::string &Filename, std::string &ErrorMessage,
std::string &ErrorMessage, bool Verbose)
bool Verbose)
{ {
std::auto_ptr<Module> M(LoadObject(Filename, ErrorMessage)); std::auto_ptr<Module> M(LoadObject(Filename, ErrorMessage));
if (M.get() == 0) return true; if (M.get() == 0) return true;
if (Verbose) std::cerr << "Linking in '" << Filename << "'\n"; if (Verbose) std::cerr << "Linking in '" << Filename << "'\n";
return (LinkModules (HeadModule, M.get(), &ErrorMessage)); return LinkModules(HeadModule, M.get(), &ErrorMessage);
} }
// //
@ -407,7 +405,7 @@ bool LinkFiles(const char *progname,
for (unsigned i = 1; i < Files.size(); ++i) { for (unsigned i = 1; i < Files.size(); ++i) {
// Determine where this file lives. // Determine where this file lives.
if (FileExists (Files[i])) { if (FileExists(Files[i])) {
Pathname = Files[i]; Pathname = Files[i];
} else { } else {
if (SearchPath == NULL) { if (SearchPath == NULL) {
@ -416,32 +414,30 @@ bool LinkFiles(const char *progname,
} }
Pathname = std::string(SearchPath)+"/"+Files[i]; Pathname = std::string(SearchPath)+"/"+Files[i];
if (!FileExists (Pathname)) { if (!FileExists(Pathname)) {
std::cerr << "Cannot find " << Files[i]; std::cerr << "Cannot find " << Files[i];
return true; return true;
} }
} }
//
// A user may specify an ar archive without -l, perhaps because it // A user may specify an ar archive without -l, perhaps because it
// is not installed as a library. Detect that and link the library. // is not installed as a library. Detect that and link the library.
//
if (IsArchive(Pathname)) { if (IsArchive(Pathname)) {
if (Verbose) if (Verbose)
std::cerr << "Linking archive '" << Files[i] << "'\n"; std::cerr << "Linking archive '" << Files[i] << "'\n";
if (LinkInArchive (HeadModule, Pathname, ErrorMessage, Verbose)) { if (LinkInArchive(HeadModule, Pathname, ErrorMessage, Verbose)) {
PrintAndReturn(progname, ErrorMessage, PrintAndReturn(progname, ErrorMessage,
": Error linking in '" + Files[i] + "'"); ": Error linking in '" + Files[i] + "'");
return true; return true;
} }
} else { } else {
if (Verbose) if (Verbose)
std::cerr << "Linking file '" << Files[i] << "'\n"; std::cerr << "Linking file '" << Files[i] << "'\n";
if (LinkInFile (HeadModule, Pathname, ErrorMessage, Verbose)) { if (LinkInFile(HeadModule, Pathname, ErrorMessage, Verbose)) {
PrintAndReturn(progname, ErrorMessage, PrintAndReturn(progname, ErrorMessage,
": error linking in '" + Files[i] + "'"); ": error linking in '" + Files[i] + "'");
return true; return true;
} }
} }
@ -472,12 +468,12 @@ bool LinkFiles(const char *progname,
// FALSE - No error. // FALSE - No error.
// TRUE - Error. // TRUE - Error.
// //
bool LinkLibraries (const char *progname, bool LinkLibraries(const char *progname,
Module *HeadModule, Module *HeadModule,
const std::vector<std::string> &Libraries, const std::vector<std::string> &Libraries,
const std::vector<std::string> &LibPaths, const std::vector<std::string> &LibPaths,
bool Verbose, bool Verbose,
bool Native) bool Native)
{ {
// String in which to receive error messages. // String in which to receive error messages.
std::string ErrorMessage; std::string ErrorMessage;
@ -495,10 +491,8 @@ bool LinkLibraries (const char *progname,
} }
} }
//
// A user may specify an ar archive without -l, perhaps because it // A user may specify an ar archive without -l, perhaps because it
// is not installed as a library. Detect that and link the library. // is not installed as a library. Detect that and link the library.
//
if (IsArchive(Pathname)) { if (IsArchive(Pathname)) {
if (Verbose) if (Verbose)
std::cerr << "Linking archive '" << Libraries[i] << "'\n"; std::cerr << "Linking archive '" << Libraries[i] << "'\n";