Skip to content

Commit

Permalink
revert r100842 which broke several of the build bots.
Browse files Browse the repository at this point in the history 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100848 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
@lattner
lattner committed Apr 9, 2010
1 parent 2381379 commit cfc99a9
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 249 deletions.
2 changes: 1 addition & 1 deletion tools/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ include $(LEVEL)/Makefile.config
ifeq ($(ENABLE_PIC),1)
# No support for dynamic libraries on windows targets.
ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
DIRS += edis
PARALLEL_DIRS += edis

# gold only builds if binutils is around. It requires "lto" to build before
# it so it is added to DIRS.
Expand Down
269 changes: 37 additions & 232 deletions tools/llvm-mc/Disassembler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "Disassembler.h"

#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/Triple.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/MC/MCDisassembler.h"
#include "llvm/MC/MCInst.h"
Expand All @@ -25,9 +24,6 @@
#include "llvm/Support/MemoryObject.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/SourceMgr.h"

#include "llvm-c/EnhancedDisassembly.h"

using namespace llvm;

typedef std::vector<std::pair<unsigned char, const char*> > ByteArrayTy;
Expand Down Expand Up @@ -68,7 +64,8 @@ static bool PrintInsts(const MCDisassembler &DisAsm,
/*REMOVE*/ nulls())) {
Printer.printInst(&Inst, outs());
outs() << "\n";
} else {
}
else {
SM.PrintMessage(SMLoc::getFromPointer(Bytes[Index].second),
"invalid instruction encoding", "warning");
if (Size == 0)
Expand All @@ -79,9 +76,37 @@ static bool PrintInsts(const MCDisassembler &DisAsm,
return false;
}

static bool ByteArrayFromString(ByteArrayTy &ByteArray,
StringRef &Str,
SourceMgr &SM) {
int Disassembler::disassemble(const Target &T, const std::string &Triple,
MemoryBuffer &Buffer) {
// Set up disassembler.
OwningPtr<const MCAsmInfo> AsmInfo(T.createAsmInfo(Triple));

if (!AsmInfo) {
errs() << "error: no assembly info for target " << Triple << "\n";
return -1;
}

OwningPtr<const MCDisassembler> DisAsm(T.createMCDisassembler());
if (!DisAsm) {
errs() << "error: no disassembler for target " << Triple << "\n";
return -1;
}

OwningPtr<MCInstPrinter> IP(T.createMCInstPrinter(0, *AsmInfo));
if (!IP) {
errs() << "error: no instruction printer for target " << Triple << '\n';
return -1;
}

bool ErrorOccurred = false;

SourceMgr SM;
SM.AddNewSourceBuffer(&Buffer, SMLoc());

// Convert the input to a vector for disassembly.
ByteArrayTy ByteArray;

StringRef Str = Buffer.getBuffer();
while (!Str.empty()) {
// Strip horizontal whitespace.
if (size_t Pos = Str.find_first_not_of(" \t\r")) {
Expand All @@ -94,9 +119,9 @@ static bool ByteArrayFromString(ByteArrayTy &ByteArray,
if (Str[0] == '\n' || Str[0] == '#') {
// Strip to the end of line if we already processed any bytes on this
// line. This strips the comment and/or the \n.
if (Str[0] == '\n') {
if (Str[0] == '\n')
Str = Str.substr(1);
} else {
else {
Str = Str.substr(Str.find_first_of('\n'));
if (!Str.empty())
Str = Str.substr(1);
Expand All @@ -113,7 +138,8 @@ static bool ByteArrayFromString(ByteArrayTy &ByteArray,
if (Value.getAsInteger(0, ByteVal) || ByteVal > 255) {
// If we have an error, print it and skip to the end of line.
SM.PrintMessage(SMLoc::getFromPointer(Value.data()),
"invalid input token", "error");
"invalid input token", "error");
ErrorOccurred = true;
Str = Str.substr(Str.find('\n'));
ByteArray.clear();
continue;
Expand All @@ -123,229 +149,8 @@ static bool ByteArrayFromString(ByteArrayTy &ByteArray,
Str = Str.substr(Next);
}

return false;
}

int Disassembler::disassemble(const Target &T, const std::string &Triple,
MemoryBuffer &Buffer) {
// Set up disassembler.
OwningPtr<const MCAsmInfo> AsmInfo(T.createAsmInfo(Triple));

if (!AsmInfo) {
errs() << "error: no assembly info for target " << Triple << "\n";
return -1;
}

OwningPtr<const MCDisassembler> DisAsm(T.createMCDisassembler());
if (!DisAsm) {
errs() << "error: no disassembler for target " << Triple << "\n";
return -1;
}

OwningPtr<MCInstPrinter> IP(T.createMCInstPrinter(0, *AsmInfo));
if (!IP) {
errs() << "error: no instruction printer for target " << Triple << '\n';
return -1;
}

bool ErrorOccurred = false;

SourceMgr SM;
SM.AddNewSourceBuffer(&Buffer, SMLoc());

// Convert the input to a vector for disassembly.
ByteArrayTy ByteArray;
StringRef Str = Buffer.getBuffer();

ErrorOccurred |= ByteArrayFromString(ByteArray, Str, SM);

if (!ByteArray.empty())
ErrorOccurred |= PrintInsts(*DisAsm, *IP, ByteArray, SM);

return ErrorOccurred;
}

static int byteArrayReader(uint8_t *B, uint64_t A, void *Arg) {
ByteArrayTy &ByteArray = *((ByteArrayTy*)Arg);

if (A >= ByteArray.size())
return -1;

*B = ByteArray[A].first;

return 0;
}

static int verboseEvaluator(uint64_t *V, unsigned R, void *Arg) {
EDDisassemblerRef &disassembler = *((EDDisassemblerRef*)Arg);

const char *regName;

if (!EDGetRegisterName(&regName,
disassembler,
R))
outs() << "[" << regName << "/" << R << "]";
if (EDRegisterIsStackPointer(disassembler, R))
outs() << "(sp)";
if (EDRegisterIsProgramCounter(disassembler, R))
outs() << "(pc)";

*V = 0;

return 0;
}

int Disassembler::disassembleEnhanced(const std::string &TS,
MemoryBuffer &Buffer) {
ByteArrayTy ByteArray;
StringRef Str = Buffer.getBuffer();
SourceMgr SM;

SM.AddNewSourceBuffer(&Buffer, SMLoc());

if (ByteArrayFromString(ByteArray, Str, SM)) {
return -1;
}

EDDisassemblerRef disassembler;

Triple T(TS);
EDAssemblySyntax_t AS;

switch (T.getArch()) {
default:
errs() << "error: no default assembly syntax for " << TS.c_str() << "\n";
return -1;
case Triple::arm:
case Triple::thumb:
AS = kEDAssemblySyntaxARMUAL;
break;
case Triple::x86:
case Triple::x86_64:
AS = kEDAssemblySyntaxX86ATT;
break;
}

if (EDGetDisassembler(&disassembler,
TS.c_str(),
AS)) {
errs() << "error: couldn't get disassembler for " << TS.c_str() << "\n";
return -1;
}

EDInstRef inst;

if (EDCreateInsts(&inst, 1, disassembler, byteArrayReader, 0,&ByteArray)
!= 1) {
errs() << "error: Didn't get an instruction\n";
return -1;
}

int numTokens = EDNumTokens(inst);

if (numTokens < 0) {
errs() << "error: Couldn't count the instruction's tokens\n";
return -1;
}

int tokenIndex;

for (tokenIndex = 0; tokenIndex < numTokens; ++tokenIndex) {
EDTokenRef token;

if (EDGetToken(&token, inst, tokenIndex)) {
errs() << "error: Couldn't get token\n";
return -1;
}

const char *buf;

if (EDGetTokenString(&buf, token)) {
errs() << "error: Couldn't get string for token\n";
return -1;
}

outs() << "[";

int operandIndex = EDOperandIndexForToken(token);

if (operandIndex >= 0)
outs() << operandIndex << "-";

if (EDTokenIsWhitespace(token)) {
outs() << "w";
} else if (EDTokenIsPunctuation(token)) {
outs() << "p";
} else if (EDTokenIsOpcode(token)) {
outs() << "o";
} else if (EDTokenIsLiteral(token)) {
outs() << "l";
} else if (EDTokenIsRegister(token)) {
outs() << "r";
} else {
outs() << "?";
}

outs() << ":" << buf;

if (EDTokenIsLiteral(token)) {
outs() << "=";
if (EDTokenIsNegativeLiteral(token))
outs() << "-";
uint64_t absoluteValue;
if (EDLiteralTokenAbsoluteValue(&absoluteValue, token)) {
errs() << "error: Couldn't get the value of a literal token\n";
return -1;
}
outs() << absoluteValue;
} else if (EDTokenIsRegister(token)) {
outs() << "=";
unsigned regID;
if (EDRegisterTokenValue(&regID, token)) {
errs() << "error: Couldn't get the ID of a register token\n";
return -1;
}
outs() << "r" << regID;
}

outs() << "]";
}

outs() << " ";

int numOperands = EDNumOperands(inst);

if (numOperands < 0) {
errs() << "error: Couldn't count operands\n";
return -1;
}

int operandIndex;

for (operandIndex = 0; operandIndex < numOperands; ++operandIndex) {
outs() << operandIndex << ":";

EDOperandRef operand;

if (EDGetOperand(&operand,
inst,
operandIndex)) {
errs() << "error: Couldn't get operand\n";
return -1;
}

uint64_t evaluatedResult;

EDEvaluateOperand(&evaluatedResult,
operand,
verboseEvaluator,
&disassembler);

outs() << " ";
}

outs() << "\n";

return 0;
}

3 changes: 0 additions & 3 deletions tools/llvm-mc/Disassembler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ class Disassembler {
static int disassemble(const Target &target,
const std::string &tripleString,
MemoryBuffer &buffer);

static int disassembleEnhanced(const std::string &tripleString,
MemoryBuffer &buffer);
};

} // namespace llvm
Expand Down
1 change: 0 additions & 1 deletion tools/llvm-mc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ NO_INSTALL = 1
include $(LEVEL)/Makefile.config

LINK_COMPONENTS := $(TARGETS_TO_BUILD) MCParser MC support
USEDLIBS := EnhancedDisassembly.a

include $(LLVM_SRC_ROOT)/Makefile.rules
16 changes: 4 additions & 12 deletions tools/llvm-mc/llvm-mc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ NoInitialTextSection("n", cl::desc(
enum ActionType {
AC_AsLex,
AC_Assemble,
AC_Disassemble,
AC_EDisassemble
AC_Disassemble
};

static cl::opt<ActionType>
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand All @@ -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);
}


Expand All @@ -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;
Expand Down

0 comments on commit cfc99a9

Please sign in to comment.