summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Olivier Galibert <galibert@pobox.com>2017-11-27 17:46:29 +0100
committerGravatarGravatar Olivier Galibert <galibert@pobox.com>2017-11-27 17:46:44 +0100
commitef4717d82af5ec3174eddb9b08fa6ba0442a0ee9 (patch) (github)
treebb34ae7d363178d7a52ea874976ffd0ceb638086
parent25f66968c39229bac0f830edbbfb28f1bc8e81f4 (diff)
downloadmame-ef4717d82af5ec3174eddb9b08fa6ba0442a0ee9.tar.bz2
mame-ef4717d82af5ec3174eddb9b08fa6ba0442a0ee9.zip
arm7 disasm fix (nw)
-rw-r--r--src/devices/cpu/arm7/arm7dasm.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/cpu/arm7/arm7dasm.cpp b/src/devices/cpu/arm7/arm7dasm.cpp
index 80cab4f1da4..efe3459898c 100644
--- a/src/devices/cpu/arm7/arm7dasm.cpp
+++ b/src/devices/cpu/arm7/arm7dasm.cpp
@@ -695,7 +695,7 @@ u32 arm7_disassembler::arm7_disasm( std::ostream &stream, uint32_t pc, uint32_t
{
util::stream_format( stream, "Undefined" );
}
- return dasmflags | SUPPORTED;
+ return 4 | dasmflags | SUPPORTED;
}
u32 arm7_disassembler::thumb_disasm(std::ostream &stream, uint32_t pc, uint16_t opcode)
@@ -1322,7 +1322,7 @@ u32 arm7_disassembler::thumb_disasm(std::ostream &stream, uint32_t pc, uint16_t
break;
}
- return dasmflags | SUPPORTED;
+ return 2 | dasmflags | SUPPORTED;
}
arm7_disassembler::arm7_disassembler(config *conf) : m_config(conf)
@@ -1337,7 +1337,7 @@ u32 arm7_disassembler::opcode_alignment() const
offs_t arm7_disassembler::disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params)
{
if(m_config->get_t_flag())
- return arm7_disasm(stream, pc, opcodes.r32(pc));
- else
return thumb_disasm(stream, pc, opcodes.r16(pc));
+ else
+ return arm7_disasm(stream, pc, opcodes.r32(pc));
}