summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/arm/arm.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/arm/arm.cpp')
-rw-r--r--src/devices/cpu/arm/arm.cpp18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/devices/cpu/arm/arm.cpp b/src/devices/cpu/arm/arm.cpp
index 077f693b144..77c8a44ac6d 100644
--- a/src/devices/cpu/arm/arm.cpp
+++ b/src/devices/cpu/arm/arm.cpp
@@ -20,9 +20,7 @@
#include "emu.h"
#include "arm.h"
#include "debugger.h"
-
-CPU_DISASSEMBLE( arm );
-CPU_DISASSEMBLE( arm_be );
+#include "armdasm.h"
#define ARM_DEBUG_CORE 0
#define ARM_DEBUG_COPRO 0
@@ -512,7 +510,7 @@ void arm_cpu_device::execute_set_input(int irqline, int state)
void arm_cpu_device::device_start()
{
m_program = &space(AS_PROGRAM);
- m_direct = &m_program->direct();
+ m_direct = m_program->direct<0>();
save_item(NAME(m_sArmRegister));
save_item(NAME(m_coproRegister));
@@ -1562,15 +1560,7 @@ void arm_cpu_device::HandleCoPro( uint32_t insn )
}
-offs_t arm_cpu_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options)
-{
- extern CPU_DISASSEMBLE( arm );
- return CPU_DISASSEMBLE_NAME(arm)(this, stream, pc, oprom, opram, options);
-}
-
-
-offs_t arm_be_cpu_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options)
+util::disasm_interface *arm_cpu_device::create_disassembler()
{
- extern CPU_DISASSEMBLE( arm_be );
- return CPU_DISASSEMBLE_NAME(arm_be)(this, stream, pc, oprom, opram, options);
+ return new arm_disassembler;
}