diff options
| author | bunnei <bunneidev@gmail.com> | 2014-09-08 00:10:13 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-09-08 00:10:13 -0400 |
| commit | 335082e74e5f015450f1ad57cb90d1f8fd4afbdb (patch) | |
| tree | 576c57f45d933885d31f7eddfbf85167bc1b88ac /src/core/arm/interpreter | |
| parent | 85f1b76cd8a223968d61fbd93235acee5dcab47e (diff) | |
| parent | 403c84cdabe0eab9b2ec1a1effdb9beac5d09853 (diff) | |
Merge pull request #95 from lioncash/disassembler
core: Make the ARM disassembler use std::string internally
Diffstat (limited to 'src/core/arm/interpreter')
| -rw-r--r-- | src/core/arm/interpreter/armsupp.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/arm/interpreter/armsupp.cpp b/src/core/arm/interpreter/armsupp.cpp index 219ba78ce..3d3545c65 100644 --- a/src/core/arm/interpreter/armsupp.cpp +++ b/src/core/arm/interpreter/armsupp.cpp @@ -17,6 +17,7 @@ //#include <util.h> +#include <string> #include "core/arm/interpreter/armdefs.h" #include "core/arm/interpreter/armemu.h" #include "core/hle/coprocessor.h" @@ -870,12 +871,8 @@ ARMul_CDP (ARMul_State * state, ARMword instr) void ARMul_UndefInstr (ARMul_State * state, ARMword instr) { - /*SKYEYE_LOG_IN_CLR(RED, "In %s, line = %d, undef instr: 0x%x\n", - __func__, __LINE__, instr);*/ - char buff[512]; - ARM_Disasm disasm = ARM_Disasm(); - disasm.disasm(state->pc, instr, buff); - ERROR_LOG(ARM11, "Undefined instruction!! Disasm: %s Opcode: 0x%x", buff, instr); + std::string disasm = ARM_Disasm::Disassemble(state->pc, instr); + ERROR_LOG(ARM11, "Undefined instruction!! Disasm: %s Opcode: 0x%x", disasm.c_str(), instr); ARMul_Abort (state, ARMul_UndefinedInstrV); } |