RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 19:23:23 +01:00
Code Issues Projects Releases Wiki Activity

add a new MCInstPrinter::getOpcodeName interface, when it is

Browse Source 
implemented, llvm-mc --show-inst now uses it to print the
instruction opcode as well as the number.

llvm-svn: 95929
This commit is contained in:
Chris Lattner 2010-02-11 22:39:10 +00:00
parent 76b8d76b39
commit 144a1b7a24
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/MC/MCInstPrinter.h
View File

@ -14,8 +14,8 @@ namespace llvm {
class MCInst; class MCInst;
class raw_ostream; class raw_ostream;
class MCAsmInfo; class MCAsmInfo;
class StringRef;
/// MCInstPrinter - This is an instance of a target assembly language printer /// MCInstPrinter - This is an instance of a target assembly language printer
/// that converts an MCInst to valid target assembly syntax. /// that converts an MCInst to valid target assembly syntax.
class MCInstPrinter { class MCInstPrinter {
@ -40,6 +40,10 @@ public:
/// printInst - Print the specified MCInst to the current raw_ostream. /// printInst - Print the specified MCInst to the current raw_ostream.
/// ///
virtual void printInst(const MCInst *MI) = 0; virtual void printInst(const MCInst *MI) = 0;
/// getOpcodeName - Return the name of the specified opcode enum (e.g.
/// "MOV32ri") or empty if we can't resolve it.
virtual StringRef getOpcodeName(unsigned Opcode) const;
}; };
} // namespace llvm } // namespace llvm

6
lib/MC/MCAsmStreamer.cpp
View File

@ -617,6 +617,12 @@ void MCAsmStreamer::EmitInstruction(const MCInst &Inst) {
raw_ostream &OS = GetCommentOS(); raw_ostream &OS = GetCommentOS();
OS << "<MCInst #" << Inst.getOpcode(); OS << "<MCInst #" << Inst.getOpcode();
StringRef InstName;
if (InstPrinter)
InstName = InstPrinter->getOpcodeName(Inst.getOpcode());
if (!InstName.empty())
OS << ' ' << InstName;
for (unsigned i = 0, e = Inst.getNumOperands(); i != e; ++i) { for (unsigned i = 0, e = Inst.getNumOperands(); i != e; ++i) {
OS << "\n "; OS << "\n ";
Inst.getOperand(i).print(OS, &MAI); Inst.getOperand(i).print(OS, &MAI);

7
lib/MC/MCInstPrinter.cpp
View File

@ -8,7 +8,14 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "llvm/MC/MCInstPrinter.h" #include "llvm/MC/MCInstPrinter.h"
#include "llvm/ADT/StringRef.h"
using namespace llvm; using namespace llvm;
MCInstPrinter::~MCInstPrinter() { MCInstPrinter::~MCInstPrinter() {
} }
/// getOpcodeName - Return the name of the specified opcode enum (e.g.
/// "MOV32ri") or empty if we can't resolve it.
StringRef MCInstPrinter::getOpcodeName(unsigned Opcode) const {
return "";
}

8
lib/Target/X86/X86MCCodeEmitter.cpp
View File

@ -282,11 +282,11 @@ void X86MCCodeEmitter::EmitMemModRMByte(const MCInst &MI, unsigned Op,
/// size, and 3) use of X86-64 extended registers. /// size, and 3) use of X86-64 extended registers.
static unsigned DetermineREXPrefix(const MCInst &MI, unsigned TSFlags, static unsigned DetermineREXPrefix(const MCInst &MI, unsigned TSFlags,
const TargetInstrDesc &Desc) { const TargetInstrDesc &Desc) {
unsigned REX = 0; // Pseudo instructions shouldn't get here.
assert((TSFlags & X86II::FormMask) != X86II::Pseudo &&
"Can't encode pseudo instrs");
// Pseudo instructions do not need REX prefix byte. unsigned REX = 0;
if ((TSFlags & X86II::FormMask) == X86II::Pseudo)
return 0;
if (TSFlags & X86II::REX_W) if (TSFlags & X86II::REX_W)
REX |= 1 << 3; REX |= 1 << 3;