summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/jaguar/jaguar.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/jaguar/jaguar.h')
-rw-r--r--src/devices/cpu/jaguar/jaguar.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/devices/cpu/jaguar/jaguar.h b/src/devices/cpu/jaguar/jaguar.h
index f9e8189b739..5cd4c616a69 100644
--- a/src/devices/cpu/jaguar/jaguar.h
+++ b/src/devices/cpu/jaguar/jaguar.h
@@ -84,16 +84,16 @@ protected:
virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;
// I/Os (common)
- DECLARE_READ32_MEMBER(flags_r);
- DECLARE_WRITE32_MEMBER(flags_w);
- DECLARE_WRITE32_MEMBER(matrix_control_w);
- DECLARE_WRITE32_MEMBER(matrix_address_w);
- DECLARE_WRITE32_MEMBER(end_w);
- DECLARE_WRITE32_MEMBER(pc_w);
- DECLARE_READ32_MEMBER(status_r);
- DECLARE_WRITE32_MEMBER(control_w);
- DECLARE_READ32_MEMBER(div_remainder_r);
- DECLARE_WRITE32_MEMBER(div_control_w);
+ u32 flags_r();
+ void flags_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void matrix_control_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void matrix_address_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void end_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void pc_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 status_r();
+ void control_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 div_remainder_r();
+ void div_control_w(u32 data);
// defines
inline void CLR_Z();
@@ -278,8 +278,8 @@ protected:
virtual void execute_run() override;
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
- DECLARE_WRITE32_MEMBER(hidata_w);
- DECLARE_READ32_MEMBER(hidata_r);
+ void hidata_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 hidata_r();
};
@@ -296,9 +296,9 @@ protected:
virtual void execute_run() override;
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
- DECLARE_WRITE32_MEMBER(modulo_w);
- DECLARE_WRITE32_MEMBER(dsp_end_w);
- DECLARE_READ32_MEMBER(high_accum_r);
+ void modulo_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void dsp_end_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 high_accum_r();
};