replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Run clang-format on tools/llvm-objdump/MachODump.cpp again as some of my 

previous changes got in with incorrect formatting. No functional change.

llvm-svn: 225417
This commit is contained in:
Kevin Enderby 2015-01-08 00:25:24 +00:00
parent 9d7bc0874c
commit 66d51fc41a
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
llvm/tools/llvm-objdump/MachODump.cpp
View File

@ -3560,8 +3560,7 @@ static void PrintUuidLoadCommand(MachO::uuid_command uuid) {
outs() << "\n"; outs() << "\n";
} }
static void PrintRpathLoadCommand(MachO::rpath_command rpath, static void PrintRpathLoadCommand(MachO::rpath_command rpath, const char *Ptr) {
const char *Ptr) {
outs() << " cmd LC_RPATH\n"; outs() << " cmd LC_RPATH\n";
outs() << " cmdsize " << rpath.cmdsize; outs() << " cmdsize " << rpath.cmdsize;
if (rpath.cmdsize < sizeof(struct MachO::rpath_command)) if (rpath.cmdsize < sizeof(struct MachO::rpath_command))
@ -3707,8 +3706,8 @@ static void PrintLinkerOptionCommand(MachO::linker_option_command lo,
} }
} }
if (lo.count != i) if (lo.count != i)
outs() << " count " << lo.count << " does not match number of strings " << i outs() << " count " << lo.count << " does not match number of strings "
<< "\n"; << i << "\n";
} }
static void PrintSubFrameworkCommand(MachO::sub_framework_command sub, static void PrintSubFrameworkCommand(MachO::sub_framework_command sub,
@ -4057,16 +4056,15 @@ static void PrintThreadCommand(MachO::thread_command t, const char *Ptr,
<< " (not x86_THREAD_STATE64_COUNT\n"; << " (not x86_THREAD_STATE64_COUNT\n";
Print_x86_thread_state64_t(ts.uts.ts64); Print_x86_thread_state64_t(ts.uts.ts64);
} else { } else {
outs() << "\t tsh.flavor " << ts.tsh.flavor outs() << "\t tsh.flavor " << ts.tsh.flavor << " tsh.count "
<< " tsh.count " << ts.tsh.count << "\n"; << ts.tsh.count << "\n";
} }
} else if (flavor == MachO::x86_FLOAT_STATE) { } else if (flavor == MachO::x86_FLOAT_STATE) {
outs() << " flavor x86_FLOAT_STATE\n"; outs() << " flavor x86_FLOAT_STATE\n";
if (count == MachO::x86_FLOAT_STATE_COUNT) if (count == MachO::x86_FLOAT_STATE_COUNT)
outs() << " count x86_FLOAT_STATE_COUNT\n"; outs() << " count x86_FLOAT_STATE_COUNT\n";
else else
outs() << " count " << count outs() << " count " << count << " (not x86_FLOAT_STATE_COUNT)\n";
<< " (not x86_FLOAT_STATE_COUNT)\n";
struct MachO::x86_float_state_t fs; struct MachO::x86_float_state_t fs;
left = end - begin; left = end - begin;
if (left >= sizeof(MachO::x86_float_state_t)) { if (left >= sizeof(MachO::x86_float_state_t)) {
@ -4088,8 +4086,8 @@ static void PrintThreadCommand(MachO::thread_command t, const char *Ptr,
<< " (not x86_FLOAT_STATE64_COUNT\n"; << " (not x86_FLOAT_STATE64_COUNT\n";
Print_x86_float_state_t(fs.ufs.fs64); Print_x86_float_state_t(fs.ufs.fs64);
} else { } else {
outs() << "\t fsh.flavor " << fs.fsh.flavor outs() << "\t fsh.flavor " << fs.fsh.flavor << " fsh.count "
<< " fsh.count " << fs.fsh.count << "\n"; << fs.fsh.count << "\n";
} }
} else if (flavor == MachO::x86_EXCEPTION_STATE) { } else if (flavor == MachO::x86_EXCEPTION_STATE) {
outs() << " flavor x86_EXCEPTION_STATE\n"; outs() << " flavor x86_EXCEPTION_STATE\n";
@ -4119,8 +4117,8 @@ static void PrintThreadCommand(MachO::thread_command t, const char *Ptr,
<< " (not x86_EXCEPTION_STATE64_COUNT\n"; << " (not x86_EXCEPTION_STATE64_COUNT\n";
Print_x86_exception_state_t(es.ues.es64); Print_x86_exception_state_t(es.ues.es64);
} else { } else {
outs() << "\t esh.flavor " << es.esh.flavor outs() << "\t esh.flavor " << es.esh.flavor << " esh.count "
<< " esh.count " << es.esh.count << "\n"; << es.esh.count << "\n";
} }
} else { } else {
outs() << " flavor " << flavor << " (unknown)\n"; outs() << " flavor " << flavor << " (unknown)\n";
@ -4307,13 +4305,16 @@ static void PrintLoadCommands(const MachOObjectFile *Obj, uint32_t ncmds,
MachO::entry_point_command Ep = Obj->getEntryPointCommand(Command); MachO::entry_point_command Ep = Obj->getEntryPointCommand(Command);
PrintEntryPointCommand(Ep); PrintEntryPointCommand(Ep);
} else if (Command.C.cmd == MachO::LC_ENCRYPTION_INFO) { } else if (Command.C.cmd == MachO::LC_ENCRYPTION_INFO) {
MachO::encryption_info_command Ei = Obj->getEncryptionInfoCommand(Command); MachO::encryption_info_command Ei =
Obj->getEncryptionInfoCommand(Command);
PrintEncryptionInfoCommand(Ei, Buf.size()); PrintEncryptionInfoCommand(Ei, Buf.size());
} else if (Command.C.cmd == MachO::LC_ENCRYPTION_INFO_64) { } else if (Command.C.cmd == MachO::LC_ENCRYPTION_INFO_64) {
MachO::encryption_info_command_64 Ei = Obj->getEncryptionInfoCommand64(Command); MachO::encryption_info_command_64 Ei =
Obj->getEncryptionInfoCommand64(Command);
PrintEncryptionInfoCommand64(Ei, Buf.size()); PrintEncryptionInfoCommand64(Ei, Buf.size());
} else if (Command.C.cmd == MachO::LC_LINKER_OPTION) { } else if (Command.C.cmd == MachO::LC_LINKER_OPTION) {
MachO::linker_option_command Lo = Obj->getLinkerOptionLoadCommand(Command); MachO::linker_option_command Lo =
Obj->getLinkerOptionLoadCommand(Command);
PrintLinkerOptionCommand(Lo, Command.Ptr); PrintLinkerOptionCommand(Lo, Command.Ptr);
} else if (Command.C.cmd == MachO::LC_SUB_FRAMEWORK) { } else if (Command.C.cmd == MachO::LC_SUB_FRAMEWORK) {
MachO::sub_framework_command Sf = Obj->getSubFrameworkCommand(Command); MachO::sub_framework_command Sf = Obj->getSubFrameworkCommand(Command);