summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/arm7/arm7dasm.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/arm7/arm7dasm.cpp')
-rw-r--r--src/devices/cpu/arm7/arm7dasm.cpp26
1 files changed, 4 insertions, 22 deletions
diff --git a/src/devices/cpu/arm7/arm7dasm.cpp b/src/devices/cpu/arm7/arm7dasm.cpp
index e0416d8aacd..5288f27e9b5 100644
--- a/src/devices/cpu/arm7/arm7dasm.cpp
+++ b/src/devices/cpu/arm7/arm7dasm.cpp
@@ -1300,40 +1300,22 @@ static uint32_t thumb_disasm(std::ostream &stream, uint32_t pc, uint16_t opcode)
return dasmflags | DASMFLAG_SUPPORTED;
}
-static uint32_t arm7_disasm(char *buffer, uint32_t pc, uint32_t opcode)
-{
- std::ostringstream stream;
- uint32_t result = arm7_disasm(stream, pc, opcode);
- std::string stream_str = stream.str();
- strcpy(buffer, stream_str.c_str());
- return result;
-}
-
-static uint32_t thumb_disasm(char *buffer, uint32_t pc, uint16_t opcode)
-{
- std::ostringstream stream;
- uint32_t result = thumb_disasm(stream, pc, opcode);
- std::string stream_str = stream.str();
- strcpy(buffer, stream_str.c_str());
- return result;
-}
-
CPU_DISASSEMBLE( arm7arm )
{
- return arm7_disasm(buffer, pc, oprom[0] | (oprom[1] << 8) | (oprom[2] << 16) | (oprom[3] << 24)) | 4;
+ return arm7_disasm(stream, pc, oprom[0] | (oprom[1] << 8) | (oprom[2] << 16) | (oprom[3] << 24)) | 4;
}
CPU_DISASSEMBLE( arm7arm_be )
{
- return arm7_disasm(buffer, pc, oprom[3] | (oprom[2] << 8) | (oprom[1] << 16) | (oprom[0] << 24)) | 4;
+ return arm7_disasm(stream, pc, oprom[3] | (oprom[2] << 8) | (oprom[1] << 16) | (oprom[0] << 24)) | 4;
}
CPU_DISASSEMBLE( arm7thumb )
{
- return thumb_disasm(buffer, pc, oprom[0] | (oprom[1] << 8)) | 2;
+ return thumb_disasm(stream, pc, oprom[0] | (oprom[1] << 8)) | 2;
}
CPU_DISASSEMBLE( arm7thumb_be )
{
- return thumb_disasm(buffer, pc, oprom[1] | (oprom[0] << 8)) | 2;
+ return thumb_disasm(stream, pc, oprom[1] | (oprom[0] << 8)) | 2;
}