[llvm-commits] [llvm] r100378 - in /llvm/trunk: lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp lib/Target/ARM/Disassembler/ARMDisassemblerCore.h test/MC/Disassembler/arm-tests.txt test/MC/Disassembler/neon-tests.txt test/MC/Disassembler/thumb-tests.txt
Evan Cheng
evan.cheng at apple.com
Sun Apr 4 18:04:27 PDT 2010
Author: evancheng
Date: Sun Apr 4 20:04:27 2010
New Revision: 100378
URL: http://llvm.org/viewvc/llvm-project?rev=100378&view=rev
Log:
Reverting 100265 to try to get buildbots green again. Lots of self-hosting buildbots started complaining since this commit. Also xfail ARM disassembly tests.
Modified:
llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp
llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h
llvm/trunk/test/MC/Disassembler/arm-tests.txt
llvm/trunk/test/MC/Disassembler/neon-tests.txt
llvm/trunk/test/MC/Disassembler/thumb-tests.txt
Modified: llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp?rev=100378&r1=100377&r2=100378&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp (original)
+++ llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp Sun Apr 4 20:04:27 2010
@@ -8,8 +8,8 @@
//===----------------------------------------------------------------------===//
//
// This file is part of the ARM Disassembler.
-// It contains code to represent the core concepts of Builder and DisassembleFP
-// to solve the problem of disassembling an ARM instr.
+// It contains code to represent the core concepts of Builder, Builder Factory,
+// as well as the Algorithm to solve the problem of disassembling an ARM instr.
//
//===----------------------------------------------------------------------===//
@@ -3127,12 +3127,40 @@
NULL
};
+/// Algorithms - Algorithms stores a map from Format to ARMAlgorithm*.
+static std::vector<ARMAlgorithm*> Algorithms;
+
+/// DoCleanup - Do cleanup of Algorithms upon exit.
+void ARMAlgorithm::DoCleanup() {
+ for (unsigned i = 0; i < array_lengthof(FuncPtrs); ++i)
+ if (Algorithms[i])
+ delete Algorithms[i];
+}
+
+/// GetInstance - GetInstance returns an instance of ARMAlgorithm given the
+/// encoding Format. API clients should not free up the returned instance.
+ARMAlgorithm *ARMAlgorithm::GetInstance(ARMFormat Format) {
+ /// Init the first time.
+ if (Algorithms.size() == 0) {
+ Algorithms.resize(array_lengthof(FuncPtrs));
+ for (unsigned i = 0, num = array_lengthof(FuncPtrs); i < num; ++i)
+ if (FuncPtrs[i])
+ Algorithms[i] = new ARMAlgorithm(FuncPtrs[i]);
+ else
+ Algorithms[i] = NULL;
+
+ // Register cleanup routine.
+ atexit(DoCleanup);
+ }
+ return Algorithms[Format];
+}
+
/// BuildIt - BuildIt performs the build step for this ARM Basic MC Builder.
/// The general idea is to set the Opcode for the MCInst, followed by adding
/// the appropriate MCOperands to the MCInst. ARM Basic MC Builder delegates
-/// to the Format-specific disassemble function for disassembly, followed by
-/// TryPredicateAndSBitModifier() to do PredicateOperand and OptionalDefOperand
-/// which follow the Dst/Src Operands.
+/// to the Algo (ARM Disassemble Algorithm) object to perform Format-specific
+/// disassembly, followed by TryPredicateAndSBitModifier() to do
+/// PredicateOperand and OptionalDefOperand which follow the Dst/Src Operands.
bool ARMBasicMCBuilder::BuildIt(MCInst &MI, uint32_t insn) {
// Stage 1 sets the Opcode.
MI.setOpcode(Opcode);
@@ -3140,12 +3168,9 @@
if (NumOps == 0)
return true;
- // Stage 2 calls the format-specific disassemble function to build the operand
- // list.
- if (Disasm == NULL)
- return false;
+ // Stage 2 calls the ARM Disassembly Algorithm to build the operand list.
unsigned NumOpsAdded = 0;
- bool OK = (*Disasm)(MI, Opcode, insn, NumOps, NumOpsAdded, this);
+ bool OK = Algo.Solve(MI, Opcode, insn, NumOps, NumOpsAdded, this);
if (!OK) return false;
if (NumOpsAdded >= NumOps)
@@ -3231,15 +3256,6 @@
return Status;
}
-/// Opcode, Format, and NumOperands make up an ARM Basic MCBuilder.
-ARMBasicMCBuilder::ARMBasicMCBuilder(unsigned opc, ARMFormat format,
- unsigned short num)
- : Opcode(opc), Format(format), NumOps(num), SP(0) {
- unsigned Idx = (unsigned)format;
- assert(Idx < (array_lengthof(FuncPtrs) - 1) && "Unknown format");
- Disasm = FuncPtrs[Idx];
-}
-
/// CreateMCBuilder - Return an ARMBasicMCBuilder that can build up the MC
/// infrastructure of an MCInst given the Opcode and Format of the instr.
/// Return NULL if it fails to create/return a proper builder. API clients
@@ -3247,6 +3263,10 @@
/// performed by the API clients to improve performance.
ARMBasicMCBuilder *llvm::CreateMCBuilder(unsigned Opcode, ARMFormat Format) {
+ ARMAlgorithm *Algo = ARMAlgorithm::GetInstance(Format);
+ if (!Algo)
+ return NULL;
+
return new ARMBasicMCBuilder(Opcode, Format,
- ARMInsts[Opcode].getNumOperands());
+ ARMInsts[Opcode].getNumOperands(), *Algo);
}
Modified: llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h?rev=100378&r1=100377&r2=100378&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h (original)
+++ llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h Sun Apr 4 20:04:27 2010
@@ -13,8 +13,8 @@
// specifies the encoding used by the instruction, as well as a helper function
// to convert the enums to printable char strings.
//
-// It also contains code to represent the concepts of Builder and DisassembleFP
-// to solve the problem of disassembling an ARM instr.
+// It also contains code to represent the concepts of Builder, Builder Factory,
+// as well as the Algorithm to solve the problem of disassembling an ARM instr.
//
//===----------------------------------------------------------------------===//
@@ -171,23 +171,60 @@
typedef bool (*DisassembleFP)(MCInst &MI, unsigned Opcode, uint32_t insn,
unsigned short NumOps, unsigned &NumOpsAdded, BO Builder);
+/// ARMAlgorithm - ARMAlgorithm implements the ARM/Thumb disassembly by solving
+/// the problem of building the MCOperands of an MCInst. Construction of
+/// ARMAlgorithm requires passing in a function pointer with the DisassembleFP
+/// data type.
+class ARMAlgorithm {
+public:
+ /// GetInstance - GetInstance returns an instance of ARMAlgorithm given the
+ /// encoding Format. API clients should not free up the returned instance.
+ static ARMAlgorithm *GetInstance(ARMFormat Format);
+
+ /// DoCleanup - DoCleanup is meant to be called upon exit as an exit handler.
+ static void DoCleanup();
+
+ /// Return true if this algorithm successfully disassembles the instruction.
+ /// NumOpsAdded is updated to reflect the number of operands added by the
+ /// algorithm. NumOpsAdded may be less than NumOps, in which case, there are
+ /// operands unaccounted for which need to be dealt with by the API client.
+ bool Solve(MCInst &MI, unsigned Opcode, uint32_t insn, unsigned short NumOps,
+ unsigned &NumOpsAdded, BO Builder) const {
+ if (Disassemble == NULL)
+ return false;
+
+ return (*Disassemble)(MI, Opcode, insn, NumOps, NumOpsAdded, Builder);
+ }
+
+private:
+ ARMAlgorithm(DisassembleFP fp) : Disassemble(fp) {}
+ ARMAlgorithm(ARMAlgorithm &AA) : Disassemble(AA.Disassemble) {}
+
+ virtual ~ARMAlgorithm() {}
+
+ DisassembleFP Disassemble;
+};
+
/// ARMBasicMCBuilder - ARMBasicMCBuilder represents an ARM MCInst builder that
/// knows how to build up the MCOperand list.
class ARMBasicMCBuilder {
unsigned Opcode;
ARMFormat Format;
unsigned short NumOps;
- DisassembleFP Disasm;
+ const ARMAlgorithm &Algo;
Session *SP;
public:
ARMBasicMCBuilder(ARMBasicMCBuilder &B)
- : Opcode(B.Opcode), Format(B.Format), NumOps(B.NumOps), Disasm(B.Disasm),
+ : Opcode(B.Opcode), Format(B.Format), NumOps(B.NumOps), Algo(B.Algo),
SP(B.SP)
{}
- /// Opcode, Format, and NumOperands make up an ARM Basic MCBuilder.
- ARMBasicMCBuilder(unsigned opc, ARMFormat format, unsigned short num);
+ /// Opcode, Format, NumOperands, and Algo make an ARM Basic MCBuilder.
+ ARMBasicMCBuilder(unsigned opc, ARMFormat format, unsigned short num,
+ const ARMAlgorithm &algo)
+ : Opcode(opc), Format(format), NumOps(num), Algo(algo), SP(0)
+ {}
virtual ~ARMBasicMCBuilder() {}
@@ -219,9 +256,9 @@
/// BuildIt - BuildIt performs the build step for this ARM Basic MC Builder.
/// The general idea is to set the Opcode for the MCInst, followed by adding
/// the appropriate MCOperands to the MCInst. ARM Basic MC Builder delegates
- /// to the Format-specific disassemble function for disassembly, followed by
- /// TryPredicateAndSBitModifier() for PredicateOperand and OptionalDefOperand
- /// which follow the Dst/Src Operands.
+ /// to the Algo (ARM Disassemble Algorithm) object to perform Format-specific
+ /// disassembly, followed by class method TryPredicateAndSBitModifier() to do
+ /// PredicateOperand and OptionalDefOperand which follow the Dst/Src Operands.
virtual bool BuildIt(MCInst &MI, uint32_t insn);
/// RunBuildAfterHook - RunBuildAfterHook performs operations deemed necessary
Modified: llvm/trunk/test/MC/Disassembler/arm-tests.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/arm-tests.txt?rev=100378&r1=100377&r2=100378&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/arm-tests.txt (original)
+++ llvm/trunk/test/MC/Disassembler/arm-tests.txt Sun Apr 4 20:04:27 2010
@@ -1,4 +1,5 @@
# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 | FileCheck %s
+# XFAIL: *
# CHECK: b #0
0xfe 0xff 0xff 0xea
Modified: llvm/trunk/test/MC/Disassembler/neon-tests.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/neon-tests.txt?rev=100378&r1=100377&r2=100378&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/neon-tests.txt (original)
+++ llvm/trunk/test/MC/Disassembler/neon-tests.txt Sun Apr 4 20:04:27 2010
@@ -1,4 +1,5 @@
# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 | FileCheck %s
+# XFAIL: *
# CHECK: vbif q15, q7, q0
0x50 0xe1 0x7e 0xf3
Modified: llvm/trunk/test/MC/Disassembler/thumb-tests.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/thumb-tests.txt?rev=100378&r1=100377&r2=100378&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/thumb-tests.txt (original)
+++ llvm/trunk/test/MC/Disassembler/thumb-tests.txt Sun Apr 4 20:04:27 2010
@@ -1,4 +1,5 @@
# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 | FileCheck %s
+# XFAIL: *
# CHECK: add r5, sp, #68
0x11 0xad
More information about the llvm-commits
mailing list