summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/psx/psx.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/psx/psx.h')
-rw-r--r--src/devices/cpu/psx/psx.h22
1 files changed, 4 insertions, 18 deletions
diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h
index da70d2c300c..641a971c2ce 100644
--- a/src/devices/cpu/psx/psx.h
+++ b/src/devices/cpu/psx/psx.h
@@ -17,6 +17,7 @@
#include "gte.h"
#include "irq.h"
#include "sio.h"
+#include "psxdasm.h"
//**************************************************************************
// CONSTANTS
@@ -140,20 +141,9 @@ enum
// TYPE DEFINITIONS
//**************************************************************************
-class psxcpu_state
-{
-public:
- virtual ~psxcpu_state() { }
-
- virtual uint32_t pc() = 0;
- virtual uint32_t delayr() = 0;
- virtual uint32_t delayv() = 0;
- virtual uint32_t r(int i) = 0;
-};
-
// ======================> psxcpu_device
-class psxcpu_device : public cpu_device, psxcpu_state
+class psxcpu_device : public cpu_device, psxcpu_disassembler::config
{
public:
// static configuration helpers
@@ -229,9 +219,7 @@ protected:
virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;
// device_disasm_interface overrides
- virtual uint32_t disasm_min_opcode_bytes() const override { return 4; }
- virtual uint32_t disasm_max_opcode_bytes() const override { return 8; }
- virtual offs_t disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override;
+ virtual util::disasm_interface *create_disassembler() override;
// CPU registers
uint32_t m_pc;
@@ -246,7 +234,7 @@ protected:
// address spaces
const address_space_config m_program_config;
address_space *m_program;
- direct_read_data *m_direct;
+ direct_read_data<0> *m_direct;
// other internal states
int m_icount;
@@ -409,6 +397,4 @@ DECLARE_DEVICE_TYPE(CXD8606BQ, cxd8606bq_device)
DECLARE_DEVICE_TYPE(CXD8606CQ, cxd8606cq_device)
-extern unsigned DasmPSXCPU(psxcpu_state *state, std::ostream &stream, uint32_t pc, const uint8_t *opram);
-
#endif // MAME_CPU_PSX_PSX_H