diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-09-11 20:50:10 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-09-11 20:59:49 +0200 |
| commit | 60b3fc01a2377e51d5d8acb497c75f41daf14030 (patch) | |
| tree | e6f64223500d6f579a924b1c53b6a20813abf1ee /src/core/arm/disassembler/arm_disasm.cpp | |
| parent | Merge pull request #1141 from lioncash/hdr (diff) | |
| download | yuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.tar yuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.tar.gz yuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.tar.bz2 yuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.tar.lz yuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.tar.xz yuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.tar.zst yuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/arm/disassembler/arm_disasm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp index 77af10b54..76408e9fa 100644 --- a/src/core/arm/disassembler/arm_disasm.cpp +++ b/src/core/arm/disassembler/arm_disasm.cpp @@ -206,7 +206,7 @@ static const char *opcode_names[] = { "swi", "tst", - NULL + nullptr }; // Indexed by the shift type (bits 6-5) @@ -399,7 +399,7 @@ std::string ARM_Disasm::Disassemble(u32 addr, u32 insn) default: return "Error"; } - return NULL; + return nullptr; } std::string ARM_Disasm::DisassembleALU(Opcode opcode, u32 insn) |