diff options
author | Stephen Hines <srhines@google.com> | 2014-02-11 20:01:10 -0800 |
---|---|---|
committer | Stephen Hines <srhines@google.com> | 2014-02-11 20:01:10 -0800 |
commit | ce9904c6ea8fd669978a8eefb854b330eb9828ff (patch) | |
tree | 2418ee2e96ea220977c8fb74959192036ab5b133 /lib/Target/R600/AMDGPUAsmPrinter.h | |
parent | c27b10b198c1d9e9b51f2303994313ec2778edd7 (diff) | |
parent | dbb832b83351cec97b025b61c26536ef50c3181c (diff) | |
download | external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.zip external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.tar.gz external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.tar.bz2 |
Merge remote-tracking branch 'upstream/release_34' into merge-20140211
Conflicts:
lib/Linker/LinkModules.cpp
lib/Support/Unix/Signals.inc
Change-Id: Ia54f291fa5dc828052d2412736e8495c1282aa64
Diffstat (limited to 'lib/Target/R600/AMDGPUAsmPrinter.h')
-rw-r--r-- | lib/Target/R600/AMDGPUAsmPrinter.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/Target/R600/AMDGPUAsmPrinter.h b/lib/Target/R600/AMDGPUAsmPrinter.h index f425ef4..05dc9bb 100644 --- a/lib/Target/R600/AMDGPUAsmPrinter.h +++ b/lib/Target/R600/AMDGPUAsmPrinter.h @@ -1,4 +1,4 @@ -//===-- AMDGPUAsmPrinter.h - Print AMDGPU assembly code -------------------===// +//===-- AMDGPUAsmPrinter.h - Print AMDGPU assembly code ---------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -16,14 +16,15 @@ #define AMDGPU_ASMPRINTER_H #include "llvm/CodeGen/AsmPrinter.h" +#include <string> +#include <vector> namespace llvm { class AMDGPUAsmPrinter : public AsmPrinter { public: - explicit AMDGPUAsmPrinter(TargetMachine &TM, MCStreamer &Streamer) - : AsmPrinter(TM, Streamer) { } + explicit AMDGPUAsmPrinter(TargetMachine &TM, MCStreamer &Streamer); virtual bool runOnMachineFunction(MachineFunction &MF); @@ -38,6 +39,11 @@ public: /// Implemented in AMDGPUMCInstLower.cpp virtual void EmitInstruction(const MachineInstr *MI); + +protected: + bool DisasmEnabled; + std::vector<std::string> DisasmLines, HexLines; + size_t DisasmLineMaxLen; }; } // End anonymous llvm |