revert r100842 which broke several of the build bots.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100848 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2010-04-09 04:24:20 +00:00
parent 2381379d1d
commit cfc99a99bd
5 changed files with 49 additions and 256 deletions

View File

@ -97,8 +97,7 @@ NoInitialTextSection("n", cl::desc(
enum ActionType {
AC_AsLex,
AC_Assemble,
AC_Disassemble,
AC_EDisassemble
AC_Disassemble
};
static cl::opt<ActionType>
@ -110,8 +109,6 @@ Action(cl::desc("Action to perform:"),
"Assemble a .s file (default)"),
clEnumValN(AC_Disassemble, "disassemble",
"Disassemble strings of hex bytes"),
clEnumValN(AC_EDisassemble, "edis",
"Enhanced disassembly of strings of hex bytes"),
clEnumValEnd));
static const Target *GetTarget(const char *ProgName) {
@ -328,7 +325,7 @@ static int AssembleInput(const char *ProgName) {
return Res;
}
static int DisassembleInput(const char *ProgName, bool Enhanced) {
static int DisassembleInput(const char *ProgName) {
const Target *TheTarget = GetTarget(ProgName);
if (!TheTarget)
return 0;
@ -347,10 +344,7 @@ static int DisassembleInput(const char *ProgName, bool Enhanced) {
return 1;
}
if (Enhanced)
return Disassembler::disassembleEnhanced(TripleName, *Buffer);
else
return Disassembler::disassemble(*TheTarget, TripleName, *Buffer);
return Disassembler::disassemble(*TheTarget, TripleName, *Buffer);
}
@ -377,9 +371,7 @@ int main(int argc, char **argv) {
case AC_Assemble:
return AssembleInput(argv[0]);
case AC_Disassemble:
return DisassembleInput(argv[0], false);
case AC_EDisassemble:
return DisassembleInput(argv[0], true);
return DisassembleInput(argv[0]);
}
return 0;