diff options
| author | Alexandre Rames <alexandre.rames@linaro.org> | 2016-09-26 14:14:01 +0100 |
|---|---|---|
| committer | Alexandre Rames <alexandre.rames@linaro.org> | 2016-09-27 09:18:14 +0000 |
| commit | 8872cadb33bb1c62d3e67cb74badb1a9309a6a69 (patch) | |
| tree | fe575825a9fc0b0bb0127820b8fa1bda0e0fa4db /disassembler/disassembler_arm.cc | |
| parent | a1d66b9050aeecd7e698c51155f0dbc0198a6822 (diff) | |
ARM64: Update the disassembler after the VIXL update.
Test: top-level `make -j40`
`mma -j40 test-art-target-test-optimizing dist`
`mma -j40 test-art-host dist`
Change-Id: I173976998dc8e3e466ca8502c3fdc447f9019cee
Diffstat (limited to 'disassembler/disassembler_arm.cc')
| -rw-r--r-- | disassembler/disassembler_arm.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc index 925047f8b0..30b708c0fc 100644 --- a/disassembler/disassembler_arm.cc +++ b/disassembler/disassembler_arm.cc @@ -116,8 +116,7 @@ class DisassemblerArm::CustomDisassembler FINAL : public PrintDisassembler { public: CustomDisassembler(std::ostream& os, const DisassemblerOptions* options) - // vixl::aarch32::Disassembler::~Disassembler() will delete the stream. - : PrintDisassembler(new CustomDisassemblerStream(os, this, options)) {} + : PrintDisassembler(&disassembler_stream_), disassembler_stream_(os, this, options) {} void PrintPc(uint32_t prog_ctr) OVERRIDE { os() << "0x" << std::hex << std::setw(8) << std::setfill('0') << prog_ctr << ": "; @@ -133,6 +132,7 @@ class DisassemblerArm::CustomDisassembler FINAL : public PrintDisassembler { private: bool is_t32_; + CustomDisassemblerStream disassembler_stream_; }; void DisassemblerArm::CustomDisassembler::CustomDisassemblerStream::PrintLiteral(LocationType type, |