[llvm-commits] [llvm] r101058 - in /llvm/trunk/tools: Makefile llvm-mc/Disassembler.cpp llvm-mc/Disassembler.h llvm-mc/Makefile llvm-mc/llvm-mc.cpp
Sean Callanan
scallanan at apple.com
Mon Apr 12 12:43:00 PDT 2010
Author: spyffe
Date: Mon Apr 12 14:43:00 2010
New Revision: 101058
URL: http://llvm.org/viewvc/llvm-project?rev=101058&view=rev
Log:
Second try at integrating the edis tester. This
time I use the LIBS variable, which is not subject
to a %.a -> -l% transformation, to link llvm-mc
against libEnhancedDisassembly.
llvm-mc -edis works the same as llvm-mc
-disassemble, but outputs tokens and operands.
Modified:
llvm/trunk/tools/Makefile
llvm/trunk/tools/llvm-mc/Disassembler.cpp
llvm/trunk/tools/llvm-mc/Disassembler.h
llvm/trunk/tools/llvm-mc/Makefile
llvm/trunk/tools/llvm-mc/llvm-mc.cpp
Modified: llvm/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=101058&r1=101057&r2=101058&view=diff
==============================================================================
--- llvm/trunk/tools/Makefile (original)
+++ llvm/trunk/tools/Makefile Mon Apr 12 14:43:00 2010
@@ -36,6 +36,8 @@
ifeq ($(ENABLE_PIC),1)
# No support for dynamic libraries on windows targets.
ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
+ # libEnhancedDisassembly must be built ahead of llvm-mc
+ # because llvm-mc links against libEnhancedDisassembly
DIRS += edis
# gold only builds if binutils is around. It requires "lto" to build before
Modified: llvm/trunk/tools/llvm-mc/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/Disassembler.cpp?rev=101058&r1=101057&r2=101058&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/Disassembler.cpp (original)
+++ llvm/trunk/tools/llvm-mc/Disassembler.cpp Mon Apr 12 14:43:00 2010
@@ -15,6 +15,7 @@
#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"
@@ -24,6 +25,9 @@
#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;
@@ -64,8 +68,7 @@
/*REMOVE*/ nulls())) {
Printer.printInst(&Inst, outs());
outs() << "\n";
- }
- else {
+ } else {
SM.PrintMessage(SMLoc::getFromPointer(Bytes[Index].second),
"invalid instruction encoding", "warning");
if (Size == 0)
@@ -76,37 +79,9 @@
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();
+static bool ByteArrayFromString(ByteArrayTy &ByteArray,
+ StringRef &Str,
+ SourceMgr &SM) {
while (!Str.empty()) {
// Strip horizontal whitespace.
if (size_t Pos = Str.find_first_not_of(" \t\r")) {
@@ -119,9 +94,9 @@
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);
@@ -138,8 +113,7 @@
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");
- ErrorOccurred = true;
+ "invalid input token", "error");
Str = Str.substr(Str.find('\n'));
ByteArray.clear();
continue;
@@ -149,8 +123,229 @@
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(®Name,
+ 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(®ID, 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;
+}
+
Modified: llvm/trunk/tools/llvm-mc/Disassembler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/Disassembler.h?rev=101058&r1=101057&r2=101058&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/Disassembler.h (original)
+++ llvm/trunk/tools/llvm-mc/Disassembler.h Mon Apr 12 14:43:00 2010
@@ -27,6 +27,9 @@
static int disassemble(const Target &target,
const std::string &tripleString,
MemoryBuffer &buffer);
+
+ static int disassembleEnhanced(const std::string &tripleString,
+ MemoryBuffer &buffer);
};
} // namespace llvm
Modified: llvm/trunk/tools/llvm-mc/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/Makefile?rev=101058&r1=101057&r2=101058&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/Makefile (original)
+++ llvm/trunk/tools/llvm-mc/Makefile Mon Apr 12 14:43:00 2010
@@ -22,3 +22,6 @@
LINK_COMPONENTS := $(TARGETS_TO_BUILD) MCParser MC support
include $(LLVM_SRC_ROOT)/Makefile.rules
+
+# Using LIBS instead of USEDLIBS to force static linking
+LIBS += $(LLVMLibDir)/libEnhancedDisassembly.a
Modified: llvm/trunk/tools/llvm-mc/llvm-mc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/llvm-mc.cpp?rev=101058&r1=101057&r2=101058&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/llvm-mc.cpp (original)
+++ llvm/trunk/tools/llvm-mc/llvm-mc.cpp Mon Apr 12 14:43:00 2010
@@ -97,7 +97,8 @@
enum ActionType {
AC_AsLex,
AC_Assemble,
- AC_Disassemble
+ AC_Disassemble,
+ AC_EDisassemble
};
static cl::opt<ActionType>
@@ -109,6 +110,8 @@
"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) {
@@ -325,7 +328,7 @@
return Res;
}
-static int DisassembleInput(const char *ProgName) {
+static int DisassembleInput(const char *ProgName, bool Enhanced) {
const Target *TheTarget = GetTarget(ProgName);
if (!TheTarget)
return 0;
@@ -344,7 +347,10 @@
return 1;
}
- return Disassembler::disassemble(*TheTarget, TripleName, *Buffer);
+ if (Enhanced)
+ return Disassembler::disassembleEnhanced(TripleName, *Buffer);
+ else
+ return Disassembler::disassemble(*TheTarget, TripleName, *Buffer);
}
@@ -371,7 +377,9 @@
case AC_Assemble:
return AssembleInput(argv[0]);
case AC_Disassemble:
- return DisassembleInput(argv[0]);
+ return DisassembleInput(argv[0], false);
+ case AC_EDisassemble:
+ return DisassembleInput(argv[0], true);
}
return 0;
More information about the llvm-commits
mailing list