6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-26 05:25:47 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup Whitespace.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112587 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Michael J. Spencer
2010-08-31 06:36:46 +00:00
parent 1211d43abf
commit 4a295d301d
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/System/Path.cpp
View File

@@ -61,7 +61,7 @@ sys::IdentifyFileType(const char *magic, unsigned length) {
if (memcmp(magic,"!<arch>\n",8) == 0) if (memcmp(magic,"!<arch>\n",8) == 0)
return Archive_FileType; return Archive_FileType;
break; break;
case '\177': case '\177':
if (magic[1] == 'E' && magic[2] == 'L' && magic[3] == 'F') { if (magic[1] == 'E' && magic[2] == 'L' && magic[3] == 'F') {
if (length >= 18 && magic[17] == 0) if (length >= 18 && magic[17] == 0)
@@ -76,11 +76,11 @@ sys::IdentifyFileType(const char *magic, unsigned length) {
break; break;
case 0xCA: case 0xCA:
if (magic[1] == char(0xFE) && magic[2] == char(0xBA) && if (magic[1] == char(0xFE) && magic[2] == char(0xBA) &&
magic[3] == char(0xBE)) { magic[3] == char(0xBE)) {
// This is complicated by an overlap with Java class files. // This is complicated by an overlap with Java class files.
// See the Mach-O section in /usr/share/file/magic for details. // See the Mach-O section in /usr/share/file/magic for details.
if (length >= 8 && magic[7] < 43) if (length >= 8 && magic[7] < 43)
// FIXME: Universal Binary of any type. // FIXME: Universal Binary of any type.
return Mach_O_DynamicallyLinkedSharedLib_FileType; return Mach_O_DynamicallyLinkedSharedLib_FileType;
} }
@@ -89,18 +89,18 @@ sys::IdentifyFileType(const char *magic, unsigned length) {
case 0xFE: case 0xFE:
case 0xCE: { case 0xCE: {
uint16_t type = 0; uint16_t type = 0;
if (magic[0] == char(0xFE) && magic[1] == char(0xED) && if (magic[0] == char(0xFE) && magic[1] == char(0xED) &&
magic[2] == char(0xFA) && magic[3] == char(0xCE)) { magic[2] == char(0xFA) && magic[3] == char(0xCE)) {
/* Native endian */ /* Native endian */
if (length >= 16) type = magic[14] << 8 | magic[15]; if (length >= 16) type = magic[14] << 8 | magic[15];
} else if (magic[0] == char(0xCE) && magic[1] == char(0xFA) && } else if (magic[0] == char(0xCE) && magic[1] == char(0xFA) &&
magic[2] == char(0xED) && magic[3] == char(0xFE)) { magic[2] == char(0xED) && magic[3] == char(0xFE)) {
/* Reverse endian */ /* Reverse endian */
if (length >= 14) type = magic[13] << 8 | magic[12]; if (length >= 14) type = magic[13] << 8 | magic[12];
} }
switch (type) { switch (type) {
default: break; default: break;
case 1: return Mach_O_Object_FileType; case 1: return Mach_O_Object_FileType;
case 2: return Mach_O_Executable_FileType; case 2: return Mach_O_Executable_FileType;
case 3: return Mach_O_FixedVirtualMemorySharedLib_FileType; case 3: return Mach_O_FixedVirtualMemorySharedLib_FileType;
case 4: return Mach_O_Core_FileType; case 4: return Mach_O_Core_FileType;
@@ -219,38 +219,38 @@ static StringRef getDirnameCharSep(StringRef path, const char *Sep) {
"Sep must be a 1-character string literal."); "Sep must be a 1-character string literal.");
if (path.empty()) if (path.empty())
return "."; return ".";
// If the path is all slashes, return a single slash. // If the path is all slashes, return a single slash.
// Otherwise, remove all trailing slashes. // Otherwise, remove all trailing slashes.
signed pos = static_cast<signed>(path.size()) - 1; signed pos = static_cast<signed>(path.size()) - 1;
while (pos >= 0 && path[pos] == Sep[0]) while (pos >= 0 && path[pos] == Sep[0])
--pos; --pos;
if (pos < 0) if (pos < 0)
return path[0] == Sep[0] ? Sep : "."; return path[0] == Sep[0] ? Sep : ".";
// Any slashes left? // Any slashes left?
signed i = 0; signed i = 0;
while (i < pos && path[i] != Sep[0]) while (i < pos && path[i] != Sep[0])
++i; ++i;
if (i == pos) // No slashes? Return "." if (i == pos) // No slashes? Return "."
return "."; return ".";
// There is at least one slash left. Remove all trailing non-slashes. // There is at least one slash left. Remove all trailing non-slashes.
while (pos >= 0 && path[pos] != Sep[0]) while (pos >= 0 && path[pos] != Sep[0])
--pos; --pos;
// Remove any trailing slashes. // Remove any trailing slashes.
while (pos >= 0 && path[pos] == Sep[0]) while (pos >= 0 && path[pos] == Sep[0])
--pos; --pos;
if (pos < 0) if (pos < 0)
return path[0] == Sep[0] ? Sep : "."; return path[0] == Sep[0] ? Sep : ".";
return path.substr(0, pos+1); return path.substr(0, pos+1);
} }

8
tools/llvm-nm/llvm-nm.cpp
View File

@@ -94,7 +94,7 @@ static void DumpSymbolNameForGlobalValue(GlobalValue &GV) {
GV.hasLinkerPrivateWeakDefAutoLinkage() || GV.hasLinkerPrivateWeakDefAutoLinkage() ||
GV.hasAvailableExternallyLinkage()) GV.hasAvailableExternallyLinkage())
return; return;
const std::string SymbolAddrStr = " "; // Not used yet... const std::string SymbolAddrStr = " "; // Not used yet...
char TypeChar = TypeCharForSymbol(GV); char TypeChar = TypeCharForSymbol(GV);
if ((TypeChar != 'U') && UndefinedOnly) if ((TypeChar != 'U') && UndefinedOnly)
@@ -148,13 +148,13 @@ static void DumpSymbolNamesFromFile(std::string &Filename) {
Module *Result = 0; Module *Result = 0;
if (Buffer.get()) if (Buffer.get())
Result = ParseBitcodeFile(Buffer.get(), Context, &ErrorMessage); Result = ParseBitcodeFile(Buffer.get(), Context, &ErrorMessage);
if (Result) { if (Result) {
DumpSymbolNamesFromModule(Result); DumpSymbolNamesFromModule(Result);
delete Result; delete Result;
} else } else
errs() << ToolName << ": " << Filename << ": " << ErrorMessage << "\n"; errs() << ToolName << ": " << Filename << ": " << ErrorMessage << "\n";
} else if (aPath.isArchive()) { } else if (aPath.isArchive()) {
std::string ErrMsg; std::string ErrMsg;
Archive* archive = Archive::OpenAndLoad(sys::Path(Filename), Context, Archive* archive = Archive::OpenAndLoad(sys::Path(Filename), Context,
@@ -179,7 +179,7 @@ int main(int argc, char **argv) {
// Print a stack trace if we signal out. // Print a stack trace if we signal out.
sys::PrintStackTraceOnErrorSignal(); sys::PrintStackTraceOnErrorSignal();
PrettyStackTraceProgram X(argc, argv); PrettyStackTraceProgram X(argc, argv);
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
cl::ParseCommandLineOptions(argc, argv, "llvm symbol table dumper\n"); cl::ParseCommandLineOptions(argc, argv, "llvm symbol table dumper\n");