From 132e64cfd9be5908ad1b40cdd93d05680ebd0643 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Mon, 29 Apr 2019 08:39:44 +0200 Subject: m680x0: Normalize type names to the short versions [O. Galibert] --- src/devices/cpu/m68000/m68000.h | 294 +- src/devices/cpu/m68000/m68k_in.lst | 2708 +++++----- src/devices/cpu/m68000/m68kcpu.cpp | 96 +- src/devices/cpu/m68000/m68kcpu.h | 662 +-- src/devices/cpu/m68000/m68kdasm.cpp | 8 +- src/devices/cpu/m68000/m68kdasm.h | 2 +- src/devices/cpu/m68000/m68kfpu.hxx | 388 +- src/devices/cpu/m68000/m68kmmu.h | 185 +- src/devices/cpu/m68000/m68kops.cpp | 9442 +++++++++++++++++------------------ 9 files changed, 6892 insertions(+), 6893 deletions(-) diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h index 609da67d3eb..a0e81426e29 100644 --- a/src/devices/cpu/m68000/m68000.h +++ b/src/devices/cpu/m68000/m68000.h @@ -101,9 +101,9 @@ public: }; // construction/destruction - m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - static constexpr uint8_t autovector(int level) { return 0x18 + level; } + static constexpr u8 autovector(int level) { return 0x18 + level; } void autovectors_map(address_map &map); protected: @@ -137,9 +137,9 @@ protected: virtual std::unique_ptr create_disassembler() override; // device_execute_interface overrides - virtual uint32_t execute_min_cycles() const override { return 4; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; - virtual uint32_t execute_input_lines() const override { return m_interrupt_mixer ? 8 : 3; }; // number of input lines + virtual u32 execute_min_cycles() const override { return 4; }; + virtual u32 execute_max_cycles() const override { return 158; }; + virtual u32 execute_input_lines() const override { return m_interrupt_mixer ? 8 : 3; }; // number of input lines virtual bool execute_input_edge_triggered(int inputnum) const override { return m_interrupt_mixer ? inputnum == M68K_IRQ_7 : false; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -163,59 +163,59 @@ public: void set_cmpild_callback(write32_delegate callback); void set_rte_callback(write_line_delegate callback); void set_tas_write_callback(write8_delegate callback); - uint16_t get_fc(); + u16 get_fc(); void set_hmmu_enable(int enable); int get_pmmu_enable() {return m_pmmu_enabled;}; void set_fpu_enable(int enable); - void set_buserror_details(uint32_t fault_addr, uint8_t rw, uint8_t fc); + void set_buserror_details(u32 fault_addr, u8 rw, u8 fc); void disable_interrupt_mixer() { m_interrupt_mixer = false; } void set_cpu_space(int space_id) { m_cpu_space_id = space_id; } protected: - m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, - const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits); + m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, + const device_type type, u32 prg_data_width, u32 prg_address_bits); - m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, - const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map); + m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, + const device_type type, u32 prg_data_width, u32 prg_address_bits, address_map_constructor internal_map); int m_has_fpu; /* Indicates if a FPU is available (yes on 030, 040, may be on 020) */ bool m_interrupt_mixer; /* Indicates whether to put a virtual 8->3 priority mixer on the input lines (default true) */ int m_cpu_space_id; /* CPU space address space id (default AS_CPU_SPACE) */ - uint32_t m_cpu_type; /* CPU Type: 68000, 68008, 68010, 68EC020, 68020, 68EC030, 68030, 68EC040, or 68040 */ + u32 m_cpu_type; /* CPU Type: 68000, 68008, 68010, 68EC020, 68020, 68EC030, 68030, 68EC040, or 68040 */ // - uint32_t m_dar[16]; /* Data and Address Registers */ - uint32_t m_ppc; /* Previous program counter */ - uint32_t m_pc; /* Program Counter */ - uint32_t m_sp[7]; /* User, Interrupt, and Master Stack Pointers */ - uint32_t m_vbr; /* Vector Base Register (m68010+) */ - uint32_t m_sfc; /* Source Function Code Register (m68010+) */ - uint32_t m_dfc; /* Destination Function Code Register (m68010+) */ - uint32_t m_cacr; /* Cache Control Register (m68020, unemulated) */ - uint32_t m_caar; /* Cache Address Register (m68020, unemulated) */ - uint32_t m_ir; /* Instruction Register */ + u32 m_dar[16]; /* Data and Address Registers */ + u32 m_ppc; /* Previous program counter */ + u32 m_pc; /* Program Counter */ + u32 m_sp[7]; /* User, Interrupt, and Master Stack Pointers */ + u32 m_vbr; /* Vector Base Register (m68010+) */ + u32 m_sfc; /* Source Function Code Register (m68010+) */ + u32 m_dfc; /* Destination Function Code Register (m68010+) */ + u32 m_cacr; /* Cache Control Register (m68020, unemulated) */ + u32 m_caar; /* Cache Address Register (m68020, unemulated) */ + u32 m_ir; /* Instruction Register */ floatx80 m_fpr[8]; /* FPU Data Register (m68030/040) */ - uint32_t m_fpiar; /* FPU Instruction Address Register (m68040) */ - uint32_t m_fpsr; /* FPU Status Register (m68040) */ - uint32_t m_fpcr; /* FPU Control Register (m68040) */ - uint32_t m_t1_flag; /* Trace 1 */ - uint32_t m_t0_flag; /* Trace 0 */ - uint32_t m_s_flag; /* Supervisor */ - uint32_t m_m_flag; /* Master/Interrupt state */ - uint32_t m_x_flag; /* Extend */ - uint32_t m_n_flag; /* Negative */ - uint32_t m_not_z_flag; /* Zero, inverted for speedups */ - uint32_t m_v_flag; /* Overflow */ - uint32_t m_c_flag; /* Carry */ - uint32_t m_int_mask; /* I0-I2 */ - uint32_t m_int_level; /* State of interrupt pins IPL0-IPL2 -- ASG: changed from ints_pending */ - uint32_t m_stopped; /* Stopped state */ - uint32_t m_pref_addr; /* Last prefetch address */ - uint32_t m_pref_data; /* Data in the prefetch queue */ - uint32_t m_sr_mask; /* Implemented status register bits */ - uint32_t m_instr_mode; /* Stores whether we are in instruction mode or group 0/1 exception mode */ - uint32_t m_run_mode; /* Stores whether we are processing a reset, bus error, address error, or something else */ + u32 m_fpiar; /* FPU Instruction Address Register (m68040) */ + u32 m_fpsr; /* FPU Status Register (m68040) */ + u32 m_fpcr; /* FPU Control Register (m68040) */ + u32 m_t1_flag; /* Trace 1 */ + u32 m_t0_flag; /* Trace 0 */ + u32 m_s_flag; /* Supervisor */ + u32 m_m_flag; /* Master/Interrupt state */ + u32 m_x_flag; /* Extend */ + u32 m_n_flag; /* Negative */ + u32 m_not_z_flag; /* Zero, inverted for speedups */ + u32 m_v_flag; /* Overflow */ + u32 m_c_flag; /* Carry */ + u32 m_int_mask; /* I0-I2 */ + u32 m_int_level; /* State of interrupt pins IPL0-IPL2 -- ASG: changed from ints_pending */ + u32 m_stopped; /* Stopped state */ + u32 m_pref_addr; /* Last prefetch address */ + u32 m_pref_data; /* Data in the prefetch queue */ + u32 m_sr_mask; /* Implemented status register bits */ + u32 m_instr_mode; /* Stores whether we are in instruction mode or group 0/1 exception mode */ + u32 m_run_mode; /* Stores whether we are processing a reset, bus error, address error, or something else */ int m_has_pmmu; /* Indicates if a PMMU available (yes on 030, 040, no on EC030) */ int m_has_hmmu; /* Indicates if an Apple HMMU is available in place of the 68851 (020 only) */ int m_pmmu_enabled; /* Indicates if the PMMU is enabled */ @@ -223,34 +223,34 @@ protected: int m_fpu_just_reset; /* Indicates the FPU was just reset */ /* Clocks required for instructions / exceptions */ - uint32_t m_cyc_bcc_notake_b; - uint32_t m_cyc_bcc_notake_w; - uint32_t m_cyc_dbcc_f_noexp; - uint32_t m_cyc_dbcc_f_exp; - uint32_t m_cyc_scc_r_true; - uint32_t m_cyc_movem_w; - uint32_t m_cyc_movem_l; - uint32_t m_cyc_shift; - uint32_t m_cyc_reset; + u32 m_cyc_bcc_notake_b; + u32 m_cyc_bcc_notake_w; + u32 m_cyc_dbcc_f_noexp; + u32 m_cyc_dbcc_f_exp; + u32 m_cyc_scc_r_true; + u32 m_cyc_movem_w; + u32 m_cyc_movem_l; + u32 m_cyc_shift; + u32 m_cyc_reset; int m_initial_cycles; int m_icount; /* Number of clocks remaining */ int m_reset_cycles; - uint32_t m_tracing; + u32 m_tracing; int m_address_error; - uint32_t m_aerr_address; - uint32_t m_aerr_write_mode; - uint32_t m_aerr_fc; + u32 m_aerr_address; + u32 m_aerr_write_mode; + u32 m_aerr_fc; /* Virtual IRQ lines state */ - uint32_t m_virq_state; - uint32_t m_nmi_pending; + u32 m_virq_state; + u32 m_nmi_pending; const u16 *m_state_table; - const uint8_t* m_cyc_instruction; - const uint8_t* m_cyc_exception; + const u8* m_cyc_instruction; + const u8* m_cyc_exception; /* Callbacks to host */ write_line_delegate m_reset_instr_callback; /* Called when a RESET instruction is encountered */ @@ -280,42 +280,42 @@ protected: address_space *m_space, *m_ospace; - uint32_t m_iotemp; + u32 m_iotemp; /* save state data */ - uint16_t m_save_sr; - uint8_t m_save_stopped; - uint8_t m_save_halted; + u16 m_save_sr; + u8 m_save_stopped; + u8 m_save_halted; /* PMMU registers */ - uint32_t m_mmu_crp_aptr, m_mmu_crp_limit; - uint32_t m_mmu_srp_aptr, m_mmu_srp_limit; - uint32_t m_mmu_urp_aptr; /* 040 only */ - uint32_t m_mmu_tc; - uint16_t m_mmu_sr; - uint32_t m_mmu_sr_040; - uint32_t m_mmu_atc_tag[MMU_ATC_ENTRIES], m_mmu_atc_data[MMU_ATC_ENTRIES]; - uint32_t m_mmu_atc_rr; - uint32_t m_mmu_tt0, m_mmu_tt1; - uint32_t m_mmu_itt0, m_mmu_itt1, m_mmu_dtt0, m_mmu_dtt1; - uint32_t m_mmu_acr0, m_mmu_acr1, m_mmu_acr2, m_mmu_acr3; - uint32_t m_mmu_last_page_entry, m_mmu_last_page_entry_addr; - - uint16_t m_mmu_tmp_sr; /* temporary hack: status code for ptest and to handle write protection */ - uint16_t m_mmu_tmp_fc; /* temporary hack: function code for the mmu (moves) */ - uint16_t m_mmu_tmp_rw; /* temporary hack: read/write (1/0) for the mmu */ - uint8_t m_mmu_tmp_sz; /* temporary hack: size for mmu */ - - uint32_t m_mmu_tmp_buserror_address; /* temporary hack: (first) bus error address */ - uint16_t m_mmu_tmp_buserror_occurred; /* temporary hack: flag that bus error has occurred from mmu */ - uint16_t m_mmu_tmp_buserror_fc; /* temporary hack: (first) bus error fc */ - uint16_t m_mmu_tmp_buserror_rw; /* temporary hack: (first) bus error rw */ - uint16_t m_mmu_tmp_buserror_sz; /* temporary hack: (first) bus error size` */ + u32 m_mmu_crp_aptr, m_mmu_crp_limit; + u32 m_mmu_srp_aptr, m_mmu_srp_limit; + u32 m_mmu_urp_aptr; /* 040 only */ + u32 m_mmu_tc; + u16 m_mmu_sr; + u32 m_mmu_sr_040; + u32 m_mmu_atc_tag[MMU_ATC_ENTRIES], m_mmu_atc_data[MMU_ATC_ENTRIES]; + u32 m_mmu_atc_rr; + u32 m_mmu_tt0, m_mmu_tt1; + u32 m_mmu_itt0, m_mmu_itt1, m_mmu_dtt0, m_mmu_dtt1; + u32 m_mmu_acr0, m_mmu_acr1, m_mmu_acr2, m_mmu_acr3; + u32 m_mmu_last_page_entry, m_mmu_last_page_entry_addr; + + u16 m_mmu_tmp_sr; /* temporary hack: status code for ptest and to handle write protection */ + u16 m_mmu_tmp_fc; /* temporary hack: function code for the mmu (moves) */ + u16 m_mmu_tmp_rw; /* temporary hack: read/write (1/0) for the mmu */ + u8 m_mmu_tmp_sz; /* temporary hack: size for mmu */ + + u32 m_mmu_tmp_buserror_address; /* temporary hack: (first) bus error address */ + u16 m_mmu_tmp_buserror_occurred; /* temporary hack: flag that bus error has occurred from mmu */ + u16 m_mmu_tmp_buserror_fc; /* temporary hack: (first) bus error fc */ + u16 m_mmu_tmp_buserror_rw; /* temporary hack: (first) bus error rw */ + u16 m_mmu_tmp_buserror_sz; /* temporary hack: (first) bus error size` */ bool m_mmu_tablewalk; /* set when MMU walks page tables */ - uint32_t m_mmu_last_logical_addr; - uint32_t m_ic_address[M68K_IC_SIZE]; /* instruction cache address data */ - uint32_t m_ic_data[M68K_IC_SIZE]; /* instruction cache content data */ + u32 m_mmu_last_logical_addr; + u32 m_ic_address[M68K_IC_SIZE]; /* instruction cache address data */ + u32 m_ic_data[M68K_IC_SIZE]; /* instruction cache content data */ bool m_ic_valid[M68K_IC_SIZE]; /* instruction cache valid flags */ @@ -345,9 +345,9 @@ protected: void default_autovectors_map(address_map &map); - void m68ki_exception_interrupt(uint32_t int_level); + void m68ki_exception_interrupt(u32 int_level); - inline void m68ki_check_address_error(uint32_t ADDR, uint32_t WRITE_MODE, uint32_t FC) + inline void m68ki_check_address_error(u32 ADDR, u32 WRITE_MODE, u32 FC) { if((ADDR)&1) { @@ -380,22 +380,22 @@ class m68000_device : public m68000_base_device { public: // construction/destruction - m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 4; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 4; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; protected: - m68000_device(const machine_config &mconfig, const device_type type, const char *tag, device_t *owner, uint32_t clock); + m68000_device(const machine_config &mconfig, const device_type type, const char *tag, device_t *owner, u32 clock); - m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, - const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map); + m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, + const device_type type, u32 prg_data_width, u32 prg_address_bits, address_map_constructor internal_map); }; @@ -405,12 +405,12 @@ class m68008_device : public m68000_base_device { public: // construction/destruction - m68008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68008_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 4; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 4; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; @@ -420,12 +420,12 @@ class m68008fn_device : public m68000_base_device { public: // construction/destruction - m68008fn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68008fn_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 4; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 4; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; @@ -435,12 +435,12 @@ class m68010_device : public m68000_base_device { public: // construction/destruction - m68010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68010_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 4; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 4; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; @@ -450,12 +450,12 @@ class m68ec020_device : public m68000_base_device { public: // construction/destruction - m68ec020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68ec020_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 2; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 2; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; @@ -465,12 +465,12 @@ class m68020_device : public m68000_base_device { public: // construction/destruction - m68020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68020_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 2; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 2; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; @@ -480,12 +480,12 @@ class m68020fpu_device : public m68000_base_device { public: // construction/destruction - m68020fpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68020fpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 2; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 2; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; @@ -495,12 +495,12 @@ class m68020pmmu_device : public m68000_base_device { public: // construction/destruction - m68020pmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68020pmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 2; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 2; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; @@ -510,12 +510,12 @@ class m68020hmmu_device : public m68000_base_device { public: // construction/destruction - m68020hmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68020hmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 2; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 2; }; + virtual u32 execute_max_cycles() const override { return 158; }; virtual bool memory_translate(int space, int intention, offs_t &address) override; @@ -527,12 +527,12 @@ class m68ec030_device : public m68000_base_device { public: // construction/destruction - m68ec030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68ec030_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 2; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 2; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; @@ -542,12 +542,12 @@ class m68030_device : public m68000_base_device { public: // construction/destruction - m68030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68030_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 2; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 2; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; @@ -557,12 +557,12 @@ class m68ec040_device : public m68000_base_device { public: // construction/destruction - m68ec040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68ec040_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 2; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 2; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; @@ -572,12 +572,12 @@ class m68lc040_device : public m68000_base_device { public: // construction/destruction - m68lc040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68lc040_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 2; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 2; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; @@ -587,12 +587,12 @@ class m68040_device : public m68000_base_device { public: // construction/destruction - m68040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m68040_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 2; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 2; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; @@ -603,13 +603,13 @@ class scc68070_base_device : public m68000_base_device protected: virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 4; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 4; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; - scc68070_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, + scc68070_base_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, const device_type type, address_map_constructor internal_map); }; @@ -620,19 +620,19 @@ class fscpu32_device : public m68000_base_device { public: // construction/destruction - fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 2; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 2; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides virtual void device_start() override; protected: - fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, - const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map); + fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, + const device_type type, u32 prg_data_width, u32 prg_address_bits, address_map_constructor internal_map); }; @@ -641,12 +641,12 @@ class mcf5206e_device : public m68000_base_device { public: // construction/destruction - mcf5206e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mcf5206e_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual std::unique_ptr create_disassembler() override; - virtual uint32_t execute_min_cycles() const override { return 2; }; - virtual uint32_t execute_max_cycles() const override { return 158; }; + virtual u32 execute_min_cycles() const override { return 2; }; + virtual u32 execute_max_cycles() const override { return 158; }; // device-level overrides diff --git a/src/devices/cpu/m68000/m68k_in.lst b/src/devices/cpu/m68000/m68k_in.lst index e3b43abe77e..8c29e1b9834 100644 --- a/src/devices/cpu/m68000/m68k_in.lst +++ b/src/devices/cpu/m68000/m68k_in.lst @@ -77,11 +77,11 @@ f300 ff00 040fpu1 l . 234f:0 c100 f1f8 abcd b . 01:6 234fc:4 - uint32_t* r_dst = &DX(); - uint32_t src = DY(); - uint32_t dst = *r_dst; - uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); - uint32_t corf = 0; + u32* r_dst = &DX(); + u32 src = DY(); + u32 dst = *r_dst; + u32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); + u32 corf = 0; if(res > 9) corf = 6; @@ -102,11 +102,11 @@ c100 f1f8 abcd b . 01:6 234fc:4 cf08 fff8 abcd b . 01:18 234fc:16 - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_AY_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); + u32 corf = 0; if(res > 9) corf = 6; @@ -127,11 +127,11 @@ cf08 fff8 abcd b . 01:18 234fc:16 c10f f1ff abcd b . 01:18 234fc:16 - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_A7_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); + u32 corf = 0; if(res > 9) corf = 6; @@ -152,11 +152,11 @@ c10f f1ff abcd b . 01:18 234fc:16 cf0f ffff abcd b . 01:18 234fc:16 - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_A7_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); + u32 corf = 0; if(res > 9) corf = 6; @@ -177,11 +177,11 @@ cf0f ffff abcd b . 01:18 234fc:16 c108 f1f8 abcd b . 01:18 234fc:16 - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_AY_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); + u32 corf = 0; if(res > 9) corf = 6; @@ -202,10 +202,10 @@ c108 f1f8 abcd b . 01:18 234fc:16 d000 f1f8 add b . 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_8(DY()); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_8(DY()); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -216,10 +216,10 @@ d000 f1f8 add b . 01:4 234fc:2 d000 f1c0 add b A+-DXWLdxI 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = M68KMAKE_GET_OPER_AY_8; - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = M68KMAKE_GET_OPER_AY_8; + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -230,10 +230,10 @@ d000 f1c0 add b A+-DXWLdxI 01:4 234fc:2 d040 f1f8 add w . 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(DY()); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(DY()); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -244,10 +244,10 @@ d040 f1f8 add w . 01:4 234fc:2 d048 f1f8 add w . 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(AY()); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(AY()); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -258,10 +258,10 @@ d048 f1f8 add w . 01:4 234fc:2 d040 f1c0 add w A+-DXWLdxI 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = M68KMAKE_GET_OPER_AY_16; - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = M68KMAKE_GET_OPER_AY_16; + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -272,10 +272,10 @@ d040 f1c0 add w A+-DXWLdxI 01:4 234fc:2 d080 f1f8 add l . 01:6 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = DY(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = DY(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -286,10 +286,10 @@ d080 f1f8 add l . 01:6 234fc:2 d088 f1f8 add l . 01:6 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = AY(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = AY(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -300,10 +300,10 @@ d088 f1f8 add l . 01:6 234fc:2 d080 f1c0 add l A+-DXWLdxI 01:6 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = M68KMAKE_GET_OPER_AY_32; - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = M68KMAKE_GET_OPER_AY_32; + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -314,10 +314,10 @@ d080 f1c0 add l A+-DXWLdxI 01:6 234fc:2 d100 f1c0 add b A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -328,10 +328,10 @@ d100 f1c0 add b A+-DXWL 01:8 234fc:4 d140 f1c0 add w A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -342,10 +342,10 @@ d140 f1c0 add w A+-DXWL 01:8 234fc:4 d180 f1c0 add l A+-DXWL 01:12 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -356,48 +356,48 @@ d180 f1c0 add l A+-DXWL 01:12 234fc:4 d0c0 f1f8 adda w . 01:8 234fc:2 - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(DY())); d0c8 f1f8 adda w . 01:8 234fc:2 - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(AY())); d0c0 f1c0 adda w A+-DXWLdxI 01:8 234fc:2 - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); d1c0 f1f8 adda l . 01:6 234fc:2 - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + DY()); d1c8 f1f8 adda l . 01:6 234fc:2 - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + AY()); d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 - uint32_t* r_dst = &AX(); - uint32_t src = M68KMAKE_GET_OPER_AY_32; + u32* r_dst = &AX(); + u32 src = M68KMAKE_GET_OPER_AY_32; *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); 0600 fff8 addi b . 01:8 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t src = OPER_I_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DY(); + u32 src = OPER_I_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -408,10 +408,10 @@ d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 0600 ffc0 addi b A+-DXWL 01:12 234fc:4 - uint32_t src = OPER_I_8(); - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = OPER_I_8(); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -422,10 +422,10 @@ d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 0640 fff8 addi w . 01:8 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t src = OPER_I_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DY(); + u32 src = OPER_I_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -436,10 +436,10 @@ d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 0640 ffc0 addi w A+-DXWL 01:12 234fc:4 - uint32_t src = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -450,10 +450,10 @@ d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 0680 fff8 addi l . 0:16 1:14 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t src = OPER_I_32(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DY(); + u32 src = OPER_I_32(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -464,10 +464,10 @@ d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 0680 ffc0 addi l A+-DXWL 01:20 234fc:4 - uint32_t src = OPER_I_32(); - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = OPER_I_32(); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -478,10 +478,10 @@ d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 5000 f1f8 addq b . 01:4 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DY(); + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -492,10 +492,10 @@ d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 5000 f1c0 addq b A+-DXWL 01:8 234fc:4 - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -506,10 +506,10 @@ d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 5040 f1f8 addq w . 01:4 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DY(); + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -520,16 +520,16 @@ d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 5048 f1f8 addq w . 01:4 234fc:2 - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + (((m_ir >> 9) - 1) & 7) + 1); 5040 f1c0 addq w A+-DXWL 01:8 234fc:4 - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -540,10 +540,10 @@ d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 5080 f1f8 addq l . 01:8 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DY(); + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -554,16 +554,16 @@ d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 5088 f1f8 addq l . 01:8 234fc:2 - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + (((m_ir >> 9) - 1) & 7) + 1); 5080 f1c0 addq l A+-DXWL 01:12 234fc:4 - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); @@ -575,10 +575,10 @@ d1c0 f1c0 adda l A+-DXWLdxI 01:6 234fc:2 d100 f1f8 addx b . 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_8(DY()); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst + XFLAG_1(); + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_8(DY()); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -591,10 +591,10 @@ d100 f1f8 addx b . 01:4 234fc:2 d140 f1f8 addx w . 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(DY()); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst + XFLAG_1(); + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(DY()); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -607,10 +607,10 @@ d140 f1f8 addx w . 01:4 234fc:2 d180 f1f8 addx l . 0:8 1:6 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = DY(); - uint32_t dst = *r_dst; - uint32_t res = src + dst + XFLAG_1(); + u32* r_dst = &DX(); + u32 src = DY(); + u32 dst = *r_dst; + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -623,10 +623,10 @@ d180 f1f8 addx l . 0:8 1:6 234fc:2 df08 fff8 addx b . 01:18 234fc:12 - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst + XFLAG_1(); + u32 src = OPER_AY_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -639,10 +639,10 @@ df08 fff8 addx b . 01:18 234fc:12 d10f f1ff addx b . 01:18 234fc:12 - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst + XFLAG_1(); + u32 src = OPER_A7_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -655,10 +655,10 @@ d10f f1ff addx b . 01:18 234fc:12 df0f ffff addx b . 01:18 234fc:12 - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst + XFLAG_1(); + u32 src = OPER_A7_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -671,10 +671,10 @@ df0f ffff addx b . 01:18 234fc:12 d108 f1f8 addx b . 01:18 234fc:12 - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst + XFLAG_1(); + u32 src = OPER_AY_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -687,10 +687,10 @@ d108 f1f8 addx b . 01:18 234fc:12 d148 f1f8 addx w . 01:18 234fc:12 - uint32_t src = OPER_AY_PD_16(); - uint32_t ea = EA_AX_PD_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst + XFLAG_1(); + u32 src = OPER_AY_PD_16(); + u32 ea = EA_AX_PD_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -703,10 +703,10 @@ d148 f1f8 addx w . 01:18 234fc:12 d188 f1f8 addx l . 01:30 234fc:12 - uint32_t src = OPER_AY_PD_32(); - uint32_t ea = EA_AX_PD_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst + XFLAG_1(); + u32 src = OPER_AY_PD_32(); + u32 ea = EA_AX_PD_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -767,8 +767,8 @@ c080 f1c0 and l A+-DXWLdxI 01:6 234fc:2 c100 f1c0 and b A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t res = DX() & m68ki_read_8(ea); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 res = DX() & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_c_flag = CFLAG_CLEAR; @@ -779,8 +779,8 @@ c100 f1c0 and b A+-DXWL 01:8 234fc:4 c140 f1c0 and w A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t res = DX() & m68ki_read_16(ea); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 res = DX() & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_c_flag = CFLAG_CLEAR; @@ -791,8 +791,8 @@ c140 f1c0 and w A+-DXWL 01:8 234fc:4 c180 f1c0 and l A+-DXWL 01:12 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t res = DX() & m68ki_read_32(ea); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 res = DX() & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -811,9 +811,9 @@ c180 f1c0 and l A+-DXWL 01:12 234fc:4 0200 ffc0 andi b A+-DXWL 01:12 234fc:4 - uint32_t src = OPER_I_8(); - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t res = src & m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 res = src & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -832,9 +832,9 @@ c180 f1c0 and l A+-DXWL 01:12 234fc:4 0240 ffc0 andi w A+-DXWL 01:12 234fc:4 - uint32_t src = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t res = src & m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 res = src & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -853,9 +853,9 @@ c180 f1c0 and l A+-DXWL 01:12 234fc:4 0280 ffc0 andi l A+-DXWL 01:20 234fc:4 - uint32_t src = OPER_I_32(); - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t res = src & m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 res = src & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -872,7 +872,7 @@ c180 f1c0 and l A+-DXWL 01:12 234fc:4 027c ffff andi w . 0:20p 1:16p 234fc:12p if(m_s_flag) { - uint32_t src = OPER_I_16(); + u32 src = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(m68ki_get_sr() & src); return; @@ -881,10 +881,10 @@ c180 f1c0 and l A+-DXWL 01:12 234fc:4 e000 f1f8 asr b . 01234fc:6 - uint32_t* r_dst = &DY(); - uint32_t shift = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src >> shift; if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src >> shift; if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = *r_dst; - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = *r_dst; + u32 res = src >> shift; if(shift != 0) m_icount -= shift<> shift; + u32* r_dst = &DY(); + u32 shift = DX() & 0x3f; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src >> shift; if(shift != 0) { @@ -991,10 +991,10 @@ e020 f1f8 asr b . 01234fc:6 e060 f1f8 asr w . 01234fc:6 - uint32_t* r_dst = &DY(); - uint32_t shift = DX() & 0x3f; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = DX() & 0x3f; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src >> shift; if(shift != 0) { @@ -1041,10 +1041,10 @@ e060 f1f8 asr w . 01234fc:6 e0a0 f1f8 asr l . 01:8 234fc:6 - uint32_t* r_dst = &DY(); - uint32_t shift = DX() & 0x3f; - uint32_t src = *r_dst; - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = DX() & 0x3f; + u32 src = *r_dst; + u32 res = src >> shift; if(shift != 0) { @@ -1091,9 +1091,9 @@ e0a0 f1f8 asr l . 01:8 234fc:6 e0c0 ffc0 asr w A+-DXWL 01:8 234fc:5 - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; if(GET_MSB_16(src)) res |= 0x8000; @@ -1107,10 +1107,10 @@ e0c0 ffc0 asr w A+-DXWL 01:8 234fc:5 e100 f1f8 asl b . 01:6 234fc:8 - uint32_t* r_dst = &DY(); - uint32_t shift = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = MASK_OUT_ABOVE_8(src << shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = MASK_OUT_ABOVE_8(src << shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = MASK_OUT_ABOVE_16(src << shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = MASK_OUT_ABOVE_16(src << shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = *r_dst; - uint32_t res = MASK_OUT_ABOVE_32(src << shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = *r_dst; + u32 res = MASK_OUT_ABOVE_32(src << shift); if(shift != 0) m_icount -= shift<>6)&31; - uint32_t width = word2; - uint32_t* data = &DY(); - uint64_t mask; + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u32* data = &DY(); + u64 mask; if(BIT_B(word2)) @@ -1432,15 +1432,15 @@ eac0 fff8 bfchg l . 234fc:12 eac0 ffc0 bfchg l ADXWL 234fc:20 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = M68KMAKE_GET_EA_AY_8; + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) @@ -1484,11 +1484,11 @@ eac0 ffc0 bfchg l ADXWL 234fc:20 ecc0 fff8 bfclr l . 234fc:12 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t* data = &DY(); - uint64_t mask; + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u32* data = &DY(); + u64 mask; if(BIT_B(word2)) @@ -1519,15 +1519,15 @@ ecc0 fff8 bfclr l . 234fc:12 ecc0 ffc0 bfclr l ADXWL 234fc:20 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = M68KMAKE_GET_EA_AY_8; + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) @@ -1571,10 +1571,10 @@ ecc0 ffc0 bfclr l ADXWL 234fc:20 ebc0 fff8 bfexts l . 234fc:8 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint64_t data = DY(); + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u64 data = DY(); if(BIT_B(word2)) @@ -1603,11 +1603,11 @@ ebc0 fff8 bfexts l . 234fc:8 ebc0 ffc0 bfexts l ADXWLdx 234fc:15 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = M68KMAKE_GET_EA_AY_8; + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) @@ -1653,10 +1653,10 @@ ebc0 ffc0 bfexts l ADXWLdx 234fc:15 e9c0 fff8 bfextu l . 234fc:8 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint64_t data = DY(); + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u64 data = DY(); if(BIT_B(word2)) @@ -1685,11 +1685,11 @@ e9c0 fff8 bfextu l . 234fc:8 e9c0 ffc0 bfextu l ADXWLdx 234fc:15 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = M68KMAKE_GET_EA_AY_8; + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) @@ -1734,11 +1734,11 @@ e9c0 ffc0 bfextu l ADXWLdx 234fc:15 edc0 fff8 bfffo l . 234fc:18 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint64_t data = DY(); - uint32_t bit; + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u64 data = DY(); + u32 bit; if(BIT_B(word2)) @@ -1770,13 +1770,13 @@ edc0 fff8 bfffo l . 234fc:18 edc0 ffc0 bfffo l ADXWLdx 234fc:28 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - int32_t local_offset; - uint32_t width = word2; - uint32_t data; - uint32_t bit; - uint32_t ea = M68KMAKE_GET_EA_AY_8; + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + s32 local_offset; + u32 width = word2; + u32 data; + u32 bit; + u32 ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) @@ -1820,12 +1820,12 @@ edc0 ffc0 bfffo l ADXWLdx 234fc:28 efc0 fff8 bfins l . 234fc:10 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t* data = &DY(); - uint64_t mask; - uint64_t insert = REG_D()[(word2>>12)&7]; + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u32* data = &DY(); + u64 mask; + u64 insert = REG_D()[(word2>>12)&7]; if(BIT_B(word2)) @@ -1860,18 +1860,18 @@ efc0 fff8 bfins l . 234fc:10 efc0 ffc0 bfins l ADXWL 234fc:17 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t insert_base = REG_D()[(word2>>12)&7]; - uint32_t insert_long; - uint32_t insert_byte; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = M68KMAKE_GET_EA_AY_8; + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 insert_base = REG_D()[(word2>>12)&7]; + u32 insert_long; + u32 insert_byte; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) @@ -1934,11 +1934,11 @@ efc0 ffc0 bfins l ADXWL 234fc:17 eec0 fff8 bfset l . 234fc:12 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t* data = &DY(); - uint64_t mask; + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u32* data = &DY(); + u64 mask; if(BIT_B(word2)) @@ -1969,15 +1969,15 @@ eec0 fff8 bfset l . 234fc:12 eec0 ffc0 bfset l ADXWL 234fc:20 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = M68KMAKE_GET_EA_AY_8; + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -2020,11 +2020,11 @@ eec0 ffc0 bfset l ADXWL 234fc:20 e8c0 fff8 bftst l . 234fc:6 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t* data = &DY(); - uint64_t mask; + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u32* data = &DY(); + u64 mask; if(BIT_B(word2)) @@ -2053,15 +2053,15 @@ e8c0 fff8 bftst l . 234fc:6 e8c0 ffc0 bftst l ADXWLdx 234fc:13 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = M68KMAKE_GET_EA_AY_8; + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -2119,7 +2119,7 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 6000 ffff bra w . 01234fc:10 - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -2130,7 +2130,7 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 60ff ffff bra l . 01234fc:10 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t offset = OPER_I_32(); + u32 offset = OPER_I_32(); m_pc -= 4; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_32(offset); @@ -2148,34 +2148,34 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 01c0 f1f8 bset l . 01:8 234fc:4 - uint32_t* r_dst = &DY(); - uint32_t mask = 1 << (DX() & 0x1f); + u32* r_dst = &DY(); + u32 mask = 1 << (DX() & 0x1f); m_not_z_flag = *r_dst & mask; *r_dst |= mask; 01c0 f1c0 bset b A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t src = m68ki_read_8(ea); - uint32_t mask = 1 << (DX() & 7); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 src = m68ki_read_8(ea); + u32 mask = 1 << (DX() & 7); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); 08c0 fff8 bset l . 01:12 234fc:4 - uint32_t* r_dst = &DY(); - uint32_t mask = 1 << (OPER_I_8() & 0x1f); + u32* r_dst = &DY(); + u32 mask = 1 << (OPER_I_8() & 0x1f); m_not_z_flag = *r_dst & mask; *r_dst |= mask; 08c0 ffc0 bset b A+-DXWL 01:12 234fc:4 - uint32_t mask = 1 << (OPER_I_8() & 7); - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t src = m68ki_read_8(ea); + u32 mask = 1 << (OPER_I_8() & 7); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 src = m68ki_read_8(ea); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -2188,7 +2188,7 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 6100 ffff bsr w . 01:18 234fc:7 - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_push_32(m_pc); m_pc -= 2; @@ -2198,7 +2198,7 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 61ff ffff bsr l . 01:18 234fc:7 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t offset = OPER_I_32(); + u32 offset = OPER_I_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_push_32(m_pc); m_pc -= 4; @@ -2226,7 +2226,7 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 0800 ffc0 btst b A+-DXWLdx 01:8 234fc:4 - uint32_t bit = OPER_I_8() & 7; + u32 bit = OPER_I_8() & 7; m_not_z_flag = M68KMAKE_GET_OPER_AY_8 & (1 << bit); @@ -2235,7 +2235,7 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 /* note: watch out for pcrelative modes */ if(CPU_TYPE_IS_020_VARIANT()) { - uint32_t ea = M68KMAKE_GET_EA_AY_32; + u32 ea = M68KMAKE_GET_EA_AY_32; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_pc += 2; @@ -2250,11 +2250,11 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 0ac0 ffc0 cas b A+-DXWL 234fc:12 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t dest = m68ki_read_8(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_8(*compare); + u32 word2 = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 dest = m68ki_read_8(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_8(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_8(res); @@ -2277,11 +2277,11 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 0cc0 ffc0 cas w A+-DXWL 234fc:12 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t dest = m68ki_read_16(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_16(*compare); + u32 word2 = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 dest = m68ki_read_16(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_16(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_16(res); @@ -2304,11 +2304,11 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 0ec0 ffc0 cas l A+-DXWL 234fc:12 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t dest = m68ki_read_32(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - *compare; + u32 word2 = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 dest = m68ki_read_32(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - *compare; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_32(res); @@ -2331,15 +2331,15 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 0cfc ffff cas2 w . 234fc:12 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_32(); - uint32_t* compare1 = ®_D()[(word2 >> 16) & 7]; - uint32_t ea1 = REG_DA()[(word2 >> 28) & 15]; - uint32_t dest1 = m68ki_read_16(ea1); - uint32_t res1 = dest1 - MASK_OUT_ABOVE_16(*compare1); - uint32_t* compare2 = ®_D()[word2 & 7]; - uint32_t ea2 = REG_DA()[(word2 >> 12) & 15]; - uint32_t dest2 = m68ki_read_16(ea2); - uint32_t res2; + u32 word2 = OPER_I_32(); + u32* compare1 = ®_D()[(word2 >> 16) & 7]; + u32 ea1 = REG_DA()[(word2 >> 28) & 15]; + u32 dest1 = m68ki_read_16(ea1); + u32 res1 = dest1 - MASK_OUT_ABOVE_16(*compare1); + u32* compare2 = ®_D()[word2 & 7]; + u32 ea2 = REG_DA()[(word2 >> 12) & 15]; + u32 dest2 = m68ki_read_16(ea2); + u32 res2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_16(res1); @@ -2374,15 +2374,15 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 0efc ffff cas2 l . 234fc:12 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_32(); - uint32_t* compare1 = ®_D()[(word2 >> 16) & 7]; - uint32_t ea1 = REG_DA()[(word2 >> 28) & 15]; - uint32_t dest1 = m68ki_read_32(ea1); - uint32_t res1 = dest1 - *compare1; - uint32_t* compare2 = ®_D()[word2 & 7]; - uint32_t ea2 = REG_DA()[(word2 >> 12) & 15]; - uint32_t dest2 = m68ki_read_32(ea2); - uint32_t res2; + u32 word2 = OPER_I_32(); + u32* compare1 = ®_D()[(word2 >> 16) & 7]; + u32 ea1 = REG_DA()[(word2 >> 28) & 15]; + u32 dest1 = m68ki_read_32(ea1); + u32 res1 = dest1 - *compare1; + u32* compare2 = ®_D()[word2 & 7]; + u32 ea2 = REG_DA()[(word2 >> 12) & 15]; + u32 dest2 = m68ki_read_32(ea2); + u32 res2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_32(res1); @@ -2415,8 +2415,8 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 4180 f1f8 chk w . 0:10 1234fc:8 - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(DY()); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(DY()); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -2431,8 +2431,8 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 4180 f1c0 chk w A+-DXWLdxI 0:10 1234fc:8 - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -2449,8 +2449,8 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 4100 f1f8 chk l . 234fc:8 if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(DY()); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(DY()); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -2470,8 +2470,8 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 4100 f1c0 chk l A+-DXWLdxI 234fc:8 if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(M68KMAKE_GET_OPER_AY_32); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(M68KMAKE_GET_OPER_AY_32); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -2491,23 +2491,23 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 00fa ffff chk2cmp2 b . 234fc:23 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xff; - uint32_t ea = EA_PCDI_8(); - int32_t lower_bound = m68ki_read_pcrel_8(ea); - int32_t upper_bound = m68ki_read_pcrel_8(ea + 1); + u32 ea = EA_PCDI_8(); + s32 lower_bound = m68ki_read_pcrel_8(ea); + s32 upper_bound = m68ki_read_pcrel_8(ea + 1); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80) { - lower_bound = (int32_t)(int8_t)lower_bound; - upper_bound = (int32_t)(int8_t)upper_bound; + lower_bound = (s32)(s8)lower_bound; + upper_bound = (s32)(s8)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int8_t)compare; + compare = (s32)(s8)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -2523,23 +2523,23 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 00fb ffff chk2cmp2 b . 234fc:23 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xff; - uint32_t ea = EA_PCIX_8(); - int32_t lower_bound = m68ki_read_pcrel_8(ea); - int32_t upper_bound = m68ki_read_pcrel_8(ea + 1); + u32 ea = EA_PCIX_8(); + s32 lower_bound = m68ki_read_pcrel_8(ea); + s32 upper_bound = m68ki_read_pcrel_8(ea + 1); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80) { - lower_bound = (int32_t)(int8_t)lower_bound; - upper_bound = (int32_t)(int8_t)upper_bound; + lower_bound = (s32)(s8)lower_bound; + upper_bound = (s32)(s8)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int8_t)compare; + compare = (s32)(s8)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -2555,23 +2555,23 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 00c0 ffc0 chk2cmp2 b ADXWL 234fc:18 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xff; - uint32_t ea = M68KMAKE_GET_EA_AY_8; - int32_t lower_bound = m68ki_read_8(ea); - int32_t upper_bound = m68ki_read_8(ea + 1); + u32 ea = M68KMAKE_GET_EA_AY_8; + s32 lower_bound = m68ki_read_8(ea); + s32 upper_bound = m68ki_read_8(ea + 1); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80) { - lower_bound = (int32_t)(int8_t)lower_bound; - upper_bound = (int32_t)(int8_t)upper_bound; + lower_bound = (s32)(s8)lower_bound; + upper_bound = (s32)(s8)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int8_t)compare; + compare = (s32)(s8)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -2587,23 +2587,23 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 02fa ffff chk2cmp2 w . 234fc:23 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xffff; - uint32_t ea = EA_PCDI_16(); - int32_t lower_bound = m68ki_read_pcrel_16(ea); - int32_t upper_bound = m68ki_read_pcrel_16(ea + 2); + u32 ea = EA_PCDI_16(); + s32 lower_bound = m68ki_read_pcrel_16(ea); + s32 upper_bound = m68ki_read_pcrel_16(ea + 2); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x8000) { - lower_bound = (int32_t)(int16_t)lower_bound; - upper_bound = (int32_t)(int16_t)upper_bound; + lower_bound = (s32)(s16)lower_bound; + upper_bound = (s32)(s16)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int16_t)compare; + compare = (s32)(s16)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -2619,23 +2619,23 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 02fb ffff chk2cmp2 w . 234fc:23 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xffff; - uint32_t ea = EA_PCIX_16(); - int32_t lower_bound = m68ki_read_pcrel_16(ea); - int32_t upper_bound = m68ki_read_pcrel_16(ea + 2); + u32 ea = EA_PCIX_16(); + s32 lower_bound = m68ki_read_pcrel_16(ea); + s32 upper_bound = m68ki_read_pcrel_16(ea + 2); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x8000) { - lower_bound = (int32_t)(int16_t)lower_bound; - upper_bound = (int32_t)(int16_t)upper_bound; + lower_bound = (s32)(s16)lower_bound; + upper_bound = (s32)(s16)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int16_t)compare; + compare = (s32)(s16)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -2651,23 +2651,23 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 02c0 ffc0 chk2cmp2 w ADXWL 234fc:18 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xffff; - uint32_t ea = M68KMAKE_GET_EA_AY_16; - int32_t lower_bound = m68ki_read_16(ea); - int32_t upper_bound = m68ki_read_16(ea + 2); + u32 ea = M68KMAKE_GET_EA_AY_16; + s32 lower_bound = m68ki_read_16(ea); + s32 upper_bound = m68ki_read_16(ea + 2); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x8000) { - lower_bound = (int32_t)(int16_t)lower_bound; - upper_bound = (int32_t)(int16_t)upper_bound; + lower_bound = (s32)(s16)lower_bound; + upper_bound = (s32)(s16)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int16_t)compare; + compare = (s32)(s16)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -2683,18 +2683,18 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 04fa ffff chk2cmp2 l . 234fc:23 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int64_t compare = REG_DA()[(word2 >> 12) & 15]; - uint32_t ea = EA_PCDI_32(); - int64_t lower_bound = m68ki_read_pcrel_32(ea); - int64_t upper_bound = m68ki_read_pcrel_32(ea + 4); + u32 word2 = OPER_I_16(); + s64 compare = REG_DA()[(word2 >> 12) & 15]; + u32 ea = EA_PCDI_32(); + s64 lower_bound = m68ki_read_pcrel_32(ea); + s64 upper_bound = m68ki_read_pcrel_32(ea + 4); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80000000) { - lower_bound = (int64_t)(int32_t)lower_bound; - upper_bound = (int64_t)(int32_t)upper_bound; - compare = (int64_t)(int32_t)compare; + lower_bound = (s64)(s32)lower_bound; + upper_bound = (s64)(s32)upper_bound; + compare = (s64)(s32)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -2710,18 +2710,18 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 04fb ffff chk2cmp2 l . 234fc:23 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int64_t compare = REG_DA()[(word2 >> 12) & 15]; - uint32_t ea = EA_PCIX_32(); - int64_t lower_bound = m68ki_read_pcrel_32(ea); - int64_t upper_bound = m68ki_read_pcrel_32(ea + 4); + u32 word2 = OPER_I_16(); + s64 compare = REG_DA()[(word2 >> 12) & 15]; + u32 ea = EA_PCIX_32(); + s64 lower_bound = m68ki_read_pcrel_32(ea); + s64 upper_bound = m68ki_read_pcrel_32(ea + 4); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80000000) { - lower_bound = (int64_t)(int32_t)lower_bound; - upper_bound = (int64_t)(int32_t)upper_bound; - compare = (int64_t)(int32_t)compare; + lower_bound = (s64)(s32)lower_bound; + upper_bound = (s64)(s32)upper_bound; + compare = (s64)(s32)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -2737,18 +2737,18 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 04c0 ffc0 chk2cmp2 l ADXWL 234fc:18 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int64_t compare = REG_DA()[(word2 >> 12) & 15]; - uint32_t ea = M68KMAKE_GET_EA_AY_32; - int64_t lower_bound = m68ki_read_32(ea); - int64_t upper_bound = m68ki_read_32(ea + 4); + u32 word2 = OPER_I_16(); + s64 compare = REG_DA()[(word2 >> 12) & 15]; + u32 ea = M68KMAKE_GET_EA_AY_32; + s64 lower_bound = m68ki_read_32(ea); + s64 upper_bound = m68ki_read_32(ea + 4); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80000000) { - lower_bound = (int64_t)(int32_t)lower_bound; - upper_bound = (int64_t)(int32_t)upper_bound; - compare = (int64_t)(int32_t)compare; + lower_bound = (s64)(s32)lower_bound; + upper_bound = (s64)(s32)upper_bound; + compare = (s64)(s32)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -2771,7 +2771,7 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 4200 ffc0 clr b A+-DXWL 0:8 1234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_8; + u32 ea = M68KMAKE_GET_EA_AY_8; if(CPU_TYPE_IS_000()) { @@ -2796,7 +2796,7 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 4240 ffc0 clr w A+-DXWL 0:8 1234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_16; + u32 ea = M68KMAKE_GET_EA_AY_16; if(CPU_TYPE_IS_000()) { @@ -2821,7 +2821,7 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 4280 ffc0 clr l A+-DXWL 0:12 1:6 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_32; + u32 ea = M68KMAKE_GET_EA_AY_32; if(CPU_TYPE_IS_000()) { @@ -2837,9 +2837,9 @@ e8c0 ffc0 bftst l ADXWLdx 234fc:13 b000 f1f8 cmp b . 01:4 234fc:2 - uint32_t src = MASK_OUT_ABOVE_8(DY()); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = MASK_OUT_ABOVE_8(DY()); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -2848,9 +2848,9 @@ b000 f1f8 cmp b . 01:4 234fc:2 b000 f1c0 cmp b A+-DXWLdxI 01:4 234fc:2 - uint32_t src = M68KMAKE_GET_OPER_AY_8; - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = M68KMAKE_GET_OPER_AY_8; + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -2859,9 +2859,9 @@ b000 f1c0 cmp b A+-DXWLdxI 01:4 234fc:2 b040 f1f8 cmp w . 01:4 234fc:2 - uint32_t src = MASK_OUT_ABOVE_16(DY()); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = MASK_OUT_ABOVE_16(DY()); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -2870,9 +2870,9 @@ b040 f1f8 cmp w . 01:4 234fc:2 b048 f1f8 cmp w . 01:4 234fc:2 - uint32_t src = MASK_OUT_ABOVE_16(AY()); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = MASK_OUT_ABOVE_16(AY()); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -2881,9 +2881,9 @@ b048 f1f8 cmp w . 01:4 234fc:2 b040 f1c0 cmp w A+-DXWLdxI 01:4 234fc:2 - uint32_t src = M68KMAKE_GET_OPER_AY_16; - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = M68KMAKE_GET_OPER_AY_16; + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -2892,9 +2892,9 @@ b040 f1c0 cmp w A+-DXWLdxI 01:4 234fc:2 b080 f1f8 cmp l . 01:6 234fc:2 - uint32_t src = DY(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = DY(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -2903,9 +2903,9 @@ b080 f1f8 cmp l . 01:6 234fc:2 b088 f1f8 cmp l . 01:6 234fc:2 - uint32_t src = AY(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = AY(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -2914,9 +2914,9 @@ b088 f1f8 cmp l . 01:6 234fc:2 b080 f1c0 cmp l A+-DXWLdxI 01:6 234fc:2 - uint32_t src = M68KMAKE_GET_OPER_AY_32; - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = M68KMAKE_GET_OPER_AY_32; + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -2925,9 +2925,9 @@ b080 f1c0 cmp l A+-DXWLdxI 01:6 234fc:2 b0c0 f1f8 cmpa w . 01:6 234fc:4 - uint32_t src = MAKE_INT_16(DY()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(DY()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -2936,9 +2936,9 @@ b0c0 f1f8 cmpa w . 01:6 234fc:4 b0c8 f1f8 cmpa w . 01:6 234fc:4 - uint32_t src = MAKE_INT_16(AY()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(AY()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -2947,9 +2947,9 @@ b0c8 f1f8 cmpa w . 01:6 234fc:4 b0c0 f1c0 cmpa w A+-DXWLdxI 01:6 234fc:4 - uint32_t src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -2958,9 +2958,9 @@ b0c0 f1c0 cmpa w A+-DXWLdxI 01:6 234fc:4 b1c0 f1f8 cmpa l . 01:6 234fc:4 - uint32_t src = DY(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = DY(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -2969,9 +2969,9 @@ b1c0 f1f8 cmpa l . 01:6 234fc:4 b1c8 f1f8 cmpa l . 01:6 234fc:4 - uint32_t src = AY(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = AY(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -2980,9 +2980,9 @@ b1c8 f1f8 cmpa l . 01:6 234fc:4 b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 - uint32_t src = M68KMAKE_GET_OPER_AY_32; - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = M68KMAKE_GET_OPER_AY_32; + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -2991,9 +2991,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 0c00 fff8 cmpi b . 01:8 234fc:2 - uint32_t src = OPER_I_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DY()); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = MASK_OUT_ABOVE_8(DY()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -3002,9 +3002,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 0c00 ffc0 cmpi b A+-DXWL 01:8 234fc:2 - uint32_t src = OPER_I_8(); - uint32_t dst = M68KMAKE_GET_OPER_AY_8; - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = M68KMAKE_GET_OPER_AY_8; + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -3015,9 +3015,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 0c3a ffff cmpi b . 234fc:7 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_PCDI_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_PCDI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -3031,9 +3031,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 0c3b ffff cmpi b . 234fc:9 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_PCIX_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_PCIX_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -3045,9 +3045,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 0c40 fff8 cmpi w . 01:8 234fc:2 - uint32_t src = OPER_I_16(); - uint32_t dst = MASK_OUT_ABOVE_16(DY()); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = MASK_OUT_ABOVE_16(DY()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -3056,9 +3056,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 0c40 ffc0 cmpi w A+-DXWL 01:8 234fc:2 - uint32_t src = OPER_I_16(); - uint32_t dst = M68KMAKE_GET_OPER_AY_16; - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = M68KMAKE_GET_OPER_AY_16; + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -3069,9 +3069,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 0c7a ffff cmpi w . 234fc:7 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_I_16(); - uint32_t dst = OPER_PCDI_16(); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = OPER_PCDI_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -3085,9 +3085,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 0c7b ffff cmpi w . 234fc:9 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_I_16(); - uint32_t dst = OPER_PCIX_16(); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = OPER_PCIX_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -3099,9 +3099,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 0c80 fff8 cmpi l . 0:14 1:12 234fc:2 - uint32_t src = OPER_I_32(); - uint32_t dst = DY(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = DY(); + u32 res = dst - src; if (!m_cmpild_instr_callback.isnull()) (m_cmpild_instr_callback)(*m_program, m_ir & 7, src, 0xffffffff); @@ -3113,9 +3113,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 0c80 ffc0 cmpi l A+-DXWL 01:12 234fc:2 - uint32_t src = OPER_I_32(); - uint32_t dst = M68KMAKE_GET_OPER_AY_32; - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = M68KMAKE_GET_OPER_AY_32; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -3126,9 +3126,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 0cba ffff cmpi l . 234fc:7 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_I_32(); - uint32_t dst = OPER_PCDI_32(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = OPER_PCDI_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -3142,9 +3142,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 0cbb ffff cmpi l . 234fc:9 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_I_32(); - uint32_t dst = OPER_PCIX_32(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = OPER_PCIX_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -3156,9 +3156,9 @@ b1c0 f1c0 cmpa l A+-DXWLdxI 01:6 234fc:4 bf08 fff8 cmpm b . 01:12 234fc:9 - uint32_t src = OPER_AY_PI_8(); - uint32_t dst = OPER_A7_PI_8(); - uint32_t res = dst - src; + u32 src = OPER_AY_PI_8(); + u32 dst = OPER_A7_PI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -3167,9 +3167,9 @@ bf08 fff8 cmpm b . 01:12 234fc:9 b10f f1ff cmpm b . 01:12 234fc:9 - uint32_t src = OPER_A7_PI_8(); - uint32_t dst = OPER_AX_PI_8(); - uint32_t res = dst - src; + u32 src = OPER_A7_PI_8(); + u32 dst = OPER_AX_PI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -3178,9 +3178,9 @@ b10f f1ff cmpm b . 01:12 234fc:9 bf0f ffff cmpm b . 01:12 234fc:9 - uint32_t src = OPER_A7_PI_8(); - uint32_t dst = OPER_A7_PI_8(); - uint32_t res = dst - src; + u32 src = OPER_A7_PI_8(); + u32 dst = OPER_A7_PI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -3189,9 +3189,9 @@ bf0f ffff cmpm b . 01:12 234fc:9 b108 f1f8 cmpm b . 01:12 234fc:9 - uint32_t src = OPER_AY_PI_8(); - uint32_t dst = OPER_AX_PI_8(); - uint32_t res = dst - src; + u32 src = OPER_AY_PI_8(); + u32 dst = OPER_AX_PI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -3200,9 +3200,9 @@ b108 f1f8 cmpm b . 01:12 234fc:9 b148 f1f8 cmpm w . 01:12 234fc:9 - uint32_t src = OPER_AY_PI_16(); - uint32_t dst = OPER_AX_PI_16(); - uint32_t res = dst - src; + u32 src = OPER_AY_PI_16(); + u32 dst = OPER_AX_PI_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -3211,9 +3211,9 @@ b148 f1f8 cmpm w . 01:12 234fc:9 b188 f1f8 cmpm l . 01:20 234fc:9 - uint32_t src = OPER_AY_PI_32(); - uint32_t dst = OPER_AX_PI_32(); - uint32_t res = dst - src; + u32 src = OPER_AY_PI_32(); + u32 dst = OPER_AX_PI_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -3285,13 +3285,13 @@ f278 fff8 ftrapcc l . 23:4 51c8 fff8 dbf w . 01:12 2:6 34fc:4 - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -3305,13 +3305,13 @@ f278 fff8 ftrapcc l . 23:4 50c8 f0f8 dbcc w . 01:12 234fc:6 if(M68KMAKE_NOT_CC) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -3326,15 +3326,15 @@ f278 fff8 ftrapcc l . 23:4 81c0 f1f8 divs w . 0:158 1:122 234fc:56 - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(DY()); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(DY()); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -3361,15 +3361,15 @@ f278 fff8 ftrapcc l . 23:4 81c0 f1c0 divs w A+-DXWLdxI 0:158 1:122 234fc:56 - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -3396,14 +3396,14 @@ f278 fff8 ftrapcc l . 23:4 80c0 f1f8 divu w . 0:140 1:108 234fc:44 - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(DY()); + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(DY()); if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -3420,14 +3420,14 @@ f278 fff8 ftrapcc l . 23:4 80c0 f1c0 divu w A+-DXWLdxI 0:140 1:108 234fc:44 - uint32_t* r_dst = &DX(); - uint32_t src = M68KMAKE_GET_OPER_AY_16; + u32* r_dst = &DX(); + u32 src = M68KMAKE_GET_OPER_AY_16; if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -3446,11 +3446,11 @@ f278 fff8 ftrapcc l . 23:4 4c40 fff8 divl l . 234fc:84 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = DY(); - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = DY(); + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -3462,9 +3462,9 @@ f278 fff8 ftrapcc l . 23:4 if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -3486,8 +3486,8 @@ f278 fff8 ftrapcc l . 23:4 dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -3514,11 +3514,11 @@ f278 fff8 ftrapcc l . 23:4 4c40 ffc0 divl l A+-DXWLdxI 234fc:84 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = M68KMAKE_GET_OPER_AY_32; - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = M68KMAKE_GET_OPER_AY_32; + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -3530,9 +3530,9 @@ f278 fff8 ftrapcc l . 23:4 if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -3554,8 +3554,8 @@ f278 fff8 ftrapcc l . 23:4 dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -3580,7 +3580,7 @@ f278 fff8 ftrapcc l . 23:4 b100 f1f8 eor b . 01:4 234fc:2 - uint32_t res = MASK_OUT_ABOVE_8(DY() ^= MASK_OUT_ABOVE_8(DX())); + u32 res = MASK_OUT_ABOVE_8(DY() ^= MASK_OUT_ABOVE_8(DX())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -3589,8 +3589,8 @@ b100 f1f8 eor b . 01:4 234fc:2 b100 f1c0 eor b A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -3601,7 +3601,7 @@ b100 f1c0 eor b A+-DXWL 01:8 234fc:4 b140 f1f8 eor w . 01:4 234fc:2 - uint32_t res = MASK_OUT_ABOVE_16(DY() ^= MASK_OUT_ABOVE_16(DX())); + u32 res = MASK_OUT_ABOVE_16(DY() ^= MASK_OUT_ABOVE_16(DX())); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -3610,8 +3610,8 @@ b140 f1f8 eor w . 01:4 234fc:2 b140 f1c0 eor w A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -3622,7 +3622,7 @@ b140 f1c0 eor w A+-DXWL 01:8 234fc:4 b180 f1f8 eor l . 0:8 1:6 234fc:2 - uint32_t res = DY() ^= DX(); + u32 res = DY() ^= DX(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -3631,8 +3631,8 @@ b180 f1f8 eor l . 0:8 1:6 234fc:2 b180 f1c0 eor l A+-DXWL 01:12 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t res = DX() ^ m68ki_read_32(ea); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 res = DX() ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -3643,7 +3643,7 @@ b180 f1c0 eor l A+-DXWL 01:12 234fc:4 0a00 fff8 eori b . 01:8 234fc:2 - uint32_t res = MASK_OUT_ABOVE_8(DY() ^= OPER_I_8()); + u32 res = MASK_OUT_ABOVE_8(DY() ^= OPER_I_8()); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -3652,9 +3652,9 @@ b180 f1c0 eor l A+-DXWL 01:12 234fc:4 0a00 ffc0 eori b A+-DXWL 01:12 234fc:4 - uint32_t src = OPER_I_8(); - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t res = src ^ m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 res = src ^ m68ki_read_8(ea); m68ki_write_8(ea, res); @@ -3665,7 +3665,7 @@ b180 f1c0 eor l A+-DXWL 01:12 234fc:4 0a40 fff8 eori w . 01:8 234fc:2 - uint32_t res = MASK_OUT_ABOVE_16(DY() ^= OPER_I_16()); + u32 res = MASK_OUT_ABOVE_16(DY() ^= OPER_I_16()); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -3674,9 +3674,9 @@ b180 f1c0 eor l A+-DXWL 01:12 234fc:4 0a40 ffc0 eori w A+-DXWL 01:12 234fc:4 - uint32_t src = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t res = src ^ m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 res = src ^ m68ki_read_16(ea); m68ki_write_16(ea, res); @@ -3687,7 +3687,7 @@ b180 f1c0 eor l A+-DXWL 01:12 234fc:4 0a80 fff8 eori l . 0:16 1:14 234fc:2 - uint32_t res = DY() ^= OPER_I_32(); + u32 res = DY() ^= OPER_I_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -3696,9 +3696,9 @@ b180 f1c0 eor l A+-DXWL 01:12 234fc:4 0a80 ffc0 eori l A+-DXWL 01:20 234fc:4 - uint32_t src = OPER_I_32(); - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t res = src ^ m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 res = src ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -3715,7 +3715,7 @@ b180 f1c0 eor l A+-DXWL 01:12 234fc:4 0a7c ffff eori w . 0:20p 1:16p 234fc:12p if(m_s_flag) { - uint32_t src = OPER_I_16(); + u32 src = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(m68ki_get_sr() ^ src); return; @@ -3724,31 +3724,31 @@ b180 f1c0 eor l A+-DXWL 01:12 234fc:4 c140 f1f8 exg l . 01:6 234fc:2 - uint32_t* reg_a = &DX(); - uint32_t* reg_b = &DY(); - uint32_t tmp = *reg_a; + u32* reg_a = &DX(); + u32* reg_b = &DY(); + u32 tmp = *reg_a; *reg_a = *reg_b; *reg_b = tmp; c148 f1f8 exg l . 01:6 234fc:2 - uint32_t* reg_a = &AX(); - uint32_t* reg_b = &AY(); - uint32_t tmp = *reg_a; + u32* reg_a = &AX(); + u32* reg_b = &AY(); + u32 tmp = *reg_a; *reg_a = *reg_b; *reg_b = tmp; c188 f1f8 exg l . 01:6 234fc:2 - uint32_t* reg_a = &DX(); - uint32_t* reg_b = &AY(); - uint32_t tmp = *reg_a; + u32* reg_a = &DX(); + u32* reg_b = &AY(); + u32 tmp = *reg_a; *reg_a = *reg_b; *reg_b = tmp; 4880 fff8 ext w . 01234fc:4 - uint32_t* r_dst = &DY(); + u32* r_dst = &DY(); *r_dst = MASK_OUT_BELOW_16(*r_dst) | MASK_OUT_ABOVE_8(*r_dst) | (GET_MSB_8(*r_dst) ? 0xff00 : 0); @@ -3759,7 +3759,7 @@ c188 f1f8 exg l . 01:6 234fc:2 48c0 fff8 ext l . 01234fc:4 - uint32_t* r_dst = &DY(); + u32* r_dst = &DY(); *r_dst = MASK_OUT_ABOVE_16(*r_dst) | (GET_MSB_16(*r_dst) ? 0xffff0000 : 0); @@ -3772,7 +3772,7 @@ c188 f1f8 exg l . 01:6 234fc:2 49c0 fff8 extb l . 234fc:4 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t* r_dst = &DY(); + u32* r_dst = &DY(); *r_dst = MASK_OUT_ABOVE_8(*r_dst) | (GET_MSB_8(*r_dst) ? 0xffffff00 : 0); @@ -3797,7 +3797,7 @@ c188 f1f8 exg l . 01:6 234fc:2 4e80 ffc0 jsr l ADXWLdx 01:12 234fc:0 - uint32_t ea = M68KMAKE_GET_EA_AY_32; + u32 ea = M68KMAKE_GET_EA_AY_32; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_push_32(m_pc); m68ki_jump(ea); @@ -3814,7 +3814,7 @@ c188 f1f8 exg l . 01:6 234fc:2 4e50 fff8 link w . 01:16 234fc:5 - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); m68ki_push_32(*r_dst); *r_dst = REG_A()[7]; @@ -3835,7 +3835,7 @@ c188 f1f8 exg l . 01:6 234fc:2 4808 fff8 link l . 234fc:6 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); m68ki_push_32(*r_dst); *r_dst = REG_A()[7]; @@ -3846,10 +3846,10 @@ c188 f1f8 exg l . 01:6 234fc:2 e008 f1f8 lsr b . 01:6 234fc:4 - uint32_t* r_dst = &DY(); - uint32_t shift = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src >> shift; if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src >> shift; if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = *r_dst; - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = *r_dst; + u32 res = src >> shift; if(shift != 0) m_icount -= shift<> shift; + u32* r_dst = &DY(); + u32 shift = DX() & 0x3f; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src >> shift; if(shift != 0) { @@ -3932,10 +3932,10 @@ e028 f1f8 lsr b . 01234fc:6 e068 f1f8 lsr w . 01234fc:6 - uint32_t* r_dst = &DY(); - uint32_t shift = DX() & 0x3f; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = DX() & 0x3f; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src >> shift; if(shift != 0) { @@ -3967,10 +3967,10 @@ e068 f1f8 lsr w . 01234fc:6 e0a8 f1f8 lsr l . 01:8 234fc:6 - uint32_t* r_dst = &DY(); - uint32_t shift = DX() & 0x3f; - uint32_t src = *r_dst; - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = DX() & 0x3f; + u32 src = *r_dst; + u32 res = src >> shift; if(shift != 0) { @@ -4001,9 +4001,9 @@ e0a8 f1f8 lsr l . 01:8 234fc:6 e2c0 ffc0 lsr w A+-DXWL 01:8 234fc:5 - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; m68ki_write_16(ea, res); @@ -4014,10 +4014,10 @@ e2c0 ffc0 lsr w A+-DXWL 01:8 234fc:5 e108 f1f8 lsl b . 01:6 234fc:4 - uint32_t* r_dst = &DY(); - uint32_t shift = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = MASK_OUT_ABOVE_8(src << shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = MASK_OUT_ABOVE_8(src << shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = MASK_OUT_ABOVE_16(src << shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = MASK_OUT_ABOVE_16(src << shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = *r_dst; - uint32_t res = MASK_OUT_ABOVE_32(src << shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = *r_dst; + u32 res = MASK_OUT_ABOVE_32(src << shift); if(shift != 0) m_icount -= shift<> 16) & 0xFFFF ); @@ -4831,8 +4831,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 2108 f1f8 move l . 0:12 1:14 234fc:5 - uint32_t res = AY(); - uint32_t ea = EA_AX_PD_32(); + u32 res = AY(); + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -4844,8 +4844,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 2100 f1c0 move l A+-DXWLdxI 0:12 1:14 234fc:5 - uint32_t res = M68KMAKE_GET_OPER_AY_32; - uint32_t ea = EA_AX_PD_32(); + u32 res = M68KMAKE_GET_OPER_AY_32; + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -4857,8 +4857,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 2140 f1f8 move l . 01:16 234fc:5 - uint32_t res = DY(); - uint32_t ea = EA_AX_DI_32(); + u32 res = DY(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -4869,8 +4869,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 2148 f1f8 move l . 01:16 234fc:5 - uint32_t res = AY(); - uint32_t ea = EA_AX_DI_32(); + u32 res = AY(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -4881,8 +4881,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 2140 f1c0 move l A+-DXWLdxI 01:16 234fc:5 - uint32_t res = M68KMAKE_GET_OPER_AY_32; - uint32_t ea = EA_AX_DI_32(); + u32 res = M68KMAKE_GET_OPER_AY_32; + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -4893,8 +4893,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 2180 f1f8 move l . 01:18 234fc:7 - uint32_t res = DY(); - uint32_t ea = EA_AX_IX_32(); + u32 res = DY(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -4905,8 +4905,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 2188 f1f8 move l . 01:18 234fc:7 - uint32_t res = AY(); - uint32_t ea = EA_AX_IX_32(); + u32 res = AY(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -4917,8 +4917,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 2180 f1c0 move l A+-DXWLdxI 01:18 234fc:7 - uint32_t res = M68KMAKE_GET_OPER_AY_32; - uint32_t ea = EA_AX_IX_32(); + u32 res = M68KMAKE_GET_OPER_AY_32; + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -4929,8 +4929,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 21c0 fff8 move l . 01:16 234fc:4 - uint32_t res = DY(); - uint32_t ea = EA_AW_32(); + u32 res = DY(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -4941,8 +4941,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 21c8 fff8 move l . 01:16 234fc:4 - uint32_t res = AY(); - uint32_t ea = EA_AW_32(); + u32 res = AY(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -4953,8 +4953,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 21c0 ffc0 move l A+-DXWLdxI 01:16 234fc:4 - uint32_t res = M68KMAKE_GET_OPER_AY_32; - uint32_t ea = EA_AW_32(); + u32 res = M68KMAKE_GET_OPER_AY_32; + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -4965,8 +4965,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 23c0 fff8 move l . 01:20 234fc:6 - uint32_t res = DY(); - uint32_t ea = EA_AL_32(); + u32 res = DY(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -4977,8 +4977,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 23c8 fff8 move l . 01:20 234fc:6 - uint32_t res = AY(); - uint32_t ea = EA_AL_32(); + u32 res = AY(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -4989,8 +4989,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 23c0 ffc0 move l A+-DXWLdxI 01:20 234fc:6 - uint32_t res = M68KMAKE_GET_OPER_AY_32; - uint32_t ea = EA_AL_32(); + u32 res = M68KMAKE_GET_OPER_AY_32; + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -5062,7 +5062,7 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 40c0 ffc0 move w A+-DXWL 0:8 1234fc:8p if(CPU_TYPE_IS_000() || CPU_TYPE_IS_070() || m_s_flag) /* NS990408 */ { - uint32_t ea = M68KMAKE_GET_EA_AY_16; + u32 ea = M68KMAKE_GET_EA_AY_16; m68ki_write_16(ea, m68ki_get_sr()); return; } @@ -5081,7 +5081,7 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 46c0 ffc0 move w A+-DXWLdxI 01:12p 234fc:8p if(m_s_flag) { - uint32_t new_sr = M68KMAKE_GET_OPER_AY_16; + u32 new_sr = M68KMAKE_GET_OPER_AY_16; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(new_sr); return; @@ -5113,7 +5113,7 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); + u32 word2 = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ switch (word2 & 0xfff) @@ -5325,7 +5325,7 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); + u32 word2 = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ switch (word2 & 0xfff) @@ -5573,10 +5573,10 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 48a0 fff8 movem w . 01:8 234fc:4 - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = AY(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = AY(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -5591,10 +5591,10 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 4880 ffc0 movem w ADXWL 01:8 234fc:4 - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -5608,10 +5608,10 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 48e0 fff8 movem l . 01:8 234fc:4 - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = AY(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = AY(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -5627,10 +5627,10 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 48c0 ffc0 movem l ADXWL 01:8 234fc:4 - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -5644,10 +5644,10 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 4c98 fff8 movem w . 01:12 234fc:8 - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = AY(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = AY(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -5662,10 +5662,10 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 4cba ffff movem w . 01:16 234fc:9 - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_PCDI_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_PCDI_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -5679,10 +5679,10 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 4cbb ffff movem w . 01:18 234fc:11 - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_PCIX_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_PCIX_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -5696,10 +5696,10 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 4c80 ffc0 movem w ADXWL 01:12 234fc:8 - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -5713,10 +5713,10 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 4cd8 fff8 movem l . 01:12 234fc:8 - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = AY(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = AY(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -5731,10 +5731,10 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 4cfa ffff movem l . 01:16 234fc:9 - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_PCDI_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_PCDI_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -5748,10 +5748,10 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 4cfb ffff movem l . 01:18 234fc:11 - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_PCIX_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_PCIX_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -5765,10 +5765,10 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 4cc0 ffc0 movem l ADXWL 01:12 234fc:8 - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -5782,16 +5782,16 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 0188 f1f8 movep w . 01:16 234fc:11 - uint32_t ea = EA_AY_DI_16(); - uint32_t src = DX(); + u32 ea = EA_AY_DI_16(); + u32 src = DX(); m68ki_write_8(ea, MASK_OUT_ABOVE_8(src >> 8)); m68ki_write_8(ea += 2, MASK_OUT_ABOVE_8(src)); 01c8 f1f8 movep l . 01:24 234fc:17 - uint32_t ea = EA_AY_DI_32(); - uint32_t src = DX(); + u32 ea = EA_AY_DI_32(); + u32 src = DX(); m68ki_write_8(ea, MASK_OUT_ABOVE_8(src >> 24)); m68ki_write_8(ea += 2, MASK_OUT_ABOVE_8(src >> 16)); @@ -5800,14 +5800,14 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 0108 f1f8 movep w . 01:16 234fc:12 - uint32_t ea = EA_AY_DI_16(); - uint32_t* r_dst = &DX(); + u32 ea = EA_AY_DI_16(); + u32* r_dst = &DX(); *r_dst = MASK_OUT_BELOW_16(*r_dst) | ((m68ki_read_8(ea) << 8) + m68ki_read_8(ea + 2)); 0148 f1f8 movep l . 01:24 234fc:18 - uint32_t ea = EA_AY_DI_32(); + u32 ea = EA_AY_DI_32(); DX() = (m68ki_read_8(ea) << 24) + (m68ki_read_8(ea + 2) << 16) + (m68ki_read_8(ea + 4) << 8) + m68ki_read_8(ea + 6); @@ -5818,8 +5818,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_8; + u32 word2 = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_8; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -5851,8 +5851,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_16; + u32 word2 = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_16; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -5884,8 +5884,8 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_32; + u32 word2 = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_32; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -5908,7 +5908,7 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 7000 f100 moveq l . 01:4 234fc:2 - uint32_t res = DX() = MAKE_INT_8(MASK_OUT_ABOVE_8(m_ir)); + u32 res = DX() = MAKE_INT_8(MASK_OUT_ABOVE_8(m_ir)); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -5917,7 +5917,7 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 234fc:5 f620 fff8 move16 l . 4f:4 c:4p - uint16_t w2 = OPER_I_16(); + u16 w2 = OPER_I_16(); int ax = m_ir & 7; int ay = (w2 >> 12) & 7; m68ki_write_32(REG_A()[ay], m68ki_read_32(REG_A()[ax])); @@ -5930,8 +5930,8 @@ f620 fff8 move16 l . 4f:4 c:4p c1c0 f1f8 muls w . 0:54 1:32 234fc:27 - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(DY()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(DY()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -5942,8 +5942,8 @@ c1c0 f1f8 muls w . 0:54 1:32 234fc:27 c1c0 f1c0 muls w A+-DXWLdxI 0:54 1:32 234fc:27 - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(M68KMAKE_GET_OPER_AY_16) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(M68KMAKE_GET_OPER_AY_16) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -5954,8 +5954,8 @@ c1c0 f1c0 muls w A+-DXWLdxI 0:54 1:32 234fc:27 c0c0 f1f8 mulu w . 0:54 1:30 234fc:27 - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_16(DY()) * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_16(DY()) * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -5966,8 +5966,8 @@ c0c0 f1f8 mulu w . 0:54 1:30 234fc:27 c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 - uint32_t* r_dst = &DX(); - uint32_t res = M68KMAKE_GET_OPER_AY_16 * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = M68KMAKE_GET_OPER_AY_16 * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -5980,21 +5980,21 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4c00 fff8 mull l . 234fc:43 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = DY(); - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = DY(); + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -6028,21 +6028,21 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4c00 ffc0 mull l A+-DXWLdxI 234fc:43 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = M68KMAKE_GET_OPER_AY_32; - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = M68KMAKE_GET_OPER_AY_32; + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -6074,9 +6074,9 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4800 fff8 nbcd b . 01234fc:6 - uint32_t* r_dst = &DY(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = -dst - XFLAG_1(); + u32* r_dst = &DY(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = -dst - XFLAG_1(); if(res != 0) { @@ -6105,9 +6105,9 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4800 ffc0 nbcd b A+-DXWL 01:8 234fc:6 - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t dst = m68ki_read_8(ea); - uint32_t res = -dst - XFLAG_1(); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 dst = m68ki_read_8(ea); + u32 res = -dst - XFLAG_1(); if(res != 0) { @@ -6136,8 +6136,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4400 fff8 neg b . 01:4 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t res = 0 - MASK_OUT_ABOVE_8(*r_dst); + u32* r_dst = &DY(); + u32 res = 0 - MASK_OUT_ABOVE_8(*r_dst); m_n_flag = NFLAG_8(res); m_c_flag = m_x_flag = CFLAG_8(res); @@ -6148,9 +6148,9 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4400 ffc0 neg b A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src; + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 src = m68ki_read_8(ea); + u32 res = 0 - src; m_n_flag = NFLAG_8(res); m_c_flag = m_x_flag = CFLAG_8(res); @@ -6161,8 +6161,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4440 fff8 neg w . 01:4 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t res = 0 - MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DY(); + u32 res = 0 - MASK_OUT_ABOVE_16(*r_dst); m_n_flag = NFLAG_16(res); m_c_flag = m_x_flag = CFLAG_16(res); @@ -6173,9 +6173,9 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4440 ffc0 neg w A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - src; + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 src = m68ki_read_16(ea); + u32 res = 0 - src; m_n_flag = NFLAG_16(res); m_c_flag = m_x_flag = CFLAG_16(res); @@ -6186,8 +6186,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4480 fff8 neg l . 01:6 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t res = 0 - *r_dst; + u32* r_dst = &DY(); + u32 res = 0 - *r_dst; m_n_flag = NFLAG_32(res); m_c_flag = m_x_flag = CFLAG_SUB_32(*r_dst, 0, res); @@ -6198,9 +6198,9 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4480 ffc0 neg l A+-DXWL 01:12 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - src; + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 src = m68ki_read_32(ea); + u32 res = 0 - src; m_n_flag = NFLAG_32(res); m_c_flag = m_x_flag = CFLAG_SUB_32(src, 0, res); @@ -6211,8 +6211,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4000 fff8 negx b . 01:4 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t res = 0 - MASK_OUT_ABOVE_8(*r_dst) - XFLAG_1(); + u32* r_dst = &DY(); + u32 res = 0 - MASK_OUT_ABOVE_8(*r_dst) - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -6225,9 +6225,9 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4000 ffc0 negx b A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src - XFLAG_1(); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 src = m68ki_read_8(ea); + u32 res = 0 - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -6240,8 +6240,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4040 fff8 negx w . 01:4 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t res = 0 - MASK_OUT_ABOVE_16(*r_dst) - XFLAG_1(); + u32* r_dst = &DY(); + u32 res = 0 - MASK_OUT_ABOVE_16(*r_dst) - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -6254,9 +6254,9 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4040 ffc0 negx w A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 src = m68ki_read_16(ea); + u32 res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -6269,8 +6269,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4080 fff8 negx l . 01:6 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t res = 0 - MASK_OUT_ABOVE_32(*r_dst) - XFLAG_1(); + u32* r_dst = &DY(); + u32 res = 0 - MASK_OUT_ABOVE_32(*r_dst) - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(*r_dst, 0, res); @@ -6283,9 +6283,9 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4080 ffc0 negx l A+-DXWL 01:12 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 src = m68ki_read_32(ea); + u32 res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, 0, res); @@ -6302,8 +6302,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4600 fff8 not b . 01:4 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_8(~*r_dst); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_8(~*r_dst); *r_dst = MASK_OUT_BELOW_8(*r_dst) | res; @@ -6314,8 +6314,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4600 ffc0 not b A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -6326,8 +6326,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4640 fff8 not w . 01:4 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(~*r_dst); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(~*r_dst); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; @@ -6338,8 +6338,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4640 ffc0 not w A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -6350,8 +6350,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4680 fff8 not l . 01:6 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t res = *r_dst = MASK_OUT_ABOVE_32(~*r_dst); + u32* r_dst = &DY(); + u32 res = *r_dst = MASK_OUT_ABOVE_32(~*r_dst); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -6360,8 +6360,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4680 ffc0 not l A+-DXWL 01:12 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); m68ki_write_32(ea, res); @@ -6372,7 +6372,7 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 8000 f1f8 or b . 01:4 234fc:2 - uint32_t res = MASK_OUT_ABOVE_8((DX() |= MASK_OUT_ABOVE_8(DY()))); + u32 res = MASK_OUT_ABOVE_8((DX() |= MASK_OUT_ABOVE_8(DY()))); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -6381,7 +6381,7 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 8000 f1c0 or b A+-DXWLdxI 01:4 234fc:2 - uint32_t res = MASK_OUT_ABOVE_8((DX() |= M68KMAKE_GET_OPER_AY_8)); + u32 res = MASK_OUT_ABOVE_8((DX() |= M68KMAKE_GET_OPER_AY_8)); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -6390,7 +6390,7 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 8040 f1f8 or w . 01:4 234fc:2 - uint32_t res = MASK_OUT_ABOVE_16((DX() |= MASK_OUT_ABOVE_16(DY()))); + u32 res = MASK_OUT_ABOVE_16((DX() |= MASK_OUT_ABOVE_16(DY()))); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -6399,7 +6399,7 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 8040 f1c0 or w A+-DXWLdxI 01:4 234fc:2 - uint32_t res = MASK_OUT_ABOVE_16((DX() |= M68KMAKE_GET_OPER_AY_16)); + u32 res = MASK_OUT_ABOVE_16((DX() |= M68KMAKE_GET_OPER_AY_16)); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -6408,7 +6408,7 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 8080 f1f8 or l . 01:6 234fc:2 - uint32_t res = DX() |= DY(); + u32 res = DX() |= DY(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -6417,7 +6417,7 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 8080 f1c0 or l A+-DXWLdxI 01:6 234fc:2 - uint32_t res = DX() |= M68KMAKE_GET_OPER_AY_32; + u32 res = DX() |= M68KMAKE_GET_OPER_AY_32; m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -6426,8 +6426,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 8100 f1c0 or b A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -6438,8 +6438,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 8140 f1c0 or w A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -6450,8 +6450,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 8180 f1c0 or l A+-DXWL 01:12 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t res = DX() | m68ki_read_32(ea); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 res = DX() | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -6462,7 +6462,7 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 0000 fff8 ori b . 01:8 234fc:2 - uint32_t res = MASK_OUT_ABOVE_8((DY() |= OPER_I_8())); + u32 res = MASK_OUT_ABOVE_8((DY() |= OPER_I_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -6471,9 +6471,9 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 0000 ffc0 ori b A+-DXWL 01:12 234fc:4 - uint32_t src = OPER_I_8(); - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); + u32 src = OPER_I_8(); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -6484,7 +6484,7 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 0040 fff8 ori w . 01:8 234fc:2 - uint32_t res = MASK_OUT_ABOVE_16(DY() |= OPER_I_16()); + u32 res = MASK_OUT_ABOVE_16(DY() |= OPER_I_16()); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -6493,9 +6493,9 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 0040 ffc0 ori w A+-DXWL 01:12 234fc:4 - uint32_t src = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); + u32 src = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -6506,7 +6506,7 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 0080 fff8 ori l . 0:16 1:14 234fc:2 - uint32_t res = DY() |= OPER_I_32(); + u32 res = DY() |= OPER_I_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -6515,9 +6515,9 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 0080 ffc0 ori l A+-DXWL 01:20 234fc:4 - uint32_t src = OPER_I_32(); - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t res = src | m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 res = src | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -6534,7 +6534,7 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 007c ffff ori w . 0:20p 1:16p 234fc:12p if(m_s_flag) { - uint32_t src = OPER_I_16(); + u32 src = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(m68ki_get_sr() | src); return; @@ -6546,8 +6546,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: DX() and DY() are reversed in Motorola's docs */ - uint32_t src = DY() + OPER_I_16(); - uint32_t* r_dst = &DX(); + u32 src = DY() + OPER_I_16(); + u32* r_dst = &DX(); *r_dst = MASK_OUT_BELOW_8(*r_dst) | ((src >> 4) & 0x00f0) | (src & 0x000f); return; @@ -6559,8 +6559,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: AX and AY are reversed in Motorola's docs */ - uint32_t ea_src = EA_AY_PD_8(); - uint32_t src = m68ki_read_8(ea_src); + u32 ea_src = EA_AY_PD_8(); + u32 src = m68ki_read_8(ea_src); ea_src = EA_AY_PD_8(); src = ((src << 8) | m68ki_read_8(ea_src)) + OPER_I_16(); @@ -6574,8 +6574,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: AX and AY are reversed in Motorola's docs */ - uint32_t ea_src = EA_A7_PD_8(); - uint32_t src = m68ki_read_8(ea_src); + u32 ea_src = EA_A7_PD_8(); + u32 src = m68ki_read_8(ea_src); ea_src = EA_A7_PD_8(); src = (src | (m68ki_read_8(ea_src) << 8)) + OPER_I_16(); @@ -6588,8 +6588,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 8f4f ffff pack w . 234fc:13 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t ea_src = EA_A7_PD_8(); - uint32_t src = m68ki_read_8(ea_src); + u32 ea_src = EA_A7_PD_8(); + u32 src = m68ki_read_8(ea_src); ea_src = EA_A7_PD_8(); src = (src | (m68ki_read_8(ea_src) << 8)) + OPER_I_16(); @@ -6603,8 +6603,8 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: AX and AY are reversed in Motorola's docs */ - uint32_t ea_src = EA_AY_PD_8(); - uint32_t src = m68ki_read_8(ea_src); + u32 ea_src = EA_AY_PD_8(); + u32 src = m68ki_read_8(ea_src); ea_src = EA_AY_PD_8(); src = (src | (m68ki_read_8(ea_src) << 8)) + OPER_I_16(); @@ -6615,7 +6615,7 @@ c0c0 f1c0 mulu w A+-DXWLdxI 0:54 1:30 234fc:27 4840 ffc0 pea l ADXWLdx 01:6 234fc:5 - uint32_t ea = M68KMAKE_GET_EA_AY_32; + u32 ea = M68KMAKE_GET_EA_AY_32; m68ki_push_32(ea); @@ -6674,11 +6674,11 @@ f548 ffd8 ptest l . 4:8p e018 f1f8 ror b . 01:6 234fc:8 - uint32_t* r_dst = &DY(); - uint32_t orig_shift = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t shift = orig_shift & 7; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = ROR_8(src, shift); + u32* r_dst = &DY(); + u32 orig_shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 shift = orig_shift & 7; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = ROR_8(src, shift); if(orig_shift != 0) m_icount -= orig_shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = ROR_16(src, shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = ROR_16(src, shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint64_t src = *r_dst; - uint32_t res = ROR_32(src, shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u64 src = *r_dst; + u32 res = ROR_32(src, shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t shift = orig_shift & 7; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = ROL_8(src, shift); + u32* r_dst = &DY(); + u32 orig_shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 shift = orig_shift & 7; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = ROL_8(src, shift); if(orig_shift != 0) m_icount -= orig_shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = ROL_16(src, shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = ROL_16(src, shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint64_t src = *r_dst; - uint32_t res = ROL_32(src, shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u64 src = *r_dst; + u32 res = ROL_32(src, shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = ROR_9(src | (XFLAG_1() << 8), shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = ROR_9(src | (XFLAG_1() << 8), shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = ROR_17(src | (XFLAG_1() << 16), shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = ROR_17(src | (XFLAG_1() << 16), shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint64_t src = *r_dst; - uint64_t res = src | (((uint64_t)XFLAG_1()) << 32); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u64 src = *r_dst; + u64 res = src | (((u64)XFLAG_1()) << 32); if(shift != 0) m_icount -= shift<> 8; res = MASK_OUT_ABOVE_16(res); @@ -7131,10 +7131,10 @@ e4c0 ffc0 roxr w A+-DXWL 01:8 234fc:5 e110 f1f8 roxl b . 01:6 234fc:12 - uint32_t* r_dst = &DY(); - uint32_t shift = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = ROL_9(src | (XFLAG_1() << 8), shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = ROL_9(src | (XFLAG_1() << 8), shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = ROL_17(src | (XFLAG_1() << 16), shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = ROL_17(src | (XFLAG_1() << 16), shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint64_t src = *r_dst; - uint64_t res = src | (((uint64_t)XFLAG_1()) << 32); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u64 src = *r_dst; + u64 res = src | (((u64)XFLAG_1()) << 32); if(shift != 0) m_icount -= shift<> 8; res = MASK_OUT_ABOVE_16(res); @@ -7294,7 +7294,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4e74 ffff rtd l . 1:16 234fc:10 if(CPU_TYPE_IS_010_PLUS()) { - uint32_t new_pc = m68ki_pull_32(); + u32 new_pc = m68ki_pull_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ REG_A()[7] = MASK_OUT_ABOVE_32(REG_A()[7] + MAKE_INT_16(OPER_I_16())); @@ -7307,9 +7307,9 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4e73 ffff rte l . 0234fc:20p 1:24p if(m_s_flag) { - uint32_t new_sr; - uint32_t new_pc; - uint32_t format_word; + u32 new_sr; + u32 new_pc; + u32 format_word; if (!m_rte_instr_callback.isnull()) (m_rte_instr_callback)(1); @@ -7489,11 +7489,11 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 8100 f1f8 sbcd b . 01:6 234fc:4 - uint32_t* r_dst = &DX(); - uint32_t src = DY(); - uint32_t dst = *r_dst; - uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); - uint32_t corf = 0; + u32* r_dst = &DX(); + u32 src = DY(); + u32 dst = *r_dst; + u32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); + u32 corf = 0; if(res > 0xf) corf = 6; @@ -7519,11 +7519,11 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 8f08 fff8 sbcd b . 01:18 234fc:16 - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_AY_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); + u32 corf = 0; if(res > 0xf) corf = 6; @@ -7549,11 +7549,11 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 810f f1ff sbcd b . 01:18 234fc:16 - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_A7_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); + u32 corf = 0; if(res > 0xf) corf = 6; @@ -7579,11 +7579,11 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 8f0f ffff sbcd b . 01:18 234fc:16 - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_A7_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); + u32 corf = 0; if(res > 0xf) corf = 6; @@ -7609,11 +7609,11 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 8108 f1f8 sbcd b . 01:18 234fc:16 - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_AY_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); + u32 corf = 0; if(res > 0xf) corf = 6; @@ -7671,7 +7671,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4e72 ffff stop . . 01:4p 234fc:8p if(m_s_flag) { - uint32_t new_sr = OPER_I_16(); + u32 new_sr = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_stopped |= STOP_LEVEL_STOP; m68ki_set_sr(new_sr); @@ -7682,10 +7682,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9000 f1f8 sub b . 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_8(DY()); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_8(DY()); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -7696,10 +7696,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9000 f1c0 sub b A+-DXWLdxI 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = M68KMAKE_GET_OPER_AY_8; - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = M68KMAKE_GET_OPER_AY_8; + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -7710,10 +7710,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9040 f1f8 sub w . 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(DY()); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(DY()); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -7724,10 +7724,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9048 f1f8 sub w . 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(AY()); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(AY()); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -7738,10 +7738,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9040 f1c0 sub w A+-DXWLdxI 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = M68KMAKE_GET_OPER_AY_16; - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = M68KMAKE_GET_OPER_AY_16; + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -7752,10 +7752,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9080 f1f8 sub l . 01:6 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = DY(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = DY(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -7766,10 +7766,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9088 f1f8 sub l . 01:6 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = AY(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = AY(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -7780,10 +7780,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9080 f1c0 sub l A+-DXWLdxI 01:6 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = M68KMAKE_GET_OPER_AY_32; - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = M68KMAKE_GET_OPER_AY_32; + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -7794,10 +7794,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9100 f1c0 sub b A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -7808,10 +7808,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9140 f1c0 sub w A+-DXWL 01:8 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -7822,10 +7822,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9180 f1c0 sub l A+-DXWL 01:12 234fc:4 - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -7836,48 +7836,48 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 90c0 f1f8 suba w . 01:8 234fc:2 - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(DY())); 90c8 f1f8 suba w . 01:8 234fc:2 - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(AY())); 90c0 f1c0 suba w A+-DXWLdxI 01:8 234fc:2 - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); 91c0 f1f8 suba l . 01:6 234fc:2 - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - DY()); 91c8 f1f8 suba l . 01:6 234fc:2 - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - AY()); 91c0 f1c0 suba l A+-DXWLdxI 01:6 234fc:2 - uint32_t* r_dst = &AX(); - uint32_t src = M68KMAKE_GET_OPER_AY_32; + u32* r_dst = &AX(); + u32 src = M68KMAKE_GET_OPER_AY_32; *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); 0400 fff8 subi b . 01:8 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t src = OPER_I_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DY(); + u32 src = OPER_I_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -7888,10 +7888,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 0400 ffc0 subi b A+-DXWL 01:12 234fc:4 - uint32_t src = OPER_I_8(); - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -7902,10 +7902,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 0440 fff8 subi w . 01:8 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t src = OPER_I_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DY(); + u32 src = OPER_I_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -7916,10 +7916,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 0440 ffc0 subi w A+-DXWL 01:12 234fc:4 - uint32_t src = OPER_I_16(); - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -7930,10 +7930,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 0480 fff8 subi l . 0:16 1:14 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t src = OPER_I_32(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DY(); + u32 src = OPER_I_32(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -7944,10 +7944,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 0480 ffc0 subi l A+-DXWL 01:20 234fc:4 - uint32_t src = OPER_I_32(); - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -7958,10 +7958,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 5100 f1f8 subq b . 01:4 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DY(); + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -7972,10 +7972,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 5100 f1c0 subq b A+-DXWL 01:8 234fc:4 - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -7986,10 +7986,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 5140 f1f8 subq w . 01:4 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DY(); + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -8000,16 +8000,16 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 5148 f1f8 subq w . 0:8 1:4 234fc:2 - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - ((((m_ir >> 9) - 1) & 7) + 1)); 5140 f1c0 subq w A+-DXWL 01:8 234fc:4 - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = M68KMAKE_GET_EA_AY_16; - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = M68KMAKE_GET_EA_AY_16; + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -8020,10 +8020,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 5180 f1f8 subq l . 01:8 234fc:2 - uint32_t* r_dst = &DY(); - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DY(); + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -8034,16 +8034,16 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 5188 f1f8 subq l . 01:8 234fc:2 - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - ((((m_ir >> 9) - 1) & 7) + 1)); 5180 f1c0 subq l A+-DXWL 01:12 234fc:4 - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = M68KMAKE_GET_EA_AY_32; - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = M68KMAKE_GET_EA_AY_32; + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -8054,10 +8054,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9100 f1f8 subx b . 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_8(DY()); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src - XFLAG_1(); + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_8(DY()); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -8070,10 +8070,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9140 f1f8 subx w . 01:4 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(DY()); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src - XFLAG_1(); + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(DY()); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -8086,10 +8086,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9180 f1f8 subx l . 0:8 1:6 234fc:2 - uint32_t* r_dst = &DX(); - uint32_t src = DY(); - uint32_t dst = *r_dst; - uint32_t res = dst - src - XFLAG_1(); + u32* r_dst = &DX(); + u32 src = DY(); + u32 dst = *r_dst; + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -8102,10 +8102,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9f08 fff8 subx b . 01:18 234fc:12 - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src - XFLAG_1(); + u32 src = OPER_AY_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -8118,10 +8118,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 910f f1ff subx b . 01:18 234fc:12 - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src - XFLAG_1(); + u32 src = OPER_A7_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -8134,10 +8134,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9f0f ffff subx b . 01:18 234fc:12 - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src - XFLAG_1(); + u32 src = OPER_A7_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -8150,10 +8150,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9108 f1f8 subx b . 01:18 234fc:12 - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src - XFLAG_1(); + u32 src = OPER_AY_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -8166,10 +8166,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9148 f1f8 subx w . 01:18 234fc:12 - uint32_t src = OPER_AY_PD_16(); - uint32_t ea = EA_AX_PD_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src - XFLAG_1(); + u32 src = OPER_AY_PD_16(); + u32 ea = EA_AX_PD_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -8182,10 +8182,10 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 9188 f1f8 subx l . 01:30 234fc:12 - uint32_t src = OPER_AY_PD_32(); - uint32_t ea = EA_AX_PD_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src - XFLAG_1(); + u32 src = OPER_AY_PD_32(); + u32 ea = EA_AX_PD_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -8198,7 +8198,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4840 fff8 swap l . 01234fc:4 - uint32_t* r_dst = &DY(); + u32* r_dst = &DY(); m_not_z_flag = MASK_OUT_ABOVE_32(*r_dst<<16); *r_dst = (*r_dst>>16) | m_not_z_flag; @@ -8210,7 +8210,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4ac0 fff8 tas b . 01234fc:4 - uint32_t* r_dst = &DY(); + u32* r_dst = &DY(); m_not_z_flag = MASK_OUT_ABOVE_8(*r_dst); m_n_flag = NFLAG_8(*r_dst); @@ -8220,8 +8220,8 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4ac0 ffc0 tas b A+-DXWL 01:14 234fc:12 - uint32_t ea = M68KMAKE_GET_EA_AY_8; - uint32_t dst = m68ki_read_8(ea); + u32 ea = M68KMAKE_GET_EA_AY_8; + u32 dst = m68ki_read_8(ea); m_not_z_flag = dst; m_n_flag = NFLAG_8(dst); @@ -8344,7 +8344,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a00 fff8 tst b . 01:4 234fc:2 - uint32_t res = MASK_OUT_ABOVE_8(DY()); + u32 res = MASK_OUT_ABOVE_8(DY()); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -8353,7 +8353,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a00 ffc0 tst b A+-DXWL 01:4 234fc:2 - uint32_t res = M68KMAKE_GET_OPER_AY_8; + u32 res = M68KMAKE_GET_OPER_AY_8; m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -8364,7 +8364,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a3a ffff tst b . 234fc:7 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_PCDI_8(); + u32 res = OPER_PCDI_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -8378,7 +8378,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a3b ffff tst b . 234fc:9 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_PCIX_8(); + u32 res = OPER_PCIX_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -8392,7 +8392,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a3c ffff tst b . 234fc:6 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_I_8(); + u32 res = OPER_I_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -8404,7 +8404,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a40 fff8 tst w . 01:4 234fc:2 - uint32_t res = MASK_OUT_ABOVE_16(DY()); + u32 res = MASK_OUT_ABOVE_16(DY()); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -8415,7 +8415,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a48 fff8 tst w . 234fc:2 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = MAKE_INT_16(AY()); + u32 res = MAKE_INT_16(AY()); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -8427,7 +8427,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a40 ffc0 tst w A+-DXWL 01:4 234fc:2 - uint32_t res = M68KMAKE_GET_OPER_AY_16; + u32 res = M68KMAKE_GET_OPER_AY_16; m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -8438,7 +8438,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a7a ffff tst w . 234fc:7 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_PCDI_16(); + u32 res = OPER_PCDI_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -8452,7 +8452,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a7b ffff tst w . 234fc:9 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_PCIX_16(); + u32 res = OPER_PCIX_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -8466,7 +8466,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a7c ffff tst w . 234fc:6 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_I_16(); + u32 res = OPER_I_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -8478,7 +8478,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a80 fff8 tst l . 01:4 234fc:2 - uint32_t res = DY(); + u32 res = DY(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -8489,7 +8489,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a88 fff8 tst l . 234fc:2 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = AY(); + u32 res = AY(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -8501,7 +8501,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4a80 ffc0 tst l A+-DXWL 01:4 234fc:2 - uint32_t res = M68KMAKE_GET_OPER_AY_32; + u32 res = M68KMAKE_GET_OPER_AY_32; m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -8512,7 +8512,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4aba ffff tst l . 234fc:7 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_PCDI_32(); + u32 res = OPER_PCDI_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -8526,7 +8526,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4abb ffff tst l . 234fc:9 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_PCIX_32(); + u32 res = OPER_PCIX_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -8540,7 +8540,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4abc ffff tst l . 234fc:6 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_I_32(); + u32 res = OPER_I_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -8556,7 +8556,7 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 4e58 fff8 unlk l . 01:12 234fc:6 - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); REG_A()[7] = *r_dst; *r_dst = m68ki_pull_32(); @@ -8566,8 +8566,8 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: DX() and DY() are reversed in Motorola's docs */ - uint32_t src = DY(); - uint32_t* r_dst = &DX(); + u32 src = DY(); + u32* r_dst = &DX(); *r_dst = MASK_OUT_BELOW_16(*r_dst) | (((((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16()) & 0xffff); return; @@ -8579,8 +8579,8 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: AX and AY are reversed in Motorola's docs */ - uint32_t src = OPER_AY_PD_8(); - uint32_t ea_dst; + u32 src = OPER_AY_PD_8(); + u32 ea_dst; src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(); ea_dst = EA_A7_PD_8(); @@ -8596,8 +8596,8 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: AX and AY are reversed in Motorola's docs */ - uint32_t src = OPER_A7_PD_8(); - uint32_t ea_dst; + u32 src = OPER_A7_PD_8(); + u32 ea_dst; src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(); ea_dst = EA_AX_PD_8(); @@ -8612,8 +8612,8 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 8f8f ffff unpk w . 234fc:13 if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_A7_PD_8(); - uint32_t ea_dst; + u32 src = OPER_A7_PD_8(); + u32 ea_dst; src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(); ea_dst = EA_A7_PD_8(); @@ -8629,8 +8629,8 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: AX and AY are reversed in Motorola's docs */ - uint32_t src = OPER_AY_PD_8(); - uint32_t ea_dst; + u32 src = OPER_AY_PD_8(); + u32 ea_dst; src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(); ea_dst = EA_AX_PD_8(); @@ -8645,9 +8645,9 @@ e5c0 ffc0 roxl w A+-DXWL 01:8 234fc:5 f400 ff20 cinv l . 4:16 if(CPU_TYPE_IS_040_PLUS()) { - uint16_t ir = m_ir; - uint8_t cache = (ir >> 6) & 3; - // uint8_t scope = (ir >> 3) & 3; + u16 ir = m_ir; + u8 cache = (ir >> 6) & 3; + // u8 scope = (ir >> 3) & 3; // logerror("68040 %s: pc=%08x ir=%04x cache=%d scope=%d register=%d\n", ir & 0x0020 ? "cpush" : "cinv", m_ppc, ir, cache, scope, ir & 7); switch (cache) { diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp index 99ff5f16dd3..0e0af68ac06 100644 --- a/src/devices/cpu/m68000/m68kcpu.cpp +++ b/src/devices/cpu/m68000/m68kcpu.cpp @@ -39,7 +39,7 @@ unsigned char m68000_base_device::m68ki_cycles[NUM_CPU_TYPES][0x10000]; /* Cycle /* ======================================================================== */ /* Used by shift & rotate instructions */ -const uint8_t m68000_base_device::m68ki_shift_8_table[65] = +const u8 m68000_base_device::m68ki_shift_8_table[65] = { 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, @@ -48,7 +48,7 @@ const uint8_t m68000_base_device::m68ki_shift_8_table[65] = 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -const uint16_t m68000_base_device::m68ki_shift_16_table[65] = +const u16 m68000_base_device::m68ki_shift_16_table[65] = { 0x0000, 0x8000, 0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80, 0xffc0, 0xffe0, 0xfff0, 0xfff8, 0xfffc, 0xfffe, 0xffff, 0xffff, @@ -59,7 +59,7 @@ const uint16_t m68000_base_device::m68ki_shift_16_table[65] = 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }; -const uint32_t m68000_base_device::m68ki_shift_32_table[65] = +const u32 m68000_base_device::m68ki_shift_32_table[65] = { 0x00000000, 0x80000000, 0xc0000000, 0xe0000000, 0xf0000000, 0xf8000000, 0xfc000000, 0xfe000000, 0xff000000, 0xff800000, 0xffc00000, 0xffe00000, @@ -78,7 +78,7 @@ const uint32_t m68000_base_device::m68ki_shift_32_table[65] = /* Number of clock cycles to use for exception processing. * I used 4 for any vectors that are undocumented for processing times. */ -const uint8_t m68000_base_device::m68ki_exception_cycle_table[7][256] = +const u8 m68000_base_device::m68ki_exception_cycle_table[7][256] = { { /* 000 */ 40, /* 0: Reset - Initial Stack Pointer */ @@ -593,7 +593,7 @@ const uint8_t m68000_base_device::m68ki_exception_cycle_table[7][256] = }, }; -const uint8_t m68000_base_device::m68ki_ea_idx_cycle_table[64] = +const u8 m68000_base_device::m68ki_ea_idx_cycle_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ..01.000 no memory indirect, base nullptr */ @@ -635,9 +635,9 @@ const uint8_t m68000_base_device::m68ki_ea_idx_cycle_table[64] = void m68000_base_device::set_irq_line(int irqline, int state) { - uint32_t old_level = m_int_level; - uint32_t vstate = m_virq_state; - uint32_t blevel; + u32 old_level = m_int_level; + u32 vstate = m_virq_state; + u32 blevel; if(state == ASSERT_LINE) vstate |= 1 << irqline; @@ -688,7 +688,7 @@ void m68000_base_device::m68k_cause_bus_error() return; } - uint32_t sr = m68ki_init_exception(); + u32 sr = m68ki_init_exception(); m_run_mode = RUN_MODE_BERR_AERR_RESET_WSF; @@ -728,9 +728,9 @@ bool m68000_base_device::memory_translate(int space, int intention, offs_t &addr if ((space == AS_PROGRAM) && ((m_pmmu_enabled) || (CPU_TYPE_IS_040_PLUS()))) { // FIXME: m_mmu_tmp_sr will be overwritten in pmmu_translate_addr_with_fc - uint16_t temp_mmu_tmp_sr = m_mmu_tmp_sr; + u16 temp_mmu_tmp_sr = m_mmu_tmp_sr; int mode = m_s_flag ? FUNCTION_CODE_SUPERVISOR_PROGRAM : FUNCTION_CODE_USER_PROGRAM; -// uint32_t va=address; +// u32 va=address; if (CPU_TYPE_IS_040_PLUS()) { @@ -835,7 +835,7 @@ void m68000_base_device::execute_run() m_run_mode = RUN_MODE_NORMAL; // save CPU address registers values at start of instruction int i; - uint32_t tmp_dar[16]; + u32 tmp_dar[16]; for (i = 15; i >= 0; i--) { @@ -856,7 +856,7 @@ void m68000_base_device::execute_run() if (m_mmu_tmp_buserror_occurred) { - uint32_t sr; + u32 sr; m_mmu_tmp_buserror_occurred = 0; @@ -930,7 +930,7 @@ void m68000_base_device::execute_run() void m68000_base_device::init_cpu_common(void) { - static uint32_t emulation_initialized = 0; + static u32 emulation_initialized = 0; //this = device;//deviceparam; m_program = &space(AS_PROGRAM); @@ -1154,7 +1154,7 @@ void m68000_base_device::state_export(const device_state_entry &entry) void m68000_base_device::state_string_export(const device_state_entry &entry, std::string &str) const { - uint16_t sr; + u16 sr; switch (entry.index()) { @@ -1536,7 +1536,7 @@ void m68000_base_device::set_reset_callback(write_line_delegate callback) // fault_addr = address to indicate fault at // rw = 1 for read, 0 for write // fc = 3-bit function code of access (usually you'd just put what m68k_get_fc() returns here) -void m68000_base_device::set_buserror_details(uint32_t fault_addr, uint8_t rw, uint8_t fc) +void m68000_base_device::set_buserror_details(u32 fault_addr, u8 rw, u8 fc) { m_aerr_address = fault_addr; m_aerr_write_mode = (rw << 4); @@ -1559,7 +1559,7 @@ void m68000_base_device::set_tas_write_callback(write8_delegate callback) m_tas_write_callback = callback; } -uint16_t m68000_base_device::get_fc() +u16 m68000_base_device::get_fc() { return m_mmu_tmp_fc; } @@ -1570,7 +1570,7 @@ uint16_t m68000_base_device::get_fc() void m68000_base_device::define_state(void) { - uint32_t addrmask = (m_cpu_type & MASK_24BIT_SPACE) ? 0xffffff : 0xffffffff; + u32 addrmask = (m_cpu_type & MASK_24BIT_SPACE) ? 0xffffff : 0xffffffff; state_add(STATE_GENPC, "PC", m_pc).mask(addrmask).callimport(); state_add(STATE_GENPCBASE, "CURPC", m_ppc).mask(addrmask).callimport().noshow(); @@ -2136,11 +2136,11 @@ std::unique_ptr mcf5206e_device::create_disassembler() /* Service an interrupt request and start exception processing */ -void m68000_base_device::m68ki_exception_interrupt(uint32_t int_level) +void m68000_base_device::m68ki_exception_interrupt(u32 int_level) { - uint32_t vector; - uint32_t sr; - uint32_t new_pc; + u32 vector; + u32 sr; + u32 new_pc; if(CPU_TYPE_IS_000()) { @@ -2207,8 +2207,8 @@ void m68000_base_device::m68ki_exception_interrupt(uint32_t int_level) // m68000_base_device - constructor //------------------------------------------------- -m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, - const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map) +m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, + const device_type type, u32 prg_data_width, u32 prg_address_bits, address_map_constructor internal_map) : cpu_device(mconfig, type, tag, owner, clock), m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map), m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map), @@ -2220,8 +2220,8 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, const char } -m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, - const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits) +m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, + const device_type type, u32 prg_data_width, u32 prg_address_bits) : cpu_device(mconfig, type, tag, owner, clock), m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits), m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, prg_data_width, prg_address_bits), @@ -2452,12 +2452,12 @@ DEFINE_DEVICE_TYPE(M68040, m68040_device, "m68040", "Motorola MC DEFINE_DEVICE_TYPE(FSCPU32, fscpu32_device, "fscpu32", "Freescale CPU32 Core") DEFINE_DEVICE_TYPE(MCF5206E, mcf5206e_device, "mcf5206e", "Freescale MCF5206E") -m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_device(mconfig, M68000, tag, owner, clock) { } -m68000_device::m68000_device(const machine_config &mconfig, const device_type type, const char *tag, device_t *owner, uint32_t clock) +m68000_device::m68000_device(const machine_config &mconfig, const device_type type, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, type, 16,24) { } @@ -2467,8 +2467,8 @@ void m68000_device::device_start() init_cpu_m68000(); } -m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, - const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map) +m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, + const device_type type, u32 prg_data_width, u32 prg_address_bits, address_map_constructor internal_map) : m68000_base_device(mconfig, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map) { } @@ -2480,7 +2480,7 @@ m68000_device::m68000_device(const machine_config &mconfig, const char *tag, dev /* m68008_device */ -m68008_device::m68008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68008_device::m68008_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68008, 8,20) { } @@ -2491,7 +2491,7 @@ void m68008_device::device_start() } -m68008fn_device::m68008fn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68008fn_device::m68008fn_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68008FN, 8,22) { } @@ -2503,7 +2503,7 @@ void m68008fn_device::device_start() -m68010_device::m68010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68010_device::m68010_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68010, 16,24) { } @@ -2515,7 +2515,7 @@ void m68010_device::device_start() -m68020_device::m68020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68020_device::m68020_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68020, 32,32) { } @@ -2526,7 +2526,7 @@ void m68020_device::device_start() } -m68020fpu_device::m68020fpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68020fpu_device::m68020fpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68020FPU, 32,32) { } @@ -2537,7 +2537,7 @@ void m68020fpu_device::device_start() } // 68020 with 68851 PMMU -m68020pmmu_device::m68020pmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68020pmmu_device::m68020pmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68020PMMU, 32,32) { } @@ -2562,7 +2562,7 @@ bool m68020hmmu_device::memory_translate(int space, int intention, offs_t &addre // 68020 with Apple HMMU & 68881 FPU // case CPUINFO_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(m68khmmu); break; -m68020hmmu_device::m68020hmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68020hmmu_device::m68020hmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68020HMMU, 32,32) { } @@ -2573,7 +2573,7 @@ void m68020hmmu_device::device_start() } -m68ec020_device::m68ec020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68ec020_device::m68ec020_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68EC020, 32,24) { } @@ -2583,7 +2583,7 @@ void m68ec020_device::device_start() init_cpu_m68ec020(); } -m68030_device::m68030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68030_device::m68030_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68030, 32,32) { } @@ -2593,7 +2593,7 @@ void m68030_device::device_start() init_cpu_m68030(); } -m68ec030_device::m68ec030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68ec030_device::m68ec030_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68EC030, 32,32) { } @@ -2603,7 +2603,7 @@ void m68ec030_device::device_start() init_cpu_m68ec030(); } -m68040_device::m68040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68040_device::m68040_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68040, 32,32) { } @@ -2616,7 +2616,7 @@ void m68040_device::device_start() -m68ec040_device::m68ec040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68ec040_device::m68ec040_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68EC040, 32,32) { } @@ -2628,7 +2628,7 @@ void m68ec040_device::device_start() -m68lc040_device::m68lc040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +m68lc040_device::m68lc040_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, M68LC040, 32,32) { } @@ -2639,7 +2639,7 @@ void m68lc040_device::device_start() } -scc68070_base_device::scc68070_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, +scc68070_base_device::scc68070_base_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, const device_type type, address_map_constructor internal_map) : m68000_base_device(mconfig, tag, owner, clock, type, 16,32, internal_map) { @@ -2651,13 +2651,13 @@ void scc68070_base_device::device_start() } -fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, FSCPU32, 32,32) { } -fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, - const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map) +fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, + const device_type type, u32 prg_data_width, u32 prg_address_bits, address_map_constructor internal_map) : m68000_base_device(mconfig, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map) { } @@ -2670,7 +2670,7 @@ void fscpu32_device::device_start() -mcf5206e_device::mcf5206e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mcf5206e_device::mcf5206e_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : m68000_base_device(mconfig, tag, owner, clock, MCF5206E, 32,32) { } diff --git a/src/devices/cpu/m68000/m68kcpu.h b/src/devices/cpu/m68000/m68kcpu.h index 377d4da11d9..ba7a515d11b 100644 --- a/src/devices/cpu/m68000/m68kcpu.h +++ b/src/devices/cpu/m68000/m68kcpu.h @@ -29,9 +29,9 @@ /* ======================================================================== */ /* Check for > 32bit sizes */ -static constexpr int8_t MAKE_INT_8(uint32_t A) { return (int8_t)(A); } -static constexpr int16_t MAKE_INT_16(uint32_t A) { return (int16_t)(A); } -static constexpr int32_t MAKE_INT_32(uint32_t A) { return (int32_t)(A); } +static constexpr s8 MAKE_INT_8(u32 A) { return (s8)(A); } +static constexpr s16 MAKE_INT_16(u32 A) { return (s16)(A); } +static constexpr s32 MAKE_INT_32(u32 A) { return (s32)(A); } /* ======================================================================== */ @@ -109,103 +109,103 @@ static constexpr int M68K_CACR_EI = 0x01; // Enable Instruction Cache /* ---------------------------- General Macros ---------------------------- */ /* Bit Isolation Macros */ -static constexpr uint32_t BIT_0(uint32_t A) { return ((A) & 0x00000001); } -static constexpr uint32_t BIT_1(uint32_t A) { return ((A) & 0x00000002); } -static constexpr uint32_t BIT_2(uint32_t A) { return ((A) & 0x00000004); } -static constexpr uint32_t BIT_3(uint32_t A) { return ((A) & 0x00000008); } -static constexpr uint32_t BIT_4(uint32_t A) { return ((A) & 0x00000010); } -static constexpr uint32_t BIT_5(uint32_t A) { return ((A) & 0x00000020); } -static constexpr uint32_t BIT_6(uint32_t A) { return ((A) & 0x00000040); } -static constexpr uint32_t BIT_7(uint32_t A) { return ((A) & 0x00000080); } -static constexpr uint32_t BIT_8(uint32_t A) { return ((A) & 0x00000100); } -static constexpr uint32_t BIT_9(uint32_t A) { return ((A) & 0x00000200); } -static constexpr uint32_t BIT_A(uint32_t A) { return ((A) & 0x00000400); } -static constexpr uint32_t BIT_B(uint32_t A) { return ((A) & 0x00000800); } -static constexpr uint32_t BIT_C(uint32_t A) { return ((A) & 0x00001000); } -static constexpr uint32_t BIT_D(uint32_t A) { return ((A) & 0x00002000); } -static constexpr uint32_t BIT_E(uint32_t A) { return ((A) & 0x00004000); } -static constexpr uint32_t BIT_F(uint32_t A) { return ((A) & 0x00008000); } -static constexpr uint32_t BIT_10(uint32_t A) { return ((A) & 0x00010000); } -static constexpr uint32_t BIT_11(uint32_t A) { return ((A) & 0x00020000); } -static constexpr uint32_t BIT_12(uint32_t A) { return ((A) & 0x00040000); } -static constexpr uint32_t BIT_13(uint32_t A) { return ((A) & 0x00080000); } -static constexpr uint32_t BIT_14(uint32_t A) { return ((A) & 0x00100000); } -static constexpr uint32_t BIT_15(uint32_t A) { return ((A) & 0x00200000); } -static constexpr uint32_t BIT_16(uint32_t A) { return ((A) & 0x00400000); } -static constexpr uint32_t BIT_17(uint32_t A) { return ((A) & 0x00800000); } -static constexpr uint32_t BIT_18(uint32_t A) { return ((A) & 0x01000000); } -static constexpr uint32_t BIT_19(uint32_t A) { return ((A) & 0x02000000); } -static constexpr uint32_t BIT_1A(uint32_t A) { return ((A) & 0x04000000); } -static constexpr uint32_t BIT_1B(uint32_t A) { return ((A) & 0x08000000); } -static constexpr uint32_t BIT_1C(uint32_t A) { return ((A) & 0x10000000); } -static constexpr uint32_t BIT_1D(uint32_t A) { return ((A) & 0x20000000); } -static constexpr uint32_t BIT_1E(uint32_t A) { return ((A) & 0x40000000); } -static constexpr uint32_t BIT_1F(uint32_t A) { return ((A) & 0x80000000); } +static constexpr u32 BIT_0(u32 A) { return ((A) & 0x00000001); } +static constexpr u32 BIT_1(u32 A) { return ((A) & 0x00000002); } +static constexpr u32 BIT_2(u32 A) { return ((A) & 0x00000004); } +static constexpr u32 BIT_3(u32 A) { return ((A) & 0x00000008); } +static constexpr u32 BIT_4(u32 A) { return ((A) & 0x00000010); } +static constexpr u32 BIT_5(u32 A) { return ((A) & 0x00000020); } +static constexpr u32 BIT_6(u32 A) { return ((A) & 0x00000040); } +static constexpr u32 BIT_7(u32 A) { return ((A) & 0x00000080); } +static constexpr u32 BIT_8(u32 A) { return ((A) & 0x00000100); } +static constexpr u32 BIT_9(u32 A) { return ((A) & 0x00000200); } +static constexpr u32 BIT_A(u32 A) { return ((A) & 0x00000400); } +static constexpr u32 BIT_B(u32 A) { return ((A) & 0x00000800); } +static constexpr u32 BIT_C(u32 A) { return ((A) & 0x00001000); } +static constexpr u32 BIT_D(u32 A) { return ((A) & 0x00002000); } +static constexpr u32 BIT_E(u32 A) { return ((A) & 0x00004000); } +static constexpr u32 BIT_F(u32 A) { return ((A) & 0x00008000); } +static constexpr u32 BIT_10(u32 A) { return ((A) & 0x00010000); } +static constexpr u32 BIT_11(u32 A) { return ((A) & 0x00020000); } +static constexpr u32 BIT_12(u32 A) { return ((A) & 0x00040000); } +static constexpr u32 BIT_13(u32 A) { return ((A) & 0x00080000); } +static constexpr u32 BIT_14(u32 A) { return ((A) & 0x00100000); } +static constexpr u32 BIT_15(u32 A) { return ((A) & 0x00200000); } +static constexpr u32 BIT_16(u32 A) { return ((A) & 0x00400000); } +static constexpr u32 BIT_17(u32 A) { return ((A) & 0x00800000); } +static constexpr u32 BIT_18(u32 A) { return ((A) & 0x01000000); } +static constexpr u32 BIT_19(u32 A) { return ((A) & 0x02000000); } +static constexpr u32 BIT_1A(u32 A) { return ((A) & 0x04000000); } +static constexpr u32 BIT_1B(u32 A) { return ((A) & 0x08000000); } +static constexpr u32 BIT_1C(u32 A) { return ((A) & 0x10000000); } +static constexpr u32 BIT_1D(u32 A) { return ((A) & 0x20000000); } +static constexpr u32 BIT_1E(u32 A) { return ((A) & 0x40000000); } +static constexpr u32 BIT_1F(u32 A) { return ((A) & 0x80000000); } /* Get the most significant bit for specific sizes */ -static constexpr uint32_t GET_MSB_8(uint32_t A) { return ((A) & 0x80); } -static constexpr uint32_t GET_MSB_9(uint32_t A) { return ((A) & 0x100); } -static constexpr uint32_t GET_MSB_16(uint32_t A) { return ((A) & 0x8000); } -static constexpr uint32_t GET_MSB_17(uint32_t A) { return ((A) & 0x10000); } -static constexpr uint32_t GET_MSB_32(uint32_t A) { return ((A) & 0x80000000); } -static constexpr uint64_t GET_MSB_33(uint64_t A) { return ((A) & 0x100000000U); } +static constexpr u32 GET_MSB_8(u32 A) { return ((A) & 0x80); } +static constexpr u32 GET_MSB_9(u32 A) { return ((A) & 0x100); } +static constexpr u32 GET_MSB_16(u32 A) { return ((A) & 0x8000); } +static constexpr u32 GET_MSB_17(u32 A) { return ((A) & 0x10000); } +static constexpr u32 GET_MSB_32(u32 A) { return ((A) & 0x80000000); } +static constexpr u64 GET_MSB_33(u64 A) { return ((A) & 0x100000000U); } /* Isolate nibbles */ -static constexpr uint32_t LOW_NIBBLE(uint32_t A) { return ((A) & 0x0f); } -static constexpr uint32_t HIGH_NIBBLE(uint32_t A) { return ((A) & 0xf0); } +static constexpr u32 LOW_NIBBLE(u32 A) { return ((A) & 0x0f); } +static constexpr u32 HIGH_NIBBLE(u32 A) { return ((A) & 0xf0); } /* These are used to isolate 8, 16, and 32 bit sizes */ -static constexpr uint32_t MASK_OUT_ABOVE_2(uint32_t A) { return ((A) & 3); } -static constexpr uint32_t MASK_OUT_ABOVE_8(uint32_t A) { return ((A) & 0xff); } -static constexpr uint32_t MASK_OUT_ABOVE_16(uint32_t A) { return ((A) & 0xffff); } -static constexpr uint32_t MASK_OUT_BELOW_2(uint32_t A) { return ((A) & ~3); } -static constexpr uint32_t MASK_OUT_BELOW_8(uint32_t A) { return ((A) & ~0xff); } -static constexpr uint32_t MASK_OUT_BELOW_16(uint32_t A) { return ((A) & ~0xffff); } +static constexpr u32 MASK_OUT_ABOVE_2(u32 A) { return ((A) & 3); } +static constexpr u32 MASK_OUT_ABOVE_8(u32 A) { return ((A) & 0xff); } +static constexpr u32 MASK_OUT_ABOVE_16(u32 A) { return ((A) & 0xffff); } +static constexpr u32 MASK_OUT_BELOW_2(u32 A) { return ((A) & ~3); } +static constexpr u32 MASK_OUT_BELOW_8(u32 A) { return ((A) & ~0xff); } +static constexpr u32 MASK_OUT_BELOW_16(u32 A) { return ((A) & ~0xffff); } /* No need to mask if we are 32 bit */ -static constexpr uint32_t MASK_OUT_ABOVE_32(uint32_t A) { return ((A) & u64(0xffffffffU)); } -static constexpr uint64_t MASK_OUT_BELOW_32(uint64_t A) { return ((A) & ~u64(0xffffffffU)); } +static constexpr u32 MASK_OUT_ABOVE_32(u32 A) { return ((A) & u64(0xffffffffU)); } +static constexpr u64 MASK_OUT_BELOW_32(u64 A) { return ((A) & ~u64(0xffffffffU)); } /* Shift & Rotate Macros. */ -static constexpr uint32_t LSL(uint32 A, uint32_t C) { return ((A) << (C)); } -static constexpr uint32_t LSR(uint32 A, uint32_t C) { return ((A) >> (C)); } +static constexpr u32 LSL(u32 A, u32 C) { return ((A) << (C)); } +static constexpr u32 LSR(u32 A, u32 C) { return ((A) >> (C)); } /* We have to do this because the morons at ANSI decided that shifts * by >= data size are undefined. */ -static constexpr uint32_t LSR_32(uint32 A, uint32_t C) { return ((C) < 32 ? (A) >> (C) : 0); } -static constexpr uint32_t LSL_32(uint32 A, uint32_t C) { return ((C) < 32 ? (A) << (C) : 0); } +static constexpr u32 LSR_32(u32 A, u32 C) { return ((C) < 32 ? (A) >> (C) : 0); } +static constexpr u32 LSL_32(u32 A, u32 C) { return ((C) < 32 ? (A) << (C) : 0); } -static constexpr uint64_t LSL_32_64(uint64_t A, uint32_t C) { return ((A) << (C)); } -static constexpr uint64_t LSR_32_64(uint64_t A, uint32_t C) { return ((A) >> (C)); } -static constexpr uint64_t ROL_33_64(uint64_t A, uint32_t C) { return (LSL_32_64(A, C) | LSR_32_64(A, 33 - (C))); } -static constexpr uint64_t ROR_33_64(uint64_t A, uint32_t C) { return (LSR_32_64(A, C) | LSL_32_64(A, 33 - (C))); } +static constexpr u64 LSL_32_64(u64 A, u32 C) { return ((A) << (C)); } +static constexpr u64 LSR_32_64(u64 A, u32 C) { return ((A) >> (C)); } +static constexpr u64 ROL_33_64(u64 A, u32 C) { return (LSL_32_64(A, C) | LSR_32_64(A, 33 - (C))); } +static constexpr u64 ROR_33_64(u64 A, u32 C) { return (LSR_32_64(A, C) | LSL_32_64(A, 33 - (C))); } -static constexpr uint32_t ROL_8(uint32_t A, uint32_t C) { return MASK_OUT_ABOVE_8(LSL(A, C) | LSR(A, 8-(C))); } -static constexpr uint32_t ROL_9(uint32_t A, uint32_t C) { return (LSL(A, C) | LSR(A, 9-(C))); } -static constexpr uint32_t ROL_16(uint32_t A, uint32_t C) { return MASK_OUT_ABOVE_16(LSL(A, C) | LSR(A, 16-(C))); } -static constexpr uint32_t ROL_17(uint32_t A, uint32_t C) { return (LSL(A, C) | LSR(A, 17-(C))); } -static constexpr uint32_t ROL_32(uint32_t A, uint32_t C) { return MASK_OUT_ABOVE_32(LSL_32(A, C) | LSR_32(A, 32-(C))); } +static constexpr u32 ROL_8(u32 A, u32 C) { return MASK_OUT_ABOVE_8(LSL(A, C) | LSR(A, 8-(C))); } +static constexpr u32 ROL_9(u32 A, u32 C) { return (LSL(A, C) | LSR(A, 9-(C))); } +static constexpr u32 ROL_16(u32 A, u32 C) { return MASK_OUT_ABOVE_16(LSL(A, C) | LSR(A, 16-(C))); } +static constexpr u32 ROL_17(u32 A, u32 C) { return (LSL(A, C) | LSR(A, 17-(C))); } +static constexpr u32 ROL_32(u32 A, u32 C) { return MASK_OUT_ABOVE_32(LSL_32(A, C) | LSR_32(A, 32-(C))); } -static constexpr uint32_t ROR_8(uint32_t A, uint32_t C) { return MASK_OUT_ABOVE_8(LSR(A, C) | LSL(A, 8-(C))); } -static constexpr uint32_t ROR_9(uint32_t A, uint32_t C) { return (LSR(A, C) | LSL(A, 9-(C))); } -static constexpr uint32_t ROR_16(uint32_t A, uint32_t C) { return MASK_OUT_ABOVE_16(LSR(A, C) | LSL(A, 16-(C))); } -static constexpr uint32_t ROR_17(uint32_t A, uint32_t C) { return (LSR(A, C) | LSL(A, 17-(C))); } -static constexpr uint32_t ROR_32(uint32_t A, uint32_t C) { return MASK_OUT_ABOVE_32(LSR_32(A, C) | LSL_32(A, 32-(C))); } +static constexpr u32 ROR_8(u32 A, u32 C) { return MASK_OUT_ABOVE_8(LSR(A, C) | LSL(A, 8-(C))); } +static constexpr u32 ROR_9(u32 A, u32 C) { return (LSR(A, C) | LSL(A, 9-(C))); } +static constexpr u32 ROR_16(u32 A, u32 C) { return MASK_OUT_ABOVE_16(LSR(A, C) | LSL(A, 16-(C))); } +static constexpr u32 ROR_17(u32 A, u32 C) { return (LSR(A, C) | LSL(A, 17-(C))); } +static constexpr u32 ROR_32(u32 A, u32 C) { return MASK_OUT_ABOVE_32(LSR_32(A, C) | LSL_32(A, 32-(C))); } /* ------------------------------ CPU Access ------------------------------ */ /* Access the CPU registers */ -inline uint32_t (®_DA())[16] { return m_dar; } /* easy access to data and address regs */ -inline uint32_t (®_D())[16] { return m_dar; } -inline uint32_t *REG_A() { return (m_dar+8); } -inline uint32_t (®_SP_BASE())[7]{ return m_sp; } -inline uint32_t ®_USP() { return m_sp[0]; } -inline uint32_t ®_ISP() { return m_sp[4]; } -inline uint32_t ®_MSP() { return m_sp[6]; } -inline uint32_t ®_SP() { return m_dar[15]; } +inline u32 (®_DA())[16] { return m_dar; } /* easy access to data and address regs */ +inline u32 (®_D())[16] { return m_dar; } +inline u32 *REG_A() { return (m_dar+8); } +inline u32 (®_SP_BASE())[7]{ return m_sp; } +inline u32 ®_USP() { return m_sp[0]; } +inline u32 ®_ISP() { return m_sp[4]; } +inline u32 ®_MSP() { return m_sp[6]; } +inline u32 ®_SP() { return m_dar[15]; } /* ----------------------------- Configuration ---------------------------- */ @@ -213,26 +213,26 @@ inline uint32_t ®_SP() { return m_dar[15]; } /* These defines are dependant on the configuration defines in m68kconf.h */ /* Disable certain comparisons if we're not using all CPU types */ -inline uint32_t CPU_TYPE_IS_COLDFIRE() const { return ((m_cpu_type) & (CPU_TYPE_COLDFIRE)); } +inline u32 CPU_TYPE_IS_COLDFIRE() const { return ((m_cpu_type) & (CPU_TYPE_COLDFIRE)); } -inline uint32_t CPU_TYPE_IS_040_PLUS() const { return ((m_cpu_type) & (CPU_TYPE_040 | CPU_TYPE_EC040)); } +inline u32 CPU_TYPE_IS_040_PLUS() const { return ((m_cpu_type) & (CPU_TYPE_040 | CPU_TYPE_EC040)); } -inline uint32_t CPU_TYPE_IS_030_PLUS() const { return ((m_cpu_type) & (CPU_TYPE_030 | CPU_TYPE_EC030 | CPU_TYPE_040 | CPU_TYPE_EC040)); } +inline u32 CPU_TYPE_IS_030_PLUS() const { return ((m_cpu_type) & (CPU_TYPE_030 | CPU_TYPE_EC030 | CPU_TYPE_040 | CPU_TYPE_EC040)); } -inline uint32_t CPU_TYPE_IS_020_PLUS() const { return ((m_cpu_type) & (CPU_TYPE_020 | CPU_TYPE_030 | CPU_TYPE_EC030 | CPU_TYPE_040 | CPU_TYPE_EC040 | CPU_TYPE_FSCPU32 | CPU_TYPE_COLDFIRE)); } +inline u32 CPU_TYPE_IS_020_PLUS() const { return ((m_cpu_type) & (CPU_TYPE_020 | CPU_TYPE_030 | CPU_TYPE_EC030 | CPU_TYPE_040 | CPU_TYPE_EC040 | CPU_TYPE_FSCPU32 | CPU_TYPE_COLDFIRE)); } -inline uint32_t CPU_TYPE_IS_020_VARIANT() const { return ((m_cpu_type) & (CPU_TYPE_EC020 | CPU_TYPE_020 | CPU_TYPE_FSCPU32)); } +inline u32 CPU_TYPE_IS_020_VARIANT() const { return ((m_cpu_type) & (CPU_TYPE_EC020 | CPU_TYPE_020 | CPU_TYPE_FSCPU32)); } -inline uint32_t CPU_TYPE_IS_EC020_PLUS() const { return ((m_cpu_type) & (CPU_TYPE_EC020 | CPU_TYPE_020 | CPU_TYPE_030 | CPU_TYPE_EC030 | CPU_TYPE_040 | CPU_TYPE_EC040 | CPU_TYPE_FSCPU32 | CPU_TYPE_COLDFIRE)); } -inline uint32_t CPU_TYPE_IS_EC020_LESS() const { return ((m_cpu_type) & (CPU_TYPE_000 | CPU_TYPE_008 | CPU_TYPE_010 | CPU_TYPE_EC020)); } +inline u32 CPU_TYPE_IS_EC020_PLUS() const { return ((m_cpu_type) & (CPU_TYPE_EC020 | CPU_TYPE_020 | CPU_TYPE_030 | CPU_TYPE_EC030 | CPU_TYPE_040 | CPU_TYPE_EC040 | CPU_TYPE_FSCPU32 | CPU_TYPE_COLDFIRE)); } +inline u32 CPU_TYPE_IS_EC020_LESS() const { return ((m_cpu_type) & (CPU_TYPE_000 | CPU_TYPE_008 | CPU_TYPE_010 | CPU_TYPE_EC020)); } -inline uint32_t CPU_TYPE_IS_010() const { return ((m_cpu_type) == CPU_TYPE_010); } -inline uint32_t CPU_TYPE_IS_010_PLUS() const { return ((m_cpu_type) & (CPU_TYPE_010 | CPU_TYPE_EC020 | CPU_TYPE_020 | CPU_TYPE_EC030 | CPU_TYPE_030 | CPU_TYPE_040 | CPU_TYPE_EC040 | CPU_TYPE_FSCPU32 | CPU_TYPE_COLDFIRE)); } -inline uint32_t CPU_TYPE_IS_010_LESS() const { return ((m_cpu_type) & (CPU_TYPE_000 | CPU_TYPE_008 | CPU_TYPE_010 | CPU_TYPE_SCC070)); } +inline u32 CPU_TYPE_IS_010() const { return ((m_cpu_type) == CPU_TYPE_010); } +inline u32 CPU_TYPE_IS_010_PLUS() const { return ((m_cpu_type) & (CPU_TYPE_010 | CPU_TYPE_EC020 | CPU_TYPE_020 | CPU_TYPE_EC030 | CPU_TYPE_030 | CPU_TYPE_040 | CPU_TYPE_EC040 | CPU_TYPE_FSCPU32 | CPU_TYPE_COLDFIRE)); } +inline u32 CPU_TYPE_IS_010_LESS() const { return ((m_cpu_type) & (CPU_TYPE_000 | CPU_TYPE_008 | CPU_TYPE_010 | CPU_TYPE_SCC070)); } -inline uint32_t CPU_TYPE_IS_000() const { return ((m_cpu_type) == CPU_TYPE_000 || (m_cpu_type) == CPU_TYPE_008); } +inline u32 CPU_TYPE_IS_000() const { return ((m_cpu_type) == CPU_TYPE_000 || (m_cpu_type) == CPU_TYPE_008); } -inline uint32_t CPU_TYPE_IS_070() const { return ((m_cpu_type) == CPU_TYPE_SCC070); } +inline u32 CPU_TYPE_IS_070() const { return ((m_cpu_type) == CPU_TYPE_SCC070); } /* Initiates trace checking before each instruction (t1) */ @@ -252,94 +252,94 @@ inline void m68ki_exception_if_trace() { if(m_tracing) m68ki_exception_trace(); * where XXX is register X and YYY is register Y */ /* Data Register Isolation */ -inline uint32_t &DX() { return (REG_D()[(m_ir >> 9) & 7]); } -inline uint32_t &DY() { return (REG_D()[m_ir & 7]); } +inline u32 &DX() { return (REG_D()[(m_ir >> 9) & 7]); } +inline u32 &DY() { return (REG_D()[m_ir & 7]); } /* Address Register Isolation */ -inline uint32_t &AX() { return (REG_A()[(m_ir >> 9) & 7]); } -inline uint32_t &AY() { return (REG_A()[m_ir & 7]); } +inline u32 &AX() { return (REG_A()[(m_ir >> 9) & 7]); } +inline u32 &AY() { return (REG_A()[m_ir & 7]); } /* Effective Address Calculations */ -inline uint32_t EA_AY_AI_8() { return AY(); } /* address register indirect */ -inline uint32_t EA_AY_AI_16() { return EA_AY_AI_8(); } -inline uint32_t EA_AY_AI_32() { return EA_AY_AI_8(); } -inline uint32_t EA_AY_PI_8() { return (AY()++); } /* postincrement (size = byte) */ -inline uint32_t EA_AY_PI_16() { return ((AY()+=2)-2); } /* postincrement (size = word) */ -inline uint32_t EA_AY_PI_32() { return ((AY()+=4)-4); } /* postincrement (size = long) */ -inline uint32_t EA_AY_PD_8() { return (--AY()); } /* predecrement (size = byte) */ -inline uint32_t EA_AY_PD_16() { return (AY()-=2); } /* predecrement (size = word) */ -inline uint32_t EA_AY_PD_32() { return (AY()-=4); } /* predecrement (size = long) */ -inline uint32_t EA_AY_DI_8() { return (AY()+MAKE_INT_16(m68ki_read_imm_16())); } /* displacement */ -inline uint32_t EA_AY_DI_16() { return EA_AY_DI_8(); } -inline uint32_t EA_AY_DI_32() { return EA_AY_DI_8(); } -inline uint32_t EA_AY_IX_8() { return m68ki_get_ea_ix(AY()); } /* indirect + index */ -inline uint32_t EA_AY_IX_16() { return EA_AY_IX_8(); } -inline uint32_t EA_AY_IX_32() { return EA_AY_IX_8(); } - -inline uint32_t EA_AX_AI_8() { return AX(); } -inline uint32_t EA_AX_AI_16() { return EA_AX_AI_8(); } -inline uint32_t EA_AX_AI_32() { return EA_AX_AI_8(); } -inline uint32_t EA_AX_PI_8() { return (AX()++); } -inline uint32_t EA_AX_PI_16() { return ((AX()+=2)-2); } -inline uint32_t EA_AX_PI_32() { return ((AX()+=4)-4); } -inline uint32_t EA_AX_PD_8() { return (--AX()); } -inline uint32_t EA_AX_PD_16() { return (AX()-=2); } -inline uint32_t EA_AX_PD_32() { return (AX()-=4); } -inline uint32_t EA_AX_DI_8() { return (AX()+MAKE_INT_16(m68ki_read_imm_16())); } -inline uint32_t EA_AX_DI_16() { return EA_AX_DI_8(); } -inline uint32_t EA_AX_DI_32() { return EA_AX_DI_8(); } -inline uint32_t EA_AX_IX_8() { return m68ki_get_ea_ix(AX()); } -inline uint32_t EA_AX_IX_16() { return EA_AX_IX_8(); } -inline uint32_t EA_AX_IX_32() { return EA_AX_IX_8(); } - -inline uint32_t EA_A7_PI_8() { return ((REG_A()[7]+=2)-2); } -inline uint32_t EA_A7_PD_8() { return (REG_A()[7]-=2); } - -inline uint32_t EA_AW_8() { return MAKE_INT_16(m68ki_read_imm_16()); } /* absolute word */ -inline uint32_t EA_AW_16() { return EA_AW_8(); } -inline uint32_t EA_AW_32() { return EA_AW_8(); } -inline uint32_t EA_AL_8() { return m68ki_read_imm_32(); } /* absolute long */ -inline uint32_t EA_AL_16() { return EA_AL_8(); } -inline uint32_t EA_AL_32() { return EA_AL_8(); } -inline uint32_t EA_PCDI_8() { return m68ki_get_ea_pcdi(); } /* pc indirect + displacement */ -inline uint32_t EA_PCDI_16() { return EA_PCDI_8(); } -inline uint32_t EA_PCDI_32() { return EA_PCDI_8(); } -inline uint32_t EA_PCIX_8() { return m68ki_get_ea_pcix(); } /* pc indirect + index */ -inline uint32_t EA_PCIX_16() { return EA_PCIX_8(); } -inline uint32_t EA_PCIX_32() { return EA_PCIX_8(); } - - -inline uint32_t OPER_I_8() { return m68ki_read_imm_8(); } -inline uint32_t OPER_I_16() { return m68ki_read_imm_16(); } -inline uint32_t OPER_I_32() { return m68ki_read_imm_32(); } +inline u32 EA_AY_AI_8() { return AY(); } /* address register indirect */ +inline u32 EA_AY_AI_16() { return EA_AY_AI_8(); } +inline u32 EA_AY_AI_32() { return EA_AY_AI_8(); } +inline u32 EA_AY_PI_8() { return (AY()++); } /* postincrement (size = byte) */ +inline u32 EA_AY_PI_16() { return ((AY()+=2)-2); } /* postincrement (size = word) */ +inline u32 EA_AY_PI_32() { return ((AY()+=4)-4); } /* postincrement (size = long) */ +inline u32 EA_AY_PD_8() { return (--AY()); } /* predecrement (size = byte) */ +inline u32 EA_AY_PD_16() { return (AY()-=2); } /* predecrement (size = word) */ +inline u32 EA_AY_PD_32() { return (AY()-=4); } /* predecrement (size = long) */ +inline u32 EA_AY_DI_8() { return (AY()+MAKE_INT_16(m68ki_read_imm_16())); } /* displacement */ +inline u32 EA_AY_DI_16() { return EA_AY_DI_8(); } +inline u32 EA_AY_DI_32() { return EA_AY_DI_8(); } +inline u32 EA_AY_IX_8() { return m68ki_get_ea_ix(AY()); } /* indirect + index */ +inline u32 EA_AY_IX_16() { return EA_AY_IX_8(); } +inline u32 EA_AY_IX_32() { return EA_AY_IX_8(); } + +inline u32 EA_AX_AI_8() { return AX(); } +inline u32 EA_AX_AI_16() { return EA_AX_AI_8(); } +inline u32 EA_AX_AI_32() { return EA_AX_AI_8(); } +inline u32 EA_AX_PI_8() { return (AX()++); } +inline u32 EA_AX_PI_16() { return ((AX()+=2)-2); } +inline u32 EA_AX_PI_32() { return ((AX()+=4)-4); } +inline u32 EA_AX_PD_8() { return (--AX()); } +inline u32 EA_AX_PD_16() { return (AX()-=2); } +inline u32 EA_AX_PD_32() { return (AX()-=4); } +inline u32 EA_AX_DI_8() { return (AX()+MAKE_INT_16(m68ki_read_imm_16())); } +inline u32 EA_AX_DI_16() { return EA_AX_DI_8(); } +inline u32 EA_AX_DI_32() { return EA_AX_DI_8(); } +inline u32 EA_AX_IX_8() { return m68ki_get_ea_ix(AX()); } +inline u32 EA_AX_IX_16() { return EA_AX_IX_8(); } +inline u32 EA_AX_IX_32() { return EA_AX_IX_8(); } + +inline u32 EA_A7_PI_8() { return ((REG_A()[7]+=2)-2); } +inline u32 EA_A7_PD_8() { return (REG_A()[7]-=2); } + +inline u32 EA_AW_8() { return MAKE_INT_16(m68ki_read_imm_16()); } /* absolute word */ +inline u32 EA_AW_16() { return EA_AW_8(); } +inline u32 EA_AW_32() { return EA_AW_8(); } +inline u32 EA_AL_8() { return m68ki_read_imm_32(); } /* absolute long */ +inline u32 EA_AL_16() { return EA_AL_8(); } +inline u32 EA_AL_32() { return EA_AL_8(); } +inline u32 EA_PCDI_8() { return m68ki_get_ea_pcdi(); } /* pc indirect + displacement */ +inline u32 EA_PCDI_16() { return EA_PCDI_8(); } +inline u32 EA_PCDI_32() { return EA_PCDI_8(); } +inline u32 EA_PCIX_8() { return m68ki_get_ea_pcix(); } /* pc indirect + index */ +inline u32 EA_PCIX_16() { return EA_PCIX_8(); } +inline u32 EA_PCIX_32() { return EA_PCIX_8(); } + + +inline u32 OPER_I_8() { return m68ki_read_imm_8(); } +inline u32 OPER_I_16() { return m68ki_read_imm_16(); } +inline u32 OPER_I_32() { return m68ki_read_imm_32(); } /* --------------------------- Status Register ---------------------------- */ /* Flag Calculation Macros */ -static constexpr uint32_t CFLAG_8(uint32_t A) { return (A); } -static constexpr uint32_t CFLAG_16(uint32_t A) { return ((A)>>8); } +static constexpr u32 CFLAG_8(u32 A) { return (A); } +static constexpr u32 CFLAG_16(u32 A) { return ((A)>>8); } -static constexpr uint32_t CFLAG_ADD_32(uint32_t S, uint32_t D, uint32_t R) { return (((S & D) | (~R & (S | D)))>>23); } -static constexpr uint32_t CFLAG_SUB_32(uint32_t S, uint32_t D, uint32_t R) { return (((S & R) | (~D & (S | R)))>>23); } +static constexpr u32 CFLAG_ADD_32(u32 S, u32 D, u32 R) { return (((S & D) | (~R & (S | D)))>>23); } +static constexpr u32 CFLAG_SUB_32(u32 S, u32 D, u32 R) { return (((S & R) | (~D & (S | R)))>>23); } -static constexpr uint32_t VFLAG_ADD_8(uint32_t S, uint32_t D, uint32_t R) { return ((S^R) & (D^R)); } -static constexpr uint32_t VFLAG_ADD_16(uint32_t S, uint32_t D, uint32_t R) { return (((S^R) & (D^R))>>8); } -static constexpr uint32_t VFLAG_ADD_32(uint32_t S, uint32_t D, uint32_t R) { return (((S^R) & (D^R))>>24); } +static constexpr u32 VFLAG_ADD_8(u32 S, u32 D, u32 R) { return ((S^R) & (D^R)); } +static constexpr u32 VFLAG_ADD_16(u32 S, u32 D, u32 R) { return (((S^R) & (D^R))>>8); } +static constexpr u32 VFLAG_ADD_32(u32 S, u32 D, u32 R) { return (((S^R) & (D^R))>>24); } -static constexpr uint32_t VFLAG_SUB_8(uint32_t S, uint32_t D, uint32_t R) { return ((S^D) & (R^D)); } -static constexpr uint32_t VFLAG_SUB_16(uint32_t S, uint32_t D, uint32_t R) { return (((S^D) & (R^D))>>8); } -static constexpr uint32_t VFLAG_SUB_32(uint32_t S, uint32_t D, uint32_t R) { return (((S^D) & (R^D))>>24); } +static constexpr u32 VFLAG_SUB_8(u32 S, u32 D, u32 R) { return ((S^D) & (R^D)); } +static constexpr u32 VFLAG_SUB_16(u32 S, u32 D, u32 R) { return (((S^D) & (R^D))>>8); } +static constexpr u32 VFLAG_SUB_32(u32 S, u32 D, u32 R) { return (((S^D) & (R^D))>>24); } -static constexpr uint32_t NFLAG_8(uint32_t A) { return (A); } -static constexpr uint32_t NFLAG_16(uint32_t A) { return ((A)>>8); } -static constexpr uint32_t NFLAG_32(uint32_t A) { return ((A)>>24); } -static constexpr uint32_t NFLAG_64(uint64_t A) { return ((A)>>56); } +static constexpr u32 NFLAG_8(u32 A) { return (A); } +static constexpr u32 NFLAG_16(u32 A) { return ((A)>>8); } +static constexpr u32 NFLAG_32(u32 A) { return ((A)>>24); } +static constexpr u32 NFLAG_64(u64 A) { return ((A)>>56); } -static constexpr uint32_t ZFLAG_8(uint32_t A) { return MASK_OUT_ABOVE_8(A); } -static constexpr uint32_t ZFLAG_16(uint32_t A) { return MASK_OUT_ABOVE_16(A); } -static constexpr uint32_t ZFLAG_32(uint32_t A) { return MASK_OUT_ABOVE_32(A); } +static constexpr u32 ZFLAG_8(u32 A) { return MASK_OUT_ABOVE_8(A); } +static constexpr u32 ZFLAG_16(u32 A) { return MASK_OUT_ABOVE_16(A); } +static constexpr u32 ZFLAG_32(u32 A) { return MASK_OUT_ABOVE_32(A); } /* Flag values */ @@ -360,59 +360,59 @@ static constexpr int MFLAG_SET = 2; static constexpr int MFLAG_CLEAR = 0; /* Turn flag values into 1 or 0 */ -inline uint32_t XFLAG_1() const { return ((m_x_flag>>8)&1); } -inline uint32_t NFLAG_1() const { return ((m_n_flag>>7)&1); } -inline uint32_t VFLAG_1() const { return ((m_v_flag>>7)&1); } -inline uint32_t ZFLAG_1() const { return (!m_not_z_flag); } -inline uint32_t CFLAG_1() const { return ((m_c_flag>>8)&1); } +inline u32 XFLAG_1() const { return ((m_x_flag>>8)&1); } +inline u32 NFLAG_1() const { return ((m_n_flag>>7)&1); } +inline u32 VFLAG_1() const { return ((m_v_flag>>7)&1); } +inline u32 ZFLAG_1() const { return (!m_not_z_flag); } +inline u32 CFLAG_1() const { return ((m_c_flag>>8)&1); } /* Conditions */ -inline uint32_t COND_CS() const { return (m_c_flag&0x100); } -inline uint32_t COND_CC() const { return (!COND_CS()); } -inline uint32_t COND_VS() const { return (m_v_flag&0x80); } -inline uint32_t COND_VC() const { return (!COND_VS()); } -inline uint32_t COND_NE() const { return m_not_z_flag; } -inline uint32_t COND_EQ() const { return (!COND_NE()); } -inline uint32_t COND_MI() const { return (m_n_flag&0x80); } -inline uint32_t COND_PL() const { return (!COND_MI()); } -inline uint32_t COND_LT() const { return ((m_n_flag^m_v_flag)&0x80); } -inline uint32_t COND_GE() const { return (!COND_LT()); } -inline uint32_t COND_HI() const { return (COND_CC() && COND_NE()); } -inline uint32_t COND_LS() const { return (COND_CS() || COND_EQ()); } -inline uint32_t COND_GT() const { return (COND_GE() && COND_NE()); } -inline uint32_t COND_LE() const { return (COND_LT() || COND_EQ()); } +inline u32 COND_CS() const { return (m_c_flag&0x100); } +inline u32 COND_CC() const { return (!COND_CS()); } +inline u32 COND_VS() const { return (m_v_flag&0x80); } +inline u32 COND_VC() const { return (!COND_VS()); } +inline u32 COND_NE() const { return m_not_z_flag; } +inline u32 COND_EQ() const { return (!COND_NE()); } +inline u32 COND_MI() const { return (m_n_flag&0x80); } +inline u32 COND_PL() const { return (!COND_MI()); } +inline u32 COND_LT() const { return ((m_n_flag^m_v_flag)&0x80); } +inline u32 COND_GE() const { return (!COND_LT()); } +inline u32 COND_HI() const { return (COND_CC() && COND_NE()); } +inline u32 COND_LS() const { return (COND_CS() || COND_EQ()); } +inline u32 COND_GT() const { return (COND_GE() && COND_NE()); } +inline u32 COND_LE() const { return (COND_LT() || COND_EQ()); } /* Reversed conditions */ -inline uint32_t COND_NOT_CS() const { return COND_CC(); } -inline uint32_t COND_NOT_CC() const { return COND_CS(); } -inline uint32_t COND_NOT_VS() const { return COND_VC(); } -inline uint32_t COND_NOT_VC() const { return COND_VS(); } -inline uint32_t COND_NOT_NE() const { return COND_EQ(); } -inline uint32_t COND_NOT_EQ() const { return COND_NE(); } -inline uint32_t COND_NOT_MI() const { return COND_PL(); } -inline uint32_t COND_NOT_PL() const { return COND_MI(); } -inline uint32_t COND_NOT_LT() const { return COND_GE(); } -inline uint32_t COND_NOT_GE() const { return COND_LT(); } -inline uint32_t COND_NOT_HI() const { return COND_LS(); } -inline uint32_t COND_NOT_LS() const { return COND_HI(); } -inline uint32_t COND_NOT_GT() const { return COND_LE(); } -inline uint32_t COND_NOT_LE() const { return COND_GT(); } +inline u32 COND_NOT_CS() const { return COND_CC(); } +inline u32 COND_NOT_CC() const { return COND_CS(); } +inline u32 COND_NOT_VS() const { return COND_VC(); } +inline u32 COND_NOT_VC() const { return COND_VS(); } +inline u32 COND_NOT_NE() const { return COND_EQ(); } +inline u32 COND_NOT_EQ() const { return COND_NE(); } +inline u32 COND_NOT_MI() const { return COND_PL(); } +inline u32 COND_NOT_PL() const { return COND_MI(); } +inline u32 COND_NOT_LT() const { return COND_GE(); } +inline u32 COND_NOT_GE() const { return COND_LT(); } +inline u32 COND_NOT_HI() const { return COND_LS(); } +inline u32 COND_NOT_LS() const { return COND_HI(); } +inline u32 COND_NOT_GT() const { return COND_LE(); } +inline u32 COND_NOT_LE() const { return COND_GT(); } /* Not real conditions, but here for convenience */ -inline uint32_t COND_XS() const { return (m_x_flag&0x100); } -inline uint32_t COND_XC() const { return (!COND_XS()); } +inline u32 COND_XS() const { return (m_x_flag&0x100); } +inline u32 COND_XC() const { return (!COND_XS()); } /* Get the condition code register */ -inline uint32_t m68ki_get_ccr() const { return((COND_XS() >> 4) | +inline u32 m68ki_get_ccr() const { return((COND_XS() >> 4) | (COND_MI() >> 4) | (COND_EQ() << 2) | (COND_VS() >> 6) | (COND_CS() >> 8)); } /* Get the status register */ -inline uint32_t m68ki_get_sr() const { return (m_t1_flag | +inline u32 m68ki_get_sr() const { return (m_t1_flag | m_t0_flag | (m_s_flag << 11) | (m_m_flag << 11) | @@ -424,33 +424,33 @@ inline uint32_t m68ki_get_sr() const { return (m_t1_flag | /* ----------------------------- Read / Write ----------------------------- */ /* Read from the current address space */ -inline uint32_t m68ki_read_8(uint32_t address) { return m68ki_read_8_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA); } -inline uint32_t m68ki_read_16(uint32_t address) { return m68ki_read_16_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA); } -inline uint32_t m68ki_read_32(uint32_t address) { return m68ki_read_32_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA); } +inline u32 m68ki_read_8(u32 address) { return m68ki_read_8_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA); } +inline u32 m68ki_read_16(u32 address) { return m68ki_read_16_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA); } +inline u32 m68ki_read_32(u32 address) { return m68ki_read_32_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA); } /* Write to the current data space */ -inline void m68ki_write_8(uint32_t address, uint32_t value) { m68ki_write_8_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA, value); } -inline void m68ki_write_16(uint32_t address, uint32_t value) { m68ki_write_16_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA, value); } -inline void m68ki_write_32(uint32_t address, uint32_t value) { m68ki_write_32_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA, value); } -inline void m68ki_write_32_pd(uint32_t address, uint32_t value) { m68ki_write_32_pd_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA, value); } +inline void m68ki_write_8(u32 address, u32 value) { m68ki_write_8_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA, value); } +inline void m68ki_write_16(u32 address, u32 value) { m68ki_write_16_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA, value); } +inline void m68ki_write_32(u32 address, u32 value) { m68ki_write_32_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA, value); } +inline void m68ki_write_32_pd(u32 address, u32 value) { m68ki_write_32_pd_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA, value); } /* map read immediate 8 to read immediate 16 */ -inline uint32_t m68ki_read_imm_8() { return MASK_OUT_ABOVE_8(m68ki_read_imm_16()); } +inline u32 m68ki_read_imm_8() { return MASK_OUT_ABOVE_8(m68ki_read_imm_16()); } /* Map PC-relative reads */ -inline uint32_t m68ki_read_pcrel_8(uint32_t address) { return m68k_read_pcrelative_8(address); } -inline uint32_t m68ki_read_pcrel_16(uint32_t address) { return m68k_read_pcrelative_16(address); } -inline uint32_t m68ki_read_pcrel_32(uint32_t address) { return m68k_read_pcrelative_32(address); } +inline u32 m68ki_read_pcrel_8(u32 address) { return m68k_read_pcrelative_8(address); } +inline u32 m68ki_read_pcrel_16(u32 address) { return m68k_read_pcrelative_16(address); } +inline u32 m68ki_read_pcrel_32(u32 address) { return m68k_read_pcrelative_32(address); } /* Read from the program space */ -inline uint32_t m68ki_read_program_8(uint32_t address) { return m68ki_read_8_fc(address, m_s_flag | FUNCTION_CODE_USER_PROGRAM); } -inline uint32_t m68ki_read_program_16(uint32_t address) { return m68ki_read_16_fc(address, m_s_flag | FUNCTION_CODE_USER_PROGRAM); } -inline uint32_t m68ki_read_program_32(uint32_t address) { return m68ki_read_32_fc(address, m_s_flag | FUNCTION_CODE_USER_PROGRAM); } +inline u32 m68ki_read_program_8(u32 address) { return m68ki_read_8_fc(address, m_s_flag | FUNCTION_CODE_USER_PROGRAM); } +inline u32 m68ki_read_program_16(u32 address) { return m68ki_read_16_fc(address, m_s_flag | FUNCTION_CODE_USER_PROGRAM); } +inline u32 m68ki_read_program_32(u32 address) { return m68ki_read_32_fc(address, m_s_flag | FUNCTION_CODE_USER_PROGRAM); } /* Read from the data space */ -inline uint32_t m68ki_read_data_8(uint32_t address) { return m68ki_read_8_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA); } -inline uint32_t m68ki_read_data_16(uint32_t address) { return m68ki_read_16_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA); } -inline uint32_t m68ki_read_data_32(uint32_t address) { return m68ki_read_32_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA); } +inline u32 m68ki_read_data_8(u32 address) { return m68ki_read_8_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA); } +inline u32 m68ki_read_data_16(u32 address) { return m68ki_read_16_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA); } +inline u32 m68ki_read_data_32(u32 address) { return m68ki_read_32_fc(address, m_s_flag | FUNCTION_CODE_USER_DATA); } @@ -464,11 +464,11 @@ void m68k_cause_bus_error(); -static const uint8_t m68ki_shift_8_table[65]; -static const uint16_t m68ki_shift_16_table[65]; -static const uint32_t m68ki_shift_32_table[65]; -static const uint8_t m68ki_exception_cycle_table[7][256]; -static const uint8_t m68ki_ea_idx_cycle_table[64]; +static const u8 m68ki_shift_8_table[65]; +static const u16 m68ki_shift_16_table[65]; +static const u32 m68ki_shift_32_table[65]; +static const u8 m68ki_exception_cycle_table[7][256]; +static const u8 m68ki_ea_idx_cycle_table[64]; /* ======================================================================== */ /* =========================== UTILITY FUNCTIONS ========================== */ @@ -532,14 +532,14 @@ inline void m68ki_ic_clear() // read immediate word using the instruction cache -inline uint32_t m68ki_ic_readimm16(uint32_t address) +inline u32 m68ki_ic_readimm16(u32 address) { if (m_cacr & M68K_CACR_EI) { // 68020 series I-cache (MC68020 User's Manual, Section 4 - On-Chip Cache Memory) if (m_cpu_type & (CPU_TYPE_EC020 | CPU_TYPE_020)) { - uint32_t tag = (address >> 8) | (m_s_flag ? 0x1000000 : 0); + u32 tag = (address >> 8) | (m_s_flag ? 0x1000000 : 0); int idx = (address >> 2) & 0x3f; // 1-of-64 select // do a cache fill if the line is invalid or the tags don't match @@ -551,7 +551,7 @@ inline uint32_t m68ki_ic_readimm16(uint32_t address) return m_readimm16(address); } - uint32_t data = m_read32(address & ~3); + u32 data = m_read32(address & ~3); //printf("m68k: doing cache fill at %08x (tag %08x idx %d)\n", address, tag, idx); @@ -587,9 +587,9 @@ inline uint32_t m68ki_ic_readimm16(uint32_t address) /* Handles all immediate reads, does address error check, function code setting, * and prefetching if they are enabled in m68kconf.h */ -inline uint32_t m68ki_read_imm_16() +inline u32 m68ki_read_imm_16() { - uint32_t result; + u32 result; m_mmu_tmp_fc = m_s_flag | FUNCTION_CODE_USER_PROGRAM; m_mmu_tmp_rw = 1; @@ -614,9 +614,9 @@ inline uint32_t m68ki_read_imm_16() return result; } -inline uint32_t m68ki_read_imm_32() +inline u32 m68ki_read_imm_32() { - uint32_t temp_val; + u32 temp_val; m_mmu_tmp_fc = m_s_flag | FUNCTION_CODE_USER_PROGRAM; m_mmu_tmp_rw = 1; @@ -651,14 +651,14 @@ inline uint32_t m68ki_read_imm_32() * These functions will also check for address error and set the function * code if they are enabled in m68kconf.h. */ -inline uint32_t m68ki_read_8_fc(uint32_t address, uint32_t fc) +inline u32 m68ki_read_8_fc(u32 address, u32 fc) { m_mmu_tmp_fc = fc; m_mmu_tmp_rw = 1; m_mmu_tmp_sz = M68K_SZ_BYTE; return m_read8(address); } -inline uint32_t m68ki_read_16_fc(uint32_t address, uint32_t fc) +inline u32 m68ki_read_16_fc(u32 address, u32 fc) { if (CPU_TYPE_IS_010_LESS()) { @@ -669,7 +669,7 @@ inline uint32_t m68ki_read_16_fc(uint32_t address, uint32_t fc) m_mmu_tmp_sz = M68K_SZ_WORD; return m_read16(address); } -inline uint32_t m68ki_read_32_fc(uint32_t address, uint32_t fc) +inline u32 m68ki_read_32_fc(u32 address, u32 fc) { if (CPU_TYPE_IS_010_LESS()) { @@ -681,14 +681,14 @@ inline uint32_t m68ki_read_32_fc(uint32_t address, uint32_t fc) return m_read32(address); } -inline void m68ki_write_8_fc(uint32_t address, uint32_t fc, uint32_t value) +inline void m68ki_write_8_fc(u32 address, u32 fc, u32 value) { m_mmu_tmp_fc = fc; m_mmu_tmp_rw = 0; m_mmu_tmp_sz = M68K_SZ_BYTE; m_write8(address, value); } -inline void m68ki_write_16_fc(uint32_t address, uint32_t fc, uint32_t value) +inline void m68ki_write_16_fc(u32 address, u32 fc, u32 value) { if (CPU_TYPE_IS_010_LESS()) { @@ -699,7 +699,7 @@ inline void m68ki_write_16_fc(uint32_t address, uint32_t fc, uint32_t value) m_mmu_tmp_sz = M68K_SZ_WORD; m_write16(address, value); } -inline void m68ki_write_32_fc(uint32_t address, uint32_t fc, uint32_t value) +inline void m68ki_write_32_fc(u32 address, u32 fc, u32 value) { if (CPU_TYPE_IS_010_LESS()) { @@ -716,7 +716,7 @@ inline void m68ki_write_32_fc(uint32_t address, uint32_t fc, uint32_t value) * A real 68k first writes the high word to [address+2], and then writes the * low word to [address]. */ -inline void m68ki_write_32_pd_fc(uint32_t address, uint32_t fc, uint32_t value) +inline void m68ki_write_32_pd_fc(u32 address, u32 fc, u32 value) { if (CPU_TYPE_IS_010_LESS()) { @@ -735,14 +735,14 @@ inline void m68ki_write_32_pd_fc(uint32_t address, uint32_t fc, uint32_t value) /* The program counter relative addressing modes cause operands to be * retrieved from program space, not data space. */ -inline uint32_t m68ki_get_ea_pcdi() +inline u32 m68ki_get_ea_pcdi() { - uint32_t old_pc = m_pc; + u32 old_pc = m_pc; return old_pc + MAKE_INT_16(m68ki_read_imm_16()); } -inline uint32_t m68ki_get_ea_pcix() +inline u32 m68ki_get_ea_pcix() { return m68ki_get_ea_ix(m_pc); } @@ -789,13 +789,13 @@ inline uint32_t m68ki_get_ea_pcix() * 1 011 mem indir with long outer * 1 100-111 reserved */ -inline uint32_t m68ki_get_ea_ix(uint32_t An) +inline u32 m68ki_get_ea_ix(u32 An) { /* An = base register */ - uint32_t extension = m68ki_read_imm_16(); - uint32_t Xn = 0; /* Index register */ - uint32_t bd = 0; /* Base Displacement */ - uint32_t od = 0; /* Outer Displacement */ + u32 extension = m68ki_read_imm_16(); + u32 Xn = 0; /* Index register */ + u32 bd = 0; /* Base Displacement */ + u32 od = 0; /* Outer Displacement */ if(CPU_TYPE_IS_010_LESS()) { @@ -862,78 +862,78 @@ inline uint32_t m68ki_get_ea_ix(uint32_t An) /* Fetch operands */ -inline uint32_t OPER_AY_AI_8() {uint32_t ea = EA_AY_AI_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_AY_AI_16() {uint32_t ea = EA_AY_AI_16(); return m68ki_read_16(ea);} -inline uint32_t OPER_AY_AI_32() {uint32_t ea = EA_AY_AI_32(); return m68ki_read_32(ea);} -inline uint32_t OPER_AY_PI_8() {uint32_t ea = EA_AY_PI_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_AY_PI_16() {uint32_t ea = EA_AY_PI_16(); return m68ki_read_16(ea);} -inline uint32_t OPER_AY_PI_32() {uint32_t ea = EA_AY_PI_32(); return m68ki_read_32(ea);} -inline uint32_t OPER_AY_PD_8() {uint32_t ea = EA_AY_PD_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_AY_PD_16() {uint32_t ea = EA_AY_PD_16(); return m68ki_read_16(ea);} -inline uint32_t OPER_AY_PD_32() {uint32_t ea = EA_AY_PD_32(); return m68ki_read_32(ea);} -inline uint32_t OPER_AY_DI_8() {uint32_t ea = EA_AY_DI_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_AY_DI_16() {uint32_t ea = EA_AY_DI_16(); return m68ki_read_16(ea);} -inline uint32_t OPER_AY_DI_32() {uint32_t ea = EA_AY_DI_32(); return m68ki_read_32(ea);} -inline uint32_t OPER_AY_IX_8() {uint32_t ea = EA_AY_IX_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_AY_IX_16() {uint32_t ea = EA_AY_IX_16(); return m68ki_read_16(ea);} -inline uint32_t OPER_AY_IX_32() {uint32_t ea = EA_AY_IX_32(); return m68ki_read_32(ea);} - -inline uint32_t OPER_AX_AI_8() {uint32_t ea = EA_AX_AI_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_AX_AI_16() {uint32_t ea = EA_AX_AI_16(); return m68ki_read_16(ea);} -inline uint32_t OPER_AX_AI_32() {uint32_t ea = EA_AX_AI_32(); return m68ki_read_32(ea);} -inline uint32_t OPER_AX_PI_8() {uint32_t ea = EA_AX_PI_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_AX_PI_16() {uint32_t ea = EA_AX_PI_16(); return m68ki_read_16(ea);} -inline uint32_t OPER_AX_PI_32() {uint32_t ea = EA_AX_PI_32(); return m68ki_read_32(ea);} -inline uint32_t OPER_AX_PD_8() {uint32_t ea = EA_AX_PD_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_AX_PD_16() {uint32_t ea = EA_AX_PD_16(); return m68ki_read_16(ea);} -inline uint32_t OPER_AX_PD_32() {uint32_t ea = EA_AX_PD_32(); return m68ki_read_32(ea);} -inline uint32_t OPER_AX_DI_8() {uint32_t ea = EA_AX_DI_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_AX_DI_16() {uint32_t ea = EA_AX_DI_16(); return m68ki_read_16(ea);} -inline uint32_t OPER_AX_DI_32() {uint32_t ea = EA_AX_DI_32(); return m68ki_read_32(ea);} -inline uint32_t OPER_AX_IX_8() {uint32_t ea = EA_AX_IX_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_AX_IX_16() {uint32_t ea = EA_AX_IX_16(); return m68ki_read_16(ea);} -inline uint32_t OPER_AX_IX_32() {uint32_t ea = EA_AX_IX_32(); return m68ki_read_32(ea);} - -inline uint32_t OPER_A7_PI_8() {uint32_t ea = EA_A7_PI_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_A7_PD_8() {uint32_t ea = EA_A7_PD_8(); return m68ki_read_8(ea); } - -inline uint32_t OPER_AW_8() {uint32_t ea = EA_AW_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_AW_16() {uint32_t ea = EA_AW_16(); return m68ki_read_16(ea);} -inline uint32_t OPER_AW_32() {uint32_t ea = EA_AW_32(); return m68ki_read_32(ea);} -inline uint32_t OPER_AL_8() {uint32_t ea = EA_AL_8(); return m68ki_read_8(ea); } -inline uint32_t OPER_AL_16() {uint32_t ea = EA_AL_16(); return m68ki_read_16(ea);} -inline uint32_t OPER_AL_32() {uint32_t ea = EA_AL_32(); return m68ki_read_32(ea);} -inline uint32_t OPER_PCDI_8() {uint32_t ea = EA_PCDI_8(); return m68ki_read_pcrel_8(ea); } -inline uint32_t OPER_PCDI_16() {uint32_t ea = EA_PCDI_16(); return m68ki_read_pcrel_16(ea);} -inline uint32_t OPER_PCDI_32() {uint32_t ea = EA_PCDI_32(); return m68ki_read_pcrel_32(ea);} -inline uint32_t OPER_PCIX_8() {uint32_t ea = EA_PCIX_8(); return m68ki_read_pcrel_8(ea); } -inline uint32_t OPER_PCIX_16() {uint32_t ea = EA_PCIX_16(); return m68ki_read_pcrel_16(ea);} -inline uint32_t OPER_PCIX_32() {uint32_t ea = EA_PCIX_32(); return m68ki_read_pcrel_32(ea);} +inline u32 OPER_AY_AI_8() {u32 ea = EA_AY_AI_8(); return m68ki_read_8(ea); } +inline u32 OPER_AY_AI_16() {u32 ea = EA_AY_AI_16(); return m68ki_read_16(ea);} +inline u32 OPER_AY_AI_32() {u32 ea = EA_AY_AI_32(); return m68ki_read_32(ea);} +inline u32 OPER_AY_PI_8() {u32 ea = EA_AY_PI_8(); return m68ki_read_8(ea); } +inline u32 OPER_AY_PI_16() {u32 ea = EA_AY_PI_16(); return m68ki_read_16(ea);} +inline u32 OPER_AY_PI_32() {u32 ea = EA_AY_PI_32(); return m68ki_read_32(ea);} +inline u32 OPER_AY_PD_8() {u32 ea = EA_AY_PD_8(); return m68ki_read_8(ea); } +inline u32 OPER_AY_PD_16() {u32 ea = EA_AY_PD_16(); return m68ki_read_16(ea);} +inline u32 OPER_AY_PD_32() {u32 ea = EA_AY_PD_32(); return m68ki_read_32(ea);} +inline u32 OPER_AY_DI_8() {u32 ea = EA_AY_DI_8(); return m68ki_read_8(ea); } +inline u32 OPER_AY_DI_16() {u32 ea = EA_AY_DI_16(); return m68ki_read_16(ea);} +inline u32 OPER_AY_DI_32() {u32 ea = EA_AY_DI_32(); return m68ki_read_32(ea);} +inline u32 OPER_AY_IX_8() {u32 ea = EA_AY_IX_8(); return m68ki_read_8(ea); } +inline u32 OPER_AY_IX_16() {u32 ea = EA_AY_IX_16(); return m68ki_read_16(ea);} +inline u32 OPER_AY_IX_32() {u32 ea = EA_AY_IX_32(); return m68ki_read_32(ea);} + +inline u32 OPER_AX_AI_8() {u32 ea = EA_AX_AI_8(); return m68ki_read_8(ea); } +inline u32 OPER_AX_AI_16() {u32 ea = EA_AX_AI_16(); return m68ki_read_16(ea);} +inline u32 OPER_AX_AI_32() {u32 ea = EA_AX_AI_32(); return m68ki_read_32(ea);} +inline u32 OPER_AX_PI_8() {u32 ea = EA_AX_PI_8(); return m68ki_read_8(ea); } +inline u32 OPER_AX_PI_16() {u32 ea = EA_AX_PI_16(); return m68ki_read_16(ea);} +inline u32 OPER_AX_PI_32() {u32 ea = EA_AX_PI_32(); return m68ki_read_32(ea);} +inline u32 OPER_AX_PD_8() {u32 ea = EA_AX_PD_8(); return m68ki_read_8(ea); } +inline u32 OPER_AX_PD_16() {u32 ea = EA_AX_PD_16(); return m68ki_read_16(ea);} +inline u32 OPER_AX_PD_32() {u32 ea = EA_AX_PD_32(); return m68ki_read_32(ea);} +inline u32 OPER_AX_DI_8() {u32 ea = EA_AX_DI_8(); return m68ki_read_8(ea); } +inline u32 OPER_AX_DI_16() {u32 ea = EA_AX_DI_16(); return m68ki_read_16(ea);} +inline u32 OPER_AX_DI_32() {u32 ea = EA_AX_DI_32(); return m68ki_read_32(ea);} +inline u32 OPER_AX_IX_8() {u32 ea = EA_AX_IX_8(); return m68ki_read_8(ea); } +inline u32 OPER_AX_IX_16() {u32 ea = EA_AX_IX_16(); return m68ki_read_16(ea);} +inline u32 OPER_AX_IX_32() {u32 ea = EA_AX_IX_32(); return m68ki_read_32(ea);} + +inline u32 OPER_A7_PI_8() {u32 ea = EA_A7_PI_8(); return m68ki_read_8(ea); } +inline u32 OPER_A7_PD_8() {u32 ea = EA_A7_PD_8(); return m68ki_read_8(ea); } + +inline u32 OPER_AW_8() {u32 ea = EA_AW_8(); return m68ki_read_8(ea); } +inline u32 OPER_AW_16() {u32 ea = EA_AW_16(); return m68ki_read_16(ea);} +inline u32 OPER_AW_32() {u32 ea = EA_AW_32(); return m68ki_read_32(ea);} +inline u32 OPER_AL_8() {u32 ea = EA_AL_8(); return m68ki_read_8(ea); } +inline u32 OPER_AL_16() {u32 ea = EA_AL_16(); return m68ki_read_16(ea);} +inline u32 OPER_AL_32() {u32 ea = EA_AL_32(); return m68ki_read_32(ea);} +inline u32 OPER_PCDI_8() {u32 ea = EA_PCDI_8(); return m68ki_read_pcrel_8(ea); } +inline u32 OPER_PCDI_16() {u32 ea = EA_PCDI_16(); return m68ki_read_pcrel_16(ea);} +inline u32 OPER_PCDI_32() {u32 ea = EA_PCDI_32(); return m68ki_read_pcrel_32(ea);} +inline u32 OPER_PCIX_8() {u32 ea = EA_PCIX_8(); return m68ki_read_pcrel_8(ea); } +inline u32 OPER_PCIX_16() {u32 ea = EA_PCIX_16(); return m68ki_read_pcrel_16(ea);} +inline u32 OPER_PCIX_32() {u32 ea = EA_PCIX_32(); return m68ki_read_pcrel_32(ea);} /* ---------------------------- Stack Functions --------------------------- */ /* Push/pull data from the stack */ -inline void m68ki_push_16(uint32_t value) +inline void m68ki_push_16(u32 value) { REG_SP() = MASK_OUT_ABOVE_32(REG_SP() - 2); m68ki_write_16(REG_SP(), value); } -inline void m68ki_push_32(uint32_t value) +inline void m68ki_push_32(u32 value) { REG_SP() = MASK_OUT_ABOVE_32(REG_SP() - 4); m68ki_write_32(REG_SP(), value); } -inline uint32_t m68ki_pull_16() +inline u32 m68ki_pull_16() { REG_SP() = MASK_OUT_ABOVE_32(REG_SP() + 2); return m68ki_read_16(REG_SP()-2); } -inline uint32_t m68ki_pull_32() +inline u32 m68ki_pull_32() { REG_SP() = MASK_OUT_ABOVE_32(REG_SP() + 4); return m68ki_read_32(REG_SP()-4); @@ -970,12 +970,12 @@ inline void m68ki_fake_pull_32() * These functions will also call the pc_changed callback if it was enabled * in m68kconf.h. */ -inline void m68ki_jump(uint32_t new_pc) +inline void m68ki_jump(u32 new_pc) { m_pc = new_pc; } -inline void m68ki_jump_vector(uint32_t vector) +inline void m68ki_jump_vector(u32 vector) { m_pc = (vector<<2) + m_vbr; m_pc = m68ki_read_data_32(m_pc); @@ -987,17 +987,17 @@ inline void m68ki_jump_vector(uint32_t vector) * So far I've found no problems with not calling pc_changed for 8 or 16 * bit branches. */ -inline void m68ki_branch_8(uint32_t offset) +inline void m68ki_branch_8(u32 offset) { m_pc += MAKE_INT_8(offset); } -inline void m68ki_branch_16(uint32_t offset) +inline void m68ki_branch_16(u32 offset) { m_pc += MAKE_INT_16(offset); } -inline void m68ki_branch_32(uint32_t offset) +inline void m68ki_branch_32(u32 offset) { m_pc += offset; } @@ -1009,9 +1009,9 @@ inline void m68ki_branch_32(uint32_t offset) /* Set the S flag and change the active stack pointer. * Note that value MUST be 4 or 0. */ -inline void m68ki_set_s_flag(uint32_t value) +inline void m68ki_set_s_flag(u32 value) { - uint32_t old_s_flag = m_s_flag; + u32 old_s_flag = m_s_flag; /* Backup the old stack pointer */ REG_SP_BASE()[m_s_flag | ((m_s_flag>>1) & m_m_flag)] = REG_SP(); /* Set the S flag */ @@ -1027,9 +1027,9 @@ inline void m68ki_set_s_flag(uint32_t value) /* Set the S and M flags and change the active stack pointer. * Note that value MUST be 0, 2, 4, or 6 (bit2 = S, bit1 = M). */ -inline void m68ki_set_sm_flag(uint32_t value) +inline void m68ki_set_sm_flag(u32 value) { - uint32_t old_s_flag = m_s_flag; + u32 old_s_flag = m_s_flag; /* Backup the old stack pointer */ REG_SP_BASE()[m_s_flag | ((m_s_flag >> 1) & m_m_flag)] = REG_SP(); /* Set the S and M flags */ @@ -1044,9 +1044,9 @@ inline void m68ki_set_sm_flag(uint32_t value) } /* Set the S and M flags. Don't touch the stack pointer. */ -inline void m68ki_set_sm_flag_nosp(uint32_t value) +inline void m68ki_set_sm_flag_nosp(u32 value) { - uint32_t old_s_flag = m_s_flag; + u32 old_s_flag = m_s_flag; /* Set the S and M flags */ m_s_flag = value & SFLAG_SET; m_m_flag = value & MFLAG_SET; @@ -1058,7 +1058,7 @@ inline void m68ki_set_sm_flag_nosp(uint32_t value) /* Set the condition code register */ -inline void m68ki_set_ccr(uint32_t value) +inline void m68ki_set_ccr(u32 value) { m_x_flag = BIT_4(value)<< 4; m_n_flag = BIT_3(value)<< 4; @@ -1068,7 +1068,7 @@ inline void m68ki_set_ccr(uint32_t value) } /* Set the status register but don't check for interrupts */ -inline void m68ki_set_sr_noint(uint32_t value) +inline void m68ki_set_sr_noint(u32 value) { /* Mask out the "unimplemented" bits */ value &= m_sr_mask; @@ -1084,7 +1084,7 @@ inline void m68ki_set_sr_noint(uint32_t value) /* Set the status register but don't check for interrupts nor * change the stack pointer */ -inline void m68ki_set_sr_noint_nosp(uint32_t value) +inline void m68ki_set_sr_noint_nosp(u32 value) { /* Mask out the "unimplemented" bits */ value &= m_sr_mask; @@ -1098,7 +1098,7 @@ inline void m68ki_set_sr_noint_nosp(uint32_t value) } /* Set the status register and check for interrupts */ -inline void m68ki_set_sr(uint32_t value) +inline void m68ki_set_sr(u32 value) { m68ki_set_sr_noint(value); m68ki_check_interrupts(); @@ -1108,10 +1108,10 @@ inline void m68ki_set_sr(uint32_t value) /* ------------------------- Exception Processing ------------------------- */ /* Initiate exception processing */ -inline uint32_t m68ki_init_exception() +inline u32 m68ki_init_exception() { /* Save the old status register */ - uint32_t sr = m68ki_get_sr(); + u32 sr = m68ki_get_sr(); /* Turn off trace flag, clear pending traces */ m_t1_flag = m_t0_flag = 0; @@ -1123,7 +1123,7 @@ inline uint32_t m68ki_init_exception() } /* 3 word stack frame (68000 only) */ -inline void m68ki_stack_frame_3word(uint32_t pc, uint32_t sr) +inline void m68ki_stack_frame_3word(u32 pc, u32 sr) { m68ki_push_32(pc); m68ki_push_16(sr); @@ -1132,7 +1132,7 @@ inline void m68ki_stack_frame_3word(uint32_t pc, uint32_t sr) /* Format 0 stack frame. * This is the standard stack frame for 68010+. */ -inline void m68ki_stack_frame_0000(uint32_t pc, uint32_t sr, uint32_t vector) +inline void m68ki_stack_frame_0000(u32 pc, u32 sr, u32 vector) { /* Stack a 3-word frame if we are 68000 */ if(CPU_TYPE_IS_000()) @@ -1148,7 +1148,7 @@ inline void m68ki_stack_frame_0000(uint32_t pc, uint32_t sr, uint32_t vector) /* Format 1 stack frame (68020). * For 68020, this is the 4 word throwaway frame. */ -inline void m68ki_stack_frame_0001(uint32_t pc, uint32_t sr, uint32_t vector) +inline void m68ki_stack_frame_0001(u32 pc, u32 sr, u32 vector) { m68ki_push_16(0x1000 | (vector<<2)); m68ki_push_32(pc); @@ -1158,7 +1158,7 @@ inline void m68ki_stack_frame_0001(uint32_t pc, uint32_t sr, uint32_t vector) /* Format 2 stack frame. * This is used only by 68020 for trap exceptions. */ -inline void m68ki_stack_frame_0010(uint32_t sr, uint32_t vector) +inline void m68ki_stack_frame_0010(u32 sr, u32 vector) { m68ki_push_32(m_ppc); m68ki_push_16(0x2000 | (vector<<2)); @@ -1169,7 +1169,7 @@ inline void m68ki_stack_frame_0010(uint32_t sr, uint32_t vector) /* Bus error stack frame (68000 only). */ -inline void m68ki_stack_frame_buserr(uint32_t sr) +inline void m68ki_stack_frame_buserr(u32 sr) { m68ki_push_32(m_pc); m68ki_push_16(sr); @@ -1186,7 +1186,7 @@ inline void m68ki_stack_frame_buserr(uint32_t sr) /* Format 8 stack frame (68010). * 68010 only. This is the 29 word bus/address error frame. */ -inline void m68ki_stack_frame_1000(uint32_t pc, uint32_t sr, uint32_t vector) +inline void m68ki_stack_frame_1000(u32 pc, u32 sr, u32 vector) { /* VERSION * NUMBER @@ -1282,7 +1282,7 @@ inline void m68ki_stack_frame_1111(uint32_t pc, uint32_t sr, uint32_t vector) * if the error happens at an instruction boundary. * PC stacked is address of next instruction. */ -inline void m68ki_stack_frame_1010(uint32_t sr, uint32_t vector, uint32_t pc, uint32_t fault_address) +inline void m68ki_stack_frame_1010(u32 sr, u32 vector, u32 pc, u32 fault_address) { int orig_rw = m_mmu_tmp_buserror_rw; // this gets splatted by the following pushes, so save it now int orig_fc = m_mmu_tmp_buserror_fc; @@ -1335,7 +1335,7 @@ inline void m68ki_stack_frame_1010(uint32_t sr, uint32_t vector, uint32_t pc, ui * if the error happens during instruction execution. * PC stacked is address of instruction in progress. */ -inline void m68ki_stack_frame_1011(uint32_t sr, uint32_t vector, uint32_t pc, uint32_t fault_address) +inline void m68ki_stack_frame_1011(u32 sr, u32 vector, u32 pc, u32 fault_address) { int orig_rw = m_mmu_tmp_buserror_rw; // this gets splatted by the following pushes, so save it now int orig_fc = m_mmu_tmp_buserror_fc; @@ -1409,7 +1409,7 @@ inline void m68ki_stack_frame_1011(uint32_t sr, uint32_t vector, uint32_t pc, ui * This is used by the 68040 for bus fault and mmu trap * 30 words */ -inline void m68ki_stack_frame_0111(uint32_t sr, uint32_t vector, uint32_t pc, uint32_t fault_address, bool in_mmu) +inline void m68ki_stack_frame_0111(u32 sr, u32 vector, u32 pc, u32 fault_address, bool in_mmu) { int orig_rw = m_mmu_tmp_buserror_rw; // this gets splatted by the following pushes, so save it now int orig_fc = m_mmu_tmp_buserror_fc; @@ -1452,9 +1452,9 @@ inline void m68ki_stack_frame_0111(uint32_t sr, uint32_t vector, uint32_t pc, ui /* Used for Group 2 exceptions. * These stack a type 2 frame on the 020. */ -inline void m68ki_exception_trap(uint32_t vector) +inline void m68ki_exception_trap(u32 vector) { - uint32_t sr = m68ki_init_exception(); + u32 sr = m68ki_init_exception(); if(CPU_TYPE_IS_010_LESS()) m68ki_stack_frame_0000(m_pc, sr, vector); @@ -1468,9 +1468,9 @@ inline void m68ki_exception_trap(uint32_t vector) } /* Trap#n stacks a 0 frame but behaves like group2 otherwise */ -inline void m68ki_exception_trapN(uint32_t vector) +inline void m68ki_exception_trapN(u32 vector) { - uint32_t sr = m68ki_init_exception(); + u32 sr = m68ki_init_exception(); m68ki_stack_frame_0000(m_pc, sr, vector); m68ki_jump_vector(vector); @@ -1481,7 +1481,7 @@ inline void m68ki_exception_trapN(uint32_t vector) /* Exception for trace mode */ inline void m68ki_exception_trace() { - uint32_t sr = m68ki_init_exception(); + u32 sr = m68ki_init_exception(); if(CPU_TYPE_IS_010_LESS()) { @@ -1506,7 +1506,7 @@ inline void m68ki_exception_trace() /* Exception for privilege violation */ inline void m68ki_exception_privilege_violation() { - uint32_t sr = m68ki_init_exception(); + u32 sr = m68ki_init_exception(); if(CPU_TYPE_IS_000()) { @@ -1523,7 +1523,7 @@ inline void m68ki_exception_privilege_violation() /* Exception for A-Line instructions */ inline void m68ki_exception_1010() { - uint32_t sr; + u32 sr; sr = m68ki_init_exception(); m68ki_stack_frame_0000(m_ppc, sr, EXCEPTION_1010); @@ -1536,7 +1536,7 @@ inline void m68ki_exception_1010() /* Exception for F-Line instructions */ inline void m68ki_exception_1111() { - uint32_t sr; + u32 sr; sr = m68ki_init_exception(); m68ki_stack_frame_0000(m_ppc, sr, EXCEPTION_1111); @@ -1549,7 +1549,7 @@ inline void m68ki_exception_1111() /* Exception for illegal instructions */ inline void m68ki_exception_illegal() { - uint32_t sr; + u32 sr; sr = m68ki_init_exception(); @@ -1568,7 +1568,7 @@ inline void m68ki_exception_illegal() /* Exception for format errror in RTE */ inline void m68ki_exception_format_error() { - uint32_t sr = m68ki_init_exception(); + u32 sr = m68ki_init_exception(); m68ki_stack_frame_0000(m_pc, sr, EXCEPTION_FORMAT_ERROR); m68ki_jump_vector(EXCEPTION_FORMAT_ERROR); @@ -1579,7 +1579,7 @@ inline void m68ki_exception_format_error() /* Exception for address error */ inline void m68ki_exception_address_error() { - uint32_t sr = m68ki_init_exception(); + u32 sr = m68ki_init_exception(); /* If we were processing a bus error, address error, or reset, * this is a catastrophic failure. diff --git a/src/devices/cpu/m68000/m68kdasm.cpp b/src/devices/cpu/m68000/m68kdasm.cpp index 72794ad52b7..f87fdc5082c 100644 --- a/src/devices/cpu/m68000/m68kdasm.cpp +++ b/src/devices/cpu/m68000/m68kdasm.cpp @@ -2901,9 +2901,9 @@ std::string m68k_disassembler::d68020_unpk_mm() return util::string_format("unpk -(A%d), -(A%d), %s; (2+)", m_cpu_ir&7, (m_cpu_ir>>9)&7, get_imm_str_u16()); } -std::string m68k_disassembler::fc_to_string(uint16_t modes) +std::string m68k_disassembler::fc_to_string(u16 modes) { - uint16_t fc = modes & 0x1f; + u16 fc = modes & 0x1f; if (fc == 0) { @@ -3077,7 +3077,7 @@ std::string m68k_disassembler::d68851_pbcc32() std::string m68k_disassembler::d68851_pdbcc() { u32 temp_pc = m_cpu_pc; - uint16_t modes = read_imm_16(); + u16 modes = read_imm_16(); return util::string_format("pb%s %x", m_mmucond[modes&0xf], temp_pc + make_int_16(read_imm_16())); } @@ -3095,7 +3095,7 @@ std::string m68k_disassembler::d68040_fbcc_16() if(limit.first) return limit.second; u32 temp_pc = m_cpu_pc; - int16_t disp = make_int_16(read_imm_16()); + s16 disp = make_int_16(read_imm_16()); return util::string_format("fb%-s $%x", m_cpcc[m_cpu_ir & 0x3f], temp_pc + disp); } diff --git a/src/devices/cpu/m68000/m68kdasm.h b/src/devices/cpu/m68000/m68kdasm.h index 7376f95242b..b7e3f9de246 100644 --- a/src/devices/cpu/m68000/m68kdasm.h +++ b/src/devices/cpu/m68000/m68kdasm.h @@ -117,7 +117,7 @@ protected: inline std::string get_ea_mode_str_16(u16 instruction) { return get_ea_mode_str(instruction, 1); } inline std::string get_ea_mode_str_32(u16 instruction) { return get_ea_mode_str(instruction, 2); } - std::string fc_to_string(uint16_t modes); + std::string fc_to_string(u16 modes); inline std::pair limit_cpu_types(u32 allowed); diff --git a/src/devices/cpu/m68000/m68kfpu.hxx b/src/devices/cpu/m68000/m68kfpu.hxx index 99be0b47173..43471ea4801 100644 --- a/src/devices/cpu/m68000/m68kfpu.hxx +++ b/src/devices/cpu/m68000/m68kfpu.hxx @@ -9,12 +9,12 @@ static constexpr int FPCC_NAN = 0x01000000; static constexpr int FPES_OE = 0x00002000; static constexpr int FPAE_IOP = 0x00000080; -static constexpr uint64_t DOUBLE_INFINITY = 0x7ff0000000000000U; -static constexpr uint64_t DOUBLE_EXPONENT = 0x7ff0000000000000U; -static constexpr uint64_t DOUBLE_MANTISSA = 0x000fffffffffffffU; +static constexpr u64 DOUBLE_INFINITY = 0x7ff0000000000000U; +static constexpr u64 DOUBLE_EXPONENT = 0x7ff0000000000000U; +static constexpr u64 DOUBLE_MANTISSA = 0x000fffffffffffffU; // masks for packed dwords, positive k-factor -const uint32_t pkmask2[18] = +const u32 pkmask2[18] = { 0xffffffff, 0, 0xf0000000, 0xff000000, 0xfff00000, 0xffff0000, 0xfffff000, 0xffffff00, 0xfffffff0, 0xffffffff, @@ -22,7 +22,7 @@ const uint32_t pkmask2[18] = 0xffffffff, 0xffffffff, 0xffffffff }; -const uint32_t pkmask3[18] = +const u32 pkmask3[18] = { 0xffffffff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xf0000000, 0xff000000, 0xfff00000, 0xffff0000, @@ -31,7 +31,7 @@ const uint32_t pkmask3[18] = static inline double fx80_to_double(floatx80 fx) { - uint64_t d; + u64 d; double *foo; foo = (double *)&d; @@ -43,17 +43,17 @@ static inline double fx80_to_double(floatx80 fx) static inline floatx80 double_to_fx80(double in) { - uint64_t *d; + u64 *d; - d = (uint64_t *)∈ + d = (u64 *)∈ return float64_to_floatx80(*d); } -inline floatx80 load_extended_float80(uint32_t ea) +inline floatx80 load_extended_float80(u32 ea) { - uint32_t d1,d2; - uint16_t d3; + u32 d1,d2; + u16 d3; floatx80 fp; d3 = m68ki_read_16(ea); @@ -61,12 +61,12 @@ inline floatx80 load_extended_float80(uint32_t ea) d2 = m68ki_read_32(ea+8); fp.high = d3; - fp.low = ((uint64_t)d1<<32) | (d2 & 0xffffffff); + fp.low = ((u64)d1<<32) | (d2 & 0xffffffff); return fp; } -inline void store_extended_float80(uint32_t ea, floatx80 fpr) +inline void store_extended_float80(u32 ea, floatx80 fpr) { m68ki_write_16(ea+0, fpr.high); m68ki_write_16(ea+2, 0); @@ -74,9 +74,9 @@ inline void store_extended_float80(uint32_t ea, floatx80 fpr) m68ki_write_32(ea+8, fpr.low&0xffffffff); } -inline floatx80 load_pack_float80(uint32_t ea) +inline floatx80 load_pack_float80(u32 ea) { - uint32_t dw1, dw2, dw3; + u32 dw1, dw2, dw3; floatx80 result; double tmp; char str[128], *ch; @@ -125,9 +125,9 @@ inline floatx80 load_pack_float80(uint32_t ea) return result; } -inline void store_pack_float80(uint32_t ea, int k, floatx80 fpr) +inline void store_pack_float80(u32 ea, int k, floatx80 fpr) { - uint32_t dw1, dw2, dw3; + u32 dw1, dw2, dw3; char str[128], *ch; int i, j, exp; @@ -259,9 +259,9 @@ inline void store_pack_float80(uint32_t ea, int k, floatx80 fpr) inline void SET_CONDITION_CODES(floatx80 reg) { -// uint64_t *regi; +// u64 *regi; -// regi = (uint64_t *)® +// regi = (u64 *)® m_fpsr &= ~(FPCC_N|FPCC_Z|FPCC_I|FPCC_NAN); @@ -352,7 +352,7 @@ inline int TEST_CONDITION(int condition) return r; } -uint8_t READ_EA_8(int ea) +u8 READ_EA_8(int ea) { int mode = (ea >> 3) & 0x7; int reg = (ea & 0x7); @@ -365,27 +365,27 @@ uint8_t READ_EA_8(int ea) } case 2: // (An) { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; return m68ki_read_8(ea); } case 3: // (An)+ { - uint32_t ea = EA_AY_PI_8(); + u32 ea = EA_AY_PI_8(); return m68ki_read_8(ea); } case 4: // -(An) { - uint32_t ea = EA_AY_PD_8(); + u32 ea = EA_AY_PD_8(); return m68ki_read_8(ea); } case 5: // (d16, An) { - uint32_t ea = EA_AY_DI_8(); + u32 ea = EA_AY_DI_8(); return m68ki_read_8(ea); } case 6: // (An) + (Xn) + d8 { - uint32_t ea = EA_AY_IX_8(); + u32 ea = EA_AY_IX_8(); return m68ki_read_8(ea); } case 7: @@ -394,24 +394,24 @@ uint8_t READ_EA_8(int ea) { case 0: // (xxx).W { - uint32_t ea = OPER_I_16(); + u32 ea = OPER_I_16(); return m68ki_read_8(ea); } case 1: // (xxx).L { - uint32_t d1 = OPER_I_16(); - uint32_t d2 = OPER_I_16(); - uint32_t ea = (d1 << 16) | d2; + u32 d1 = OPER_I_16(); + u32 d2 = OPER_I_16(); + u32 ea = (d1 << 16) | d2; return m68ki_read_8(ea); } case 2: // (d16, PC) { - uint32_t ea = EA_PCDI_8(); + u32 ea = EA_PCDI_8(); return m68ki_read_8(ea); } case 3: // (PC) + (Xn) + d8 { - uint32_t ea = EA_PCIX_8(); + u32 ea = EA_PCIX_8(); return m68ki_read_8(ea); } case 4: // # @@ -428,7 +428,7 @@ uint8_t READ_EA_8(int ea) return 0; } -uint16_t READ_EA_16(int ea) +u16 READ_EA_16(int ea) { int mode = (ea >> 3) & 0x7; int reg = (ea & 0x7); @@ -437,31 +437,31 @@ uint16_t READ_EA_16(int ea) { case 0: // Dn { - return (uint16_t)(REG_D()[reg]); + return (u16)(REG_D()[reg]); } case 2: // (An) { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; return m68ki_read_16(ea); } case 3: // (An)+ { - uint32_t ea = EA_AY_PI_16(); + u32 ea = EA_AY_PI_16(); return m68ki_read_16(ea); } case 4: // -(An) { - uint32_t ea = EA_AY_PD_16(); + u32 ea = EA_AY_PD_16(); return m68ki_read_16(ea); } case 5: // (d16, An) { - uint32_t ea = EA_AY_DI_16(); + u32 ea = EA_AY_DI_16(); return m68ki_read_16(ea); } case 6: // (An) + (Xn) + d8 { - uint32_t ea = EA_AY_IX_16(); + u32 ea = EA_AY_IX_16(); return m68ki_read_16(ea); } case 7: @@ -470,24 +470,24 @@ uint16_t READ_EA_16(int ea) { case 0: // (xxx).W { - uint32_t ea = OPER_I_16(); + u32 ea = OPER_I_16(); return m68ki_read_16(ea); } case 1: // (xxx).L { - uint32_t d1 = OPER_I_16(); - uint32_t d2 = OPER_I_16(); - uint32_t ea = (d1 << 16) | d2; + u32 d1 = OPER_I_16(); + u32 d2 = OPER_I_16(); + u32 ea = (d1 << 16) | d2; return m68ki_read_16(ea); } case 2: // (d16, PC) { - uint32_t ea = EA_PCDI_16(); + u32 ea = EA_PCDI_16(); return m68ki_read_16(ea); } case 3: // (PC) + (Xn) + d8 { - uint32_t ea = EA_PCIX_16(); + u32 ea = EA_PCIX_16(); return m68ki_read_16(ea); } case 4: // # @@ -505,7 +505,7 @@ uint16_t READ_EA_16(int ea) return 0; } -uint32_t READ_EA_32(int ea) +u32 READ_EA_32(int ea) { int mode = (ea >> 3) & 0x7; int reg = (ea & 0x7); @@ -518,27 +518,27 @@ uint32_t READ_EA_32(int ea) } case 2: // (An) { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; return m68ki_read_32(ea); } case 3: // (An)+ { - uint32_t ea = EA_AY_PI_32(); + u32 ea = EA_AY_PI_32(); return m68ki_read_32(ea); } case 4: // -(An) { - uint32_t ea = EA_AY_PD_32(); + u32 ea = EA_AY_PD_32(); return m68ki_read_32(ea); } case 5: // (d16, An) { - uint32_t ea = EA_AY_DI_32(); + u32 ea = EA_AY_DI_32(); return m68ki_read_32(ea); } case 6: // (An) + (Xn) + d8 { - uint32_t ea = EA_AY_IX_32(); + u32 ea = EA_AY_IX_32(); return m68ki_read_32(ea); } case 7: @@ -547,24 +547,24 @@ uint32_t READ_EA_32(int ea) { case 0: // (xxx).W { - uint32_t ea = OPER_I_16(); + u32 ea = OPER_I_16(); return m68ki_read_32(ea); } case 1: // (xxx).L { - uint32_t d1 = OPER_I_16(); - uint32_t d2 = OPER_I_16(); - uint32_t ea = (d1 << 16) | d2; + u32 d1 = OPER_I_16(); + u32 d2 = OPER_I_16(); + u32 ea = (d1 << 16) | d2; return m68ki_read_32(ea); } case 2: // (d16, PC) { - uint32_t ea = EA_PCDI_32(); + u32 ea = EA_PCDI_32(); return m68ki_read_32(ea); } case 3: // (PC) + (Xn) + d8 { - uint32_t ea = EA_PCIX_32(); + u32 ea = EA_PCIX_32(); return m68ki_read_32(ea); } case 4: // # @@ -580,50 +580,50 @@ uint32_t READ_EA_32(int ea) return 0; } -uint64_t READ_EA_64(int ea) +u64 READ_EA_64(int ea) { int mode = (ea >> 3) & 0x7; int reg = (ea & 0x7); - uint32_t h1, h2; + u32 h1, h2; switch (mode) { case 2: // (An) { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; h1 = m68ki_read_32(ea+0); h2 = m68ki_read_32(ea+4); - return (uint64_t)(h1) << 32 | (uint64_t)(h2); + return (u64)(h1) << 32 | (u64)(h2); } case 3: // (An)+ { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; REG_A()[reg] += 8; h1 = m68ki_read_32(ea+0); h2 = m68ki_read_32(ea+4); - return (uint64_t)(h1) << 32 | (uint64_t)(h2); + return (u64)(h1) << 32 | (u64)(h2); } case 4: // -(An) { - uint32_t ea = REG_A()[reg]-8; + u32 ea = REG_A()[reg]-8; REG_A()[reg] -= 8; h1 = m68ki_read_32(ea+0); h2 = m68ki_read_32(ea+4); - return (uint64_t)(h1) << 32 | (uint64_t)(h2); + return (u64)(h1) << 32 | (u64)(h2); } case 5: // (d16, An) { - uint32_t ea = EA_AY_DI_32(); + u32 ea = EA_AY_DI_32(); h1 = m68ki_read_32(ea+0); h2 = m68ki_read_32(ea+4); - return (uint64_t)(h1) << 32 | (uint64_t)(h2); + return (u64)(h1) << 32 | (u64)(h2); } case 6: // (An) + (Xn) + d8 { - uint32_t ea = EA_AY_IX_32(); + u32 ea = EA_AY_IX_32(); h1 = m68ki_read_32(ea+0); h2 = m68ki_read_32(ea+4); - return (uint64_t)(h1) << 32 | (uint64_t)(h2); + return (u64)(h1) << 32 | (u64)(h2); } case 7: { @@ -631,30 +631,30 @@ uint64_t READ_EA_64(int ea) { case 1: // (xxx).L { - uint32_t d1 = OPER_I_16(); - uint32_t d2 = OPER_I_16(); - uint32_t ea = (d1 << 16) | d2; - return (uint64_t)(m68ki_read_32(ea)) << 32 | (uint64_t)(m68ki_read_32(ea+4)); + u32 d1 = OPER_I_16(); + u32 d2 = OPER_I_16(); + u32 ea = (d1 << 16) | d2; + return (u64)(m68ki_read_32(ea)) << 32 | (u64)(m68ki_read_32(ea+4)); } case 3: // (PC) + (Xn) + d8 { - uint32_t ea = EA_PCIX_32(); + u32 ea = EA_PCIX_32(); h1 = m68ki_read_32(ea+0); h2 = m68ki_read_32(ea+4); - return (uint64_t)(h1) << 32 | (uint64_t)(h2); + return (u64)(h1) << 32 | (u64)(h2); } case 4: // # { h1 = OPER_I_32(); h2 = OPER_I_32(); - return (uint64_t)(h1) << 32 | (uint64_t)(h2); + return (u64)(h1) << 32 | (u64)(h2); } case 2: // (d16, PC) { - uint32_t ea = EA_PCDI_32(); + u32 ea = EA_PCDI_32(); h1 = m68ki_read_32(ea+0); h2 = m68ki_read_32(ea+4); - return (uint64_t)(h1) << 32 | (uint64_t)(h2); + return (u64)(h1) << 32 | (u64)(h2); } default: fatalerror("M68kFPU: READ_EA_64: unhandled mode %d, reg %d at %08X\n", mode, reg, m_pc); } @@ -677,21 +677,21 @@ floatx80 READ_EA_FPE(int ea) { case 2: // (An) { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; fpr = load_extended_float80(ea); break; } case 3: // (An)+ { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; REG_A()[reg] += 12; fpr = load_extended_float80(ea); break; } case 4: // -(An) { - uint32_t ea = REG_A()[reg]-12; + u32 ea = REG_A()[reg]-12; REG_A()[reg] -= 12; fpr = load_extended_float80(ea); break; @@ -699,14 +699,14 @@ floatx80 READ_EA_FPE(int ea) case 5: // (d16, An) { // FIXME: will fail for fmovem - uint32_t ea = EA_AY_DI_32(); + u32 ea = EA_AY_DI_32(); fpr = load_extended_float80(ea); break; } case 6: // (An) + (Xn) + d8 { // FIXME: will fail for fmovem - uint32_t ea = EA_AY_IX_32(); + u32 ea = EA_AY_IX_32(); fpr = load_extended_float80(ea); break; } @@ -717,23 +717,23 @@ floatx80 READ_EA_FPE(int ea) { case 1: // (xxx) { - uint32_t d1 = OPER_I_16(); - uint32_t d2 = OPER_I_16(); - uint32_t ea = (d1 << 16) | d2; + u32 d1 = OPER_I_16(); + u32 d2 = OPER_I_16(); + u32 ea = (d1 << 16) | d2; fpr = load_extended_float80(ea); } break; case 2: // (d16, PC) { - uint32_t ea = EA_PCDI_32(); + u32 ea = EA_PCDI_32(); fpr = load_extended_float80(ea); } break; case 3: // (d16,PC,Dx.w) { - uint32_t ea = EA_PCIX_32(); + u32 ea = EA_PCIX_32(); fpr = load_extended_float80(ea); } break; @@ -761,14 +761,14 @@ floatx80 READ_EA_PACK(int ea) { case 2: // (An) { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; fpr = load_pack_float80(ea); break; } case 3: // (An)+ { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; REG_A()[reg] += 12; fpr = load_pack_float80(ea); break; @@ -780,7 +780,7 @@ floatx80 READ_EA_PACK(int ea) { case 3: // (d16,PC,Dx.w) { - uint32_t ea = EA_PCIX_32(); + u32 ea = EA_PCIX_32(); fpr = load_pack_float80(ea); } break; @@ -798,7 +798,7 @@ floatx80 READ_EA_PACK(int ea) return fpr; } -void WRITE_EA_8(int ea, uint8_t data) +void WRITE_EA_8(int ea, u8 data) { int mode = (ea >> 3) & 0x7; int reg = (ea & 0x7); @@ -812,31 +812,31 @@ void WRITE_EA_8(int ea, uint8_t data) } case 2: // (An) { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; m68ki_write_8(ea, data); break; } case 3: // (An)+ { - uint32_t ea = EA_AY_PI_8(); + u32 ea = EA_AY_PI_8(); m68ki_write_8(ea, data); break; } case 4: // -(An) { - uint32_t ea = EA_AY_PD_8(); + u32 ea = EA_AY_PD_8(); m68ki_write_8(ea, data); break; } case 5: // (d16, An) { - uint32_t ea = EA_AY_DI_8(); + u32 ea = EA_AY_DI_8(); m68ki_write_8(ea, data); break; } case 6: // (An) + (Xn) + d8 { - uint32_t ea = EA_AY_IX_8(); + u32 ea = EA_AY_IX_8(); m68ki_write_8(ea, data); break; } @@ -846,15 +846,15 @@ void WRITE_EA_8(int ea, uint8_t data) { case 1: // (xxx).B { - uint32_t d1 = OPER_I_16(); - uint32_t d2 = OPER_I_16(); - uint32_t ea = (d1 << 16) | d2; + u32 d1 = OPER_I_16(); + u32 d2 = OPER_I_16(); + u32 ea = (d1 << 16) | d2; m68ki_write_8(ea, data); break; } case 2: // (d16, PC) { - uint32_t ea = EA_PCDI_16(); + u32 ea = EA_PCDI_16(); m68ki_write_8(ea, data); break; } @@ -866,7 +866,7 @@ void WRITE_EA_8(int ea, uint8_t data) } } -void WRITE_EA_16(int ea, uint16_t data) +void WRITE_EA_16(int ea, u16 data) { int mode = (ea >> 3) & 0x7; int reg = (ea & 0x7); @@ -880,31 +880,31 @@ void WRITE_EA_16(int ea, uint16_t data) } case 2: // (An) { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; m68ki_write_16(ea, data); break; } case 3: // (An)+ { - uint32_t ea = EA_AY_PI_16(); + u32 ea = EA_AY_PI_16(); m68ki_write_16(ea, data); break; } case 4: // -(An) { - uint32_t ea = EA_AY_PD_16(); + u32 ea = EA_AY_PD_16(); m68ki_write_16(ea, data); break; } case 5: // (d16, An) { - uint32_t ea = EA_AY_DI_16(); + u32 ea = EA_AY_DI_16(); m68ki_write_16(ea, data); break; } case 6: // (An) + (Xn) + d8 { - uint32_t ea = EA_AY_IX_16(); + u32 ea = EA_AY_IX_16(); m68ki_write_16(ea, data); break; } @@ -914,15 +914,15 @@ void WRITE_EA_16(int ea, uint16_t data) { case 1: // (xxx).W { - uint32_t d1 = OPER_I_16(); - uint32_t d2 = OPER_I_16(); - uint32_t ea = (d1 << 16) | d2; + u32 d1 = OPER_I_16(); + u32 d2 = OPER_I_16(); + u32 ea = (d1 << 16) | d2; m68ki_write_16(ea, data); break; } case 2: // (d16, PC) { - uint32_t ea = EA_PCDI_16(); + u32 ea = EA_PCDI_16(); m68ki_write_16(ea, data); break; } @@ -934,7 +934,7 @@ void WRITE_EA_16(int ea, uint16_t data) } } -void WRITE_EA_32(int ea, uint32_t data) +void WRITE_EA_32(int ea, u32 data) { int mode = (ea >> 3) & 0x7; int reg = (ea & 0x7); @@ -953,31 +953,31 @@ void WRITE_EA_32(int ea, uint32_t data) } case 2: // (An) { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; m68ki_write_32(ea, data); break; } case 3: // (An)+ { - uint32_t ea = EA_AY_PI_32(); + u32 ea = EA_AY_PI_32(); m68ki_write_32(ea, data); break; } case 4: // -(An) { - uint32_t ea = EA_AY_PD_32(); + u32 ea = EA_AY_PD_32(); m68ki_write_32(ea, data); break; } case 5: // (d16, An) { - uint32_t ea = EA_AY_DI_32(); + u32 ea = EA_AY_DI_32(); m68ki_write_32(ea, data); break; } case 6: // (An) + (Xn) + d8 { - uint32_t ea = EA_AY_IX_32(); + u32 ea = EA_AY_IX_32(); m68ki_write_32(ea, data); break; } @@ -987,21 +987,21 @@ void WRITE_EA_32(int ea, uint32_t data) { case 0: // (xxx).W { - uint32_t ea = OPER_I_16(); + u32 ea = OPER_I_16(); m68ki_write_32(ea, data); break; } case 1: // (xxx).L { - uint32_t d1 = OPER_I_16(); - uint32_t d2 = OPER_I_16(); - uint32_t ea = (d1 << 16) | d2; + u32 d1 = OPER_I_16(); + u32 d2 = OPER_I_16(); + u32 ea = (d1 << 16) | d2; m68ki_write_32(ea, data); break; } case 2: // (d16, PC) { - uint32_t ea = EA_PCDI_32(); + u32 ea = EA_PCDI_32(); m68ki_write_32(ea, data); break; } @@ -1013,7 +1013,7 @@ void WRITE_EA_32(int ea, uint32_t data) } } -void WRITE_EA_64(int ea, uint64_t data) +void WRITE_EA_64(int ea, u64 data) { int mode = (ea >> 3) & 0x7; int reg = (ea & 0x7); @@ -1022,40 +1022,40 @@ void WRITE_EA_64(int ea, uint64_t data) { case 2: // (An) { - uint32_t ea = REG_A()[reg]; - m68ki_write_32(ea, (uint32_t)(data >> 32)); - m68ki_write_32(ea+4, (uint32_t)(data)); + u32 ea = REG_A()[reg]; + m68ki_write_32(ea, (u32)(data >> 32)); + m68ki_write_32(ea+4, (u32)(data)); break; } case 3: // (An)+ { - uint32_t ea = REG_A()[reg]; + u32 ea = REG_A()[reg]; REG_A()[reg] += 8; - m68ki_write_32(ea+0, (uint32_t)(data >> 32)); - m68ki_write_32(ea+4, (uint32_t)(data)); + m68ki_write_32(ea+0, (u32)(data >> 32)); + m68ki_write_32(ea+4, (u32)(data)); break; } case 4: // -(An) { - uint32_t ea; + u32 ea; REG_A()[reg] -= 8; ea = REG_A()[reg]; - m68ki_write_32(ea+0, (uint32_t)(data >> 32)); - m68ki_write_32(ea+4, (uint32_t)(data)); + m68ki_write_32(ea+0, (u32)(data >> 32)); + m68ki_write_32(ea+4, (u32)(data)); break; } case 5: // (d16, An) { - uint32_t ea = EA_AY_DI_32(); - m68ki_write_32(ea+0, (uint32_t)(data >> 32)); - m68ki_write_32(ea+4, (uint32_t)(data)); + u32 ea = EA_AY_DI_32(); + m68ki_write_32(ea+0, (u32)(data >> 32)); + m68ki_write_32(ea+4, (u32)(data)); break; } case 6: // (An) + (Xn) + d8 { - uint32_t ea = EA_AY_IX_32(); - m68ki_write_32(ea+0, (uint32_t)(data >> 32)); - m68ki_write_32(ea+4, (uint32_t)(data)); + u32 ea = EA_AY_IX_32(); + m68ki_write_32(ea+0, (u32)(data >> 32)); + m68ki_write_32(ea+4, (u32)(data)); break; } case 7: @@ -1064,25 +1064,25 @@ void WRITE_EA_64(int ea, uint64_t data) { case 1: // (xxx).L { - uint32_t d1 = OPER_I_16(); - uint32_t d2 = OPER_I_16(); - uint32_t ea = (d1 << 16) | d2; - m68ki_write_32(ea+0, (uint32_t)(data >> 32)); - m68ki_write_32(ea+4, (uint32_t)(data)); + u32 d1 = OPER_I_16(); + u32 d2 = OPER_I_16(); + u32 ea = (d1 << 16) | d2; + m68ki_write_32(ea+0, (u32)(data >> 32)); + m68ki_write_32(ea+4, (u32)(data)); break; } case 2: // (d16, PC) { - uint32_t ea = EA_PCDI_32(); - m68ki_write_32(ea+0, (uint32_t)(data >> 32)); - m68ki_write_32(ea+4, (uint32_t)(data)); + u32 ea = EA_PCDI_32(); + m68ki_write_32(ea+0, (u32)(data >> 32)); + m68ki_write_32(ea+4, (u32)(data)); break; } default: fatalerror("M68kFPU: WRITE_EA_64: unhandled mode %d, reg %d at %08X\n", mode, reg, m_pc); } break; } - default: fatalerror("M68kFPU: WRITE_EA_64: unhandled mode %d, reg %d, data %08X%08X at %08X\n", mode, reg, (uint32_t)(data >> 32), (uint32_t)(data), m_pc); + default: fatalerror("M68kFPU: WRITE_EA_64: unhandled mode %d, reg %d, data %08X%08X at %08X\n", mode, reg, (u32)(data >> 32), (u32)(data), m_pc); } } @@ -1095,7 +1095,7 @@ void WRITE_EA_FPE(int ea, floatx80 fpr) { case 2: // (An) { - uint32_t ea; + u32 ea; ea = REG_A()[reg]; store_extended_float80(ea, fpr); break; @@ -1103,7 +1103,7 @@ void WRITE_EA_FPE(int ea, floatx80 fpr) case 3: // (An)+ { - uint32_t ea; + u32 ea; ea = REG_A()[reg]; store_extended_float80(ea, fpr); REG_A()[reg] += 12; @@ -1112,7 +1112,7 @@ void WRITE_EA_FPE(int ea, floatx80 fpr) case 4: // -(An) { - uint32_t ea; + u32 ea; REG_A()[reg] -= 12; ea = REG_A()[reg]; store_extended_float80(ea, fpr); @@ -1121,7 +1121,7 @@ void WRITE_EA_FPE(int ea, floatx80 fpr) case 5: // (d16,An) { - uint32_t ea = EA_AY_DI_32(); + u32 ea = EA_AY_DI_32(); store_extended_float80(ea, fpr); break; } @@ -1146,7 +1146,7 @@ void WRITE_EA_PACK(int ea, int k, floatx80 fpr) { case 2: // (An) { - uint32_t ea; + u32 ea; ea = REG_A()[reg]; store_pack_float80(ea, k, fpr); break; @@ -1154,7 +1154,7 @@ void WRITE_EA_PACK(int ea, int k, floatx80 fpr) case 3: // (An)+ { - uint32_t ea; + u32 ea; ea = REG_A()[reg]; store_pack_float80(ea, k, fpr); REG_A()[reg] += 12; @@ -1163,7 +1163,7 @@ void WRITE_EA_PACK(int ea, int k, floatx80 fpr) case 4: // -(An) { - uint32_t ea; + u32 ea; REG_A()[reg] -= 12; ea = REG_A()[reg]; store_pack_float80(ea, k, fpr); @@ -1181,7 +1181,7 @@ void WRITE_EA_PACK(int ea, int k, floatx80 fpr) } } -void fpgen_rm_reg(uint16_t w2) +void fpgen_rm_reg(u16 w2) { int ea = m_ir & 0x3f; int rm = (w2 >> 14) & 0x1; @@ -1198,13 +1198,13 @@ void fpgen_rm_reg(uint16_t w2) { case 0: // Long-Word Integer { - int32_t d = READ_EA_32(ea); + s32 d = READ_EA_32(ea); source = int32_to_floatx80(d); break; } case 1: // Single-precision Real { - uint32_t d = READ_EA_32(ea); + u32 d = READ_EA_32(ea); source = float32_to_floatx80(d); break; } @@ -1220,21 +1220,21 @@ void fpgen_rm_reg(uint16_t w2) } case 4: // Word Integer { - int16_t d = READ_EA_16(ea); - source = int32_to_floatx80((int32_t)d); + s16 d = READ_EA_16(ea); + source = int32_to_floatx80((s32)d); break; } case 5: // Double-precision Real { - uint64_t d = READ_EA_64(ea); + u64 d = READ_EA_64(ea); source = float64_to_floatx80(d); break; } case 6: // Byte Integer { - int8_t d = READ_EA_8(ea); - source = int32_to_floatx80((int32_t)d); + s8 d = READ_EA_8(ea); + source = int32_to_floatx80((s32)d); break; } case 7: // FMOVECR load from constant ROM @@ -1267,7 +1267,7 @@ void fpgen_rm_reg(uint16_t w2) break; case 0xf: // 0.0 - source = int32_to_floatx80((int32_t)0); + source = int32_to_floatx80((s32)0); break; case 0x30: // ln(2) @@ -1281,26 +1281,26 @@ void fpgen_rm_reg(uint16_t w2) break; case 0x32: // 1 (or 100? manuals are unclear, but 1 would make more sense) - source = int32_to_floatx80((int32_t)1); + source = int32_to_floatx80((s32)1); break; case 0x33: // 10^1 - source = int32_to_floatx80((int32_t)10); + source = int32_to_floatx80((s32)10); break; case 0x34: // 10^2 - source = int32_to_floatx80((int32_t)10*10); + source = int32_to_floatx80((s32)10*10); break; case 0x35: // 10^4 - source = int32_to_floatx80((int32_t)1000*10); + source = int32_to_floatx80((s32)1000*10); break; case 0x36: // 1.0e8 - source = int32_to_floatx80((int32_t)10000000*10); + source = int32_to_floatx80((s32)10000000*10); break; - case 0x37: // 1.0e16 - can't get the right precision from int32_t so go "direct" with constants from h/w + case 0x37: // 1.0e16 - can't get the right precision from s32 so go "direct" with constants from h/w source.high = 0x4034; source.low = 0x8e1bc9bf04000000U; break; @@ -1376,14 +1376,14 @@ void fpgen_rm_reg(uint16_t w2) } case 0x01: // FINT { - int32_t temp; + s32 temp; temp = floatx80_to_int32(source); m_fpr[dst] = int32_to_floatx80(temp); break; } case 0x03: // FINTRZ { - int32_t temp; + s32 temp; temp = floatx80_to_int32_round_to_zero(source); m_fpr[dst] = int32_to_floatx80(temp); break; @@ -1465,7 +1465,7 @@ void fpgen_rm_reg(uint16_t w2) } case 0x1e: // FGETEXP { - int16_t temp2; + s16 temp2; temp2 = source.high; // get the exponent temp2 -= 0x3fff; // take off the bias @@ -1553,7 +1553,7 @@ void fpgen_rm_reg(uint16_t w2) } } -void fmove_reg_mem(uint16_t w2) +void fmove_reg_mem(u16 w2) { int ea = m_ir & 0x3f; int src = (w2 >> 7) & 0x7; @@ -1564,13 +1564,13 @@ void fmove_reg_mem(uint16_t w2) { case 0: // Long-Word Integer { - int32_t d = (int32_t)floatx80_to_int32(m_fpr[src]); + s32 d = (s32)floatx80_to_int32(m_fpr[src]); WRITE_EA_32(ea, d); break; } case 1: // Single-precision Real { - uint32_t d = floatx80_to_float32(m_fpr[src]); + u32 d = floatx80_to_float32(m_fpr[src]); WRITE_EA_32(ea, d); break; } @@ -1588,17 +1588,17 @@ void fmove_reg_mem(uint16_t w2) } case 4: // Word Integer { - int32 value = floatx80_to_int32(m_fpr[src]); + s32 value = floatx80_to_int32(m_fpr[src]); if (value > 0x7fff || value < -0x8000 ) { m_fpsr |= FPES_OE | FPAE_IOP; } - WRITE_EA_16(ea, (int16_t)value); + WRITE_EA_16(ea, (s16)value); break; } case 5: // Double-precision Real { - uint64_t d; + u64 d; d = floatx80_to_float64(m_fpr[src]); @@ -1607,12 +1607,12 @@ void fmove_reg_mem(uint16_t w2) } case 6: // Byte Integer { - int32 value = floatx80_to_int32(m_fpr[src]); + s32 value = floatx80_to_int32(m_fpr[src]); if (value > 127 || value < -128) { m_fpsr |= FPES_OE | FPAE_IOP; } - WRITE_EA_8(ea, (int8_t) value); + WRITE_EA_8(ea, (s8) value); break; } case 7: // Packed-decimal Real with Dynamic K-factor @@ -1625,7 +1625,7 @@ void fmove_reg_mem(uint16_t w2) m_icount -= 12; } -void fmove_fpcr(uint16_t w2) +void fmove_fpcr(u16 w2) { int ea = m_ir & 0x3f; int dir = (w2 >> 13) & 0x1; @@ -1634,7 +1634,7 @@ void fmove_fpcr(uint16_t w2) if ((mode == 5) || (mode == 6)) { - uint32_t address = 0xffffffff; // force a bus error if this doesn't get assigned + u32 address = 0xffffffff; // force a bus error if this doesn't get assigned if (mode == 5) { @@ -1725,7 +1725,7 @@ void fmove_fpcr(uint16_t w2) m_icount -= 10; } -void fmovem(uint16_t w2) +void fmovem(u16 w2) { int i; int ea = m_ir & 0x3f; @@ -1733,7 +1733,7 @@ void fmovem(uint16_t w2) int mode = (w2 >> 11) & 0x3; int reglist = w2 & 0xff; - uint32_t mem_addr = 0; + u32 mem_addr = 0; switch (ea >> 3) { case 5: // (d16, An) @@ -1842,7 +1842,7 @@ void fmovem(uint16_t w2) void fscc() { int ea = m_ir & 0x3f; - int condition = (int16_t)(OPER_I_16()); + int condition = (s16)(OPER_I_16()); WRITE_EA_8(ea, TEST_CONDITION(condition) ? 0xff : 0); m_icount -= 7; // ??? @@ -1850,10 +1850,10 @@ void fscc() void fbcc16() { - int32_t offset; + s32 offset; int condition = m_ir & 0x3f; - offset = (int16_t)(OPER_I_16()); + offset = (s16)(OPER_I_16()); // TODO: condition and jump!!! if (TEST_CONDITION(condition)) @@ -1867,7 +1867,7 @@ void fbcc16() void fbcc32() { - int32_t offset; + s32 offset; int condition = m_ir & 0x3f; offset = OPER_I_32(); @@ -1891,7 +1891,7 @@ void m68040_fpu_op0() { case 0: { - uint16_t w2 = OPER_I_16(); + u16 w2 = OPER_I_16(); switch ((w2 >> 13) & 0x7) { case 0x0: // FPU ALU FP, FP @@ -1954,7 +1954,7 @@ void m68040_fpu_op0() } } -int perform_fsave(uint32_t addr, int inc) +int perform_fsave(u32 addr, int inc) { if(m_cpu_type & CPU_TYPE_040) { @@ -2014,7 +2014,7 @@ void do_frestore_null() m_fpu_just_reset = 1; } -void m68040_do_fsave(uint32_t addr, int reg, int inc) +void m68040_do_fsave(u32 addr, int reg, int inc) { if (m_fpu_just_reset) { @@ -2029,10 +2029,10 @@ void m68040_do_fsave(uint32_t addr, int reg, int inc) } } -void m68040_do_frestore(uint32_t addr, int reg) +void m68040_do_frestore(u32 addr, int reg) { bool m40 = m_cpu_type & CPU_TYPE_040; - uint32_t temp = m68ki_read_32(addr); + u32 temp = m68ki_read_32(addr); // check for nullptr frame if (temp & 0xff000000) @@ -2072,7 +2072,7 @@ void m68040_fpu_op1() int ea = m_ir & 0x3f; int mode = (ea >> 3) & 0x7; int reg = (ea & 0x7); - uint32_t addr; + u32 addr; switch ((m_ir >> 6) & 0x3) { @@ -2181,7 +2181,7 @@ void m68040_fpu_op1() void m68881_ftrap() { - uint16_t w2 = OPER_I_16(); + u16 w2 = OPER_I_16(); // now check the condition if (TEST_CONDITION(w2 & 0x3f)) diff --git a/src/devices/cpu/m68000/m68kmmu.h b/src/devices/cpu/m68000/m68kmmu.h index e07ff8883fb..706426fe43b 100644 --- a/src/devices/cpu/m68000/m68kmmu.h +++ b/src/devices/cpu/m68000/m68kmmu.h @@ -16,44 +16,44 @@ #endif // MMU SR register fields -static constexpr uint16_t M68K_MMU_SR_BUS_ERROR = 0x8000; -static constexpr uint16_t M68K_MMU_SR_SUPERVISOR_ONLY = 0x2000; -static constexpr uint16_t M68K_MMU_SR_WRITE_PROTECT = 0x0800; -static constexpr uint16_t M68K_MMU_SR_INVALID = 0x0400; -static constexpr uint16_t M68K_MMU_SR_MODIFIED = 0x0200; -static constexpr uint16_t M68K_MMU_SR_TRANSPARENT = 0x0040; +static constexpr u16 M68K_MMU_SR_BUS_ERROR = 0x8000; +static constexpr u16 M68K_MMU_SR_SUPERVISOR_ONLY = 0x2000; +static constexpr u16 M68K_MMU_SR_WRITE_PROTECT = 0x0800; +static constexpr u16 M68K_MMU_SR_INVALID = 0x0400; +static constexpr u16 M68K_MMU_SR_MODIFIED = 0x0200; +static constexpr u16 M68K_MMU_SR_TRANSPARENT = 0x0040; // MMU translation table descriptor field definitions -static constexpr uint32_t M68K_MMU_DF_DT = 0x00000003; -static constexpr uint32_t M68K_MMU_DF_DT_INVALID = 0x00000000; -static constexpr uint32_t M68K_MMU_DF_DT_PAGE = 0x00000001; -static constexpr uint32_t M68K_MMU_DF_DT_TABLE_4BYTE = 0x00000002; -static constexpr uint32_t M68K_MMU_DF_DT_TABLE_8BYTE = 0x00000003; -static constexpr uint32_t M68K_MMU_DF_WP = 0x00000004; -static constexpr uint32_t M68K_MMU_DF_USED = 0x00000008; -static constexpr uint32_t M68K_MMU_DF_MODIFIED = 0x00000010; -static constexpr uint32_t M68K_MMU_DF_CI = 0x00000040; -static constexpr uint32_t M68K_MMU_DF_SUPERVISOR = 0x00000100; -static constexpr uint32_t M68K_MMU_DF_ADDR_MASK = 0xfffffff0; -static constexpr uint32_t M68K_MMU_DF_IND_ADDR_MASK = 0xfffffffc; +static constexpr u32 M68K_MMU_DF_DT = 0x00000003; +static constexpr u32 M68K_MMU_DF_DT_INVALID = 0x00000000; +static constexpr u32 M68K_MMU_DF_DT_PAGE = 0x00000001; +static constexpr u32 M68K_MMU_DF_DT_TABLE_4BYTE = 0x00000002; +static constexpr u32 M68K_MMU_DF_DT_TABLE_8BYTE = 0x00000003; +static constexpr u32 M68K_MMU_DF_WP = 0x00000004; +static constexpr u32 M68K_MMU_DF_USED = 0x00000008; +static constexpr u32 M68K_MMU_DF_MODIFIED = 0x00000010; +static constexpr u32 M68K_MMU_DF_CI = 0x00000040; +static constexpr u32 M68K_MMU_DF_SUPERVISOR = 0x00000100; +static constexpr u32 M68K_MMU_DF_ADDR_MASK = 0xfffffff0; +static constexpr u32 M68K_MMU_DF_IND_ADDR_MASK = 0xfffffffc; // MMU ATC Fields -static constexpr uint32_t M68K_MMU_ATC_BUSERROR = 0x08000000; -static constexpr uint32_t M68K_MMU_ATC_CACHE_IN = 0x04000000; -static constexpr uint32_t M68K_MMU_ATC_WRITE_PR = 0x02000000; -static constexpr uint32_t M68K_MMU_ATC_MODIFIED = 0x01000000; -static constexpr uint32_t M68K_MMU_ATC_MASK = 0x00ffffff; -static constexpr uint32_t M68K_MMU_ATC_SHIFT = 8; -static constexpr uint32_t M68K_MMU_ATC_VALID = 0x08000000; +static constexpr u32 M68K_MMU_ATC_BUSERROR = 0x08000000; +static constexpr u32 M68K_MMU_ATC_CACHE_IN = 0x04000000; +static constexpr u32 M68K_MMU_ATC_WRITE_PR = 0x02000000; +static constexpr u32 M68K_MMU_ATC_MODIFIED = 0x01000000; +static constexpr u32 M68K_MMU_ATC_MASK = 0x00ffffff; +static constexpr u32 M68K_MMU_ATC_SHIFT = 8; +static constexpr u32 M68K_MMU_ATC_VALID = 0x08000000; // MMU Translation Control register -static constexpr uint32_t M68K_MMU_TC_SRE = 0x02000000; -static constexpr uint32_t M68K_MMU_TC_FCL = 0x01000000; +static constexpr u32 M68K_MMU_TC_SRE = 0x02000000; +static constexpr u32 M68K_MMU_TC_FCL = 0x01000000; // TT register -static constexpr uint16_t M68K_MMU_TT_ENABLE = 0x8000; +static constexpr u16 M68K_MMU_TT_ENABLE = 0x8000; /* decodes the effective address */ -uint32_t DECODE_EA_32(int ea) +u32 DECODE_EA_32(int ea) { int mode = (ea >> 3) & 0x7; int reg = (ea & 0x7); @@ -66,17 +66,17 @@ uint32_t DECODE_EA_32(int ea) } case 3: // (An)+ { - uint32_t ea = EA_AY_PI_32(); + u32 ea = EA_AY_PI_32(); return ea; } case 5: // (d16, An) { - uint32_t ea = EA_AY_DI_32(); + u32 ea = EA_AY_DI_32(); return ea; } case 6: // (An) + (Xn) + d8 { - uint32_t ea = EA_AY_IX_32(); + u32 ea = EA_AY_IX_32(); return ea; } case 7: @@ -85,19 +85,19 @@ uint32_t DECODE_EA_32(int ea) { case 0: // (xxx).W { - uint32_t ea = OPER_I_16(); + u32 ea = OPER_I_16(); return ea; } case 1: // (xxx).L { - uint32_t d1 = OPER_I_16(); - uint32_t d2 = OPER_I_16(); - uint32_t ea = (d1 << 16) | d2; + u32 d1 = OPER_I_16(); + u32 d2 = OPER_I_16(); + u32 ea = (d1 << 16) | d2; return ea; } case 2: // (d16, PC) { - uint32_t ea = EA_PCDI_32(); + u32 ea = EA_PCDI_32(); return ea; } default: fatalerror("m68k: DECODE_EA_32: unhandled mode %d, reg %d at %08X\n", mode, reg, m_pc); @@ -109,7 +109,7 @@ uint32_t DECODE_EA_32(int ea) return 0; } -void pmmu_set_buserror(uint32_t addr_in) +void pmmu_set_buserror(u32 addr_in) { if (!machine().side_effects_disabled() && ++m_mmu_tmp_buserror_occurred == 1) { @@ -122,13 +122,12 @@ void pmmu_set_buserror(uint32_t addr_in) // pmmu_atc_add: adds this address to the ATC -void pmmu_atc_add(uint32_t logical, uint32_t physical, int fc, const int rw) +void pmmu_atc_add(u32 logical, u32 physical, int fc, const int rw) { // get page size (i.e. # of bits to ignore); is 10 for Apollo int ps = (m_mmu_tc >> 20) & 0xf; - const uint32_t atc_tag = M68K_MMU_ATC_VALID | ((fc &7) << 24)| logical >> ps; - uint32_t atc_data = (physical >> ps) << (ps - 8); - + const u32 atc_tag = M68K_MMU_ATC_VALID | ((fc &7) << 24)| logical >> ps; + u32 atc_data = (physical >> ps) << (ps - 8); if (m_mmu_tmp_sr & (M68K_MMU_SR_BUS_ERROR|M68K_MMU_SR_INVALID|M68K_MMU_SR_SUPERVISOR_ONLY)) { @@ -196,13 +195,13 @@ void pmmu_atc_flush() m_mmu_atc_rr = 0; } -void pmmu_atc_flush_fc_ea(const uint16_t modes) +void pmmu_atc_flush_fc_ea(const u16 modes) { const int fcmask = (modes >> 5) & 7; const int fc = fc_from_modes(modes) & fcmask; const int ps = (m_mmu_tc >> 16) & 0xf; const int mode = (modes >> 10) & 7; - uint32_t ea; + u32 ea; switch (mode) { @@ -245,12 +244,12 @@ void pmmu_atc_flush_fc_ea(const uint16_t modes) } template -bool pmmu_atc_lookup(const uint32_t addr_in, const int fc, const bool rw, - uint32_t& addr_out) +bool pmmu_atc_lookup(const u32 addr_in, const int fc, const bool rw, + u32& addr_out) { MMULOG("%s: LOOKUP addr_in=%08x, fc=%d, ptest=%d\n", __func__, addr_in, fc, ptest); const int ps = (m_mmu_tc >> 20) & 0xf; - const uint32_t atc_tag = M68K_MMU_ATC_VALID | ((fc & 7) << 24) | ((addr_in >> ps) << (ps - 8)); + const u32 atc_tag = M68K_MMU_ATC_VALID | ((fc & 7) << 24) | ((addr_in >> ps) << (ps - 8)); for (int i = 0; i < MMU_ATC_ENTRIES; i++) { @@ -260,7 +259,7 @@ bool pmmu_atc_lookup(const uint32_t addr_in, const int fc, const bool rw, continue; } - const uint32_t atc_data = m_mmu_atc_data[i]; + const u32 atc_data = m_mmu_atc_data[i]; if (!ptest && !rw) { @@ -304,7 +303,7 @@ bool pmmu_atc_lookup(const uint32_t addr_in, const int fc, const bool rw, return false; } -bool pmmu_match_tt(const uint32_t addr_in, const int fc, const uint32_t tt, const bool rw) +bool pmmu_match_tt(const u32 addr_in, const int fc, const u32 tt, const bool rw) { if (!(tt & M68K_MMU_TT_ENABLE)) { @@ -312,10 +311,10 @@ bool pmmu_match_tt(const uint32_t addr_in, const int fc, const uint32_t tt, cons } // transparent translation enabled - const uint32_t address_base = tt & 0xff000000; - const uint32_t address_mask = ((tt << 8) & 0xff000000) ^ 0xff000000; - const uint32_t fcmask = (~tt) & 7; - const uint32_t fcbits = (tt >> 4) & 7; + const u32 address_base = tt & 0xff000000; + const u32 address_mask = ((tt << 8) & 0xff000000) ^ 0xff000000; + const u32 fcmask = (~tt) & 7; + const u32 fcbits = (tt >> 4) & 7; const bool rwmask = (~tt & 0x100); const bool rwbit = (tt & 0x200); @@ -338,7 +337,7 @@ bool pmmu_match_tt(const uint32_t addr_in, const int fc, const uint32_t tt, cons return true; } -void update_descriptor(const uint32_t tptr, const int type, const uint32_t entry, const bool rw) +void update_descriptor(const u32 tptr, const int type, const u32 entry, const bool rw) { if (type == M68K_MMU_DF_DT_PAGE && !rw && !(entry & M68K_MMU_DF_MODIFIED) && @@ -355,7 +354,7 @@ void update_descriptor(const uint32_t tptr, const int type, const uint32_t entry } template -void update_sr(const int type, const uint32_t tbl_entry, const int fc) +void update_sr(const int type, const u32 tbl_entry, const int fc) { if (machine().side_effects_disabled()) { @@ -396,11 +395,11 @@ void update_sr(const int type, const uint32_t tbl_entry, const int fc) } template -bool pmmu_walk_tables(uint32_t addr_in, int type, uint32_t table, const int fc, - const int limit, const bool rw, uint32_t &addr_out) +bool pmmu_walk_tables(u32 addr_in, int type, u32 table, const int fc, + const int limit, const bool rw, u32 &addr_out) { int level = 0; - const uint32_t bits = m_mmu_tc & 0xffff; + const u32 bits = m_mmu_tc & 0xffff; const int pagesize = (m_mmu_tc >> 20) & 0xf; const int is = (m_mmu_tc >> 16) & 0xf; int bitpos = 12; @@ -422,7 +421,7 @@ bool pmmu_walk_tables(uint32_t addr_in, int type, uint32_t table, const int fc, const int table_index = (bitpos == 16) ? fc : (addr_in >> (32 - indexbits)); bitpos -= 4; const bool indirect = (!bitpos || !(bits >> bitpos)) && indexbits; - uint32_t tbl_entry, tbl_entry2; + u32 tbl_entry, tbl_entry2; MMULOG("%s: type %d, table %08x, addr_in %08x, indexbits %d, pageshift %d, indirect %d table_index %08x, rw=%d fc=%d\n", __func__, type, table, addr_in, indexbits, pageshift, indirect, table_index, rw, fc); @@ -537,9 +536,9 @@ bool pmmu_walk_tables(uint32_t addr_in, int type, uint32_t table, const int fc, // pmmu_translate_addr_with_fc: perform 68851/68030-style PMMU address translation template -uint32_t pmmu_translate_addr_with_fc(uint32_t addr_in, uint8_t fc, bool rw, const int limit = 7) +u32 pmmu_translate_addr_with_fc(u32 addr_in, u8 fc, bool rw, const int limit = 7) { - uint32_t addr_out = 0; + u32 addr_out = 0; MMULOG("%s: addr_in=%08x, fc=%d, ptest=%d, rw=%d, limit=%d\n", @@ -578,7 +577,7 @@ uint32_t pmmu_translate_addr_with_fc(uint32_t addr_in, uint8_t fc, bool rw, cons } int type; - uint32_t tbl_addr; + u32 tbl_addr; // if SRP is enabled and we're in supervisor mode, use it if ((m_mmu_tc & M68K_MMU_TC_SRE) && (fc & 4)) { @@ -626,9 +625,9 @@ uint32_t pmmu_translate_addr_with_fc(uint32_t addr_in, uint8_t fc, bool rw, cons // FC bits: 2 = supervisor, 1 = program, 0 = data // the 68040 is a subset of the 68851 and 68030 PMMUs - the page table sizes are fixed, there is no early termination, etc, etc. -uint32_t pmmu_translate_addr_with_fc_040(uint32_t addr_in, uint8_t fc, uint8_t ptest) +u32 pmmu_translate_addr_with_fc_040(u32 addr_in, u8 fc, u8 ptest) { - uint32_t addr_out, tt0, tt1; + u32 addr_out, tt0, tt1; addr_out = addr_in; m_mmu_tmp_sr = 0; @@ -655,7 +654,7 @@ uint32_t pmmu_translate_addr_with_fc_040(uint32_t addr_in, uint8_t fc, uint8_t p { static constexpr int fcmask[4] = { 4, 4, 0, 0 }; static constexpr int fcmatch[4] = { 0, 4, 0, 0 }; - uint32_t mask = (tt0 >> 16) & 0xff; + u32 mask = (tt0 >> 16) & 0xff; mask ^= 0xff; mask <<= 24; @@ -675,7 +674,7 @@ uint32_t pmmu_translate_addr_with_fc_040(uint32_t addr_in, uint8_t fc, uint8_t p { static int fcmask[4] = { 4, 4, 0, 0 }; static int fcmatch[4] = { 0, 4, 0, 0 }; - uint32_t mask = (tt1 >> 16) & 0xff; + u32 mask = (tt1 >> 16) & 0xff; mask ^= 0xff; mask <<= 24; @@ -693,11 +692,11 @@ uint32_t pmmu_translate_addr_with_fc_040(uint32_t addr_in, uint8_t fc, uint8_t p if (m_pmmu_enabled) { - uint32_t root_idx = (addr_in >> 25) & 0x7f; - uint32_t ptr_idx = (addr_in >> 18) & 0x7f; - uint32_t page_idx, page; - uint32_t root_ptr, pointer_ptr, page_ptr; - uint32_t root_entry, pointer_entry, page_entry; + u32 root_idx = (addr_in >> 25) & 0x7f; + u32 ptr_idx = (addr_in >> 18) & 0x7f; + u32 page_idx, page; + u32 root_ptr, pointer_ptr, page_ptr; + u32 root_entry, pointer_entry, page_entry; // select supervisor or user root pointer if (fc & 4) @@ -870,9 +869,9 @@ uint32_t pmmu_translate_addr_with_fc_040(uint32_t addr_in, uint8_t fc, uint8_t p } // pmmu_translate_addr: perform 68851/68030-style PMMU address translation -uint32_t pmmu_translate_addr(uint32_t addr_in, const bool rw) +u32 pmmu_translate_addr(u32 addr_in, const bool rw) { - uint32_t addr_out; + u32 addr_out; if (CPU_TYPE_IS_040_PLUS()) { @@ -887,7 +886,7 @@ uint32_t pmmu_translate_addr(uint32_t addr_in, const bool rw) // m68851_mmu_ops: COP 0 MMU opcode handling -int fc_from_modes(const uint16_t modes) +int fc_from_modes(const u16 modes) { if ((modes & 0x1f) == 0) { @@ -930,9 +929,9 @@ int fc_from_modes(const uint16_t modes) return 0; } -void m68851_pload(const uint32_t ea, const uint16_t modes) +void m68851_pload(const u32 ea, const u16 modes) { - uint32_t ltmp = DECODE_EA_32(ea); + u32 ltmp = DECODE_EA_32(ea); const int fc = fc_from_modes(modes); bool rw = (modes & 0x200); @@ -958,10 +957,10 @@ void m68851_pload(const uint32_t ea, const uint16_t modes) } } -void m68851_ptest(const uint32_t ea, const uint16_t modes) +void m68851_ptest(const u32 ea, const u16 modes) { - uint32_t v_addr = DECODE_EA_32(ea); - uint32_t p_addr; + u32 v_addr = DECODE_EA_32(ea); + u32 p_addr; const int level = (modes >> 10) & 7; const bool rw = (modes & 0x200); @@ -990,7 +989,7 @@ void m68851_ptest(const uint32_t ea, const uint16_t modes) } } -void m68851_pmove_get(uint32_t ea, uint16_t modes) +void m68851_pmove_get(u32 ea, u16 modes) { switch ((modes>>10) & 0x3f) { @@ -1008,12 +1007,12 @@ void m68851_pmove_get(uint32_t ea, uint16_t modes) break; case 0x12: // supervisor root pointer - WRITE_EA_64(ea, (uint64_t)m_mmu_srp_limit<<32 | (uint64_t)m_mmu_srp_aptr); + WRITE_EA_64(ea, (u64)m_mmu_srp_limit<<32 | (u64)m_mmu_srp_aptr); MMULOG("PMMU: pc=%x PMOVE from SRP limit = %08x, aptr = %08x\n", m_ppc, m_mmu_srp_limit, m_mmu_srp_aptr); break; case 0x13: // CPU root pointer - WRITE_EA_64(ea, (uint64_t)m_mmu_crp_limit<<32 | (uint64_t)m_mmu_crp_aptr); + WRITE_EA_64(ea, (u64)m_mmu_crp_limit<<32 | (u64)m_mmu_crp_aptr); MMULOG("PMMU: pc=%x PMOVE from CRP limit = %08x, aptr = %08x\n", m_ppc, m_mmu_crp_limit, m_mmu_crp_aptr); break; @@ -1029,14 +1028,14 @@ void m68851_pmove_get(uint32_t ea, uint16_t modes) } -void m68851_pmove_put(uint32_t ea, uint16_t modes) +void m68851_pmove_put(u32 ea, u16 modes) { - uint64_t temp64; + u64 temp64; switch ((modes>>13) & 7) { case 0: { - uint32_t temp = READ_EA_32(ea); + u32 temp = READ_EA_32(ea); if (((modes >> 10) & 7) == 2) { @@ -1136,7 +1135,7 @@ void m68851_pmove_put(uint32_t ea, uint16_t modes) if (m_cpu_type == CPU_TYPE_020) { // DomainOS on Apollo DN3000 will only reset this to 0 - uint16_t mmu_ac = READ_EA_16(ea); + u16 mmu_ac = READ_EA_16(ea); if (mmu_ac != 0) { MMULOG("680x0 PMMU: pc=%x PMOVE to mmu_ac=%08x\n", @@ -1152,14 +1151,14 @@ void m68851_pmove_put(uint32_t ea, uint16_t modes) } break; case 3: // MMU status - uint32_t temp = READ_EA_32(ea); + u32 temp = READ_EA_32(ea); logerror("680x0: unsupported PMOVE %x to MMU status, PC %x\n", temp, m_pc); break; } } -void m68851_pmove(uint32_t ea, uint16_t modes) +void m68851_pmove(u32 ea, u16 modes) { switch ((modes >> 13) & 0x7) { @@ -1197,8 +1196,8 @@ void m68851_pmove(uint32_t ea, uint16_t modes) void m68851_mmu_ops() { - uint16_t modes; - uint32_t ea = m_ir & 0x3f; + u16 modes; + u32 ea = m_ir & 0x3f; // catch the 2 "weird" encodings up front (PBcc) @@ -1269,9 +1268,9 @@ void m68851_mmu_ops() /* Apple HMMU translation is much simpler */ -inline uint32_t hmmu_translate_addr(uint32_t addr_in) +inline u32 hmmu_translate_addr(u32 addr_in) { - uint32_t addr_out; + u32 addr_out; addr_out = addr_in; @@ -1306,7 +1305,7 @@ inline uint32_t hmmu_translate_addr(uint32_t addr_in) } public: -int m68851_buserror(uint32_t& addr) +int m68851_buserror(u32& addr) { if (!m_pmmu_enabled) { diff --git a/src/devices/cpu/m68000/m68kops.cpp b/src/devices/cpu/m68000/m68kops.cpp index f721ab89bb1..edbc3c8c80e 100644 --- a/src/devices/cpu/m68000/m68kops.cpp +++ b/src/devices/cpu/m68000/m68kops.cpp @@ -39,11 +39,11 @@ void m68000_base_device::xf300_040fpu1_l_234f() } void m68000_base_device::xc100_abcd_b_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = DY(); - uint32_t dst = *r_dst; - uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); - uint32_t corf = 0; + u32* r_dst = &DX(); + u32 src = DY(); + u32 dst = *r_dst; + u32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); + u32 corf = 0; if(res > 9) corf = 6; @@ -66,11 +66,11 @@ void m68000_base_device::xc100_abcd_b_01234fc() } void m68000_base_device::xcf08_abcd_b_01234fc() { - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_AY_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); + u32 corf = 0; if(res > 9) corf = 6; @@ -93,11 +93,11 @@ void m68000_base_device::xcf08_abcd_b_01234fc() } void m68000_base_device::xc10f_abcd_b_01234fc() { - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_A7_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); + u32 corf = 0; if(res > 9) corf = 6; @@ -120,11 +120,11 @@ void m68000_base_device::xc10f_abcd_b_01234fc() } void m68000_base_device::xcf0f_abcd_b_01234fc() { - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_A7_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); + u32 corf = 0; if(res > 9) corf = 6; @@ -147,11 +147,11 @@ void m68000_base_device::xcf0f_abcd_b_01234fc() } void m68000_base_device::xc108_abcd_b_01234fc() { - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_AY_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_1(); + u32 corf = 0; if(res > 9) corf = 6; @@ -174,10 +174,10 @@ void m68000_base_device::xc108_abcd_b_01234fc() } void m68000_base_device::xd000_add_b_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_8(DY()); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_8(DY()); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -190,10 +190,10 @@ void m68000_base_device::xd000_add_b_01234fc() } void m68000_base_device::xd010_add_b_ai_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_AI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_AI_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -206,10 +206,10 @@ void m68000_base_device::xd010_add_b_ai_01234fc() } void m68000_base_device::xd018_add_b_pi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_PI_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -222,10 +222,10 @@ void m68000_base_device::xd018_add_b_pi_01234fc() } void m68000_base_device::xd01f_add_b_pi7_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_A7_PI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_A7_PI_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -238,10 +238,10 @@ void m68000_base_device::xd01f_add_b_pi7_01234fc() } void m68000_base_device::xd020_add_b_pd_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PD_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_PD_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -254,10 +254,10 @@ void m68000_base_device::xd020_add_b_pd_01234fc() } void m68000_base_device::xd027_add_b_pd7_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_A7_PD_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_A7_PD_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -270,10 +270,10 @@ void m68000_base_device::xd027_add_b_pd7_01234fc() } void m68000_base_device::xd028_add_b_di_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_DI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_DI_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -286,10 +286,10 @@ void m68000_base_device::xd028_add_b_di_01234fc() } void m68000_base_device::xd030_add_b_ix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_IX_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_IX_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -302,10 +302,10 @@ void m68000_base_device::xd030_add_b_ix_01234fc() } void m68000_base_device::xd038_add_b_aw_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AW_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AW_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -318,10 +318,10 @@ void m68000_base_device::xd038_add_b_aw_01234fc() } void m68000_base_device::xd039_add_b_al_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AL_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AL_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -334,10 +334,10 @@ void m68000_base_device::xd039_add_b_al_01234fc() } void m68000_base_device::xd03a_add_b_pcdi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCDI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_PCDI_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -350,10 +350,10 @@ void m68000_base_device::xd03a_add_b_pcdi_01234fc() } void m68000_base_device::xd03b_add_b_pcix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCIX_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_PCIX_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -366,10 +366,10 @@ void m68000_base_device::xd03b_add_b_pcix_01234fc() } void m68000_base_device::xd03c_add_b_i_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_I_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_I_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -382,10 +382,10 @@ void m68000_base_device::xd03c_add_b_i_01234fc() } void m68000_base_device::xd040_add_w_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(DY()); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(DY()); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -398,10 +398,10 @@ void m68000_base_device::xd040_add_w_01234fc() } void m68000_base_device::xd048_add_w_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(AY()); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(AY()); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -414,10 +414,10 @@ void m68000_base_device::xd048_add_w_01234fc() } void m68000_base_device::xd050_add_w_ai_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_AI_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_AI_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -430,10 +430,10 @@ void m68000_base_device::xd050_add_w_ai_01234fc() } void m68000_base_device::xd058_add_w_pi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PI_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_PI_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -446,10 +446,10 @@ void m68000_base_device::xd058_add_w_pi_01234fc() } void m68000_base_device::xd060_add_w_pd_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PD_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_PD_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -462,10 +462,10 @@ void m68000_base_device::xd060_add_w_pd_01234fc() } void m68000_base_device::xd068_add_w_di_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_DI_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_DI_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -478,10 +478,10 @@ void m68000_base_device::xd068_add_w_di_01234fc() } void m68000_base_device::xd070_add_w_ix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_IX_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_IX_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -494,10 +494,10 @@ void m68000_base_device::xd070_add_w_ix_01234fc() } void m68000_base_device::xd078_add_w_aw_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AW_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AW_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -510,10 +510,10 @@ void m68000_base_device::xd078_add_w_aw_01234fc() } void m68000_base_device::xd079_add_w_al_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AL_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AL_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -526,10 +526,10 @@ void m68000_base_device::xd079_add_w_al_01234fc() } void m68000_base_device::xd07a_add_w_pcdi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCDI_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_PCDI_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -542,10 +542,10 @@ void m68000_base_device::xd07a_add_w_pcdi_01234fc() } void m68000_base_device::xd07b_add_w_pcix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCIX_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_PCIX_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -558,10 +558,10 @@ void m68000_base_device::xd07b_add_w_pcix_01234fc() } void m68000_base_device::xd07c_add_w_i_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_I_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_I_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -574,10 +574,10 @@ void m68000_base_device::xd07c_add_w_i_01234fc() } void m68000_base_device::xd080_add_l_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = DY(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = DY(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -590,10 +590,10 @@ void m68000_base_device::xd080_add_l_01234fc() } void m68000_base_device::xd088_add_l_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = AY(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = AY(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -606,10 +606,10 @@ void m68000_base_device::xd088_add_l_01234fc() } void m68000_base_device::xd090_add_l_ai_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_AI_32(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_AI_32(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -622,10 +622,10 @@ void m68000_base_device::xd090_add_l_ai_01234fc() } void m68000_base_device::xd098_add_l_pi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PI_32(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_PI_32(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -638,10 +638,10 @@ void m68000_base_device::xd098_add_l_pi_01234fc() } void m68000_base_device::xd0a0_add_l_pd_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PD_32(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_PD_32(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -654,10 +654,10 @@ void m68000_base_device::xd0a0_add_l_pd_01234fc() } void m68000_base_device::xd0a8_add_l_di_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_DI_32(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_DI_32(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -670,10 +670,10 @@ void m68000_base_device::xd0a8_add_l_di_01234fc() } void m68000_base_device::xd0b0_add_l_ix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_IX_32(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AY_IX_32(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -686,10 +686,10 @@ void m68000_base_device::xd0b0_add_l_ix_01234fc() } void m68000_base_device::xd0b8_add_l_aw_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AW_32(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AW_32(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -702,10 +702,10 @@ void m68000_base_device::xd0b8_add_l_aw_01234fc() } void m68000_base_device::xd0b9_add_l_al_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AL_32(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_AL_32(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -718,10 +718,10 @@ void m68000_base_device::xd0b9_add_l_al_01234fc() } void m68000_base_device::xd0ba_add_l_pcdi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCDI_32(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_PCDI_32(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -734,10 +734,10 @@ void m68000_base_device::xd0ba_add_l_pcdi_01234fc() } void m68000_base_device::xd0bb_add_l_pcix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCIX_32(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_PCIX_32(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -750,10 +750,10 @@ void m68000_base_device::xd0bb_add_l_pcix_01234fc() } void m68000_base_device::xd0bc_add_l_i_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_I_32(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DX(); + u32 src = OPER_I_32(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -766,10 +766,10 @@ void m68000_base_device::xd0bc_add_l_i_01234fc() } void m68000_base_device::xd110_add_b_ai_01234fc() { - uint32_t ea = EA_AY_AI_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_AI_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -782,10 +782,10 @@ void m68000_base_device::xd110_add_b_ai_01234fc() } void m68000_base_device::xd118_add_b_pi_01234fc() { - uint32_t ea = EA_AY_PI_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_PI_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -798,10 +798,10 @@ void m68000_base_device::xd118_add_b_pi_01234fc() } void m68000_base_device::xd11f_add_b_pi7_01234fc() { - uint32_t ea = EA_A7_PI_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 ea = EA_A7_PI_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -814,10 +814,10 @@ void m68000_base_device::xd11f_add_b_pi7_01234fc() } void m68000_base_device::xd120_add_b_pd_01234fc() { - uint32_t ea = EA_AY_PD_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_PD_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -830,10 +830,10 @@ void m68000_base_device::xd120_add_b_pd_01234fc() } void m68000_base_device::xd127_add_b_pd7_01234fc() { - uint32_t ea = EA_A7_PD_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 ea = EA_A7_PD_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -846,10 +846,10 @@ void m68000_base_device::xd127_add_b_pd7_01234fc() } void m68000_base_device::xd128_add_b_di_01234fc() { - uint32_t ea = EA_AY_DI_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_DI_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -862,10 +862,10 @@ void m68000_base_device::xd128_add_b_di_01234fc() } void m68000_base_device::xd130_add_b_ix_01234fc() { - uint32_t ea = EA_AY_IX_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_IX_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -878,10 +878,10 @@ void m68000_base_device::xd130_add_b_ix_01234fc() } void m68000_base_device::xd138_add_b_aw_01234fc() { - uint32_t ea = EA_AW_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 ea = EA_AW_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -894,10 +894,10 @@ void m68000_base_device::xd138_add_b_aw_01234fc() } void m68000_base_device::xd139_add_b_al_01234fc() { - uint32_t ea = EA_AL_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 ea = EA_AL_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -910,10 +910,10 @@ void m68000_base_device::xd139_add_b_al_01234fc() } void m68000_base_device::xd150_add_w_ai_01234fc() { - uint32_t ea = EA_AY_AI_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_AI_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -926,10 +926,10 @@ void m68000_base_device::xd150_add_w_ai_01234fc() } void m68000_base_device::xd158_add_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_PI_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -942,10 +942,10 @@ void m68000_base_device::xd158_add_w_pi_01234fc() } void m68000_base_device::xd160_add_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_PD_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -958,10 +958,10 @@ void m68000_base_device::xd160_add_w_pd_01234fc() } void m68000_base_device::xd168_add_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_DI_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -974,10 +974,10 @@ void m68000_base_device::xd168_add_w_di_01234fc() } void m68000_base_device::xd170_add_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_IX_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -990,10 +990,10 @@ void m68000_base_device::xd170_add_w_ix_01234fc() } void m68000_base_device::xd178_add_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 ea = EA_AW_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1006,10 +1006,10 @@ void m68000_base_device::xd178_add_w_aw_01234fc() } void m68000_base_device::xd179_add_w_al_01234fc() { - uint32_t ea = EA_AL_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 ea = EA_AL_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1022,10 +1022,10 @@ void m68000_base_device::xd179_add_w_al_01234fc() } void m68000_base_device::xd190_add_l_ai_01234fc() { - uint32_t ea = EA_AY_AI_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_AI_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1038,10 +1038,10 @@ void m68000_base_device::xd190_add_l_ai_01234fc() } void m68000_base_device::xd198_add_l_pi_01234fc() { - uint32_t ea = EA_AY_PI_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_PI_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1054,10 +1054,10 @@ void m68000_base_device::xd198_add_l_pi_01234fc() } void m68000_base_device::xd1a0_add_l_pd_01234fc() { - uint32_t ea = EA_AY_PD_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_PD_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1070,10 +1070,10 @@ void m68000_base_device::xd1a0_add_l_pd_01234fc() } void m68000_base_device::xd1a8_add_l_di_01234fc() { - uint32_t ea = EA_AY_DI_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_DI_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1086,10 +1086,10 @@ void m68000_base_device::xd1a8_add_l_di_01234fc() } void m68000_base_device::xd1b0_add_l_ix_01234fc() { - uint32_t ea = EA_AY_IX_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 ea = EA_AY_IX_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1102,10 +1102,10 @@ void m68000_base_device::xd1b0_add_l_ix_01234fc() } void m68000_base_device::xd1b8_add_l_aw_01234fc() { - uint32_t ea = EA_AW_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 ea = EA_AW_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1118,10 +1118,10 @@ void m68000_base_device::xd1b8_add_l_aw_01234fc() } void m68000_base_device::xd1b9_add_l_al_01234fc() { - uint32_t ea = EA_AL_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 ea = EA_AL_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1134,7 +1134,7 @@ void m68000_base_device::xd1b9_add_l_al_01234fc() } void m68000_base_device::xd0c0_adda_w_01234fc() { - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(DY())); @@ -1142,7 +1142,7 @@ void m68000_base_device::xd0c0_adda_w_01234fc() } void m68000_base_device::xd0c8_adda_w_01234fc() { - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(AY())); @@ -1150,8 +1150,8 @@ void m68000_base_device::xd0c8_adda_w_01234fc() } void m68000_base_device::xd0d0_adda_w_ai_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AY_AI_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AY_AI_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1159,8 +1159,8 @@ void m68000_base_device::xd0d0_adda_w_ai_01234fc() } void m68000_base_device::xd0d8_adda_w_pi_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AY_PI_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AY_PI_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1168,8 +1168,8 @@ void m68000_base_device::xd0d8_adda_w_pi_01234fc() } void m68000_base_device::xd0e0_adda_w_pd_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AY_PD_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AY_PD_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1177,8 +1177,8 @@ void m68000_base_device::xd0e0_adda_w_pd_01234fc() } void m68000_base_device::xd0e8_adda_w_di_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AY_DI_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AY_DI_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1186,8 +1186,8 @@ void m68000_base_device::xd0e8_adda_w_di_01234fc() } void m68000_base_device::xd0f0_adda_w_ix_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AY_IX_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AY_IX_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1195,8 +1195,8 @@ void m68000_base_device::xd0f0_adda_w_ix_01234fc() } void m68000_base_device::xd0f8_adda_w_aw_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AW_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AW_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1204,8 +1204,8 @@ void m68000_base_device::xd0f8_adda_w_aw_01234fc() } void m68000_base_device::xd0f9_adda_w_al_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AL_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AL_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1213,8 +1213,8 @@ void m68000_base_device::xd0f9_adda_w_al_01234fc() } void m68000_base_device::xd0fa_adda_w_pcdi_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_PCDI_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_PCDI_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1222,8 +1222,8 @@ void m68000_base_device::xd0fa_adda_w_pcdi_01234fc() } void m68000_base_device::xd0fb_adda_w_pcix_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_PCIX_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_PCIX_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1231,8 +1231,8 @@ void m68000_base_device::xd0fb_adda_w_pcix_01234fc() } void m68000_base_device::xd0fc_adda_w_i_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_I_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_I_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1240,7 +1240,7 @@ void m68000_base_device::xd0fc_adda_w_i_01234fc() } void m68000_base_device::xd1c0_adda_l_01234fc() { - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + DY()); @@ -1248,7 +1248,7 @@ void m68000_base_device::xd1c0_adda_l_01234fc() } void m68000_base_device::xd1c8_adda_l_01234fc() { - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + AY()); @@ -1256,8 +1256,8 @@ void m68000_base_device::xd1c8_adda_l_01234fc() } void m68000_base_device::xd1d0_adda_l_ai_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AY_AI_32(); + u32* r_dst = &AX(); + u32 src = OPER_AY_AI_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1265,8 +1265,8 @@ void m68000_base_device::xd1d0_adda_l_ai_01234fc() } void m68000_base_device::xd1d8_adda_l_pi_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AY_PI_32(); + u32* r_dst = &AX(); + u32 src = OPER_AY_PI_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1274,8 +1274,8 @@ void m68000_base_device::xd1d8_adda_l_pi_01234fc() } void m68000_base_device::xd1e0_adda_l_pd_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AY_PD_32(); + u32* r_dst = &AX(); + u32 src = OPER_AY_PD_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1283,8 +1283,8 @@ void m68000_base_device::xd1e0_adda_l_pd_01234fc() } void m68000_base_device::xd1e8_adda_l_di_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AY_DI_32(); + u32* r_dst = &AX(); + u32 src = OPER_AY_DI_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1292,8 +1292,8 @@ void m68000_base_device::xd1e8_adda_l_di_01234fc() } void m68000_base_device::xd1f0_adda_l_ix_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AY_IX_32(); + u32* r_dst = &AX(); + u32 src = OPER_AY_IX_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1301,8 +1301,8 @@ void m68000_base_device::xd1f0_adda_l_ix_01234fc() } void m68000_base_device::xd1f8_adda_l_aw_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AW_32(); + u32* r_dst = &AX(); + u32 src = OPER_AW_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1310,8 +1310,8 @@ void m68000_base_device::xd1f8_adda_l_aw_01234fc() } void m68000_base_device::xd1f9_adda_l_al_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AL_32(); + u32* r_dst = &AX(); + u32 src = OPER_AL_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1319,8 +1319,8 @@ void m68000_base_device::xd1f9_adda_l_al_01234fc() } void m68000_base_device::xd1fa_adda_l_pcdi_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_PCDI_32(); + u32* r_dst = &AX(); + u32 src = OPER_PCDI_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1328,8 +1328,8 @@ void m68000_base_device::xd1fa_adda_l_pcdi_01234fc() } void m68000_base_device::xd1fb_adda_l_pcix_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_PCIX_32(); + u32* r_dst = &AX(); + u32 src = OPER_PCIX_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1337,8 +1337,8 @@ void m68000_base_device::xd1fb_adda_l_pcix_01234fc() } void m68000_base_device::xd1fc_adda_l_i_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_I_32(); + u32* r_dst = &AX(); + u32 src = OPER_I_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); @@ -1346,10 +1346,10 @@ void m68000_base_device::xd1fc_adda_l_i_01234fc() } void m68000_base_device::x0600_addi_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t src = OPER_I_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DY(); + u32 src = OPER_I_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1362,10 +1362,10 @@ void m68000_base_device::x0600_addi_b_01234fc() } void m68000_base_device::x0610_addi_b_ai_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_AI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = OPER_I_8(); + u32 ea = EA_AY_AI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1378,10 +1378,10 @@ void m68000_base_device::x0610_addi_b_ai_01234fc() } void m68000_base_device::x0618_addi_b_pi_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_PI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = OPER_I_8(); + u32 ea = EA_AY_PI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1394,10 +1394,10 @@ void m68000_base_device::x0618_addi_b_pi_01234fc() } void m68000_base_device::x061f_addi_b_pi7_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_A7_PI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = OPER_I_8(); + u32 ea = EA_A7_PI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1410,10 +1410,10 @@ void m68000_base_device::x061f_addi_b_pi7_01234fc() } void m68000_base_device::x0620_addi_b_pd_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = OPER_I_8(); + u32 ea = EA_AY_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1426,10 +1426,10 @@ void m68000_base_device::x0620_addi_b_pd_01234fc() } void m68000_base_device::x0627_addi_b_pd7_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = OPER_I_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1442,10 +1442,10 @@ void m68000_base_device::x0627_addi_b_pd7_01234fc() } void m68000_base_device::x0628_addi_b_di_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_DI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = OPER_I_8(); + u32 ea = EA_AY_DI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1458,10 +1458,10 @@ void m68000_base_device::x0628_addi_b_di_01234fc() } void m68000_base_device::x0630_addi_b_ix_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_IX_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = OPER_I_8(); + u32 ea = EA_AY_IX_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1474,10 +1474,10 @@ void m68000_base_device::x0630_addi_b_ix_01234fc() } void m68000_base_device::x0638_addi_b_aw_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AW_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = OPER_I_8(); + u32 ea = EA_AW_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1490,10 +1490,10 @@ void m68000_base_device::x0638_addi_b_aw_01234fc() } void m68000_base_device::x0639_addi_b_al_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AL_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = OPER_I_8(); + u32 ea = EA_AL_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1506,10 +1506,10 @@ void m68000_base_device::x0639_addi_b_al_01234fc() } void m68000_base_device::x0640_addi_w_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t src = OPER_I_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DY(); + u32 src = OPER_I_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1522,10 +1522,10 @@ void m68000_base_device::x0640_addi_w_01234fc() } void m68000_base_device::x0650_addi_w_ai_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_AI_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = OPER_I_16(); + u32 ea = EA_AY_AI_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1538,10 +1538,10 @@ void m68000_base_device::x0650_addi_w_ai_01234fc() } void m68000_base_device::x0658_addi_w_pi_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_PI_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = OPER_I_16(); + u32 ea = EA_AY_PI_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1554,10 +1554,10 @@ void m68000_base_device::x0658_addi_w_pi_01234fc() } void m68000_base_device::x0660_addi_w_pd_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_PD_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = OPER_I_16(); + u32 ea = EA_AY_PD_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1570,10 +1570,10 @@ void m68000_base_device::x0660_addi_w_pd_01234fc() } void m68000_base_device::x0668_addi_w_di_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_DI_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = OPER_I_16(); + u32 ea = EA_AY_DI_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1586,10 +1586,10 @@ void m68000_base_device::x0668_addi_w_di_01234fc() } void m68000_base_device::x0670_addi_w_ix_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_IX_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = OPER_I_16(); + u32 ea = EA_AY_IX_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1602,10 +1602,10 @@ void m68000_base_device::x0670_addi_w_ix_01234fc() } void m68000_base_device::x0678_addi_w_aw_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AW_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = OPER_I_16(); + u32 ea = EA_AW_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1618,10 +1618,10 @@ void m68000_base_device::x0678_addi_w_aw_01234fc() } void m68000_base_device::x0679_addi_w_al_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AL_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = OPER_I_16(); + u32 ea = EA_AL_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1634,10 +1634,10 @@ void m68000_base_device::x0679_addi_w_al_01234fc() } void m68000_base_device::x0680_addi_l_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t src = OPER_I_32(); - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DY(); + u32 src = OPER_I_32(); + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1650,10 +1650,10 @@ void m68000_base_device::x0680_addi_l_01234fc() } void m68000_base_device::x0690_addi_l_ai_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_AI_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = OPER_I_32(); + u32 ea = EA_AY_AI_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1666,10 +1666,10 @@ void m68000_base_device::x0690_addi_l_ai_01234fc() } void m68000_base_device::x0698_addi_l_pi_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_PI_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = OPER_I_32(); + u32 ea = EA_AY_PI_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1682,10 +1682,10 @@ void m68000_base_device::x0698_addi_l_pi_01234fc() } void m68000_base_device::x06a0_addi_l_pd_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_PD_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = OPER_I_32(); + u32 ea = EA_AY_PD_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1698,10 +1698,10 @@ void m68000_base_device::x06a0_addi_l_pd_01234fc() } void m68000_base_device::x06a8_addi_l_di_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_DI_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = OPER_I_32(); + u32 ea = EA_AY_DI_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1714,10 +1714,10 @@ void m68000_base_device::x06a8_addi_l_di_01234fc() } void m68000_base_device::x06b0_addi_l_ix_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_IX_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = OPER_I_32(); + u32 ea = EA_AY_IX_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1730,10 +1730,10 @@ void m68000_base_device::x06b0_addi_l_ix_01234fc() } void m68000_base_device::x06b8_addi_l_aw_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AW_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = OPER_I_32(); + u32 ea = EA_AW_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1746,10 +1746,10 @@ void m68000_base_device::x06b8_addi_l_aw_01234fc() } void m68000_base_device::x06b9_addi_l_al_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AL_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = OPER_I_32(); + u32 ea = EA_AL_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -1762,10 +1762,10 @@ void m68000_base_device::x06b9_addi_l_al_01234fc() } void m68000_base_device::x5000_addq_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DY(); + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1778,10 +1778,10 @@ void m68000_base_device::x5000_addq_b_01234fc() } void m68000_base_device::x5010_addq_b_ai_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_AI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_AI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1794,10 +1794,10 @@ void m68000_base_device::x5010_addq_b_ai_01234fc() } void m68000_base_device::x5018_addq_b_pi_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_PI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_PI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1810,10 +1810,10 @@ void m68000_base_device::x5018_addq_b_pi_01234fc() } void m68000_base_device::x501f_addq_b_pi7_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_A7_PI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_A7_PI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1826,10 +1826,10 @@ void m68000_base_device::x501f_addq_b_pi7_01234fc() } void m68000_base_device::x5020_addq_b_pd_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1842,10 +1842,10 @@ void m68000_base_device::x5020_addq_b_pd_01234fc() } void m68000_base_device::x5027_addq_b_pd7_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1858,10 +1858,10 @@ void m68000_base_device::x5027_addq_b_pd7_01234fc() } void m68000_base_device::x5028_addq_b_di_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_DI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_DI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1874,10 +1874,10 @@ void m68000_base_device::x5028_addq_b_di_01234fc() } void m68000_base_device::x5030_addq_b_ix_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_IX_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_IX_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1890,10 +1890,10 @@ void m68000_base_device::x5030_addq_b_ix_01234fc() } void m68000_base_device::x5038_addq_b_aw_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AW_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AW_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1906,10 +1906,10 @@ void m68000_base_device::x5038_addq_b_aw_01234fc() } void m68000_base_device::x5039_addq_b_al_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AL_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AL_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst; m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -1922,10 +1922,10 @@ void m68000_base_device::x5039_addq_b_al_01234fc() } void m68000_base_device::x5040_addq_w_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst; + u32* r_dst = &DY(); + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1938,7 +1938,7 @@ void m68000_base_device::x5040_addq_w_01234fc() } void m68000_base_device::x5048_addq_w_01234fc() { - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + (((m_ir >> 9) - 1) & 7) + 1); @@ -1946,10 +1946,10 @@ void m68000_base_device::x5048_addq_w_01234fc() } void m68000_base_device::x5050_addq_w_ai_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_AI_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_AI_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1962,10 +1962,10 @@ void m68000_base_device::x5050_addq_w_ai_01234fc() } void m68000_base_device::x5058_addq_w_pi_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_PI_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_PI_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1978,10 +1978,10 @@ void m68000_base_device::x5058_addq_w_pi_01234fc() } void m68000_base_device::x5060_addq_w_pd_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_PD_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_PD_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -1994,10 +1994,10 @@ void m68000_base_device::x5060_addq_w_pd_01234fc() } void m68000_base_device::x5068_addq_w_di_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_DI_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_DI_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -2010,10 +2010,10 @@ void m68000_base_device::x5068_addq_w_di_01234fc() } void m68000_base_device::x5070_addq_w_ix_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_IX_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_IX_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -2026,10 +2026,10 @@ void m68000_base_device::x5070_addq_w_ix_01234fc() } void m68000_base_device::x5078_addq_w_aw_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AW_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AW_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -2042,10 +2042,10 @@ void m68000_base_device::x5078_addq_w_aw_01234fc() } void m68000_base_device::x5079_addq_w_al_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AL_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AL_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst; m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -2058,10 +2058,10 @@ void m68000_base_device::x5079_addq_w_al_01234fc() } void m68000_base_device::x5080_addq_l_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t dst = *r_dst; - uint32_t res = src + dst; + u32* r_dst = &DY(); + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 dst = *r_dst; + u32 res = src + dst; m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -2074,7 +2074,7 @@ void m68000_base_device::x5080_addq_l_01234fc() } void m68000_base_device::x5088_addq_l_01234fc() { - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); *r_dst = MASK_OUT_ABOVE_32(*r_dst + (((m_ir >> 9) - 1) & 7) + 1); @@ -2082,10 +2082,10 @@ void m68000_base_device::x5088_addq_l_01234fc() } void m68000_base_device::x5090_addq_l_ai_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_AI_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_AI_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); @@ -2099,10 +2099,10 @@ void m68000_base_device::x5090_addq_l_ai_01234fc() } void m68000_base_device::x5098_addq_l_pi_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_PI_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_PI_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); @@ -2116,10 +2116,10 @@ void m68000_base_device::x5098_addq_l_pi_01234fc() } void m68000_base_device::x50a0_addq_l_pd_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_PD_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_PD_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); @@ -2133,10 +2133,10 @@ void m68000_base_device::x50a0_addq_l_pd_01234fc() } void m68000_base_device::x50a8_addq_l_di_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_DI_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_DI_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); @@ -2150,10 +2150,10 @@ void m68000_base_device::x50a8_addq_l_di_01234fc() } void m68000_base_device::x50b0_addq_l_ix_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_IX_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_IX_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); @@ -2167,10 +2167,10 @@ void m68000_base_device::x50b0_addq_l_ix_01234fc() } void m68000_base_device::x50b8_addq_l_aw_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AW_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AW_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); @@ -2184,10 +2184,10 @@ void m68000_base_device::x50b8_addq_l_aw_01234fc() } void m68000_base_device::x50b9_addq_l_al_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AL_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AL_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst; m_n_flag = NFLAG_32(res); @@ -2201,10 +2201,10 @@ void m68000_base_device::x50b9_addq_l_al_01234fc() } void m68000_base_device::xd100_addx_b_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_8(DY()); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src + dst + XFLAG_1(); + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_8(DY()); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -2219,10 +2219,10 @@ void m68000_base_device::xd100_addx_b_01234fc() } void m68000_base_device::xd140_addx_w_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(DY()); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src + dst + XFLAG_1(); + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(DY()); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -2237,10 +2237,10 @@ void m68000_base_device::xd140_addx_w_01234fc() } void m68000_base_device::xd180_addx_l_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = DY(); - uint32_t dst = *r_dst; - uint32_t res = src + dst + XFLAG_1(); + u32* r_dst = &DX(); + u32 src = DY(); + u32 dst = *r_dst; + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -2255,10 +2255,10 @@ void m68000_base_device::xd180_addx_l_01234fc() } void m68000_base_device::xdf08_addx_b_01234fc() { - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst + XFLAG_1(); + u32 src = OPER_AY_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -2273,10 +2273,10 @@ void m68000_base_device::xdf08_addx_b_01234fc() } void m68000_base_device::xd10f_addx_b_01234fc() { - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst + XFLAG_1(); + u32 src = OPER_A7_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -2291,10 +2291,10 @@ void m68000_base_device::xd10f_addx_b_01234fc() } void m68000_base_device::xdf0f_addx_b_01234fc() { - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst + XFLAG_1(); + u32 src = OPER_A7_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -2309,10 +2309,10 @@ void m68000_base_device::xdf0f_addx_b_01234fc() } void m68000_base_device::xd108_addx_b_01234fc() { - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = src + dst + XFLAG_1(); + u32 src = OPER_AY_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_8(res); m_v_flag = VFLAG_ADD_8(src, dst, res); @@ -2327,10 +2327,10 @@ void m68000_base_device::xd108_addx_b_01234fc() } void m68000_base_device::xd148_addx_w_01234fc() { - uint32_t src = OPER_AY_PD_16(); - uint32_t ea = EA_AX_PD_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = src + dst + XFLAG_1(); + u32 src = OPER_AY_PD_16(); + u32 ea = EA_AX_PD_16(); + u32 dst = m68ki_read_16(ea); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_16(res); m_v_flag = VFLAG_ADD_16(src, dst, res); @@ -2345,10 +2345,10 @@ void m68000_base_device::xd148_addx_w_01234fc() } void m68000_base_device::xd188_addx_l_01234fc() { - uint32_t src = OPER_AY_PD_32(); - uint32_t ea = EA_AX_PD_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = src + dst + XFLAG_1(); + u32 src = OPER_AY_PD_32(); + u32 ea = EA_AX_PD_32(); + u32 dst = m68ki_read_32(ea); + u32 res = src + dst + XFLAG_1(); m_n_flag = NFLAG_32(res); m_v_flag = VFLAG_ADD_32(src, dst, res); @@ -2713,8 +2713,8 @@ void m68000_base_device::xc0bc_and_l_i_01234fc() } void m68000_base_device::xc110_and_b_ai_01234fc() { - uint32_t ea = EA_AY_AI_8(); - uint32_t res = DX() & m68ki_read_8(ea); + u32 ea = EA_AY_AI_8(); + u32 res = DX() & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_c_flag = CFLAG_CLEAR; @@ -2727,8 +2727,8 @@ void m68000_base_device::xc110_and_b_ai_01234fc() } void m68000_base_device::xc118_and_b_pi_01234fc() { - uint32_t ea = EA_AY_PI_8(); - uint32_t res = DX() & m68ki_read_8(ea); + u32 ea = EA_AY_PI_8(); + u32 res = DX() & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_c_flag = CFLAG_CLEAR; @@ -2741,8 +2741,8 @@ void m68000_base_device::xc118_and_b_pi_01234fc() } void m68000_base_device::xc11f_and_b_pi7_01234fc() { - uint32_t ea = EA_A7_PI_8(); - uint32_t res = DX() & m68ki_read_8(ea); + u32 ea = EA_A7_PI_8(); + u32 res = DX() & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_c_flag = CFLAG_CLEAR; @@ -2755,8 +2755,8 @@ void m68000_base_device::xc11f_and_b_pi7_01234fc() } void m68000_base_device::xc120_and_b_pd_01234fc() { - uint32_t ea = EA_AY_PD_8(); - uint32_t res = DX() & m68ki_read_8(ea); + u32 ea = EA_AY_PD_8(); + u32 res = DX() & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_c_flag = CFLAG_CLEAR; @@ -2769,8 +2769,8 @@ void m68000_base_device::xc120_and_b_pd_01234fc() } void m68000_base_device::xc127_and_b_pd7_01234fc() { - uint32_t ea = EA_A7_PD_8(); - uint32_t res = DX() & m68ki_read_8(ea); + u32 ea = EA_A7_PD_8(); + u32 res = DX() & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_c_flag = CFLAG_CLEAR; @@ -2783,8 +2783,8 @@ void m68000_base_device::xc127_and_b_pd7_01234fc() } void m68000_base_device::xc128_and_b_di_01234fc() { - uint32_t ea = EA_AY_DI_8(); - uint32_t res = DX() & m68ki_read_8(ea); + u32 ea = EA_AY_DI_8(); + u32 res = DX() & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_c_flag = CFLAG_CLEAR; @@ -2797,8 +2797,8 @@ void m68000_base_device::xc128_and_b_di_01234fc() } void m68000_base_device::xc130_and_b_ix_01234fc() { - uint32_t ea = EA_AY_IX_8(); - uint32_t res = DX() & m68ki_read_8(ea); + u32 ea = EA_AY_IX_8(); + u32 res = DX() & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_c_flag = CFLAG_CLEAR; @@ -2811,8 +2811,8 @@ void m68000_base_device::xc130_and_b_ix_01234fc() } void m68000_base_device::xc138_and_b_aw_01234fc() { - uint32_t ea = EA_AW_8(); - uint32_t res = DX() & m68ki_read_8(ea); + u32 ea = EA_AW_8(); + u32 res = DX() & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_c_flag = CFLAG_CLEAR; @@ -2825,8 +2825,8 @@ void m68000_base_device::xc138_and_b_aw_01234fc() } void m68000_base_device::xc139_and_b_al_01234fc() { - uint32_t ea = EA_AL_8(); - uint32_t res = DX() & m68ki_read_8(ea); + u32 ea = EA_AL_8(); + u32 res = DX() & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_c_flag = CFLAG_CLEAR; @@ -2839,8 +2839,8 @@ void m68000_base_device::xc139_and_b_al_01234fc() } void m68000_base_device::xc150_and_w_ai_01234fc() { - uint32_t ea = EA_AY_AI_16(); - uint32_t res = DX() & m68ki_read_16(ea); + u32 ea = EA_AY_AI_16(); + u32 res = DX() & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_c_flag = CFLAG_CLEAR; @@ -2853,8 +2853,8 @@ void m68000_base_device::xc150_and_w_ai_01234fc() } void m68000_base_device::xc158_and_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); - uint32_t res = DX() & m68ki_read_16(ea); + u32 ea = EA_AY_PI_16(); + u32 res = DX() & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_c_flag = CFLAG_CLEAR; @@ -2867,8 +2867,8 @@ void m68000_base_device::xc158_and_w_pi_01234fc() } void m68000_base_device::xc160_and_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); - uint32_t res = DX() & m68ki_read_16(ea); + u32 ea = EA_AY_PD_16(); + u32 res = DX() & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_c_flag = CFLAG_CLEAR; @@ -2881,8 +2881,8 @@ void m68000_base_device::xc160_and_w_pd_01234fc() } void m68000_base_device::xc168_and_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t res = DX() & m68ki_read_16(ea); + u32 ea = EA_AY_DI_16(); + u32 res = DX() & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_c_flag = CFLAG_CLEAR; @@ -2895,8 +2895,8 @@ void m68000_base_device::xc168_and_w_di_01234fc() } void m68000_base_device::xc170_and_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); - uint32_t res = DX() & m68ki_read_16(ea); + u32 ea = EA_AY_IX_16(); + u32 res = DX() & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_c_flag = CFLAG_CLEAR; @@ -2909,8 +2909,8 @@ void m68000_base_device::xc170_and_w_ix_01234fc() } void m68000_base_device::xc178_and_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); - uint32_t res = DX() & m68ki_read_16(ea); + u32 ea = EA_AW_16(); + u32 res = DX() & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_c_flag = CFLAG_CLEAR; @@ -2923,8 +2923,8 @@ void m68000_base_device::xc178_and_w_aw_01234fc() } void m68000_base_device::xc179_and_w_al_01234fc() { - uint32_t ea = EA_AL_16(); - uint32_t res = DX() & m68ki_read_16(ea); + u32 ea = EA_AL_16(); + u32 res = DX() & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_c_flag = CFLAG_CLEAR; @@ -2937,8 +2937,8 @@ void m68000_base_device::xc179_and_w_al_01234fc() } void m68000_base_device::xc190_and_l_ai_01234fc() { - uint32_t ea = EA_AY_AI_32(); - uint32_t res = DX() & m68ki_read_32(ea); + u32 ea = EA_AY_AI_32(); + u32 res = DX() & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -2951,8 +2951,8 @@ void m68000_base_device::xc190_and_l_ai_01234fc() } void m68000_base_device::xc198_and_l_pi_01234fc() { - uint32_t ea = EA_AY_PI_32(); - uint32_t res = DX() & m68ki_read_32(ea); + u32 ea = EA_AY_PI_32(); + u32 res = DX() & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -2965,8 +2965,8 @@ void m68000_base_device::xc198_and_l_pi_01234fc() } void m68000_base_device::xc1a0_and_l_pd_01234fc() { - uint32_t ea = EA_AY_PD_32(); - uint32_t res = DX() & m68ki_read_32(ea); + u32 ea = EA_AY_PD_32(); + u32 res = DX() & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -2979,8 +2979,8 @@ void m68000_base_device::xc1a0_and_l_pd_01234fc() } void m68000_base_device::xc1a8_and_l_di_01234fc() { - uint32_t ea = EA_AY_DI_32(); - uint32_t res = DX() & m68ki_read_32(ea); + u32 ea = EA_AY_DI_32(); + u32 res = DX() & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -2993,8 +2993,8 @@ void m68000_base_device::xc1a8_and_l_di_01234fc() } void m68000_base_device::xc1b0_and_l_ix_01234fc() { - uint32_t ea = EA_AY_IX_32(); - uint32_t res = DX() & m68ki_read_32(ea); + u32 ea = EA_AY_IX_32(); + u32 res = DX() & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -3007,8 +3007,8 @@ void m68000_base_device::xc1b0_and_l_ix_01234fc() } void m68000_base_device::xc1b8_and_l_aw_01234fc() { - uint32_t ea = EA_AW_32(); - uint32_t res = DX() & m68ki_read_32(ea); + u32 ea = EA_AW_32(); + u32 res = DX() & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -3021,8 +3021,8 @@ void m68000_base_device::xc1b8_and_l_aw_01234fc() } void m68000_base_device::xc1b9_and_l_al_01234fc() { - uint32_t ea = EA_AL_32(); - uint32_t res = DX() & m68ki_read_32(ea); + u32 ea = EA_AL_32(); + u32 res = DX() & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -3045,9 +3045,9 @@ void m68000_base_device::x0200_andi_b_01234fc() } void m68000_base_device::x0210_andi_b_ai_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_AI_8(); - uint32_t res = src & m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AY_AI_8(); + u32 res = src & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -3060,9 +3060,9 @@ void m68000_base_device::x0210_andi_b_ai_01234fc() } void m68000_base_device::x0218_andi_b_pi_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_PI_8(); - uint32_t res = src & m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AY_PI_8(); + u32 res = src & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -3075,9 +3075,9 @@ void m68000_base_device::x0218_andi_b_pi_01234fc() } void m68000_base_device::x021f_andi_b_pi7_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_A7_PI_8(); - uint32_t res = src & m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_A7_PI_8(); + u32 res = src & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -3090,9 +3090,9 @@ void m68000_base_device::x021f_andi_b_pi7_01234fc() } void m68000_base_device::x0220_andi_b_pd_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_PD_8(); - uint32_t res = src & m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AY_PD_8(); + u32 res = src & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -3105,9 +3105,9 @@ void m68000_base_device::x0220_andi_b_pd_01234fc() } void m68000_base_device::x0227_andi_b_pd7_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t res = src & m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_A7_PD_8(); + u32 res = src & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -3120,9 +3120,9 @@ void m68000_base_device::x0227_andi_b_pd7_01234fc() } void m68000_base_device::x0228_andi_b_di_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_DI_8(); - uint32_t res = src & m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AY_DI_8(); + u32 res = src & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -3135,9 +3135,9 @@ void m68000_base_device::x0228_andi_b_di_01234fc() } void m68000_base_device::x0230_andi_b_ix_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_IX_8(); - uint32_t res = src & m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AY_IX_8(); + u32 res = src & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -3150,9 +3150,9 @@ void m68000_base_device::x0230_andi_b_ix_01234fc() } void m68000_base_device::x0238_andi_b_aw_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AW_8(); - uint32_t res = src & m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AW_8(); + u32 res = src & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -3165,9 +3165,9 @@ void m68000_base_device::x0238_andi_b_aw_01234fc() } void m68000_base_device::x0239_andi_b_al_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AL_8(); - uint32_t res = src & m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AL_8(); + u32 res = src & m68ki_read_8(ea); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -3190,9 +3190,9 @@ void m68000_base_device::x0240_andi_w_01234fc() } void m68000_base_device::x0250_andi_w_ai_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_AI_16(); - uint32_t res = src & m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AY_AI_16(); + u32 res = src & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -3205,9 +3205,9 @@ void m68000_base_device::x0250_andi_w_ai_01234fc() } void m68000_base_device::x0258_andi_w_pi_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_PI_16(); - uint32_t res = src & m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AY_PI_16(); + u32 res = src & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -3220,9 +3220,9 @@ void m68000_base_device::x0258_andi_w_pi_01234fc() } void m68000_base_device::x0260_andi_w_pd_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_PD_16(); - uint32_t res = src & m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AY_PD_16(); + u32 res = src & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -3235,9 +3235,9 @@ void m68000_base_device::x0260_andi_w_pd_01234fc() } void m68000_base_device::x0268_andi_w_di_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_DI_16(); - uint32_t res = src & m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AY_DI_16(); + u32 res = src & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -3250,9 +3250,9 @@ void m68000_base_device::x0268_andi_w_di_01234fc() } void m68000_base_device::x0270_andi_w_ix_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_IX_16(); - uint32_t res = src & m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AY_IX_16(); + u32 res = src & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -3265,9 +3265,9 @@ void m68000_base_device::x0270_andi_w_ix_01234fc() } void m68000_base_device::x0278_andi_w_aw_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AW_16(); - uint32_t res = src & m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AW_16(); + u32 res = src & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -3280,9 +3280,9 @@ void m68000_base_device::x0278_andi_w_aw_01234fc() } void m68000_base_device::x0279_andi_w_al_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AL_16(); - uint32_t res = src & m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AL_16(); + u32 res = src & m68ki_read_16(ea); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -3305,9 +3305,9 @@ void m68000_base_device::x0280_andi_l_01234fc() } void m68000_base_device::x0290_andi_l_ai_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_AI_32(); - uint32_t res = src & m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_AI_32(); + u32 res = src & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -3320,9 +3320,9 @@ void m68000_base_device::x0290_andi_l_ai_01234fc() } void m68000_base_device::x0298_andi_l_pi_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_PI_32(); - uint32_t res = src & m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_PI_32(); + u32 res = src & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -3335,9 +3335,9 @@ void m68000_base_device::x0298_andi_l_pi_01234fc() } void m68000_base_device::x02a0_andi_l_pd_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_PD_32(); - uint32_t res = src & m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_PD_32(); + u32 res = src & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -3350,9 +3350,9 @@ void m68000_base_device::x02a0_andi_l_pd_01234fc() } void m68000_base_device::x02a8_andi_l_di_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_DI_32(); - uint32_t res = src & m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_DI_32(); + u32 res = src & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -3365,9 +3365,9 @@ void m68000_base_device::x02a8_andi_l_di_01234fc() } void m68000_base_device::x02b0_andi_l_ix_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_IX_32(); - uint32_t res = src & m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_IX_32(); + u32 res = src & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -3380,9 +3380,9 @@ void m68000_base_device::x02b0_andi_l_ix_01234fc() } void m68000_base_device::x02b8_andi_l_aw_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AW_32(); - uint32_t res = src & m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AW_32(); + u32 res = src & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -3395,9 +3395,9 @@ void m68000_base_device::x02b8_andi_l_aw_01234fc() } void m68000_base_device::x02b9_andi_l_al_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AL_32(); - uint32_t res = src & m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AL_32(); + u32 res = src & m68ki_read_32(ea); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -3418,7 +3418,7 @@ void m68000_base_device::x027c_andi_w_01234fc() { if(m_s_flag) { - uint32_t src = OPER_I_16(); + u32 src = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(m68ki_get_sr() & src); return; @@ -3429,10 +3429,10 @@ void m68000_base_device::x027c_andi_w_01234fc() } void m68000_base_device::xe000_asr_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t shift = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src >> shift; if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src >> shift; if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = *r_dst; - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = *r_dst; + u32 res = src >> shift; if(shift != 0) m_icount -= shift<> shift; + u32* r_dst = &DY(); + u32 shift = DX() & 0x3f; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src >> shift; if(shift != 0) { @@ -3547,10 +3547,10 @@ void m68000_base_device::xe020_asr_b_01234fc() } void m68000_base_device::xe060_asr_w_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t shift = DX() & 0x3f; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = DX() & 0x3f; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src >> shift; if(shift != 0) { @@ -3599,10 +3599,10 @@ void m68000_base_device::xe060_asr_w_01234fc() } void m68000_base_device::xe0a0_asr_l_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t shift = DX() & 0x3f; - uint32_t src = *r_dst; - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = DX() & 0x3f; + u32 src = *r_dst; + u32 res = src >> shift; if(shift != 0) { @@ -3651,9 +3651,9 @@ void m68000_base_device::xe0a0_asr_l_01234fc() } void m68000_base_device::xe0d0_asr_w_ai_01234fc() { - uint32_t ea = EA_AY_AI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AY_AI_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; if(GET_MSB_16(src)) res |= 0x8000; @@ -3669,9 +3669,9 @@ void m68000_base_device::xe0d0_asr_w_ai_01234fc() } void m68000_base_device::xe0d8_asr_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AY_PI_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; if(GET_MSB_16(src)) res |= 0x8000; @@ -3687,9 +3687,9 @@ void m68000_base_device::xe0d8_asr_w_pi_01234fc() } void m68000_base_device::xe0e0_asr_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AY_PD_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; if(GET_MSB_16(src)) res |= 0x8000; @@ -3705,9 +3705,9 @@ void m68000_base_device::xe0e0_asr_w_pd_01234fc() } void m68000_base_device::xe0e8_asr_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AY_DI_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; if(GET_MSB_16(src)) res |= 0x8000; @@ -3723,9 +3723,9 @@ void m68000_base_device::xe0e8_asr_w_di_01234fc() } void m68000_base_device::xe0f0_asr_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AY_IX_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; if(GET_MSB_16(src)) res |= 0x8000; @@ -3741,9 +3741,9 @@ void m68000_base_device::xe0f0_asr_w_ix_01234fc() } void m68000_base_device::xe0f8_asr_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AW_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; if(GET_MSB_16(src)) res |= 0x8000; @@ -3759,9 +3759,9 @@ void m68000_base_device::xe0f8_asr_w_aw_01234fc() } void m68000_base_device::xe0f9_asr_w_al_01234fc() { - uint32_t ea = EA_AL_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AL_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; if(GET_MSB_16(src)) res |= 0x8000; @@ -3777,10 +3777,10 @@ void m68000_base_device::xe0f9_asr_w_al_01234fc() } void m68000_base_device::xe100_asl_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t shift = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = MASK_OUT_ABOVE_8(src << shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = MASK_OUT_ABOVE_8(src << shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = MASK_OUT_ABOVE_16(src << shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = MASK_OUT_ABOVE_16(src << shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = *r_dst; - uint32_t res = MASK_OUT_ABOVE_32(src << shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = *r_dst; + u32 res = MASK_OUT_ABOVE_32(src << shift); if(shift != 0) m_icount -= shift<>6)&31; - uint32_t width = word2; - uint32_t* data = &DY(); - uint64_t mask; + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u32* data = &DY(); + u64 mask; if(BIT_B(word2)) @@ -5303,15 +5303,15 @@ void m68000_base_device::xead0_bfchg_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_AI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_AI_8(); if(BIT_B(word2)) @@ -5357,15 +5357,15 @@ void m68000_base_device::xeae8_bfchg_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_DI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_DI_8(); if(BIT_B(word2)) @@ -5411,15 +5411,15 @@ void m68000_base_device::xeaf0_bfchg_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_IX_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_IX_8(); if(BIT_B(word2)) @@ -5465,15 +5465,15 @@ void m68000_base_device::xeaf8_bfchg_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AW_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AW_8(); if(BIT_B(word2)) @@ -5519,15 +5519,15 @@ void m68000_base_device::xeaf9_bfchg_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AL_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AL_8(); if(BIT_B(word2)) @@ -5573,11 +5573,11 @@ void m68000_base_device::xecc0_bfclr_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t* data = &DY(); - uint64_t mask; + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u32* data = &DY(); + u64 mask; if(BIT_B(word2)) @@ -5610,15 +5610,15 @@ void m68000_base_device::xecd0_bfclr_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_AI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_AI_8(); if(BIT_B(word2)) @@ -5664,15 +5664,15 @@ void m68000_base_device::xece8_bfclr_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_DI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_DI_8(); if(BIT_B(word2)) @@ -5718,15 +5718,15 @@ void m68000_base_device::xecf0_bfclr_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_IX_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_IX_8(); if(BIT_B(word2)) @@ -5772,15 +5772,15 @@ void m68000_base_device::xecf8_bfclr_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AW_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AW_8(); if(BIT_B(word2)) @@ -5826,15 +5826,15 @@ void m68000_base_device::xecf9_bfclr_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AL_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AL_8(); if(BIT_B(word2)) @@ -5880,10 +5880,10 @@ void m68000_base_device::xebc0_bfexts_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint64_t data = DY(); + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u64 data = DY(); if(BIT_B(word2)) @@ -5914,11 +5914,11 @@ void m68000_base_device::xebd0_bfexts_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_AY_AI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_AY_AI_8(); if(BIT_B(word2)) @@ -5966,11 +5966,11 @@ void m68000_base_device::xebe8_bfexts_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_AY_DI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_AY_DI_8(); if(BIT_B(word2)) @@ -6018,11 +6018,11 @@ void m68000_base_device::xebf0_bfexts_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_AY_IX_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_AY_IX_8(); if(BIT_B(word2)) @@ -6070,11 +6070,11 @@ void m68000_base_device::xebf8_bfexts_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_AW_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_AW_8(); if(BIT_B(word2)) @@ -6122,11 +6122,11 @@ void m68000_base_device::xebf9_bfexts_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_AL_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_AL_8(); if(BIT_B(word2)) @@ -6174,11 +6174,11 @@ void m68000_base_device::xebfa_bfexts_l_pcdi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_PCDI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_PCDI_8(); if(BIT_B(word2)) @@ -6226,11 +6226,11 @@ void m68000_base_device::xebfb_bfexts_l_pcix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_PCIX_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_PCIX_8(); if(BIT_B(word2)) @@ -6278,10 +6278,10 @@ void m68000_base_device::xe9c0_bfextu_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint64_t data = DY(); + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u64 data = DY(); if(BIT_B(word2)) @@ -6312,11 +6312,11 @@ void m68000_base_device::xe9d0_bfextu_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_AY_AI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_AY_AI_8(); if(BIT_B(word2)) @@ -6363,11 +6363,11 @@ void m68000_base_device::xe9e8_bfextu_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_AY_DI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_AY_DI_8(); if(BIT_B(word2)) @@ -6414,11 +6414,11 @@ void m68000_base_device::xe9f0_bfextu_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_AY_IX_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_AY_IX_8(); if(BIT_B(word2)) @@ -6465,11 +6465,11 @@ void m68000_base_device::xe9f8_bfextu_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_AW_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_AW_8(); if(BIT_B(word2)) @@ -6516,11 +6516,11 @@ void m68000_base_device::xe9f9_bfextu_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_AL_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_AL_8(); if(BIT_B(word2)) @@ -6567,11 +6567,11 @@ void m68000_base_device::xe9fa_bfextu_l_pcdi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_PCDI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_PCDI_8(); if(BIT_B(word2)) @@ -6618,11 +6618,11 @@ void m68000_base_device::xe9fb_bfextu_l_pcix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t data; - uint32_t ea = EA_PCIX_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 data; + u32 ea = EA_PCIX_8(); if(BIT_B(word2)) @@ -6669,11 +6669,11 @@ void m68000_base_device::xedc0_bfffo_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint64_t data = DY(); - uint32_t bit; + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u64 data = DY(); + u32 bit; if(BIT_B(word2)) @@ -6707,13 +6707,13 @@ void m68000_base_device::xedd0_bfffo_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - int32_t local_offset; - uint32_t width = word2; - uint32_t data; - uint32_t bit; - uint32_t ea = EA_AY_AI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + s32 local_offset; + u32 width = word2; + u32 data; + u32 bit; + u32 ea = EA_AY_AI_8(); if(BIT_B(word2)) @@ -6759,13 +6759,13 @@ void m68000_base_device::xede8_bfffo_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - int32_t local_offset; - uint32_t width = word2; - uint32_t data; - uint32_t bit; - uint32_t ea = EA_AY_DI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + s32 local_offset; + u32 width = word2; + u32 data; + u32 bit; + u32 ea = EA_AY_DI_8(); if(BIT_B(word2)) @@ -6811,13 +6811,13 @@ void m68000_base_device::xedf0_bfffo_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - int32_t local_offset; - uint32_t width = word2; - uint32_t data; - uint32_t bit; - uint32_t ea = EA_AY_IX_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + s32 local_offset; + u32 width = word2; + u32 data; + u32 bit; + u32 ea = EA_AY_IX_8(); if(BIT_B(word2)) @@ -6863,13 +6863,13 @@ void m68000_base_device::xedf8_bfffo_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - int32_t local_offset; - uint32_t width = word2; - uint32_t data; - uint32_t bit; - uint32_t ea = EA_AW_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + s32 local_offset; + u32 width = word2; + u32 data; + u32 bit; + u32 ea = EA_AW_8(); if(BIT_B(word2)) @@ -6915,13 +6915,13 @@ void m68000_base_device::xedf9_bfffo_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - int32_t local_offset; - uint32_t width = word2; - uint32_t data; - uint32_t bit; - uint32_t ea = EA_AL_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + s32 local_offset; + u32 width = word2; + u32 data; + u32 bit; + u32 ea = EA_AL_8(); if(BIT_B(word2)) @@ -6967,13 +6967,13 @@ void m68000_base_device::xedfa_bfffo_l_pcdi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - int32_t local_offset; - uint32_t width = word2; - uint32_t data; - uint32_t bit; - uint32_t ea = EA_PCDI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + s32 local_offset; + u32 width = word2; + u32 data; + u32 bit; + u32 ea = EA_PCDI_8(); if(BIT_B(word2)) @@ -7019,13 +7019,13 @@ void m68000_base_device::xedfb_bfffo_l_pcix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - int32_t local_offset; - uint32_t width = word2; - uint32_t data; - uint32_t bit; - uint32_t ea = EA_PCIX_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + s32 local_offset; + u32 width = word2; + u32 data; + u32 bit; + u32 ea = EA_PCIX_8(); if(BIT_B(word2)) @@ -7071,12 +7071,12 @@ void m68000_base_device::xefc0_bfins_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t* data = &DY(); - uint64_t mask; - uint64_t insert = REG_D()[(word2>>12)&7]; + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u32* data = &DY(); + u64 mask; + u64 insert = REG_D()[(word2>>12)&7]; if(BIT_B(word2)) @@ -7113,18 +7113,18 @@ void m68000_base_device::xefd0_bfins_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t insert_base = REG_D()[(word2>>12)&7]; - uint32_t insert_long; - uint32_t insert_byte; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_AI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 insert_base = REG_D()[(word2>>12)&7]; + u32 insert_long; + u32 insert_byte; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_AI_8(); if(BIT_B(word2)) @@ -7189,18 +7189,18 @@ void m68000_base_device::xefe8_bfins_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t insert_base = REG_D()[(word2>>12)&7]; - uint32_t insert_long; - uint32_t insert_byte; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_DI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 insert_base = REG_D()[(word2>>12)&7]; + u32 insert_long; + u32 insert_byte; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_DI_8(); if(BIT_B(word2)) @@ -7265,18 +7265,18 @@ void m68000_base_device::xeff0_bfins_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t insert_base = REG_D()[(word2>>12)&7]; - uint32_t insert_long; - uint32_t insert_byte; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_IX_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 insert_base = REG_D()[(word2>>12)&7]; + u32 insert_long; + u32 insert_byte; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_IX_8(); if(BIT_B(word2)) @@ -7341,18 +7341,18 @@ void m68000_base_device::xeff8_bfins_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t insert_base = REG_D()[(word2>>12)&7]; - uint32_t insert_long; - uint32_t insert_byte; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AW_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 insert_base = REG_D()[(word2>>12)&7]; + u32 insert_long; + u32 insert_byte; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AW_8(); if(BIT_B(word2)) @@ -7417,18 +7417,18 @@ void m68000_base_device::xeff9_bfins_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t insert_base = REG_D()[(word2>>12)&7]; - uint32_t insert_long; - uint32_t insert_byte; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AL_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 insert_base = REG_D()[(word2>>12)&7]; + u32 insert_long; + u32 insert_byte; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AL_8(); if(BIT_B(word2)) @@ -7493,11 +7493,11 @@ void m68000_base_device::xeec0_bfset_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t* data = &DY(); - uint64_t mask; + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u32* data = &DY(); + u64 mask; if(BIT_B(word2)) @@ -7530,15 +7530,15 @@ void m68000_base_device::xeed0_bfset_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_AI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_AI_8(); if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -7583,15 +7583,15 @@ void m68000_base_device::xeee8_bfset_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_DI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_DI_8(); if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -7636,15 +7636,15 @@ void m68000_base_device::xeef0_bfset_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_IX_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_IX_8(); if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -7689,15 +7689,15 @@ void m68000_base_device::xeef8_bfset_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AW_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AW_8(); if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -7742,15 +7742,15 @@ void m68000_base_device::xeef9_bfset_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AL_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AL_8(); if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -7795,11 +7795,11 @@ void m68000_base_device::xe8c0_bftst_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t* data = &DY(); - uint64_t mask; + u32 word2 = OPER_I_16(); + u32 offset = (word2>>6)&31; + u32 width = word2; + u32* data = &DY(); + u64 mask; if(BIT_B(word2)) @@ -7830,15 +7830,15 @@ void m68000_base_device::xe8d0_bftst_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_AI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_AI_8(); if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -7881,15 +7881,15 @@ void m68000_base_device::xe8e8_bftst_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_DI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_DI_8(); if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -7932,15 +7932,15 @@ void m68000_base_device::xe8f0_bftst_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AY_IX_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AY_IX_8(); if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -7983,15 +7983,15 @@ void m68000_base_device::xe8f8_bftst_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AW_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AW_8(); if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -8034,15 +8034,15 @@ void m68000_base_device::xe8f9_bftst_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_AL_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_AL_8(); if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -8085,15 +8085,15 @@ void m68000_base_device::xe8fa_bftst_l_pcdi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_PCDI_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_PCDI_8(); if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -8136,15 +8136,15 @@ void m68000_base_device::xe8fb_bftst_l_pcix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t offset = (word2>>6)&31; - uint32_t width = word2; - uint32_t mask_base; - uint32_t data_long; - uint32_t mask_long; - uint32_t data_byte = 0; - uint32_t mask_byte = 0; - uint32_t ea = EA_PCIX_8(); + u32 word2 = OPER_I_16(); + s32 offset = (word2>>6)&31; + u32 width = word2; + u32 mask_base; + u32 data_long; + u32 mask_long; + u32 data_byte = 0; + u32 mask_byte = 0; + u32 ea = EA_PCIX_8(); if(BIT_B(word2)) offset = MAKE_INT_32(REG_D()[offset&7]); @@ -8208,7 +8208,7 @@ void m68000_base_device::x6000_bra_b_01234fc() } void m68000_base_device::x6000_bra_w_01234fc() { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -8221,7 +8221,7 @@ void m68000_base_device::x60ff_bra_l_01234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t offset = OPER_I_32(); + u32 offset = OPER_I_32(); m_pc -= 4; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_32(offset); @@ -8241,8 +8241,8 @@ void m68000_base_device::x60ff_bra_l_01234fc() } void m68000_base_device::x01c0_bset_l_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t mask = 1 << (DX() & 0x1f); + u32* r_dst = &DY(); + u32 mask = 1 << (DX() & 0x1f); m_not_z_flag = *r_dst & mask; *r_dst |= mask; @@ -8251,9 +8251,9 @@ void m68000_base_device::x01c0_bset_l_01234fc() } void m68000_base_device::x01d0_bset_b_ai_01234fc() { - uint32_t ea = EA_AY_AI_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t mask = 1 << (DX() & 7); + u32 ea = EA_AY_AI_8(); + u32 src = m68ki_read_8(ea); + u32 mask = 1 << (DX() & 7); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8262,9 +8262,9 @@ void m68000_base_device::x01d0_bset_b_ai_01234fc() } void m68000_base_device::x01d8_bset_b_pi_01234fc() { - uint32_t ea = EA_AY_PI_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t mask = 1 << (DX() & 7); + u32 ea = EA_AY_PI_8(); + u32 src = m68ki_read_8(ea); + u32 mask = 1 << (DX() & 7); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8273,9 +8273,9 @@ void m68000_base_device::x01d8_bset_b_pi_01234fc() } void m68000_base_device::x01df_bset_b_pi7_01234fc() { - uint32_t ea = EA_A7_PI_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t mask = 1 << (DX() & 7); + u32 ea = EA_A7_PI_8(); + u32 src = m68ki_read_8(ea); + u32 mask = 1 << (DX() & 7); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8284,9 +8284,9 @@ void m68000_base_device::x01df_bset_b_pi7_01234fc() } void m68000_base_device::x01e0_bset_b_pd_01234fc() { - uint32_t ea = EA_AY_PD_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t mask = 1 << (DX() & 7); + u32 ea = EA_AY_PD_8(); + u32 src = m68ki_read_8(ea); + u32 mask = 1 << (DX() & 7); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8295,9 +8295,9 @@ void m68000_base_device::x01e0_bset_b_pd_01234fc() } void m68000_base_device::x01e7_bset_b_pd7_01234fc() { - uint32_t ea = EA_A7_PD_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t mask = 1 << (DX() & 7); + u32 ea = EA_A7_PD_8(); + u32 src = m68ki_read_8(ea); + u32 mask = 1 << (DX() & 7); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8306,9 +8306,9 @@ void m68000_base_device::x01e7_bset_b_pd7_01234fc() } void m68000_base_device::x01e8_bset_b_di_01234fc() { - uint32_t ea = EA_AY_DI_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t mask = 1 << (DX() & 7); + u32 ea = EA_AY_DI_8(); + u32 src = m68ki_read_8(ea); + u32 mask = 1 << (DX() & 7); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8317,9 +8317,9 @@ void m68000_base_device::x01e8_bset_b_di_01234fc() } void m68000_base_device::x01f0_bset_b_ix_01234fc() { - uint32_t ea = EA_AY_IX_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t mask = 1 << (DX() & 7); + u32 ea = EA_AY_IX_8(); + u32 src = m68ki_read_8(ea); + u32 mask = 1 << (DX() & 7); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8328,9 +8328,9 @@ void m68000_base_device::x01f0_bset_b_ix_01234fc() } void m68000_base_device::x01f8_bset_b_aw_01234fc() { - uint32_t ea = EA_AW_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t mask = 1 << (DX() & 7); + u32 ea = EA_AW_8(); + u32 src = m68ki_read_8(ea); + u32 mask = 1 << (DX() & 7); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8339,9 +8339,9 @@ void m68000_base_device::x01f8_bset_b_aw_01234fc() } void m68000_base_device::x01f9_bset_b_al_01234fc() { - uint32_t ea = EA_AL_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t mask = 1 << (DX() & 7); + u32 ea = EA_AL_8(); + u32 src = m68ki_read_8(ea); + u32 mask = 1 << (DX() & 7); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8350,8 +8350,8 @@ void m68000_base_device::x01f9_bset_b_al_01234fc() } void m68000_base_device::x08c0_bset_l_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t mask = 1 << (OPER_I_8() & 0x1f); + u32* r_dst = &DY(); + u32 mask = 1 << (OPER_I_8() & 0x1f); m_not_z_flag = *r_dst & mask; *r_dst |= mask; @@ -8360,9 +8360,9 @@ void m68000_base_device::x08c0_bset_l_01234fc() } void m68000_base_device::x08d0_bset_b_ai_01234fc() { - uint32_t mask = 1 << (OPER_I_8() & 7); - uint32_t ea = EA_AY_AI_8(); - uint32_t src = m68ki_read_8(ea); + u32 mask = 1 << (OPER_I_8() & 7); + u32 ea = EA_AY_AI_8(); + u32 src = m68ki_read_8(ea); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8371,9 +8371,9 @@ void m68000_base_device::x08d0_bset_b_ai_01234fc() } void m68000_base_device::x08d8_bset_b_pi_01234fc() { - uint32_t mask = 1 << (OPER_I_8() & 7); - uint32_t ea = EA_AY_PI_8(); - uint32_t src = m68ki_read_8(ea); + u32 mask = 1 << (OPER_I_8() & 7); + u32 ea = EA_AY_PI_8(); + u32 src = m68ki_read_8(ea); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8382,9 +8382,9 @@ void m68000_base_device::x08d8_bset_b_pi_01234fc() } void m68000_base_device::x08df_bset_b_pi7_01234fc() { - uint32_t mask = 1 << (OPER_I_8() & 7); - uint32_t ea = EA_A7_PI_8(); - uint32_t src = m68ki_read_8(ea); + u32 mask = 1 << (OPER_I_8() & 7); + u32 ea = EA_A7_PI_8(); + u32 src = m68ki_read_8(ea); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8393,9 +8393,9 @@ void m68000_base_device::x08df_bset_b_pi7_01234fc() } void m68000_base_device::x08e0_bset_b_pd_01234fc() { - uint32_t mask = 1 << (OPER_I_8() & 7); - uint32_t ea = EA_AY_PD_8(); - uint32_t src = m68ki_read_8(ea); + u32 mask = 1 << (OPER_I_8() & 7); + u32 ea = EA_AY_PD_8(); + u32 src = m68ki_read_8(ea); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8404,9 +8404,9 @@ void m68000_base_device::x08e0_bset_b_pd_01234fc() } void m68000_base_device::x08e7_bset_b_pd7_01234fc() { - uint32_t mask = 1 << (OPER_I_8() & 7); - uint32_t ea = EA_A7_PD_8(); - uint32_t src = m68ki_read_8(ea); + u32 mask = 1 << (OPER_I_8() & 7); + u32 ea = EA_A7_PD_8(); + u32 src = m68ki_read_8(ea); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8415,9 +8415,9 @@ void m68000_base_device::x08e7_bset_b_pd7_01234fc() } void m68000_base_device::x08e8_bset_b_di_01234fc() { - uint32_t mask = 1 << (OPER_I_8() & 7); - uint32_t ea = EA_AY_DI_8(); - uint32_t src = m68ki_read_8(ea); + u32 mask = 1 << (OPER_I_8() & 7); + u32 ea = EA_AY_DI_8(); + u32 src = m68ki_read_8(ea); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8426,9 +8426,9 @@ void m68000_base_device::x08e8_bset_b_di_01234fc() } void m68000_base_device::x08f0_bset_b_ix_01234fc() { - uint32_t mask = 1 << (OPER_I_8() & 7); - uint32_t ea = EA_AY_IX_8(); - uint32_t src = m68ki_read_8(ea); + u32 mask = 1 << (OPER_I_8() & 7); + u32 ea = EA_AY_IX_8(); + u32 src = m68ki_read_8(ea); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8437,9 +8437,9 @@ void m68000_base_device::x08f0_bset_b_ix_01234fc() } void m68000_base_device::x08f8_bset_b_aw_01234fc() { - uint32_t mask = 1 << (OPER_I_8() & 7); - uint32_t ea = EA_AW_8(); - uint32_t src = m68ki_read_8(ea); + u32 mask = 1 << (OPER_I_8() & 7); + u32 ea = EA_AW_8(); + u32 src = m68ki_read_8(ea); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8448,9 +8448,9 @@ void m68000_base_device::x08f8_bset_b_aw_01234fc() } void m68000_base_device::x08f9_bset_b_al_01234fc() { - uint32_t mask = 1 << (OPER_I_8() & 7); - uint32_t ea = EA_AL_8(); - uint32_t src = m68ki_read_8(ea); + u32 mask = 1 << (OPER_I_8() & 7); + u32 ea = EA_AL_8(); + u32 src = m68ki_read_8(ea); m_not_z_flag = src & mask; m68ki_write_8(ea, src | mask); @@ -8467,7 +8467,7 @@ void m68000_base_device::x6100_bsr_b_01234fc() } void m68000_base_device::x6100_bsr_w_01234fc() { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_push_32(m_pc); m_pc -= 2; @@ -8479,7 +8479,7 @@ void m68000_base_device::x61ff_bsr_l_01234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t offset = OPER_I_32(); + u32 offset = OPER_I_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_push_32(m_pc); m_pc -= 4; @@ -8581,7 +8581,7 @@ void m68000_base_device::x0800_btst_l_01234fc() } void m68000_base_device::x0810_btst_b_ai_01234fc() { - uint32_t bit = OPER_I_8() & 7; + u32 bit = OPER_I_8() & 7; m_not_z_flag = OPER_AY_AI_8() & (1 << bit); @@ -8589,7 +8589,7 @@ void m68000_base_device::x0810_btst_b_ai_01234fc() } void m68000_base_device::x0818_btst_b_pi_01234fc() { - uint32_t bit = OPER_I_8() & 7; + u32 bit = OPER_I_8() & 7; m_not_z_flag = OPER_AY_PI_8() & (1 << bit); @@ -8597,7 +8597,7 @@ void m68000_base_device::x0818_btst_b_pi_01234fc() } void m68000_base_device::x081f_btst_b_pi7_01234fc() { - uint32_t bit = OPER_I_8() & 7; + u32 bit = OPER_I_8() & 7; m_not_z_flag = OPER_A7_PI_8() & (1 << bit); @@ -8605,7 +8605,7 @@ void m68000_base_device::x081f_btst_b_pi7_01234fc() } void m68000_base_device::x0820_btst_b_pd_01234fc() { - uint32_t bit = OPER_I_8() & 7; + u32 bit = OPER_I_8() & 7; m_not_z_flag = OPER_AY_PD_8() & (1 << bit); @@ -8613,7 +8613,7 @@ void m68000_base_device::x0820_btst_b_pd_01234fc() } void m68000_base_device::x0827_btst_b_pd7_01234fc() { - uint32_t bit = OPER_I_8() & 7; + u32 bit = OPER_I_8() & 7; m_not_z_flag = OPER_A7_PD_8() & (1 << bit); @@ -8621,7 +8621,7 @@ void m68000_base_device::x0827_btst_b_pd7_01234fc() } void m68000_base_device::x0828_btst_b_di_01234fc() { - uint32_t bit = OPER_I_8() & 7; + u32 bit = OPER_I_8() & 7; m_not_z_flag = OPER_AY_DI_8() & (1 << bit); @@ -8629,7 +8629,7 @@ void m68000_base_device::x0828_btst_b_di_01234fc() } void m68000_base_device::x0830_btst_b_ix_01234fc() { - uint32_t bit = OPER_I_8() & 7; + u32 bit = OPER_I_8() & 7; m_not_z_flag = OPER_AY_IX_8() & (1 << bit); @@ -8637,7 +8637,7 @@ void m68000_base_device::x0830_btst_b_ix_01234fc() } void m68000_base_device::x0838_btst_b_aw_01234fc() { - uint32_t bit = OPER_I_8() & 7; + u32 bit = OPER_I_8() & 7; m_not_z_flag = OPER_AW_8() & (1 << bit); @@ -8645,7 +8645,7 @@ void m68000_base_device::x0838_btst_b_aw_01234fc() } void m68000_base_device::x0839_btst_b_al_01234fc() { - uint32_t bit = OPER_I_8() & 7; + u32 bit = OPER_I_8() & 7; m_not_z_flag = OPER_AL_8() & (1 << bit); @@ -8653,7 +8653,7 @@ void m68000_base_device::x0839_btst_b_al_01234fc() } void m68000_base_device::x083a_btst_b_pcdi_01234fc() { - uint32_t bit = OPER_I_8() & 7; + u32 bit = OPER_I_8() & 7; m_not_z_flag = OPER_PCDI_8() & (1 << bit); @@ -8661,7 +8661,7 @@ void m68000_base_device::x083a_btst_b_pcdi_01234fc() } void m68000_base_device::x083b_btst_b_pcix_01234fc() { - uint32_t bit = OPER_I_8() & 7; + u32 bit = OPER_I_8() & 7; m_not_z_flag = OPER_PCIX_8() & (1 << bit); @@ -8672,7 +8672,7 @@ void m68000_base_device::x06d0_callm_l_ai_234fc() /* note: watch out for pcrelative modes */ if(CPU_TYPE_IS_020_VARIANT()) { - uint32_t ea = EA_AY_AI_32(); + u32 ea = EA_AY_AI_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_pc += 2; @@ -8690,7 +8690,7 @@ void m68000_base_device::x06e8_callm_l_di_234fc() /* note: watch out for pcrelative modes */ if(CPU_TYPE_IS_020_VARIANT()) { - uint32_t ea = EA_AY_DI_32(); + u32 ea = EA_AY_DI_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_pc += 2; @@ -8708,7 +8708,7 @@ void m68000_base_device::x06f0_callm_l_ix_234fc() /* note: watch out for pcrelative modes */ if(CPU_TYPE_IS_020_VARIANT()) { - uint32_t ea = EA_AY_IX_32(); + u32 ea = EA_AY_IX_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_pc += 2; @@ -8726,7 +8726,7 @@ void m68000_base_device::x06f8_callm_l_aw_234fc() /* note: watch out for pcrelative modes */ if(CPU_TYPE_IS_020_VARIANT()) { - uint32_t ea = EA_AW_32(); + u32 ea = EA_AW_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_pc += 2; @@ -8744,7 +8744,7 @@ void m68000_base_device::x06f9_callm_l_al_234fc() /* note: watch out for pcrelative modes */ if(CPU_TYPE_IS_020_VARIANT()) { - uint32_t ea = EA_AL_32(); + u32 ea = EA_AL_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_pc += 2; @@ -8762,7 +8762,7 @@ void m68000_base_device::x06fa_callm_l_pcdi_234fc() /* note: watch out for pcrelative modes */ if(CPU_TYPE_IS_020_VARIANT()) { - uint32_t ea = EA_PCDI_32(); + u32 ea = EA_PCDI_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_pc += 2; @@ -8780,7 +8780,7 @@ void m68000_base_device::x06fb_callm_l_pcix_234fc() /* note: watch out for pcrelative modes */ if(CPU_TYPE_IS_020_VARIANT()) { - uint32_t ea = EA_PCIX_32(); + u32 ea = EA_PCIX_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_pc += 2; @@ -8797,11 +8797,11 @@ void m68000_base_device::x0ad0_cas_b_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_AI_8(); - uint32_t dest = m68ki_read_8(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_8(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_AI_8(); + u32 dest = m68ki_read_8(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_8(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_8(res); @@ -8826,11 +8826,11 @@ void m68000_base_device::x0ad8_cas_b_pi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_PI_8(); - uint32_t dest = m68ki_read_8(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_8(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_PI_8(); + u32 dest = m68ki_read_8(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_8(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_8(res); @@ -8855,11 +8855,11 @@ void m68000_base_device::x0adf_cas_b_pi7_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_A7_PI_8(); - uint32_t dest = m68ki_read_8(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_8(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_A7_PI_8(); + u32 dest = m68ki_read_8(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_8(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_8(res); @@ -8884,11 +8884,11 @@ void m68000_base_device::x0ae0_cas_b_pd_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_PD_8(); - uint32_t dest = m68ki_read_8(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_8(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_PD_8(); + u32 dest = m68ki_read_8(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_8(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_8(res); @@ -8913,11 +8913,11 @@ void m68000_base_device::x0ae7_cas_b_pd7_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dest = m68ki_read_8(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_8(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_A7_PD_8(); + u32 dest = m68ki_read_8(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_8(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_8(res); @@ -8942,11 +8942,11 @@ void m68000_base_device::x0ae8_cas_b_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_DI_8(); - uint32_t dest = m68ki_read_8(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_8(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_DI_8(); + u32 dest = m68ki_read_8(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_8(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_8(res); @@ -8971,11 +8971,11 @@ void m68000_base_device::x0af0_cas_b_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_IX_8(); - uint32_t dest = m68ki_read_8(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_8(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_IX_8(); + u32 dest = m68ki_read_8(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_8(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_8(res); @@ -9000,11 +9000,11 @@ void m68000_base_device::x0af8_cas_b_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AW_8(); - uint32_t dest = m68ki_read_8(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_8(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AW_8(); + u32 dest = m68ki_read_8(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_8(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_8(res); @@ -9029,11 +9029,11 @@ void m68000_base_device::x0af9_cas_b_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AL_8(); - uint32_t dest = m68ki_read_8(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_8(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AL_8(); + u32 dest = m68ki_read_8(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_8(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_8(res); @@ -9058,11 +9058,11 @@ void m68000_base_device::x0cd0_cas_w_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_AI_16(); - uint32_t dest = m68ki_read_16(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_16(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_AI_16(); + u32 dest = m68ki_read_16(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_16(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_16(res); @@ -9087,11 +9087,11 @@ void m68000_base_device::x0cd8_cas_w_pi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_PI_16(); - uint32_t dest = m68ki_read_16(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_16(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_PI_16(); + u32 dest = m68ki_read_16(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_16(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_16(res); @@ -9116,11 +9116,11 @@ void m68000_base_device::x0ce0_cas_w_pd_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_PD_16(); - uint32_t dest = m68ki_read_16(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_16(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_PD_16(); + u32 dest = m68ki_read_16(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_16(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_16(res); @@ -9145,11 +9145,11 @@ void m68000_base_device::x0ce8_cas_w_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_DI_16(); - uint32_t dest = m68ki_read_16(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_16(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_DI_16(); + u32 dest = m68ki_read_16(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_16(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_16(res); @@ -9174,11 +9174,11 @@ void m68000_base_device::x0cf0_cas_w_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_IX_16(); - uint32_t dest = m68ki_read_16(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_16(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_IX_16(); + u32 dest = m68ki_read_16(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_16(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_16(res); @@ -9203,11 +9203,11 @@ void m68000_base_device::x0cf8_cas_w_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AW_16(); - uint32_t dest = m68ki_read_16(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_16(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AW_16(); + u32 dest = m68ki_read_16(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_16(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_16(res); @@ -9232,11 +9232,11 @@ void m68000_base_device::x0cf9_cas_w_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AL_16(); - uint32_t dest = m68ki_read_16(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - MASK_OUT_ABOVE_16(*compare); + u32 word2 = OPER_I_16(); + u32 ea = EA_AL_16(); + u32 dest = m68ki_read_16(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - MASK_OUT_ABOVE_16(*compare); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_16(res); @@ -9261,11 +9261,11 @@ void m68000_base_device::x0ed0_cas_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_AI_32(); - uint32_t dest = m68ki_read_32(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - *compare; + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_AI_32(); + u32 dest = m68ki_read_32(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - *compare; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_32(res); @@ -9290,11 +9290,11 @@ void m68000_base_device::x0ed8_cas_l_pi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_PI_32(); - uint32_t dest = m68ki_read_32(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - *compare; + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_PI_32(); + u32 dest = m68ki_read_32(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - *compare; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_32(res); @@ -9319,11 +9319,11 @@ void m68000_base_device::x0ee0_cas_l_pd_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_PD_32(); - uint32_t dest = m68ki_read_32(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - *compare; + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_PD_32(); + u32 dest = m68ki_read_32(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - *compare; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_32(res); @@ -9348,11 +9348,11 @@ void m68000_base_device::x0ee8_cas_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_DI_32(); - uint32_t dest = m68ki_read_32(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - *compare; + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_DI_32(); + u32 dest = m68ki_read_32(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - *compare; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_32(res); @@ -9377,11 +9377,11 @@ void m68000_base_device::x0ef0_cas_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_IX_32(); - uint32_t dest = m68ki_read_32(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - *compare; + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_IX_32(); + u32 dest = m68ki_read_32(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - *compare; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_32(res); @@ -9406,11 +9406,11 @@ void m68000_base_device::x0ef8_cas_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AW_32(); - uint32_t dest = m68ki_read_32(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - *compare; + u32 word2 = OPER_I_16(); + u32 ea = EA_AW_32(); + u32 dest = m68ki_read_32(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - *compare; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_32(res); @@ -9435,11 +9435,11 @@ void m68000_base_device::x0ef9_cas_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AL_32(); - uint32_t dest = m68ki_read_32(ea); - uint32_t* compare = ®_D()[word2 & 7]; - uint32_t res = dest - *compare; + u32 word2 = OPER_I_16(); + u32 ea = EA_AL_32(); + u32 dest = m68ki_read_32(ea); + u32* compare = ®_D()[word2 & 7]; + u32 res = dest - *compare; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_32(res); @@ -9464,15 +9464,15 @@ void m68000_base_device::x0cfc_cas2_w_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_32(); - uint32_t* compare1 = ®_D()[(word2 >> 16) & 7]; - uint32_t ea1 = REG_DA()[(word2 >> 28) & 15]; - uint32_t dest1 = m68ki_read_16(ea1); - uint32_t res1 = dest1 - MASK_OUT_ABOVE_16(*compare1); - uint32_t* compare2 = ®_D()[word2 & 7]; - uint32_t ea2 = REG_DA()[(word2 >> 12) & 15]; - uint32_t dest2 = m68ki_read_16(ea2); - uint32_t res2; + u32 word2 = OPER_I_32(); + u32* compare1 = ®_D()[(word2 >> 16) & 7]; + u32 ea1 = REG_DA()[(word2 >> 28) & 15]; + u32 dest1 = m68ki_read_16(ea1); + u32 res1 = dest1 - MASK_OUT_ABOVE_16(*compare1); + u32* compare2 = ®_D()[word2 & 7]; + u32 ea2 = REG_DA()[(word2 >> 12) & 15]; + u32 dest2 = m68ki_read_16(ea2); + u32 res2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_16(res1); @@ -9509,15 +9509,15 @@ void m68000_base_device::x0efc_cas2_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_32(); - uint32_t* compare1 = ®_D()[(word2 >> 16) & 7]; - uint32_t ea1 = REG_DA()[(word2 >> 28) & 15]; - uint32_t dest1 = m68ki_read_32(ea1); - uint32_t res1 = dest1 - *compare1; - uint32_t* compare2 = ®_D()[word2 & 7]; - uint32_t ea2 = REG_DA()[(word2 >> 12) & 15]; - uint32_t dest2 = m68ki_read_32(ea2); - uint32_t res2; + u32 word2 = OPER_I_32(); + u32* compare1 = ®_D()[(word2 >> 16) & 7]; + u32 ea1 = REG_DA()[(word2 >> 28) & 15]; + u32 dest1 = m68ki_read_32(ea1); + u32 res1 = dest1 - *compare1; + u32* compare2 = ®_D()[word2 & 7]; + u32 ea2 = REG_DA()[(word2 >> 12) & 15]; + u32 dest2 = m68ki_read_32(ea2); + u32 res2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_n_flag = NFLAG_32(res1); @@ -9552,8 +9552,8 @@ void m68000_base_device::x0efc_cas2_l_234fc() } void m68000_base_device::x4180_chk_w_01234fc() { - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(DY()); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(DY()); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9570,8 +9570,8 @@ void m68000_base_device::x4180_chk_w_01234fc() } void m68000_base_device::x4190_chk_w_ai_01234fc() { - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(OPER_AY_AI_16()); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(OPER_AY_AI_16()); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9588,8 +9588,8 @@ void m68000_base_device::x4190_chk_w_ai_01234fc() } void m68000_base_device::x4198_chk_w_pi_01234fc() { - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(OPER_AY_PI_16()); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(OPER_AY_PI_16()); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9606,8 +9606,8 @@ void m68000_base_device::x4198_chk_w_pi_01234fc() } void m68000_base_device::x41a0_chk_w_pd_01234fc() { - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(OPER_AY_PD_16()); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(OPER_AY_PD_16()); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9624,8 +9624,8 @@ void m68000_base_device::x41a0_chk_w_pd_01234fc() } void m68000_base_device::x41a8_chk_w_di_01234fc() { - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(OPER_AY_DI_16()); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(OPER_AY_DI_16()); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9642,8 +9642,8 @@ void m68000_base_device::x41a8_chk_w_di_01234fc() } void m68000_base_device::x41b0_chk_w_ix_01234fc() { - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(OPER_AY_IX_16()); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(OPER_AY_IX_16()); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9660,8 +9660,8 @@ void m68000_base_device::x41b0_chk_w_ix_01234fc() } void m68000_base_device::x41b8_chk_w_aw_01234fc() { - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(OPER_AW_16()); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(OPER_AW_16()); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9678,8 +9678,8 @@ void m68000_base_device::x41b8_chk_w_aw_01234fc() } void m68000_base_device::x41b9_chk_w_al_01234fc() { - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(OPER_AL_16()); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(OPER_AL_16()); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9696,8 +9696,8 @@ void m68000_base_device::x41b9_chk_w_al_01234fc() } void m68000_base_device::x41ba_chk_w_pcdi_01234fc() { - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(OPER_PCDI_16()); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(OPER_PCDI_16()); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9714,8 +9714,8 @@ void m68000_base_device::x41ba_chk_w_pcdi_01234fc() } void m68000_base_device::x41bb_chk_w_pcix_01234fc() { - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(OPER_PCIX_16()); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(OPER_PCIX_16()); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9732,8 +9732,8 @@ void m68000_base_device::x41bb_chk_w_pcix_01234fc() } void m68000_base_device::x41bc_chk_w_i_01234fc() { - int32_t src = MAKE_INT_16(DX()); - int32_t bound = MAKE_INT_16(OPER_I_16()); + s32 src = MAKE_INT_16(DX()); + s32 bound = MAKE_INT_16(OPER_I_16()); m_not_z_flag = ZFLAG_16(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9752,8 +9752,8 @@ void m68000_base_device::x4100_chk_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(DY()); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(DY()); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9775,8 +9775,8 @@ void m68000_base_device::x4110_chk_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(OPER_AY_AI_32()); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(OPER_AY_AI_32()); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9798,8 +9798,8 @@ void m68000_base_device::x4118_chk_l_pi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(OPER_AY_PI_32()); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(OPER_AY_PI_32()); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9821,8 +9821,8 @@ void m68000_base_device::x4120_chk_l_pd_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(OPER_AY_PD_32()); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(OPER_AY_PD_32()); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9844,8 +9844,8 @@ void m68000_base_device::x4128_chk_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(OPER_AY_DI_32()); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(OPER_AY_DI_32()); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9867,8 +9867,8 @@ void m68000_base_device::x4130_chk_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(OPER_AY_IX_32()); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(OPER_AY_IX_32()); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9890,8 +9890,8 @@ void m68000_base_device::x4138_chk_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(OPER_AW_32()); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(OPER_AW_32()); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9913,8 +9913,8 @@ void m68000_base_device::x4139_chk_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(OPER_AL_32()); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(OPER_AL_32()); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9936,8 +9936,8 @@ void m68000_base_device::x413a_chk_l_pcdi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(OPER_PCDI_32()); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(OPER_PCDI_32()); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9959,8 +9959,8 @@ void m68000_base_device::x413b_chk_l_pcix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(OPER_PCIX_32()); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(OPER_PCIX_32()); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -9982,8 +9982,8 @@ void m68000_base_device::x413c_chk_l_i_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - int32_t src = MAKE_INT_32(DX()); - int32_t bound = MAKE_INT_32(OPER_I_32()); + s32 src = MAKE_INT_32(DX()); + s32 bound = MAKE_INT_32(OPER_I_32()); m_not_z_flag = ZFLAG_32(src); /* Undocumented */ m_v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -10005,23 +10005,23 @@ void m68000_base_device::x00fa_chk2cmp2_b_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xff; - uint32_t ea = EA_PCDI_8(); - int32_t lower_bound = m68ki_read_pcrel_8(ea); - int32_t upper_bound = m68ki_read_pcrel_8(ea + 1); + u32 ea = EA_PCDI_8(); + s32 lower_bound = m68ki_read_pcrel_8(ea); + s32 upper_bound = m68ki_read_pcrel_8(ea + 1); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80) { - lower_bound = (int32_t)(int8_t)lower_bound; - upper_bound = (int32_t)(int8_t)upper_bound; + lower_bound = (s32)(s8)lower_bound; + upper_bound = (s32)(s8)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int8_t)compare; + compare = (s32)(s8)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10039,23 +10039,23 @@ void m68000_base_device::x00fb_chk2cmp2_b_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xff; - uint32_t ea = EA_PCIX_8(); - int32_t lower_bound = m68ki_read_pcrel_8(ea); - int32_t upper_bound = m68ki_read_pcrel_8(ea + 1); + u32 ea = EA_PCIX_8(); + s32 lower_bound = m68ki_read_pcrel_8(ea); + s32 upper_bound = m68ki_read_pcrel_8(ea + 1); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80) { - lower_bound = (int32_t)(int8_t)lower_bound; - upper_bound = (int32_t)(int8_t)upper_bound; + lower_bound = (s32)(s8)lower_bound; + upper_bound = (s32)(s8)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int8_t)compare; + compare = (s32)(s8)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10073,23 +10073,23 @@ void m68000_base_device::x00d0_chk2cmp2_b_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xff; - uint32_t ea = EA_AY_AI_8(); - int32_t lower_bound = m68ki_read_8(ea); - int32_t upper_bound = m68ki_read_8(ea + 1); + u32 ea = EA_AY_AI_8(); + s32 lower_bound = m68ki_read_8(ea); + s32 upper_bound = m68ki_read_8(ea + 1); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80) { - lower_bound = (int32_t)(int8_t)lower_bound; - upper_bound = (int32_t)(int8_t)upper_bound; + lower_bound = (s32)(s8)lower_bound; + upper_bound = (s32)(s8)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int8_t)compare; + compare = (s32)(s8)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10107,23 +10107,23 @@ void m68000_base_device::x00e8_chk2cmp2_b_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xff; - uint32_t ea = EA_AY_DI_8(); - int32_t lower_bound = m68ki_read_8(ea); - int32_t upper_bound = m68ki_read_8(ea + 1); + u32 ea = EA_AY_DI_8(); + s32 lower_bound = m68ki_read_8(ea); + s32 upper_bound = m68ki_read_8(ea + 1); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80) { - lower_bound = (int32_t)(int8_t)lower_bound; - upper_bound = (int32_t)(int8_t)upper_bound; + lower_bound = (s32)(s8)lower_bound; + upper_bound = (s32)(s8)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int8_t)compare; + compare = (s32)(s8)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10141,23 +10141,23 @@ void m68000_base_device::x00f0_chk2cmp2_b_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xff; - uint32_t ea = EA_AY_IX_8(); - int32_t lower_bound = m68ki_read_8(ea); - int32_t upper_bound = m68ki_read_8(ea + 1); + u32 ea = EA_AY_IX_8(); + s32 lower_bound = m68ki_read_8(ea); + s32 upper_bound = m68ki_read_8(ea + 1); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80) { - lower_bound = (int32_t)(int8_t)lower_bound; - upper_bound = (int32_t)(int8_t)upper_bound; + lower_bound = (s32)(s8)lower_bound; + upper_bound = (s32)(s8)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int8_t)compare; + compare = (s32)(s8)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10175,23 +10175,23 @@ void m68000_base_device::x00f8_chk2cmp2_b_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xff; - uint32_t ea = EA_AW_8(); - int32_t lower_bound = m68ki_read_8(ea); - int32_t upper_bound = m68ki_read_8(ea + 1); + u32 ea = EA_AW_8(); + s32 lower_bound = m68ki_read_8(ea); + s32 upper_bound = m68ki_read_8(ea + 1); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80) { - lower_bound = (int32_t)(int8_t)lower_bound; - upper_bound = (int32_t)(int8_t)upper_bound; + lower_bound = (s32)(s8)lower_bound; + upper_bound = (s32)(s8)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int8_t)compare; + compare = (s32)(s8)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10209,23 +10209,23 @@ void m68000_base_device::x00f9_chk2cmp2_b_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xff; - uint32_t ea = EA_AL_8(); - int32_t lower_bound = m68ki_read_8(ea); - int32_t upper_bound = m68ki_read_8(ea + 1); + u32 ea = EA_AL_8(); + s32 lower_bound = m68ki_read_8(ea); + s32 upper_bound = m68ki_read_8(ea + 1); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80) { - lower_bound = (int32_t)(int8_t)lower_bound; - upper_bound = (int32_t)(int8_t)upper_bound; + lower_bound = (s32)(s8)lower_bound; + upper_bound = (s32)(s8)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int8_t)compare; + compare = (s32)(s8)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10243,23 +10243,23 @@ void m68000_base_device::x02fa_chk2cmp2_w_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xffff; - uint32_t ea = EA_PCDI_16(); - int32_t lower_bound = m68ki_read_pcrel_16(ea); - int32_t upper_bound = m68ki_read_pcrel_16(ea + 2); + u32 ea = EA_PCDI_16(); + s32 lower_bound = m68ki_read_pcrel_16(ea); + s32 upper_bound = m68ki_read_pcrel_16(ea + 2); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x8000) { - lower_bound = (int32_t)(int16_t)lower_bound; - upper_bound = (int32_t)(int16_t)upper_bound; + lower_bound = (s32)(s16)lower_bound; + upper_bound = (s32)(s16)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int16_t)compare; + compare = (s32)(s16)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10277,23 +10277,23 @@ void m68000_base_device::x02fb_chk2cmp2_w_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xffff; - uint32_t ea = EA_PCIX_16(); - int32_t lower_bound = m68ki_read_pcrel_16(ea); - int32_t upper_bound = m68ki_read_pcrel_16(ea + 2); + u32 ea = EA_PCIX_16(); + s32 lower_bound = m68ki_read_pcrel_16(ea); + s32 upper_bound = m68ki_read_pcrel_16(ea + 2); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x8000) { - lower_bound = (int32_t)(int16_t)lower_bound; - upper_bound = (int32_t)(int16_t)upper_bound; + lower_bound = (s32)(s16)lower_bound; + upper_bound = (s32)(s16)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int16_t)compare; + compare = (s32)(s16)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10311,23 +10311,23 @@ void m68000_base_device::x02d0_chk2cmp2_w_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xffff; - uint32_t ea = EA_AY_AI_16(); - int32_t lower_bound = m68ki_read_16(ea); - int32_t upper_bound = m68ki_read_16(ea + 2); + u32 ea = EA_AY_AI_16(); + s32 lower_bound = m68ki_read_16(ea); + s32 upper_bound = m68ki_read_16(ea + 2); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x8000) { - lower_bound = (int32_t)(int16_t)lower_bound; - upper_bound = (int32_t)(int16_t)upper_bound; + lower_bound = (s32)(s16)lower_bound; + upper_bound = (s32)(s16)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int16_t)compare; + compare = (s32)(s16)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10345,23 +10345,23 @@ void m68000_base_device::x02e8_chk2cmp2_w_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xffff; - uint32_t ea = EA_AY_DI_16(); - int32_t lower_bound = m68ki_read_16(ea); - int32_t upper_bound = m68ki_read_16(ea + 2); + u32 ea = EA_AY_DI_16(); + s32 lower_bound = m68ki_read_16(ea); + s32 upper_bound = m68ki_read_16(ea + 2); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x8000) { - lower_bound = (int32_t)(int16_t)lower_bound; - upper_bound = (int32_t)(int16_t)upper_bound; + lower_bound = (s32)(s16)lower_bound; + upper_bound = (s32)(s16)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int16_t)compare; + compare = (s32)(s16)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10379,23 +10379,23 @@ void m68000_base_device::x02f0_chk2cmp2_w_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xffff; - uint32_t ea = EA_AY_IX_16(); - int32_t lower_bound = m68ki_read_16(ea); - int32_t upper_bound = m68ki_read_16(ea + 2); + u32 ea = EA_AY_IX_16(); + s32 lower_bound = m68ki_read_16(ea); + s32 upper_bound = m68ki_read_16(ea + 2); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x8000) { - lower_bound = (int32_t)(int16_t)lower_bound; - upper_bound = (int32_t)(int16_t)upper_bound; + lower_bound = (s32)(s16)lower_bound; + upper_bound = (s32)(s16)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int16_t)compare; + compare = (s32)(s16)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10413,23 +10413,23 @@ void m68000_base_device::x02f8_chk2cmp2_w_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xffff; - uint32_t ea = EA_AW_16(); - int32_t lower_bound = m68ki_read_16(ea); - int32_t upper_bound = m68ki_read_16(ea + 2); + u32 ea = EA_AW_16(); + s32 lower_bound = m68ki_read_16(ea); + s32 upper_bound = m68ki_read_16(ea + 2); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x8000) { - lower_bound = (int32_t)(int16_t)lower_bound; - upper_bound = (int32_t)(int16_t)upper_bound; + lower_bound = (s32)(s16)lower_bound; + upper_bound = (s32)(s16)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int16_t)compare; + compare = (s32)(s16)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10447,23 +10447,23 @@ void m68000_base_device::x02f9_chk2cmp2_w_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int32_t compare = (int32_t)REG_DA()[(word2 >> 12) & 15]; + u32 word2 = OPER_I_16(); + s32 compare = (s32)REG_DA()[(word2 >> 12) & 15]; if(!BIT_F(word2)) compare &= 0xffff; - uint32_t ea = EA_AL_16(); - int32_t lower_bound = m68ki_read_16(ea); - int32_t upper_bound = m68ki_read_16(ea + 2); + u32 ea = EA_AL_16(); + s32 lower_bound = m68ki_read_16(ea); + s32 upper_bound = m68ki_read_16(ea + 2); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x8000) { - lower_bound = (int32_t)(int16_t)lower_bound; - upper_bound = (int32_t)(int16_t)upper_bound; + lower_bound = (s32)(s16)lower_bound; + upper_bound = (s32)(s16)upper_bound; if(!BIT_F(word2)) - compare = (int32_t)(int16_t)compare; + compare = (s32)(s16)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10481,18 +10481,18 @@ void m68000_base_device::x04fa_chk2cmp2_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int64_t compare = REG_DA()[(word2 >> 12) & 15]; - uint32_t ea = EA_PCDI_32(); - int64_t lower_bound = m68ki_read_pcrel_32(ea); - int64_t upper_bound = m68ki_read_pcrel_32(ea + 4); + u32 word2 = OPER_I_16(); + s64 compare = REG_DA()[(word2 >> 12) & 15]; + u32 ea = EA_PCDI_32(); + s64 lower_bound = m68ki_read_pcrel_32(ea); + s64 upper_bound = m68ki_read_pcrel_32(ea + 4); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80000000) { - lower_bound = (int64_t)(int32_t)lower_bound; - upper_bound = (int64_t)(int32_t)upper_bound; - compare = (int64_t)(int32_t)compare; + lower_bound = (s64)(s32)lower_bound; + upper_bound = (s64)(s32)upper_bound; + compare = (s64)(s32)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10510,18 +10510,18 @@ void m68000_base_device::x04fb_chk2cmp2_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int64_t compare = REG_DA()[(word2 >> 12) & 15]; - uint32_t ea = EA_PCIX_32(); - int64_t lower_bound = m68ki_read_pcrel_32(ea); - int64_t upper_bound = m68ki_read_pcrel_32(ea + 4); + u32 word2 = OPER_I_16(); + s64 compare = REG_DA()[(word2 >> 12) & 15]; + u32 ea = EA_PCIX_32(); + s64 lower_bound = m68ki_read_pcrel_32(ea); + s64 upper_bound = m68ki_read_pcrel_32(ea + 4); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80000000) { - lower_bound = (int64_t)(int32_t)lower_bound; - upper_bound = (int64_t)(int32_t)upper_bound; - compare = (int64_t)(int32_t)compare; + lower_bound = (s64)(s32)lower_bound; + upper_bound = (s64)(s32)upper_bound; + compare = (s64)(s32)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10539,18 +10539,18 @@ void m68000_base_device::x04d0_chk2cmp2_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int64_t compare = REG_DA()[(word2 >> 12) & 15]; - uint32_t ea = EA_AY_AI_32(); - int64_t lower_bound = m68ki_read_32(ea); - int64_t upper_bound = m68ki_read_32(ea + 4); + u32 word2 = OPER_I_16(); + s64 compare = REG_DA()[(word2 >> 12) & 15]; + u32 ea = EA_AY_AI_32(); + s64 lower_bound = m68ki_read_32(ea); + s64 upper_bound = m68ki_read_32(ea + 4); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80000000) { - lower_bound = (int64_t)(int32_t)lower_bound; - upper_bound = (int64_t)(int32_t)upper_bound; - compare = (int64_t)(int32_t)compare; + lower_bound = (s64)(s32)lower_bound; + upper_bound = (s64)(s32)upper_bound; + compare = (s64)(s32)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10568,18 +10568,18 @@ void m68000_base_device::x04e8_chk2cmp2_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int64_t compare = REG_DA()[(word2 >> 12) & 15]; - uint32_t ea = EA_AY_DI_32(); - int64_t lower_bound = m68ki_read_32(ea); - int64_t upper_bound = m68ki_read_32(ea + 4); + u32 word2 = OPER_I_16(); + s64 compare = REG_DA()[(word2 >> 12) & 15]; + u32 ea = EA_AY_DI_32(); + s64 lower_bound = m68ki_read_32(ea); + s64 upper_bound = m68ki_read_32(ea + 4); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80000000) { - lower_bound = (int64_t)(int32_t)lower_bound; - upper_bound = (int64_t)(int32_t)upper_bound; - compare = (int64_t)(int32_t)compare; + lower_bound = (s64)(s32)lower_bound; + upper_bound = (s64)(s32)upper_bound; + compare = (s64)(s32)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10597,18 +10597,18 @@ void m68000_base_device::x04f0_chk2cmp2_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int64_t compare = REG_DA()[(word2 >> 12) & 15]; - uint32_t ea = EA_AY_IX_32(); - int64_t lower_bound = m68ki_read_32(ea); - int64_t upper_bound = m68ki_read_32(ea + 4); + u32 word2 = OPER_I_16(); + s64 compare = REG_DA()[(word2 >> 12) & 15]; + u32 ea = EA_AY_IX_32(); + s64 lower_bound = m68ki_read_32(ea); + s64 upper_bound = m68ki_read_32(ea + 4); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80000000) { - lower_bound = (int64_t)(int32_t)lower_bound; - upper_bound = (int64_t)(int32_t)upper_bound; - compare = (int64_t)(int32_t)compare; + lower_bound = (s64)(s32)lower_bound; + upper_bound = (s64)(s32)upper_bound; + compare = (s64)(s32)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10626,18 +10626,18 @@ void m68000_base_device::x04f8_chk2cmp2_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int64_t compare = REG_DA()[(word2 >> 12) & 15]; - uint32_t ea = EA_AW_32(); - int64_t lower_bound = m68ki_read_32(ea); - int64_t upper_bound = m68ki_read_32(ea + 4); + u32 word2 = OPER_I_16(); + s64 compare = REG_DA()[(word2 >> 12) & 15]; + u32 ea = EA_AW_32(); + s64 lower_bound = m68ki_read_32(ea); + s64 upper_bound = m68ki_read_32(ea + 4); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80000000) { - lower_bound = (int64_t)(int32_t)lower_bound; - upper_bound = (int64_t)(int32_t)upper_bound; - compare = (int64_t)(int32_t)compare; + lower_bound = (s64)(s32)lower_bound; + upper_bound = (s64)(s32)upper_bound; + compare = (s64)(s32)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10655,18 +10655,18 @@ void m68000_base_device::x04f9_chk2cmp2_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - int64_t compare = REG_DA()[(word2 >> 12) & 15]; - uint32_t ea = EA_AL_32(); - int64_t lower_bound = m68ki_read_32(ea); - int64_t upper_bound = m68ki_read_32(ea + 4); + u32 word2 = OPER_I_16(); + s64 compare = REG_DA()[(word2 >> 12) & 15]; + u32 ea = EA_AL_32(); + s64 lower_bound = m68ki_read_32(ea); + s64 upper_bound = m68ki_read_32(ea + 4); // for signed compare, the arithmetically smaller value is the lower bound if (lower_bound & 0x80000000) { - lower_bound = (int64_t)(int32_t)lower_bound; - upper_bound = (int64_t)(int32_t)upper_bound; - compare = (int64_t)(int32_t)compare; + lower_bound = (s64)(s32)lower_bound; + upper_bound = (s64)(s32)upper_bound; + compare = (s64)(s32)compare; } m_c_flag = (compare >= lower_bound && compare <= upper_bound) ? CFLAG_CLEAR : CFLAG_SET; @@ -10693,7 +10693,7 @@ void m68000_base_device::x4200_clr_b_01234fc() } void m68000_base_device::x4210_clr_b_ai_01234fc() { - uint32_t ea = EA_AY_AI_8(); + u32 ea = EA_AY_AI_8(); if(CPU_TYPE_IS_000()) { @@ -10711,7 +10711,7 @@ void m68000_base_device::x4210_clr_b_ai_01234fc() } void m68000_base_device::x4218_clr_b_pi_01234fc() { - uint32_t ea = EA_AY_PI_8(); + u32 ea = EA_AY_PI_8(); if(CPU_TYPE_IS_000()) { @@ -10729,7 +10729,7 @@ void m68000_base_device::x4218_clr_b_pi_01234fc() } void m68000_base_device::x421f_clr_b_pi7_01234fc() { - uint32_t ea = EA_A7_PI_8(); + u32 ea = EA_A7_PI_8(); if(CPU_TYPE_IS_000()) { @@ -10747,7 +10747,7 @@ void m68000_base_device::x421f_clr_b_pi7_01234fc() } void m68000_base_device::x4220_clr_b_pd_01234fc() { - uint32_t ea = EA_AY_PD_8(); + u32 ea = EA_AY_PD_8(); if(CPU_TYPE_IS_000()) { @@ -10765,7 +10765,7 @@ void m68000_base_device::x4220_clr_b_pd_01234fc() } void m68000_base_device::x4227_clr_b_pd7_01234fc() { - uint32_t ea = EA_A7_PD_8(); + u32 ea = EA_A7_PD_8(); if(CPU_TYPE_IS_000()) { @@ -10783,7 +10783,7 @@ void m68000_base_device::x4227_clr_b_pd7_01234fc() } void m68000_base_device::x4228_clr_b_di_01234fc() { - uint32_t ea = EA_AY_DI_8(); + u32 ea = EA_AY_DI_8(); if(CPU_TYPE_IS_000()) { @@ -10801,7 +10801,7 @@ void m68000_base_device::x4228_clr_b_di_01234fc() } void m68000_base_device::x4230_clr_b_ix_01234fc() { - uint32_t ea = EA_AY_IX_8(); + u32 ea = EA_AY_IX_8(); if(CPU_TYPE_IS_000()) { @@ -10819,7 +10819,7 @@ void m68000_base_device::x4230_clr_b_ix_01234fc() } void m68000_base_device::x4238_clr_b_aw_01234fc() { - uint32_t ea = EA_AW_8(); + u32 ea = EA_AW_8(); if(CPU_TYPE_IS_000()) { @@ -10837,7 +10837,7 @@ void m68000_base_device::x4238_clr_b_aw_01234fc() } void m68000_base_device::x4239_clr_b_al_01234fc() { - uint32_t ea = EA_AL_8(); + u32 ea = EA_AL_8(); if(CPU_TYPE_IS_000()) { @@ -10866,7 +10866,7 @@ void m68000_base_device::x4240_clr_w_01234fc() } void m68000_base_device::x4250_clr_w_ai_01234fc() { - uint32_t ea = EA_AY_AI_16(); + u32 ea = EA_AY_AI_16(); if(CPU_TYPE_IS_000()) { @@ -10884,7 +10884,7 @@ void m68000_base_device::x4250_clr_w_ai_01234fc() } void m68000_base_device::x4258_clr_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); + u32 ea = EA_AY_PI_16(); if(CPU_TYPE_IS_000()) { @@ -10902,7 +10902,7 @@ void m68000_base_device::x4258_clr_w_pi_01234fc() } void m68000_base_device::x4260_clr_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); + u32 ea = EA_AY_PD_16(); if(CPU_TYPE_IS_000()) { @@ -10920,7 +10920,7 @@ void m68000_base_device::x4260_clr_w_pd_01234fc() } void m68000_base_device::x4268_clr_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); + u32 ea = EA_AY_DI_16(); if(CPU_TYPE_IS_000()) { @@ -10938,7 +10938,7 @@ void m68000_base_device::x4268_clr_w_di_01234fc() } void m68000_base_device::x4270_clr_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); + u32 ea = EA_AY_IX_16(); if(CPU_TYPE_IS_000()) { @@ -10956,7 +10956,7 @@ void m68000_base_device::x4270_clr_w_ix_01234fc() } void m68000_base_device::x4278_clr_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); + u32 ea = EA_AW_16(); if(CPU_TYPE_IS_000()) { @@ -10974,7 +10974,7 @@ void m68000_base_device::x4278_clr_w_aw_01234fc() } void m68000_base_device::x4279_clr_w_al_01234fc() { - uint32_t ea = EA_AL_16(); + u32 ea = EA_AL_16(); if(CPU_TYPE_IS_000()) { @@ -11003,7 +11003,7 @@ void m68000_base_device::x4280_clr_l_01234fc() } void m68000_base_device::x4290_clr_l_ai_01234fc() { - uint32_t ea = EA_AY_AI_32(); + u32 ea = EA_AY_AI_32(); if(CPU_TYPE_IS_000()) { @@ -11021,7 +11021,7 @@ void m68000_base_device::x4290_clr_l_ai_01234fc() } void m68000_base_device::x4298_clr_l_pi_01234fc() { - uint32_t ea = EA_AY_PI_32(); + u32 ea = EA_AY_PI_32(); if(CPU_TYPE_IS_000()) { @@ -11039,7 +11039,7 @@ void m68000_base_device::x4298_clr_l_pi_01234fc() } void m68000_base_device::x42a0_clr_l_pd_01234fc() { - uint32_t ea = EA_AY_PD_32(); + u32 ea = EA_AY_PD_32(); if(CPU_TYPE_IS_000()) { @@ -11057,7 +11057,7 @@ void m68000_base_device::x42a0_clr_l_pd_01234fc() } void m68000_base_device::x42a8_clr_l_di_01234fc() { - uint32_t ea = EA_AY_DI_32(); + u32 ea = EA_AY_DI_32(); if(CPU_TYPE_IS_000()) { @@ -11075,7 +11075,7 @@ void m68000_base_device::x42a8_clr_l_di_01234fc() } void m68000_base_device::x42b0_clr_l_ix_01234fc() { - uint32_t ea = EA_AY_IX_32(); + u32 ea = EA_AY_IX_32(); if(CPU_TYPE_IS_000()) { @@ -11093,7 +11093,7 @@ void m68000_base_device::x42b0_clr_l_ix_01234fc() } void m68000_base_device::x42b8_clr_l_aw_01234fc() { - uint32_t ea = EA_AW_32(); + u32 ea = EA_AW_32(); if(CPU_TYPE_IS_000()) { @@ -11111,7 +11111,7 @@ void m68000_base_device::x42b8_clr_l_aw_01234fc() } void m68000_base_device::x42b9_clr_l_al_01234fc() { - uint32_t ea = EA_AL_32(); + u32 ea = EA_AL_32(); if(CPU_TYPE_IS_000()) { @@ -11129,9 +11129,9 @@ void m68000_base_device::x42b9_clr_l_al_01234fc() } void m68000_base_device::xb000_cmp_b_01234fc() { - uint32_t src = MASK_OUT_ABOVE_8(DY()); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = MASK_OUT_ABOVE_8(DY()); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11142,9 +11142,9 @@ void m68000_base_device::xb000_cmp_b_01234fc() } void m68000_base_device::xb010_cmp_b_ai_01234fc() { - uint32_t src = OPER_AY_AI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = OPER_AY_AI_8(); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11155,9 +11155,9 @@ void m68000_base_device::xb010_cmp_b_ai_01234fc() } void m68000_base_device::xb018_cmp_b_pi_01234fc() { - uint32_t src = OPER_AY_PI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = OPER_AY_PI_8(); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11168,9 +11168,9 @@ void m68000_base_device::xb018_cmp_b_pi_01234fc() } void m68000_base_device::xb01f_cmp_b_pi7_01234fc() { - uint32_t src = OPER_A7_PI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = OPER_A7_PI_8(); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11181,9 +11181,9 @@ void m68000_base_device::xb01f_cmp_b_pi7_01234fc() } void m68000_base_device::xb020_cmp_b_pd_01234fc() { - uint32_t src = OPER_AY_PD_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = OPER_AY_PD_8(); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11194,9 +11194,9 @@ void m68000_base_device::xb020_cmp_b_pd_01234fc() } void m68000_base_device::xb027_cmp_b_pd7_01234fc() { - uint32_t src = OPER_A7_PD_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = OPER_A7_PD_8(); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11207,9 +11207,9 @@ void m68000_base_device::xb027_cmp_b_pd7_01234fc() } void m68000_base_device::xb028_cmp_b_di_01234fc() { - uint32_t src = OPER_AY_DI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = OPER_AY_DI_8(); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11220,9 +11220,9 @@ void m68000_base_device::xb028_cmp_b_di_01234fc() } void m68000_base_device::xb030_cmp_b_ix_01234fc() { - uint32_t src = OPER_AY_IX_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = OPER_AY_IX_8(); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11233,9 +11233,9 @@ void m68000_base_device::xb030_cmp_b_ix_01234fc() } void m68000_base_device::xb038_cmp_b_aw_01234fc() { - uint32_t src = OPER_AW_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = OPER_AW_8(); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11246,9 +11246,9 @@ void m68000_base_device::xb038_cmp_b_aw_01234fc() } void m68000_base_device::xb039_cmp_b_al_01234fc() { - uint32_t src = OPER_AL_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = OPER_AL_8(); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11259,9 +11259,9 @@ void m68000_base_device::xb039_cmp_b_al_01234fc() } void m68000_base_device::xb03a_cmp_b_pcdi_01234fc() { - uint32_t src = OPER_PCDI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = OPER_PCDI_8(); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11272,9 +11272,9 @@ void m68000_base_device::xb03a_cmp_b_pcdi_01234fc() } void m68000_base_device::xb03b_cmp_b_pcix_01234fc() { - uint32_t src = OPER_PCIX_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = OPER_PCIX_8(); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11285,9 +11285,9 @@ void m68000_base_device::xb03b_cmp_b_pcix_01234fc() } void m68000_base_device::xb03c_cmp_b_i_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DX()); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = MASK_OUT_ABOVE_8(DX()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11298,9 +11298,9 @@ void m68000_base_device::xb03c_cmp_b_i_01234fc() } void m68000_base_device::xb040_cmp_w_01234fc() { - uint32_t src = MASK_OUT_ABOVE_16(DY()); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = MASK_OUT_ABOVE_16(DY()); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -11311,9 +11311,9 @@ void m68000_base_device::xb040_cmp_w_01234fc() } void m68000_base_device::xb048_cmp_w_01234fc() { - uint32_t src = MASK_OUT_ABOVE_16(AY()); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = MASK_OUT_ABOVE_16(AY()); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -11324,9 +11324,9 @@ void m68000_base_device::xb048_cmp_w_01234fc() } void m68000_base_device::xb050_cmp_w_ai_01234fc() { - uint32_t src = OPER_AY_AI_16(); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = OPER_AY_AI_16(); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -11337,9 +11337,9 @@ void m68000_base_device::xb050_cmp_w_ai_01234fc() } void m68000_base_device::xb058_cmp_w_pi_01234fc() { - uint32_t src = OPER_AY_PI_16(); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = OPER_AY_PI_16(); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -11350,9 +11350,9 @@ void m68000_base_device::xb058_cmp_w_pi_01234fc() } void m68000_base_device::xb060_cmp_w_pd_01234fc() { - uint32_t src = OPER_AY_PD_16(); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = OPER_AY_PD_16(); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -11363,9 +11363,9 @@ void m68000_base_device::xb060_cmp_w_pd_01234fc() } void m68000_base_device::xb068_cmp_w_di_01234fc() { - uint32_t src = OPER_AY_DI_16(); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = OPER_AY_DI_16(); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -11376,9 +11376,9 @@ void m68000_base_device::xb068_cmp_w_di_01234fc() } void m68000_base_device::xb070_cmp_w_ix_01234fc() { - uint32_t src = OPER_AY_IX_16(); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = OPER_AY_IX_16(); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -11389,9 +11389,9 @@ void m68000_base_device::xb070_cmp_w_ix_01234fc() } void m68000_base_device::xb078_cmp_w_aw_01234fc() { - uint32_t src = OPER_AW_16(); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = OPER_AW_16(); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -11402,9 +11402,9 @@ void m68000_base_device::xb078_cmp_w_aw_01234fc() } void m68000_base_device::xb079_cmp_w_al_01234fc() { - uint32_t src = OPER_AL_16(); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = OPER_AL_16(); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -11415,9 +11415,9 @@ void m68000_base_device::xb079_cmp_w_al_01234fc() } void m68000_base_device::xb07a_cmp_w_pcdi_01234fc() { - uint32_t src = OPER_PCDI_16(); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = OPER_PCDI_16(); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -11428,9 +11428,9 @@ void m68000_base_device::xb07a_cmp_w_pcdi_01234fc() } void m68000_base_device::xb07b_cmp_w_pcix_01234fc() { - uint32_t src = OPER_PCIX_16(); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = OPER_PCIX_16(); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -11441,9 +11441,9 @@ void m68000_base_device::xb07b_cmp_w_pcix_01234fc() } void m68000_base_device::xb07c_cmp_w_i_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t dst = MASK_OUT_ABOVE_16(DX()); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = MASK_OUT_ABOVE_16(DX()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -11454,9 +11454,9 @@ void m68000_base_device::xb07c_cmp_w_i_01234fc() } void m68000_base_device::xb080_cmp_l_01234fc() { - uint32_t src = DY(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = DY(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11467,9 +11467,9 @@ void m68000_base_device::xb080_cmp_l_01234fc() } void m68000_base_device::xb088_cmp_l_01234fc() { - uint32_t src = AY(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = AY(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11480,9 +11480,9 @@ void m68000_base_device::xb088_cmp_l_01234fc() } void m68000_base_device::xb090_cmp_l_ai_01234fc() { - uint32_t src = OPER_AY_AI_32(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = OPER_AY_AI_32(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11493,9 +11493,9 @@ void m68000_base_device::xb090_cmp_l_ai_01234fc() } void m68000_base_device::xb098_cmp_l_pi_01234fc() { - uint32_t src = OPER_AY_PI_32(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = OPER_AY_PI_32(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11506,9 +11506,9 @@ void m68000_base_device::xb098_cmp_l_pi_01234fc() } void m68000_base_device::xb0a0_cmp_l_pd_01234fc() { - uint32_t src = OPER_AY_PD_32(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = OPER_AY_PD_32(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11519,9 +11519,9 @@ void m68000_base_device::xb0a0_cmp_l_pd_01234fc() } void m68000_base_device::xb0a8_cmp_l_di_01234fc() { - uint32_t src = OPER_AY_DI_32(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = OPER_AY_DI_32(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11532,9 +11532,9 @@ void m68000_base_device::xb0a8_cmp_l_di_01234fc() } void m68000_base_device::xb0b0_cmp_l_ix_01234fc() { - uint32_t src = OPER_AY_IX_32(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = OPER_AY_IX_32(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11545,9 +11545,9 @@ void m68000_base_device::xb0b0_cmp_l_ix_01234fc() } void m68000_base_device::xb0b8_cmp_l_aw_01234fc() { - uint32_t src = OPER_AW_32(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = OPER_AW_32(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11558,9 +11558,9 @@ void m68000_base_device::xb0b8_cmp_l_aw_01234fc() } void m68000_base_device::xb0b9_cmp_l_al_01234fc() { - uint32_t src = OPER_AL_32(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = OPER_AL_32(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11571,9 +11571,9 @@ void m68000_base_device::xb0b9_cmp_l_al_01234fc() } void m68000_base_device::xb0ba_cmp_l_pcdi_01234fc() { - uint32_t src = OPER_PCDI_32(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = OPER_PCDI_32(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11584,9 +11584,9 @@ void m68000_base_device::xb0ba_cmp_l_pcdi_01234fc() } void m68000_base_device::xb0bb_cmp_l_pcix_01234fc() { - uint32_t src = OPER_PCIX_32(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = OPER_PCIX_32(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11597,9 +11597,9 @@ void m68000_base_device::xb0bb_cmp_l_pcix_01234fc() } void m68000_base_device::xb0bc_cmp_l_i_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t dst = DX(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = DX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11610,9 +11610,9 @@ void m68000_base_device::xb0bc_cmp_l_i_01234fc() } void m68000_base_device::xb0c0_cmpa_w_01234fc() { - uint32_t src = MAKE_INT_16(DY()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(DY()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11623,9 +11623,9 @@ void m68000_base_device::xb0c0_cmpa_w_01234fc() } void m68000_base_device::xb0c8_cmpa_w_01234fc() { - uint32_t src = MAKE_INT_16(AY()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(AY()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11636,9 +11636,9 @@ void m68000_base_device::xb0c8_cmpa_w_01234fc() } void m68000_base_device::xb0d0_cmpa_w_ai_01234fc() { - uint32_t src = MAKE_INT_16(OPER_AY_AI_16()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(OPER_AY_AI_16()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11649,9 +11649,9 @@ void m68000_base_device::xb0d0_cmpa_w_ai_01234fc() } void m68000_base_device::xb0d8_cmpa_w_pi_01234fc() { - uint32_t src = MAKE_INT_16(OPER_AY_PI_16()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(OPER_AY_PI_16()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11662,9 +11662,9 @@ void m68000_base_device::xb0d8_cmpa_w_pi_01234fc() } void m68000_base_device::xb0e0_cmpa_w_pd_01234fc() { - uint32_t src = MAKE_INT_16(OPER_AY_PD_16()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(OPER_AY_PD_16()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11675,9 +11675,9 @@ void m68000_base_device::xb0e0_cmpa_w_pd_01234fc() } void m68000_base_device::xb0e8_cmpa_w_di_01234fc() { - uint32_t src = MAKE_INT_16(OPER_AY_DI_16()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(OPER_AY_DI_16()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11688,9 +11688,9 @@ void m68000_base_device::xb0e8_cmpa_w_di_01234fc() } void m68000_base_device::xb0f0_cmpa_w_ix_01234fc() { - uint32_t src = MAKE_INT_16(OPER_AY_IX_16()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(OPER_AY_IX_16()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11701,9 +11701,9 @@ void m68000_base_device::xb0f0_cmpa_w_ix_01234fc() } void m68000_base_device::xb0f8_cmpa_w_aw_01234fc() { - uint32_t src = MAKE_INT_16(OPER_AW_16()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(OPER_AW_16()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11714,9 +11714,9 @@ void m68000_base_device::xb0f8_cmpa_w_aw_01234fc() } void m68000_base_device::xb0f9_cmpa_w_al_01234fc() { - uint32_t src = MAKE_INT_16(OPER_AL_16()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(OPER_AL_16()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11727,9 +11727,9 @@ void m68000_base_device::xb0f9_cmpa_w_al_01234fc() } void m68000_base_device::xb0fa_cmpa_w_pcdi_01234fc() { - uint32_t src = MAKE_INT_16(OPER_PCDI_16()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(OPER_PCDI_16()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11740,9 +11740,9 @@ void m68000_base_device::xb0fa_cmpa_w_pcdi_01234fc() } void m68000_base_device::xb0fb_cmpa_w_pcix_01234fc() { - uint32_t src = MAKE_INT_16(OPER_PCIX_16()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(OPER_PCIX_16()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11753,9 +11753,9 @@ void m68000_base_device::xb0fb_cmpa_w_pcix_01234fc() } void m68000_base_device::xb0fc_cmpa_w_i_01234fc() { - uint32_t src = MAKE_INT_16(OPER_I_16()); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = MAKE_INT_16(OPER_I_16()); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11766,9 +11766,9 @@ void m68000_base_device::xb0fc_cmpa_w_i_01234fc() } void m68000_base_device::xb1c0_cmpa_l_01234fc() { - uint32_t src = DY(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = DY(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11779,9 +11779,9 @@ void m68000_base_device::xb1c0_cmpa_l_01234fc() } void m68000_base_device::xb1c8_cmpa_l_01234fc() { - uint32_t src = AY(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = AY(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11792,9 +11792,9 @@ void m68000_base_device::xb1c8_cmpa_l_01234fc() } void m68000_base_device::xb1d0_cmpa_l_ai_01234fc() { - uint32_t src = OPER_AY_AI_32(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = OPER_AY_AI_32(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11805,9 +11805,9 @@ void m68000_base_device::xb1d0_cmpa_l_ai_01234fc() } void m68000_base_device::xb1d8_cmpa_l_pi_01234fc() { - uint32_t src = OPER_AY_PI_32(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = OPER_AY_PI_32(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11818,9 +11818,9 @@ void m68000_base_device::xb1d8_cmpa_l_pi_01234fc() } void m68000_base_device::xb1e0_cmpa_l_pd_01234fc() { - uint32_t src = OPER_AY_PD_32(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = OPER_AY_PD_32(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11831,9 +11831,9 @@ void m68000_base_device::xb1e0_cmpa_l_pd_01234fc() } void m68000_base_device::xb1e8_cmpa_l_di_01234fc() { - uint32_t src = OPER_AY_DI_32(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = OPER_AY_DI_32(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11844,9 +11844,9 @@ void m68000_base_device::xb1e8_cmpa_l_di_01234fc() } void m68000_base_device::xb1f0_cmpa_l_ix_01234fc() { - uint32_t src = OPER_AY_IX_32(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = OPER_AY_IX_32(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11857,9 +11857,9 @@ void m68000_base_device::xb1f0_cmpa_l_ix_01234fc() } void m68000_base_device::xb1f8_cmpa_l_aw_01234fc() { - uint32_t src = OPER_AW_32(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = OPER_AW_32(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11870,9 +11870,9 @@ void m68000_base_device::xb1f8_cmpa_l_aw_01234fc() } void m68000_base_device::xb1f9_cmpa_l_al_01234fc() { - uint32_t src = OPER_AL_32(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = OPER_AL_32(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11883,9 +11883,9 @@ void m68000_base_device::xb1f9_cmpa_l_al_01234fc() } void m68000_base_device::xb1fa_cmpa_l_pcdi_01234fc() { - uint32_t src = OPER_PCDI_32(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = OPER_PCDI_32(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11896,9 +11896,9 @@ void m68000_base_device::xb1fa_cmpa_l_pcdi_01234fc() } void m68000_base_device::xb1fb_cmpa_l_pcix_01234fc() { - uint32_t src = OPER_PCIX_32(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = OPER_PCIX_32(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11909,9 +11909,9 @@ void m68000_base_device::xb1fb_cmpa_l_pcix_01234fc() } void m68000_base_device::xb1fc_cmpa_l_i_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t dst = AX(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = AX(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -11922,9 +11922,9 @@ void m68000_base_device::xb1fc_cmpa_l_i_01234fc() } void m68000_base_device::x0c00_cmpi_b_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t dst = MASK_OUT_ABOVE_8(DY()); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = MASK_OUT_ABOVE_8(DY()); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11935,9 +11935,9 @@ void m68000_base_device::x0c00_cmpi_b_01234fc() } void m68000_base_device::x0c10_cmpi_b_ai_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_AY_AI_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_AY_AI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11948,9 +11948,9 @@ void m68000_base_device::x0c10_cmpi_b_ai_01234fc() } void m68000_base_device::x0c18_cmpi_b_pi_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_AY_PI_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_AY_PI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11961,9 +11961,9 @@ void m68000_base_device::x0c18_cmpi_b_pi_01234fc() } void m68000_base_device::x0c1f_cmpi_b_pi7_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_A7_PI_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_A7_PI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11974,9 +11974,9 @@ void m68000_base_device::x0c1f_cmpi_b_pi7_01234fc() } void m68000_base_device::x0c20_cmpi_b_pd_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_AY_PD_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_AY_PD_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -11987,9 +11987,9 @@ void m68000_base_device::x0c20_cmpi_b_pd_01234fc() } void m68000_base_device::x0c27_cmpi_b_pd7_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_A7_PD_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_A7_PD_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -12000,9 +12000,9 @@ void m68000_base_device::x0c27_cmpi_b_pd7_01234fc() } void m68000_base_device::x0c28_cmpi_b_di_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_AY_DI_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_AY_DI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -12013,9 +12013,9 @@ void m68000_base_device::x0c28_cmpi_b_di_01234fc() } void m68000_base_device::x0c30_cmpi_b_ix_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_AY_IX_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_AY_IX_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -12026,9 +12026,9 @@ void m68000_base_device::x0c30_cmpi_b_ix_01234fc() } void m68000_base_device::x0c38_cmpi_b_aw_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_AW_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_AW_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -12039,9 +12039,9 @@ void m68000_base_device::x0c38_cmpi_b_aw_01234fc() } void m68000_base_device::x0c39_cmpi_b_al_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_AL_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_AL_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -12054,9 +12054,9 @@ void m68000_base_device::x0c3a_cmpi_b_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_PCDI_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_PCDI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -12072,9 +12072,9 @@ void m68000_base_device::x0c3b_cmpi_b_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_I_8(); - uint32_t dst = OPER_PCIX_8(); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 dst = OPER_PCIX_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -12088,9 +12088,9 @@ void m68000_base_device::x0c3b_cmpi_b_234fc() } void m68000_base_device::x0c40_cmpi_w_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t dst = MASK_OUT_ABOVE_16(DY()); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = MASK_OUT_ABOVE_16(DY()); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -12101,9 +12101,9 @@ void m68000_base_device::x0c40_cmpi_w_01234fc() } void m68000_base_device::x0c50_cmpi_w_ai_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t dst = OPER_AY_AI_16(); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = OPER_AY_AI_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -12114,9 +12114,9 @@ void m68000_base_device::x0c50_cmpi_w_ai_01234fc() } void m68000_base_device::x0c58_cmpi_w_pi_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t dst = OPER_AY_PI_16(); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = OPER_AY_PI_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -12127,9 +12127,9 @@ void m68000_base_device::x0c58_cmpi_w_pi_01234fc() } void m68000_base_device::x0c60_cmpi_w_pd_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t dst = OPER_AY_PD_16(); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = OPER_AY_PD_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -12140,9 +12140,9 @@ void m68000_base_device::x0c60_cmpi_w_pd_01234fc() } void m68000_base_device::x0c68_cmpi_w_di_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t dst = OPER_AY_DI_16(); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = OPER_AY_DI_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -12153,9 +12153,9 @@ void m68000_base_device::x0c68_cmpi_w_di_01234fc() } void m68000_base_device::x0c70_cmpi_w_ix_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t dst = OPER_AY_IX_16(); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = OPER_AY_IX_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -12166,9 +12166,9 @@ void m68000_base_device::x0c70_cmpi_w_ix_01234fc() } void m68000_base_device::x0c78_cmpi_w_aw_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t dst = OPER_AW_16(); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = OPER_AW_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -12179,9 +12179,9 @@ void m68000_base_device::x0c78_cmpi_w_aw_01234fc() } void m68000_base_device::x0c79_cmpi_w_al_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t dst = OPER_AL_16(); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = OPER_AL_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -12194,9 +12194,9 @@ void m68000_base_device::x0c7a_cmpi_w_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_I_16(); - uint32_t dst = OPER_PCDI_16(); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = OPER_PCDI_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -12212,9 +12212,9 @@ void m68000_base_device::x0c7b_cmpi_w_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_I_16(); - uint32_t dst = OPER_PCIX_16(); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 dst = OPER_PCIX_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -12228,9 +12228,9 @@ void m68000_base_device::x0c7b_cmpi_w_234fc() } void m68000_base_device::x0c80_cmpi_l_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t dst = DY(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = DY(); + u32 res = dst - src; if (!m_cmpild_instr_callback.isnull()) (m_cmpild_instr_callback)(*m_program, m_ir & 7, src, 0xffffffff); @@ -12244,9 +12244,9 @@ void m68000_base_device::x0c80_cmpi_l_01234fc() } void m68000_base_device::x0c90_cmpi_l_ai_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t dst = OPER_AY_AI_32(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = OPER_AY_AI_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -12257,9 +12257,9 @@ void m68000_base_device::x0c90_cmpi_l_ai_01234fc() } void m68000_base_device::x0c98_cmpi_l_pi_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t dst = OPER_AY_PI_32(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = OPER_AY_PI_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -12270,9 +12270,9 @@ void m68000_base_device::x0c98_cmpi_l_pi_01234fc() } void m68000_base_device::x0ca0_cmpi_l_pd_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t dst = OPER_AY_PD_32(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = OPER_AY_PD_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -12283,9 +12283,9 @@ void m68000_base_device::x0ca0_cmpi_l_pd_01234fc() } void m68000_base_device::x0ca8_cmpi_l_di_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t dst = OPER_AY_DI_32(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = OPER_AY_DI_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -12296,9 +12296,9 @@ void m68000_base_device::x0ca8_cmpi_l_di_01234fc() } void m68000_base_device::x0cb0_cmpi_l_ix_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t dst = OPER_AY_IX_32(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = OPER_AY_IX_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -12309,9 +12309,9 @@ void m68000_base_device::x0cb0_cmpi_l_ix_01234fc() } void m68000_base_device::x0cb8_cmpi_l_aw_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t dst = OPER_AW_32(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = OPER_AW_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -12322,9 +12322,9 @@ void m68000_base_device::x0cb8_cmpi_l_aw_01234fc() } void m68000_base_device::x0cb9_cmpi_l_al_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t dst = OPER_AL_32(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = OPER_AL_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -12337,9 +12337,9 @@ void m68000_base_device::x0cba_cmpi_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_I_32(); - uint32_t dst = OPER_PCDI_32(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = OPER_PCDI_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -12355,9 +12355,9 @@ void m68000_base_device::x0cbb_cmpi_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_I_32(); - uint32_t dst = OPER_PCIX_32(); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 dst = OPER_PCIX_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -12371,9 +12371,9 @@ void m68000_base_device::x0cbb_cmpi_l_234fc() } void m68000_base_device::xbf08_cmpm_b_01234fc() { - uint32_t src = OPER_AY_PI_8(); - uint32_t dst = OPER_A7_PI_8(); - uint32_t res = dst - src; + u32 src = OPER_AY_PI_8(); + u32 dst = OPER_A7_PI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -12384,9 +12384,9 @@ void m68000_base_device::xbf08_cmpm_b_01234fc() } void m68000_base_device::xb10f_cmpm_b_01234fc() { - uint32_t src = OPER_A7_PI_8(); - uint32_t dst = OPER_AX_PI_8(); - uint32_t res = dst - src; + u32 src = OPER_A7_PI_8(); + u32 dst = OPER_AX_PI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -12397,9 +12397,9 @@ void m68000_base_device::xb10f_cmpm_b_01234fc() } void m68000_base_device::xbf0f_cmpm_b_01234fc() { - uint32_t src = OPER_A7_PI_8(); - uint32_t dst = OPER_A7_PI_8(); - uint32_t res = dst - src; + u32 src = OPER_A7_PI_8(); + u32 dst = OPER_A7_PI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -12410,9 +12410,9 @@ void m68000_base_device::xbf0f_cmpm_b_01234fc() } void m68000_base_device::xb108_cmpm_b_01234fc() { - uint32_t src = OPER_AY_PI_8(); - uint32_t dst = OPER_AX_PI_8(); - uint32_t res = dst - src; + u32 src = OPER_AY_PI_8(); + u32 dst = OPER_AX_PI_8(); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -12423,9 +12423,9 @@ void m68000_base_device::xb108_cmpm_b_01234fc() } void m68000_base_device::xb148_cmpm_w_01234fc() { - uint32_t src = OPER_AY_PI_16(); - uint32_t dst = OPER_AX_PI_16(); - uint32_t res = dst - src; + u32 src = OPER_AY_PI_16(); + u32 dst = OPER_AX_PI_16(); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -12436,9 +12436,9 @@ void m68000_base_device::xb148_cmpm_w_01234fc() } void m68000_base_device::xb188_cmpm_l_01234fc() { - uint32_t src = OPER_AY_PI_32(); - uint32_t dst = OPER_AX_PI_32(); - uint32_t res = dst - src; + u32 src = OPER_AY_PI_32(); + u32 dst = OPER_AX_PI_32(); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -12526,13 +12526,13 @@ void m68000_base_device::x50c8_dbt_w_01234fc() } void m68000_base_device::x51c8_dbf_w_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12548,13 +12548,13 @@ void m68000_base_device::x52c8_dbhi_w_01234fc() { if(COND_NOT_HI()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12573,13 +12573,13 @@ void m68000_base_device::x53c8_dbls_w_01234fc() { if(COND_NOT_LS()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12598,13 +12598,13 @@ void m68000_base_device::x54c8_dbcc_w_01234fc() { if(COND_NOT_CC()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12623,13 +12623,13 @@ void m68000_base_device::x55c8_dbcs_w_01234fc() { if(COND_NOT_CS()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12648,13 +12648,13 @@ void m68000_base_device::x56c8_dbne_w_01234fc() { if(COND_NOT_NE()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12673,13 +12673,13 @@ void m68000_base_device::x57c8_dbeq_w_01234fc() { if(COND_NOT_EQ()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12698,13 +12698,13 @@ void m68000_base_device::x58c8_dbvc_w_01234fc() { if(COND_NOT_VC()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12723,13 +12723,13 @@ void m68000_base_device::x59c8_dbvs_w_01234fc() { if(COND_NOT_VS()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12748,13 +12748,13 @@ void m68000_base_device::x5ac8_dbpl_w_01234fc() { if(COND_NOT_PL()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12773,13 +12773,13 @@ void m68000_base_device::x5bc8_dbmi_w_01234fc() { if(COND_NOT_MI()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12798,13 +12798,13 @@ void m68000_base_device::x5cc8_dbge_w_01234fc() { if(COND_NOT_GE()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12823,13 +12823,13 @@ void m68000_base_device::x5dc8_dblt_w_01234fc() { if(COND_NOT_LT()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12848,13 +12848,13 @@ void m68000_base_device::x5ec8_dbgt_w_01234fc() { if(COND_NOT_GT()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12873,13 +12873,13 @@ void m68000_base_device::x5fc8_dble_w_01234fc() { if(COND_NOT_LE()) { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - uint32_t offset = OPER_I_16(); + u32 offset = OPER_I_16(); m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); @@ -12896,15 +12896,15 @@ void m68000_base_device::x5fc8_dble_w_01234fc() } void m68000_base_device::x81c0_divs_w_01234fc() { - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(DY()); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(DY()); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -12933,15 +12933,15 @@ void m68000_base_device::x81c0_divs_w_01234fc() } void m68000_base_device::x81d0_divs_w_ai_01234fc() { - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(OPER_AY_AI_16()); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(OPER_AY_AI_16()); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -12970,15 +12970,15 @@ void m68000_base_device::x81d0_divs_w_ai_01234fc() } void m68000_base_device::x81d8_divs_w_pi_01234fc() { - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(OPER_AY_PI_16()); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(OPER_AY_PI_16()); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -13007,15 +13007,15 @@ void m68000_base_device::x81d8_divs_w_pi_01234fc() } void m68000_base_device::x81e0_divs_w_pd_01234fc() { - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(OPER_AY_PD_16()); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(OPER_AY_PD_16()); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -13044,15 +13044,15 @@ void m68000_base_device::x81e0_divs_w_pd_01234fc() } void m68000_base_device::x81e8_divs_w_di_01234fc() { - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(OPER_AY_DI_16()); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(OPER_AY_DI_16()); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -13081,15 +13081,15 @@ void m68000_base_device::x81e8_divs_w_di_01234fc() } void m68000_base_device::x81f0_divs_w_ix_01234fc() { - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(OPER_AY_IX_16()); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(OPER_AY_IX_16()); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -13118,15 +13118,15 @@ void m68000_base_device::x81f0_divs_w_ix_01234fc() } void m68000_base_device::x81f8_divs_w_aw_01234fc() { - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(OPER_AW_16()); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(OPER_AW_16()); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -13155,15 +13155,15 @@ void m68000_base_device::x81f8_divs_w_aw_01234fc() } void m68000_base_device::x81f9_divs_w_al_01234fc() { - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(OPER_AL_16()); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(OPER_AL_16()); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -13192,15 +13192,15 @@ void m68000_base_device::x81f9_divs_w_al_01234fc() } void m68000_base_device::x81fa_divs_w_pcdi_01234fc() { - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(OPER_PCDI_16()); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(OPER_PCDI_16()); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -13229,15 +13229,15 @@ void m68000_base_device::x81fa_divs_w_pcdi_01234fc() } void m68000_base_device::x81fb_divs_w_pcix_01234fc() { - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(OPER_PCIX_16()); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(OPER_PCIX_16()); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -13266,15 +13266,15 @@ void m68000_base_device::x81fb_divs_w_pcix_01234fc() } void m68000_base_device::x81fc_divs_w_i_01234fc() { - uint32_t* r_dst = &DX(); - int32_t src = MAKE_INT_16(OPER_I_16()); - int32_t quotient; - int32_t remainder; + u32* r_dst = &DX(); + s32 src = MAKE_INT_16(OPER_I_16()); + s32 quotient; + s32 remainder; if(src != 0) { m_c_flag = CFLAG_CLEAR; - if((uint32_t)*r_dst == 0x80000000 && src == -1) + if((u32)*r_dst == 0x80000000 && src == -1) { m_not_z_flag = 0; m_n_flag = NFLAG_CLEAR; @@ -13303,14 +13303,14 @@ void m68000_base_device::x81fc_divs_w_i_01234fc() } void m68000_base_device::x80c0_divu_w_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(DY()); + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(DY()); if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -13329,14 +13329,14 @@ void m68000_base_device::x80c0_divu_w_01234fc() } void m68000_base_device::x80d0_divu_w_ai_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_AI_16(); + u32* r_dst = &DX(); + u32 src = OPER_AY_AI_16(); if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -13355,14 +13355,14 @@ void m68000_base_device::x80d0_divu_w_ai_01234fc() } void m68000_base_device::x80d8_divu_w_pi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PI_16(); + u32* r_dst = &DX(); + u32 src = OPER_AY_PI_16(); if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -13381,14 +13381,14 @@ void m68000_base_device::x80d8_divu_w_pi_01234fc() } void m68000_base_device::x80e0_divu_w_pd_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PD_16(); + u32* r_dst = &DX(); + u32 src = OPER_AY_PD_16(); if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -13407,14 +13407,14 @@ void m68000_base_device::x80e0_divu_w_pd_01234fc() } void m68000_base_device::x80e8_divu_w_di_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_DI_16(); + u32* r_dst = &DX(); + u32 src = OPER_AY_DI_16(); if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -13433,14 +13433,14 @@ void m68000_base_device::x80e8_divu_w_di_01234fc() } void m68000_base_device::x80f0_divu_w_ix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_IX_16(); + u32* r_dst = &DX(); + u32 src = OPER_AY_IX_16(); if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -13459,14 +13459,14 @@ void m68000_base_device::x80f0_divu_w_ix_01234fc() } void m68000_base_device::x80f8_divu_w_aw_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AW_16(); + u32* r_dst = &DX(); + u32 src = OPER_AW_16(); if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -13485,14 +13485,14 @@ void m68000_base_device::x80f8_divu_w_aw_01234fc() } void m68000_base_device::x80f9_divu_w_al_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AL_16(); + u32* r_dst = &DX(); + u32 src = OPER_AL_16(); if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -13511,14 +13511,14 @@ void m68000_base_device::x80f9_divu_w_al_01234fc() } void m68000_base_device::x80fa_divu_w_pcdi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCDI_16(); + u32* r_dst = &DX(); + u32 src = OPER_PCDI_16(); if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -13537,14 +13537,14 @@ void m68000_base_device::x80fa_divu_w_pcdi_01234fc() } void m68000_base_device::x80fb_divu_w_pcix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCIX_16(); + u32* r_dst = &DX(); + u32 src = OPER_PCIX_16(); if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -13563,14 +13563,14 @@ void m68000_base_device::x80fb_divu_w_pcix_01234fc() } void m68000_base_device::x80fc_divu_w_i_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_I_16(); + u32* r_dst = &DX(); + u32 src = OPER_I_16(); if(src != 0) { m_c_flag = CFLAG_CLEAR; - uint32_t quotient = *r_dst / src; - uint32_t remainder = *r_dst % src; + u32 quotient = *r_dst / src; + u32 remainder = *r_dst % src; if(quotient < 0x10000) { @@ -13591,11 +13591,11 @@ void m68000_base_device::x4c40_divl_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = DY(); - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = DY(); + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -13607,9 +13607,9 @@ void m68000_base_device::x4c40_divl_l_234fc() if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -13631,8 +13631,8 @@ void m68000_base_device::x4c40_divl_l_234fc() dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -13661,11 +13661,11 @@ void m68000_base_device::x4c50_divl_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = OPER_AY_AI_32(); - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = OPER_AY_AI_32(); + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -13677,9 +13677,9 @@ void m68000_base_device::x4c50_divl_l_ai_234fc() if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -13701,8 +13701,8 @@ void m68000_base_device::x4c50_divl_l_ai_234fc() dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -13731,11 +13731,11 @@ void m68000_base_device::x4c58_divl_l_pi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = OPER_AY_PI_32(); - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = OPER_AY_PI_32(); + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -13747,9 +13747,9 @@ void m68000_base_device::x4c58_divl_l_pi_234fc() if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -13771,8 +13771,8 @@ void m68000_base_device::x4c58_divl_l_pi_234fc() dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -13801,11 +13801,11 @@ void m68000_base_device::x4c60_divl_l_pd_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = OPER_AY_PD_32(); - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = OPER_AY_PD_32(); + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -13817,9 +13817,9 @@ void m68000_base_device::x4c60_divl_l_pd_234fc() if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -13841,8 +13841,8 @@ void m68000_base_device::x4c60_divl_l_pd_234fc() dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -13871,11 +13871,11 @@ void m68000_base_device::x4c68_divl_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = OPER_AY_DI_32(); - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = OPER_AY_DI_32(); + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -13887,9 +13887,9 @@ void m68000_base_device::x4c68_divl_l_di_234fc() if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -13911,8 +13911,8 @@ void m68000_base_device::x4c68_divl_l_di_234fc() dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -13941,11 +13941,11 @@ void m68000_base_device::x4c70_divl_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = OPER_AY_IX_32(); - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = OPER_AY_IX_32(); + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -13957,9 +13957,9 @@ void m68000_base_device::x4c70_divl_l_ix_234fc() if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -13981,8 +13981,8 @@ void m68000_base_device::x4c70_divl_l_ix_234fc() dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -14011,11 +14011,11 @@ void m68000_base_device::x4c78_divl_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = OPER_AW_32(); - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = OPER_AW_32(); + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -14027,9 +14027,9 @@ void m68000_base_device::x4c78_divl_l_aw_234fc() if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -14051,8 +14051,8 @@ void m68000_base_device::x4c78_divl_l_aw_234fc() dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -14081,11 +14081,11 @@ void m68000_base_device::x4c79_divl_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = OPER_AL_32(); - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = OPER_AL_32(); + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -14097,9 +14097,9 @@ void m68000_base_device::x4c79_divl_l_al_234fc() if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -14121,8 +14121,8 @@ void m68000_base_device::x4c79_divl_l_al_234fc() dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -14151,11 +14151,11 @@ void m68000_base_device::x4c7a_divl_l_pcdi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = OPER_PCDI_32(); - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = OPER_PCDI_32(); + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -14167,9 +14167,9 @@ void m68000_base_device::x4c7a_divl_l_pcdi_234fc() if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -14191,8 +14191,8 @@ void m68000_base_device::x4c7a_divl_l_pcdi_234fc() dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -14221,11 +14221,11 @@ void m68000_base_device::x4c7b_divl_l_pcix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = OPER_PCIX_32(); - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = OPER_PCIX_32(); + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -14237,9 +14237,9 @@ void m68000_base_device::x4c7b_divl_l_pcix_234fc() if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -14261,8 +14261,8 @@ void m68000_base_device::x4c7b_divl_l_pcix_234fc() dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -14291,11 +14291,11 @@ void m68000_base_device::x4c7c_divl_l_i_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t divisor = OPER_I_32(); - uint64_t dividend = 0; - uint64_t quotient = 0; - uint64_t remainder = 0; + u32 word2 = OPER_I_16(); + u64 divisor = OPER_I_32(); + u64 dividend = 0; + u64 quotient = 0; + u64 remainder = 0; if(divisor != 0) { @@ -14307,9 +14307,9 @@ void m68000_base_device::x4c7c_divl_l_i_234fc() if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); - if((int64_t)quotient != (int64_t)((int32_t)quotient)) + quotient = (u64)((s64)dividend / (s64)((s32)divisor)); + remainder = (u64)((s64)dividend % (s64)((s32)divisor)); + if((s64)quotient != (s64)((s32)quotient)) { m_v_flag = VFLAG_SET; return; @@ -14331,8 +14331,8 @@ void m68000_base_device::x4c7c_divl_l_i_234fc() dividend = REG_D()[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); - remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); + quotient = (u64)((s64)((s32)dividend) / (s64)((s32)divisor)); + remainder = (u64)((s64)((s32)dividend) % (s64)((s32)divisor)); } else /* unsigned */ { @@ -14359,7 +14359,7 @@ void m68000_base_device::x4c7c_divl_l_i_234fc() } void m68000_base_device::xb100_eor_b_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8(DY() ^= MASK_OUT_ABOVE_8(DX())); + u32 res = MASK_OUT_ABOVE_8(DY() ^= MASK_OUT_ABOVE_8(DX())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -14370,8 +14370,8 @@ void m68000_base_device::xb100_eor_b_01234fc() } void m68000_base_device::xb110_eor_b_ai_01234fc() { - uint32_t ea = EA_AY_AI_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); + u32 ea = EA_AY_AI_8(); + u32 res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -14384,8 +14384,8 @@ void m68000_base_device::xb110_eor_b_ai_01234fc() } void m68000_base_device::xb118_eor_b_pi_01234fc() { - uint32_t ea = EA_AY_PI_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); + u32 ea = EA_AY_PI_8(); + u32 res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -14398,8 +14398,8 @@ void m68000_base_device::xb118_eor_b_pi_01234fc() } void m68000_base_device::xb11f_eor_b_pi7_01234fc() { - uint32_t ea = EA_A7_PI_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); + u32 ea = EA_A7_PI_8(); + u32 res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -14412,8 +14412,8 @@ void m68000_base_device::xb11f_eor_b_pi7_01234fc() } void m68000_base_device::xb120_eor_b_pd_01234fc() { - uint32_t ea = EA_AY_PD_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); + u32 ea = EA_AY_PD_8(); + u32 res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -14426,8 +14426,8 @@ void m68000_base_device::xb120_eor_b_pd_01234fc() } void m68000_base_device::xb127_eor_b_pd7_01234fc() { - uint32_t ea = EA_A7_PD_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); + u32 ea = EA_A7_PD_8(); + u32 res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -14440,8 +14440,8 @@ void m68000_base_device::xb127_eor_b_pd7_01234fc() } void m68000_base_device::xb128_eor_b_di_01234fc() { - uint32_t ea = EA_AY_DI_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); + u32 ea = EA_AY_DI_8(); + u32 res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -14454,8 +14454,8 @@ void m68000_base_device::xb128_eor_b_di_01234fc() } void m68000_base_device::xb130_eor_b_ix_01234fc() { - uint32_t ea = EA_AY_IX_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); + u32 ea = EA_AY_IX_8(); + u32 res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -14468,8 +14468,8 @@ void m68000_base_device::xb130_eor_b_ix_01234fc() } void m68000_base_device::xb138_eor_b_aw_01234fc() { - uint32_t ea = EA_AW_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); + u32 ea = EA_AW_8(); + u32 res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -14482,8 +14482,8 @@ void m68000_base_device::xb138_eor_b_aw_01234fc() } void m68000_base_device::xb139_eor_b_al_01234fc() { - uint32_t ea = EA_AL_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); + u32 ea = EA_AL_8(); + u32 res = MASK_OUT_ABOVE_8(DX() ^ m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -14496,7 +14496,7 @@ void m68000_base_device::xb139_eor_b_al_01234fc() } void m68000_base_device::xb140_eor_w_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16(DY() ^= MASK_OUT_ABOVE_16(DX())); + u32 res = MASK_OUT_ABOVE_16(DY() ^= MASK_OUT_ABOVE_16(DX())); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -14507,8 +14507,8 @@ void m68000_base_device::xb140_eor_w_01234fc() } void m68000_base_device::xb150_eor_w_ai_01234fc() { - uint32_t ea = EA_AY_AI_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); + u32 ea = EA_AY_AI_16(); + u32 res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -14521,8 +14521,8 @@ void m68000_base_device::xb150_eor_w_ai_01234fc() } void m68000_base_device::xb158_eor_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); + u32 ea = EA_AY_PI_16(); + u32 res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -14535,8 +14535,8 @@ void m68000_base_device::xb158_eor_w_pi_01234fc() } void m68000_base_device::xb160_eor_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); + u32 ea = EA_AY_PD_16(); + u32 res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -14549,8 +14549,8 @@ void m68000_base_device::xb160_eor_w_pd_01234fc() } void m68000_base_device::xb168_eor_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); + u32 ea = EA_AY_DI_16(); + u32 res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -14563,8 +14563,8 @@ void m68000_base_device::xb168_eor_w_di_01234fc() } void m68000_base_device::xb170_eor_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); + u32 ea = EA_AY_IX_16(); + u32 res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -14577,8 +14577,8 @@ void m68000_base_device::xb170_eor_w_ix_01234fc() } void m68000_base_device::xb178_eor_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); + u32 ea = EA_AW_16(); + u32 res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -14591,8 +14591,8 @@ void m68000_base_device::xb178_eor_w_aw_01234fc() } void m68000_base_device::xb179_eor_w_al_01234fc() { - uint32_t ea = EA_AL_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); + u32 ea = EA_AL_16(); + u32 res = MASK_OUT_ABOVE_16(DX() ^ m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -14605,7 +14605,7 @@ void m68000_base_device::xb179_eor_w_al_01234fc() } void m68000_base_device::xb180_eor_l_01234fc() { - uint32_t res = DY() ^= DX(); + u32 res = DY() ^= DX(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -14616,8 +14616,8 @@ void m68000_base_device::xb180_eor_l_01234fc() } void m68000_base_device::xb190_eor_l_ai_01234fc() { - uint32_t ea = EA_AY_AI_32(); - uint32_t res = DX() ^ m68ki_read_32(ea); + u32 ea = EA_AY_AI_32(); + u32 res = DX() ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -14630,8 +14630,8 @@ void m68000_base_device::xb190_eor_l_ai_01234fc() } void m68000_base_device::xb198_eor_l_pi_01234fc() { - uint32_t ea = EA_AY_PI_32(); - uint32_t res = DX() ^ m68ki_read_32(ea); + u32 ea = EA_AY_PI_32(); + u32 res = DX() ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -14644,8 +14644,8 @@ void m68000_base_device::xb198_eor_l_pi_01234fc() } void m68000_base_device::xb1a0_eor_l_pd_01234fc() { - uint32_t ea = EA_AY_PD_32(); - uint32_t res = DX() ^ m68ki_read_32(ea); + u32 ea = EA_AY_PD_32(); + u32 res = DX() ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -14658,8 +14658,8 @@ void m68000_base_device::xb1a0_eor_l_pd_01234fc() } void m68000_base_device::xb1a8_eor_l_di_01234fc() { - uint32_t ea = EA_AY_DI_32(); - uint32_t res = DX() ^ m68ki_read_32(ea); + u32 ea = EA_AY_DI_32(); + u32 res = DX() ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -14672,8 +14672,8 @@ void m68000_base_device::xb1a8_eor_l_di_01234fc() } void m68000_base_device::xb1b0_eor_l_ix_01234fc() { - uint32_t ea = EA_AY_IX_32(); - uint32_t res = DX() ^ m68ki_read_32(ea); + u32 ea = EA_AY_IX_32(); + u32 res = DX() ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -14686,8 +14686,8 @@ void m68000_base_device::xb1b0_eor_l_ix_01234fc() } void m68000_base_device::xb1b8_eor_l_aw_01234fc() { - uint32_t ea = EA_AW_32(); - uint32_t res = DX() ^ m68ki_read_32(ea); + u32 ea = EA_AW_32(); + u32 res = DX() ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -14700,8 +14700,8 @@ void m68000_base_device::xb1b8_eor_l_aw_01234fc() } void m68000_base_device::xb1b9_eor_l_al_01234fc() { - uint32_t ea = EA_AL_32(); - uint32_t res = DX() ^ m68ki_read_32(ea); + u32 ea = EA_AL_32(); + u32 res = DX() ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -14714,7 +14714,7 @@ void m68000_base_device::xb1b9_eor_l_al_01234fc() } void m68000_base_device::x0a00_eori_b_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8(DY() ^= OPER_I_8()); + u32 res = MASK_OUT_ABOVE_8(DY() ^= OPER_I_8()); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -14725,9 +14725,9 @@ void m68000_base_device::x0a00_eori_b_01234fc() } void m68000_base_device::x0a10_eori_b_ai_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_AI_8(); - uint32_t res = src ^ m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AY_AI_8(); + u32 res = src ^ m68ki_read_8(ea); m68ki_write_8(ea, res); @@ -14740,9 +14740,9 @@ void m68000_base_device::x0a10_eori_b_ai_01234fc() } void m68000_base_device::x0a18_eori_b_pi_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_PI_8(); - uint32_t res = src ^ m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AY_PI_8(); + u32 res = src ^ m68ki_read_8(ea); m68ki_write_8(ea, res); @@ -14755,9 +14755,9 @@ void m68000_base_device::x0a18_eori_b_pi_01234fc() } void m68000_base_device::x0a1f_eori_b_pi7_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_A7_PI_8(); - uint32_t res = src ^ m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_A7_PI_8(); + u32 res = src ^ m68ki_read_8(ea); m68ki_write_8(ea, res); @@ -14770,9 +14770,9 @@ void m68000_base_device::x0a1f_eori_b_pi7_01234fc() } void m68000_base_device::x0a20_eori_b_pd_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_PD_8(); - uint32_t res = src ^ m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AY_PD_8(); + u32 res = src ^ m68ki_read_8(ea); m68ki_write_8(ea, res); @@ -14785,9 +14785,9 @@ void m68000_base_device::x0a20_eori_b_pd_01234fc() } void m68000_base_device::x0a27_eori_b_pd7_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t res = src ^ m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_A7_PD_8(); + u32 res = src ^ m68ki_read_8(ea); m68ki_write_8(ea, res); @@ -14800,9 +14800,9 @@ void m68000_base_device::x0a27_eori_b_pd7_01234fc() } void m68000_base_device::x0a28_eori_b_di_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_DI_8(); - uint32_t res = src ^ m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AY_DI_8(); + u32 res = src ^ m68ki_read_8(ea); m68ki_write_8(ea, res); @@ -14815,9 +14815,9 @@ void m68000_base_device::x0a28_eori_b_di_01234fc() } void m68000_base_device::x0a30_eori_b_ix_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_IX_8(); - uint32_t res = src ^ m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AY_IX_8(); + u32 res = src ^ m68ki_read_8(ea); m68ki_write_8(ea, res); @@ -14830,9 +14830,9 @@ void m68000_base_device::x0a30_eori_b_ix_01234fc() } void m68000_base_device::x0a38_eori_b_aw_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AW_8(); - uint32_t res = src ^ m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AW_8(); + u32 res = src ^ m68ki_read_8(ea); m68ki_write_8(ea, res); @@ -14845,9 +14845,9 @@ void m68000_base_device::x0a38_eori_b_aw_01234fc() } void m68000_base_device::x0a39_eori_b_al_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AL_8(); - uint32_t res = src ^ m68ki_read_8(ea); + u32 src = OPER_I_8(); + u32 ea = EA_AL_8(); + u32 res = src ^ m68ki_read_8(ea); m68ki_write_8(ea, res); @@ -14860,7 +14860,7 @@ void m68000_base_device::x0a39_eori_b_al_01234fc() } void m68000_base_device::x0a40_eori_w_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16(DY() ^= OPER_I_16()); + u32 res = MASK_OUT_ABOVE_16(DY() ^= OPER_I_16()); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -14871,9 +14871,9 @@ void m68000_base_device::x0a40_eori_w_01234fc() } void m68000_base_device::x0a50_eori_w_ai_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_AI_16(); - uint32_t res = src ^ m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AY_AI_16(); + u32 res = src ^ m68ki_read_16(ea); m68ki_write_16(ea, res); @@ -14886,9 +14886,9 @@ void m68000_base_device::x0a50_eori_w_ai_01234fc() } void m68000_base_device::x0a58_eori_w_pi_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_PI_16(); - uint32_t res = src ^ m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AY_PI_16(); + u32 res = src ^ m68ki_read_16(ea); m68ki_write_16(ea, res); @@ -14901,9 +14901,9 @@ void m68000_base_device::x0a58_eori_w_pi_01234fc() } void m68000_base_device::x0a60_eori_w_pd_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_PD_16(); - uint32_t res = src ^ m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AY_PD_16(); + u32 res = src ^ m68ki_read_16(ea); m68ki_write_16(ea, res); @@ -14916,9 +14916,9 @@ void m68000_base_device::x0a60_eori_w_pd_01234fc() } void m68000_base_device::x0a68_eori_w_di_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_DI_16(); - uint32_t res = src ^ m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AY_DI_16(); + u32 res = src ^ m68ki_read_16(ea); m68ki_write_16(ea, res); @@ -14931,9 +14931,9 @@ void m68000_base_device::x0a68_eori_w_di_01234fc() } void m68000_base_device::x0a70_eori_w_ix_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_IX_16(); - uint32_t res = src ^ m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AY_IX_16(); + u32 res = src ^ m68ki_read_16(ea); m68ki_write_16(ea, res); @@ -14946,9 +14946,9 @@ void m68000_base_device::x0a70_eori_w_ix_01234fc() } void m68000_base_device::x0a78_eori_w_aw_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AW_16(); - uint32_t res = src ^ m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AW_16(); + u32 res = src ^ m68ki_read_16(ea); m68ki_write_16(ea, res); @@ -14961,9 +14961,9 @@ void m68000_base_device::x0a78_eori_w_aw_01234fc() } void m68000_base_device::x0a79_eori_w_al_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AL_16(); - uint32_t res = src ^ m68ki_read_16(ea); + u32 src = OPER_I_16(); + u32 ea = EA_AL_16(); + u32 res = src ^ m68ki_read_16(ea); m68ki_write_16(ea, res); @@ -14976,7 +14976,7 @@ void m68000_base_device::x0a79_eori_w_al_01234fc() } void m68000_base_device::x0a80_eori_l_01234fc() { - uint32_t res = DY() ^= OPER_I_32(); + u32 res = DY() ^= OPER_I_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -14987,9 +14987,9 @@ void m68000_base_device::x0a80_eori_l_01234fc() } void m68000_base_device::x0a90_eori_l_ai_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_AI_32(); - uint32_t res = src ^ m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_AI_32(); + u32 res = src ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -15002,9 +15002,9 @@ void m68000_base_device::x0a90_eori_l_ai_01234fc() } void m68000_base_device::x0a98_eori_l_pi_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_PI_32(); - uint32_t res = src ^ m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_PI_32(); + u32 res = src ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -15017,9 +15017,9 @@ void m68000_base_device::x0a98_eori_l_pi_01234fc() } void m68000_base_device::x0aa0_eori_l_pd_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_PD_32(); - uint32_t res = src ^ m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_PD_32(); + u32 res = src ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -15032,9 +15032,9 @@ void m68000_base_device::x0aa0_eori_l_pd_01234fc() } void m68000_base_device::x0aa8_eori_l_di_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_DI_32(); - uint32_t res = src ^ m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_DI_32(); + u32 res = src ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -15047,9 +15047,9 @@ void m68000_base_device::x0aa8_eori_l_di_01234fc() } void m68000_base_device::x0ab0_eori_l_ix_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_IX_32(); - uint32_t res = src ^ m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_IX_32(); + u32 res = src ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -15062,9 +15062,9 @@ void m68000_base_device::x0ab0_eori_l_ix_01234fc() } void m68000_base_device::x0ab8_eori_l_aw_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AW_32(); - uint32_t res = src ^ m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AW_32(); + u32 res = src ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -15077,9 +15077,9 @@ void m68000_base_device::x0ab8_eori_l_aw_01234fc() } void m68000_base_device::x0ab9_eori_l_al_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AL_32(); - uint32_t res = src ^ m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AL_32(); + u32 res = src ^ m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -15100,7 +15100,7 @@ void m68000_base_device::x0a7c_eori_w_01234fc() { if(m_s_flag) { - uint32_t src = OPER_I_16(); + u32 src = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(m68ki_get_sr() ^ src); return; @@ -15111,9 +15111,9 @@ void m68000_base_device::x0a7c_eori_w_01234fc() } void m68000_base_device::xc140_exg_l_01234fc() { - uint32_t* reg_a = &DX(); - uint32_t* reg_b = &DY(); - uint32_t tmp = *reg_a; + u32* reg_a = &DX(); + u32* reg_b = &DY(); + u32 tmp = *reg_a; *reg_a = *reg_b; *reg_b = tmp; @@ -15121,9 +15121,9 @@ void m68000_base_device::xc140_exg_l_01234fc() } void m68000_base_device::xc148_exg_l_01234fc() { - uint32_t* reg_a = &AX(); - uint32_t* reg_b = &AY(); - uint32_t tmp = *reg_a; + u32* reg_a = &AX(); + u32* reg_b = &AY(); + u32 tmp = *reg_a; *reg_a = *reg_b; *reg_b = tmp; @@ -15131,9 +15131,9 @@ void m68000_base_device::xc148_exg_l_01234fc() } void m68000_base_device::xc188_exg_l_01234fc() { - uint32_t* reg_a = &DX(); - uint32_t* reg_b = &AY(); - uint32_t tmp = *reg_a; + u32* reg_a = &DX(); + u32* reg_b = &AY(); + u32 tmp = *reg_a; *reg_a = *reg_b; *reg_b = tmp; @@ -15141,7 +15141,7 @@ void m68000_base_device::xc188_exg_l_01234fc() } void m68000_base_device::x4880_ext_w_01234fc() { - uint32_t* r_dst = &DY(); + u32* r_dst = &DY(); *r_dst = MASK_OUT_BELOW_16(*r_dst) | MASK_OUT_ABOVE_8(*r_dst) | (GET_MSB_8(*r_dst) ? 0xff00 : 0); @@ -15154,7 +15154,7 @@ void m68000_base_device::x4880_ext_w_01234fc() } void m68000_base_device::x48c0_ext_l_01234fc() { - uint32_t* r_dst = &DY(); + u32* r_dst = &DY(); *r_dst = MASK_OUT_ABOVE_16(*r_dst) | (GET_MSB_16(*r_dst) ? 0xffff0000 : 0); @@ -15169,7 +15169,7 @@ void m68000_base_device::x49c0_extb_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t* r_dst = &DY(); + u32* r_dst = &DY(); *r_dst = MASK_OUT_ABOVE_8(*r_dst) | (GET_MSB_8(*r_dst) ? 0xffffff00 : 0); @@ -15254,7 +15254,7 @@ void m68000_base_device::x4efb_jmp_l_pcix_01234fc() } void m68000_base_device::x4e90_jsr_l_ai_01234fc() { - uint32_t ea = EA_AY_AI_32(); + u32 ea = EA_AY_AI_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_push_32(m_pc); m68ki_jump(ea); @@ -15263,7 +15263,7 @@ void m68000_base_device::x4e90_jsr_l_ai_01234fc() } void m68000_base_device::x4ea8_jsr_l_di_01234fc() { - uint32_t ea = EA_AY_DI_32(); + u32 ea = EA_AY_DI_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_push_32(m_pc); m68ki_jump(ea); @@ -15272,7 +15272,7 @@ void m68000_base_device::x4ea8_jsr_l_di_01234fc() } void m68000_base_device::x4eb0_jsr_l_ix_01234fc() { - uint32_t ea = EA_AY_IX_32(); + u32 ea = EA_AY_IX_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_push_32(m_pc); m68ki_jump(ea); @@ -15281,7 +15281,7 @@ void m68000_base_device::x4eb0_jsr_l_ix_01234fc() } void m68000_base_device::x4eb8_jsr_l_aw_01234fc() { - uint32_t ea = EA_AW_32(); + u32 ea = EA_AW_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_push_32(m_pc); m68ki_jump(ea); @@ -15290,7 +15290,7 @@ void m68000_base_device::x4eb8_jsr_l_aw_01234fc() } void m68000_base_device::x4eb9_jsr_l_al_01234fc() { - uint32_t ea = EA_AL_32(); + u32 ea = EA_AL_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_push_32(m_pc); m68ki_jump(ea); @@ -15299,7 +15299,7 @@ void m68000_base_device::x4eb9_jsr_l_al_01234fc() } void m68000_base_device::x4eba_jsr_l_pcdi_01234fc() { - uint32_t ea = EA_PCDI_32(); + u32 ea = EA_PCDI_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_push_32(m_pc); m68ki_jump(ea); @@ -15308,7 +15308,7 @@ void m68000_base_device::x4eba_jsr_l_pcdi_01234fc() } void m68000_base_device::x4ebb_jsr_l_pcix_01234fc() { - uint32_t ea = EA_PCIX_32(); + u32 ea = EA_PCIX_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_push_32(m_pc); m68ki_jump(ea); @@ -15367,7 +15367,7 @@ void m68000_base_device::x4e57_link_w_01234fc() } void m68000_base_device::x4e50_link_w_01234fc() { - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); m68ki_push_32(*r_dst); *r_dst = REG_A()[7]; @@ -15392,7 +15392,7 @@ void m68000_base_device::x4808_link_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); m68ki_push_32(*r_dst); *r_dst = REG_A()[7]; @@ -15405,10 +15405,10 @@ void m68000_base_device::x4808_link_l_234fc() } void m68000_base_device::xe008_lsr_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t shift = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src >> shift; if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src >> shift; if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = *r_dst; - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = *r_dst; + u32 res = src >> shift; if(shift != 0) m_icount -= shift<> shift; + u32* r_dst = &DY(); + u32 shift = DX() & 0x3f; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = src >> shift; if(shift != 0) { @@ -15499,10 +15499,10 @@ void m68000_base_device::xe028_lsr_b_01234fc() } void m68000_base_device::xe068_lsr_w_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t shift = DX() & 0x3f; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = DX() & 0x3f; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = src >> shift; if(shift != 0) { @@ -15536,10 +15536,10 @@ void m68000_base_device::xe068_lsr_w_01234fc() } void m68000_base_device::xe0a8_lsr_l_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t shift = DX() & 0x3f; - uint32_t src = *r_dst; - uint32_t res = src >> shift; + u32* r_dst = &DY(); + u32 shift = DX() & 0x3f; + u32 src = *r_dst; + u32 res = src >> shift; if(shift != 0) { @@ -15572,9 +15572,9 @@ void m68000_base_device::xe0a8_lsr_l_01234fc() } void m68000_base_device::xe2d0_lsr_w_ai_01234fc() { - uint32_t ea = EA_AY_AI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AY_AI_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; m68ki_write_16(ea, res); @@ -15587,9 +15587,9 @@ void m68000_base_device::xe2d0_lsr_w_ai_01234fc() } void m68000_base_device::xe2d8_lsr_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AY_PI_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; m68ki_write_16(ea, res); @@ -15602,9 +15602,9 @@ void m68000_base_device::xe2d8_lsr_w_pi_01234fc() } void m68000_base_device::xe2e0_lsr_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AY_PD_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; m68ki_write_16(ea, res); @@ -15617,9 +15617,9 @@ void m68000_base_device::xe2e0_lsr_w_pd_01234fc() } void m68000_base_device::xe2e8_lsr_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AY_DI_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; m68ki_write_16(ea, res); @@ -15632,9 +15632,9 @@ void m68000_base_device::xe2e8_lsr_w_di_01234fc() } void m68000_base_device::xe2f0_lsr_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AY_IX_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; m68ki_write_16(ea, res); @@ -15647,9 +15647,9 @@ void m68000_base_device::xe2f0_lsr_w_ix_01234fc() } void m68000_base_device::xe2f8_lsr_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AW_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; m68ki_write_16(ea, res); @@ -15662,9 +15662,9 @@ void m68000_base_device::xe2f8_lsr_w_aw_01234fc() } void m68000_base_device::xe2f9_lsr_w_al_01234fc() { - uint32_t ea = EA_AL_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = src >> 1; + u32 ea = EA_AL_16(); + u32 src = m68ki_read_16(ea); + u32 res = src >> 1; m68ki_write_16(ea, res); @@ -15677,10 +15677,10 @@ void m68000_base_device::xe2f9_lsr_w_al_01234fc() } void m68000_base_device::xe108_lsl_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t shift = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = MASK_OUT_ABOVE_8(src << shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = MASK_OUT_ABOVE_8(src << shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = MASK_OUT_ABOVE_16(src << shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = MASK_OUT_ABOVE_16(src << shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = *r_dst; - uint32_t res = MASK_OUT_ABOVE_32(src << shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = *r_dst; + u32 res = MASK_OUT_ABOVE_32(src << shift); if(shift != 0) m_icount -= shift<> 16) & 0xFFFF ); @@ -19632,8 +19632,8 @@ void m68000_base_device::x2100_move_l_01234fc() } void m68000_base_device::x2108_move_l_01234fc() { - uint32_t res = AY(); - uint32_t ea = EA_AX_PD_32(); + u32 res = AY(); + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -19647,8 +19647,8 @@ void m68000_base_device::x2108_move_l_01234fc() } void m68000_base_device::x2110_move_l_ai_01234fc() { - uint32_t res = OPER_AY_AI_32(); - uint32_t ea = EA_AX_PD_32(); + u32 res = OPER_AY_AI_32(); + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -19662,8 +19662,8 @@ void m68000_base_device::x2110_move_l_ai_01234fc() } void m68000_base_device::x2118_move_l_pi_01234fc() { - uint32_t res = OPER_AY_PI_32(); - uint32_t ea = EA_AX_PD_32(); + u32 res = OPER_AY_PI_32(); + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -19677,8 +19677,8 @@ void m68000_base_device::x2118_move_l_pi_01234fc() } void m68000_base_device::x2120_move_l_pd_01234fc() { - uint32_t res = OPER_AY_PD_32(); - uint32_t ea = EA_AX_PD_32(); + u32 res = OPER_AY_PD_32(); + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -19692,8 +19692,8 @@ void m68000_base_device::x2120_move_l_pd_01234fc() } void m68000_base_device::x2128_move_l_di_01234fc() { - uint32_t res = OPER_AY_DI_32(); - uint32_t ea = EA_AX_PD_32(); + u32 res = OPER_AY_DI_32(); + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -19707,8 +19707,8 @@ void m68000_base_device::x2128_move_l_di_01234fc() } void m68000_base_device::x2130_move_l_ix_01234fc() { - uint32_t res = OPER_AY_IX_32(); - uint32_t ea = EA_AX_PD_32(); + u32 res = OPER_AY_IX_32(); + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -19722,8 +19722,8 @@ void m68000_base_device::x2130_move_l_ix_01234fc() } void m68000_base_device::x2138_move_l_aw_01234fc() { - uint32_t res = OPER_AW_32(); - uint32_t ea = EA_AX_PD_32(); + u32 res = OPER_AW_32(); + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -19737,8 +19737,8 @@ void m68000_base_device::x2138_move_l_aw_01234fc() } void m68000_base_device::x2139_move_l_al_01234fc() { - uint32_t res = OPER_AL_32(); - uint32_t ea = EA_AX_PD_32(); + u32 res = OPER_AL_32(); + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -19752,8 +19752,8 @@ void m68000_base_device::x2139_move_l_al_01234fc() } void m68000_base_device::x213a_move_l_pcdi_01234fc() { - uint32_t res = OPER_PCDI_32(); - uint32_t ea = EA_AX_PD_32(); + u32 res = OPER_PCDI_32(); + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -19767,8 +19767,8 @@ void m68000_base_device::x213a_move_l_pcdi_01234fc() } void m68000_base_device::x213b_move_l_pcix_01234fc() { - uint32_t res = OPER_PCIX_32(); - uint32_t ea = EA_AX_PD_32(); + u32 res = OPER_PCIX_32(); + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -19782,8 +19782,8 @@ void m68000_base_device::x213b_move_l_pcix_01234fc() } void m68000_base_device::x213c_move_l_i_01234fc() { - uint32_t res = OPER_I_32(); - uint32_t ea = EA_AX_PD_32(); + u32 res = OPER_I_32(); + u32 ea = EA_AX_PD_32(); m68ki_write_16(ea+2, res & 0xFFFF ); m68ki_write_16(ea, (res >> 16) & 0xFFFF ); @@ -19797,8 +19797,8 @@ void m68000_base_device::x213c_move_l_i_01234fc() } void m68000_base_device::x2140_move_l_01234fc() { - uint32_t res = DY(); - uint32_t ea = EA_AX_DI_32(); + u32 res = DY(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -19811,8 +19811,8 @@ void m68000_base_device::x2140_move_l_01234fc() } void m68000_base_device::x2148_move_l_01234fc() { - uint32_t res = AY(); - uint32_t ea = EA_AX_DI_32(); + u32 res = AY(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -19825,8 +19825,8 @@ void m68000_base_device::x2148_move_l_01234fc() } void m68000_base_device::x2150_move_l_ai_01234fc() { - uint32_t res = OPER_AY_AI_32(); - uint32_t ea = EA_AX_DI_32(); + u32 res = OPER_AY_AI_32(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -19839,8 +19839,8 @@ void m68000_base_device::x2150_move_l_ai_01234fc() } void m68000_base_device::x2158_move_l_pi_01234fc() { - uint32_t res = OPER_AY_PI_32(); - uint32_t ea = EA_AX_DI_32(); + u32 res = OPER_AY_PI_32(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -19853,8 +19853,8 @@ void m68000_base_device::x2158_move_l_pi_01234fc() } void m68000_base_device::x2160_move_l_pd_01234fc() { - uint32_t res = OPER_AY_PD_32(); - uint32_t ea = EA_AX_DI_32(); + u32 res = OPER_AY_PD_32(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -19867,8 +19867,8 @@ void m68000_base_device::x2160_move_l_pd_01234fc() } void m68000_base_device::x2168_move_l_di_01234fc() { - uint32_t res = OPER_AY_DI_32(); - uint32_t ea = EA_AX_DI_32(); + u32 res = OPER_AY_DI_32(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -19881,8 +19881,8 @@ void m68000_base_device::x2168_move_l_di_01234fc() } void m68000_base_device::x2170_move_l_ix_01234fc() { - uint32_t res = OPER_AY_IX_32(); - uint32_t ea = EA_AX_DI_32(); + u32 res = OPER_AY_IX_32(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -19895,8 +19895,8 @@ void m68000_base_device::x2170_move_l_ix_01234fc() } void m68000_base_device::x2178_move_l_aw_01234fc() { - uint32_t res = OPER_AW_32(); - uint32_t ea = EA_AX_DI_32(); + u32 res = OPER_AW_32(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -19909,8 +19909,8 @@ void m68000_base_device::x2178_move_l_aw_01234fc() } void m68000_base_device::x2179_move_l_al_01234fc() { - uint32_t res = OPER_AL_32(); - uint32_t ea = EA_AX_DI_32(); + u32 res = OPER_AL_32(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -19923,8 +19923,8 @@ void m68000_base_device::x2179_move_l_al_01234fc() } void m68000_base_device::x217a_move_l_pcdi_01234fc() { - uint32_t res = OPER_PCDI_32(); - uint32_t ea = EA_AX_DI_32(); + u32 res = OPER_PCDI_32(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -19937,8 +19937,8 @@ void m68000_base_device::x217a_move_l_pcdi_01234fc() } void m68000_base_device::x217b_move_l_pcix_01234fc() { - uint32_t res = OPER_PCIX_32(); - uint32_t ea = EA_AX_DI_32(); + u32 res = OPER_PCIX_32(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -19951,8 +19951,8 @@ void m68000_base_device::x217b_move_l_pcix_01234fc() } void m68000_base_device::x217c_move_l_i_01234fc() { - uint32_t res = OPER_I_32(); - uint32_t ea = EA_AX_DI_32(); + u32 res = OPER_I_32(); + u32 ea = EA_AX_DI_32(); m68ki_write_32(ea, res); @@ -19965,8 +19965,8 @@ void m68000_base_device::x217c_move_l_i_01234fc() } void m68000_base_device::x2180_move_l_01234fc() { - uint32_t res = DY(); - uint32_t ea = EA_AX_IX_32(); + u32 res = DY(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -19979,8 +19979,8 @@ void m68000_base_device::x2180_move_l_01234fc() } void m68000_base_device::x2188_move_l_01234fc() { - uint32_t res = AY(); - uint32_t ea = EA_AX_IX_32(); + u32 res = AY(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -19993,8 +19993,8 @@ void m68000_base_device::x2188_move_l_01234fc() } void m68000_base_device::x2190_move_l_ai_01234fc() { - uint32_t res = OPER_AY_AI_32(); - uint32_t ea = EA_AX_IX_32(); + u32 res = OPER_AY_AI_32(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -20007,8 +20007,8 @@ void m68000_base_device::x2190_move_l_ai_01234fc() } void m68000_base_device::x2198_move_l_pi_01234fc() { - uint32_t res = OPER_AY_PI_32(); - uint32_t ea = EA_AX_IX_32(); + u32 res = OPER_AY_PI_32(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -20021,8 +20021,8 @@ void m68000_base_device::x2198_move_l_pi_01234fc() } void m68000_base_device::x21a0_move_l_pd_01234fc() { - uint32_t res = OPER_AY_PD_32(); - uint32_t ea = EA_AX_IX_32(); + u32 res = OPER_AY_PD_32(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -20035,8 +20035,8 @@ void m68000_base_device::x21a0_move_l_pd_01234fc() } void m68000_base_device::x21a8_move_l_di_01234fc() { - uint32_t res = OPER_AY_DI_32(); - uint32_t ea = EA_AX_IX_32(); + u32 res = OPER_AY_DI_32(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -20049,8 +20049,8 @@ void m68000_base_device::x21a8_move_l_di_01234fc() } void m68000_base_device::x21b0_move_l_ix_01234fc() { - uint32_t res = OPER_AY_IX_32(); - uint32_t ea = EA_AX_IX_32(); + u32 res = OPER_AY_IX_32(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -20063,8 +20063,8 @@ void m68000_base_device::x21b0_move_l_ix_01234fc() } void m68000_base_device::x21b8_move_l_aw_01234fc() { - uint32_t res = OPER_AW_32(); - uint32_t ea = EA_AX_IX_32(); + u32 res = OPER_AW_32(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -20077,8 +20077,8 @@ void m68000_base_device::x21b8_move_l_aw_01234fc() } void m68000_base_device::x21b9_move_l_al_01234fc() { - uint32_t res = OPER_AL_32(); - uint32_t ea = EA_AX_IX_32(); + u32 res = OPER_AL_32(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -20091,8 +20091,8 @@ void m68000_base_device::x21b9_move_l_al_01234fc() } void m68000_base_device::x21ba_move_l_pcdi_01234fc() { - uint32_t res = OPER_PCDI_32(); - uint32_t ea = EA_AX_IX_32(); + u32 res = OPER_PCDI_32(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -20105,8 +20105,8 @@ void m68000_base_device::x21ba_move_l_pcdi_01234fc() } void m68000_base_device::x21bb_move_l_pcix_01234fc() { - uint32_t res = OPER_PCIX_32(); - uint32_t ea = EA_AX_IX_32(); + u32 res = OPER_PCIX_32(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -20119,8 +20119,8 @@ void m68000_base_device::x21bb_move_l_pcix_01234fc() } void m68000_base_device::x21bc_move_l_i_01234fc() { - uint32_t res = OPER_I_32(); - uint32_t ea = EA_AX_IX_32(); + u32 res = OPER_I_32(); + u32 ea = EA_AX_IX_32(); m68ki_write_32(ea, res); @@ -20133,8 +20133,8 @@ void m68000_base_device::x21bc_move_l_i_01234fc() } void m68000_base_device::x21c0_move_l_01234fc() { - uint32_t res = DY(); - uint32_t ea = EA_AW_32(); + u32 res = DY(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -20147,8 +20147,8 @@ void m68000_base_device::x21c0_move_l_01234fc() } void m68000_base_device::x21c8_move_l_01234fc() { - uint32_t res = AY(); - uint32_t ea = EA_AW_32(); + u32 res = AY(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -20161,8 +20161,8 @@ void m68000_base_device::x21c8_move_l_01234fc() } void m68000_base_device::x21d0_move_l_ai_01234fc() { - uint32_t res = OPER_AY_AI_32(); - uint32_t ea = EA_AW_32(); + u32 res = OPER_AY_AI_32(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -20175,8 +20175,8 @@ void m68000_base_device::x21d0_move_l_ai_01234fc() } void m68000_base_device::x21d8_move_l_pi_01234fc() { - uint32_t res = OPER_AY_PI_32(); - uint32_t ea = EA_AW_32(); + u32 res = OPER_AY_PI_32(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -20189,8 +20189,8 @@ void m68000_base_device::x21d8_move_l_pi_01234fc() } void m68000_base_device::x21e0_move_l_pd_01234fc() { - uint32_t res = OPER_AY_PD_32(); - uint32_t ea = EA_AW_32(); + u32 res = OPER_AY_PD_32(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -20203,8 +20203,8 @@ void m68000_base_device::x21e0_move_l_pd_01234fc() } void m68000_base_device::x21e8_move_l_di_01234fc() { - uint32_t res = OPER_AY_DI_32(); - uint32_t ea = EA_AW_32(); + u32 res = OPER_AY_DI_32(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -20217,8 +20217,8 @@ void m68000_base_device::x21e8_move_l_di_01234fc() } void m68000_base_device::x21f0_move_l_ix_01234fc() { - uint32_t res = OPER_AY_IX_32(); - uint32_t ea = EA_AW_32(); + u32 res = OPER_AY_IX_32(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -20231,8 +20231,8 @@ void m68000_base_device::x21f0_move_l_ix_01234fc() } void m68000_base_device::x21f8_move_l_aw_01234fc() { - uint32_t res = OPER_AW_32(); - uint32_t ea = EA_AW_32(); + u32 res = OPER_AW_32(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -20245,8 +20245,8 @@ void m68000_base_device::x21f8_move_l_aw_01234fc() } void m68000_base_device::x21f9_move_l_al_01234fc() { - uint32_t res = OPER_AL_32(); - uint32_t ea = EA_AW_32(); + u32 res = OPER_AL_32(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -20259,8 +20259,8 @@ void m68000_base_device::x21f9_move_l_al_01234fc() } void m68000_base_device::x21fa_move_l_pcdi_01234fc() { - uint32_t res = OPER_PCDI_32(); - uint32_t ea = EA_AW_32(); + u32 res = OPER_PCDI_32(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -20273,8 +20273,8 @@ void m68000_base_device::x21fa_move_l_pcdi_01234fc() } void m68000_base_device::x21fb_move_l_pcix_01234fc() { - uint32_t res = OPER_PCIX_32(); - uint32_t ea = EA_AW_32(); + u32 res = OPER_PCIX_32(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -20287,8 +20287,8 @@ void m68000_base_device::x21fb_move_l_pcix_01234fc() } void m68000_base_device::x21fc_move_l_i_01234fc() { - uint32_t res = OPER_I_32(); - uint32_t ea = EA_AW_32(); + u32 res = OPER_I_32(); + u32 ea = EA_AW_32(); m68ki_write_32(ea, res); @@ -20301,8 +20301,8 @@ void m68000_base_device::x21fc_move_l_i_01234fc() } void m68000_base_device::x23c0_move_l_01234fc() { - uint32_t res = DY(); - uint32_t ea = EA_AL_32(); + u32 res = DY(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -20315,8 +20315,8 @@ void m68000_base_device::x23c0_move_l_01234fc() } void m68000_base_device::x23c8_move_l_01234fc() { - uint32_t res = AY(); - uint32_t ea = EA_AL_32(); + u32 res = AY(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -20329,8 +20329,8 @@ void m68000_base_device::x23c8_move_l_01234fc() } void m68000_base_device::x23d0_move_l_ai_01234fc() { - uint32_t res = OPER_AY_AI_32(); - uint32_t ea = EA_AL_32(); + u32 res = OPER_AY_AI_32(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -20343,8 +20343,8 @@ void m68000_base_device::x23d0_move_l_ai_01234fc() } void m68000_base_device::x23d8_move_l_pi_01234fc() { - uint32_t res = OPER_AY_PI_32(); - uint32_t ea = EA_AL_32(); + u32 res = OPER_AY_PI_32(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -20357,8 +20357,8 @@ void m68000_base_device::x23d8_move_l_pi_01234fc() } void m68000_base_device::x23e0_move_l_pd_01234fc() { - uint32_t res = OPER_AY_PD_32(); - uint32_t ea = EA_AL_32(); + u32 res = OPER_AY_PD_32(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -20371,8 +20371,8 @@ void m68000_base_device::x23e0_move_l_pd_01234fc() } void m68000_base_device::x23e8_move_l_di_01234fc() { - uint32_t res = OPER_AY_DI_32(); - uint32_t ea = EA_AL_32(); + u32 res = OPER_AY_DI_32(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -20385,8 +20385,8 @@ void m68000_base_device::x23e8_move_l_di_01234fc() } void m68000_base_device::x23f0_move_l_ix_01234fc() { - uint32_t res = OPER_AY_IX_32(); - uint32_t ea = EA_AL_32(); + u32 res = OPER_AY_IX_32(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -20399,8 +20399,8 @@ void m68000_base_device::x23f0_move_l_ix_01234fc() } void m68000_base_device::x23f8_move_l_aw_01234fc() { - uint32_t res = OPER_AW_32(); - uint32_t ea = EA_AL_32(); + u32 res = OPER_AW_32(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -20413,8 +20413,8 @@ void m68000_base_device::x23f8_move_l_aw_01234fc() } void m68000_base_device::x23f9_move_l_al_01234fc() { - uint32_t res = OPER_AL_32(); - uint32_t ea = EA_AL_32(); + u32 res = OPER_AL_32(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -20427,8 +20427,8 @@ void m68000_base_device::x23f9_move_l_al_01234fc() } void m68000_base_device::x23fa_move_l_pcdi_01234fc() { - uint32_t res = OPER_PCDI_32(); - uint32_t ea = EA_AL_32(); + u32 res = OPER_PCDI_32(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -20441,8 +20441,8 @@ void m68000_base_device::x23fa_move_l_pcdi_01234fc() } void m68000_base_device::x23fb_move_l_pcix_01234fc() { - uint32_t res = OPER_PCIX_32(); - uint32_t ea = EA_AL_32(); + u32 res = OPER_PCIX_32(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -20455,8 +20455,8 @@ void m68000_base_device::x23fb_move_l_pcix_01234fc() } void m68000_base_device::x23fc_move_l_i_01234fc() { - uint32_t res = OPER_I_32(); - uint32_t ea = EA_AL_32(); + u32 res = OPER_I_32(); + u32 ea = EA_AL_32(); m68ki_write_32(ea, res); @@ -20780,7 +20780,7 @@ void m68000_base_device::x40d0_move_w_ai_01234fc() { if(CPU_TYPE_IS_000() || m_s_flag) /* NS990408 */ { - uint32_t ea = EA_AY_AI_16(); + u32 ea = EA_AY_AI_16(); m68ki_write_16(ea, m68ki_get_sr()); return; } @@ -20792,7 +20792,7 @@ void m68000_base_device::x40d8_move_w_pi_01234fc() { if(CPU_TYPE_IS_000() || m_s_flag) /* NS990408 */ { - uint32_t ea = EA_AY_PI_16(); + u32 ea = EA_AY_PI_16(); m68ki_write_16(ea, m68ki_get_sr()); return; } @@ -20804,7 +20804,7 @@ void m68000_base_device::x40e0_move_w_pd_01234fc() { if(CPU_TYPE_IS_000() || m_s_flag) /* NS990408 */ { - uint32_t ea = EA_AY_PD_16(); + u32 ea = EA_AY_PD_16(); m68ki_write_16(ea, m68ki_get_sr()); return; } @@ -20816,7 +20816,7 @@ void m68000_base_device::x40e8_move_w_di_01234fc() { if(CPU_TYPE_IS_000() || m_s_flag) /* NS990408 */ { - uint32_t ea = EA_AY_DI_16(); + u32 ea = EA_AY_DI_16(); m68ki_write_16(ea, m68ki_get_sr()); return; } @@ -20828,7 +20828,7 @@ void m68000_base_device::x40f0_move_w_ix_01234fc() { if(CPU_TYPE_IS_000() || m_s_flag) /* NS990408 */ { - uint32_t ea = EA_AY_IX_16(); + u32 ea = EA_AY_IX_16(); m68ki_write_16(ea, m68ki_get_sr()); return; } @@ -20840,7 +20840,7 @@ void m68000_base_device::x40f8_move_w_aw_01234fc() { if(CPU_TYPE_IS_000() || m_s_flag) /* NS990408 */ { - uint32_t ea = EA_AW_16(); + u32 ea = EA_AW_16(); m68ki_write_16(ea, m68ki_get_sr()); return; } @@ -20852,7 +20852,7 @@ void m68000_base_device::x40f9_move_w_al_01234fc() { if(CPU_TYPE_IS_000() || m_s_flag) /* NS990408 */ { - uint32_t ea = EA_AL_16(); + u32 ea = EA_AL_16(); m68ki_write_16(ea, m68ki_get_sr()); return; } @@ -20875,7 +20875,7 @@ void m68000_base_device::x46d0_move_w_ai_01234fc() { if(m_s_flag) { - uint32_t new_sr = OPER_AY_AI_16(); + u32 new_sr = OPER_AY_AI_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(new_sr); return; @@ -20888,7 +20888,7 @@ void m68000_base_device::x46d8_move_w_pi_01234fc() { if(m_s_flag) { - uint32_t new_sr = OPER_AY_PI_16(); + u32 new_sr = OPER_AY_PI_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(new_sr); return; @@ -20901,7 +20901,7 @@ void m68000_base_device::x46e0_move_w_pd_01234fc() { if(m_s_flag) { - uint32_t new_sr = OPER_AY_PD_16(); + u32 new_sr = OPER_AY_PD_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(new_sr); return; @@ -20914,7 +20914,7 @@ void m68000_base_device::x46e8_move_w_di_01234fc() { if(m_s_flag) { - uint32_t new_sr = OPER_AY_DI_16(); + u32 new_sr = OPER_AY_DI_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(new_sr); return; @@ -20927,7 +20927,7 @@ void m68000_base_device::x46f0_move_w_ix_01234fc() { if(m_s_flag) { - uint32_t new_sr = OPER_AY_IX_16(); + u32 new_sr = OPER_AY_IX_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(new_sr); return; @@ -20940,7 +20940,7 @@ void m68000_base_device::x46f8_move_w_aw_01234fc() { if(m_s_flag) { - uint32_t new_sr = OPER_AW_16(); + u32 new_sr = OPER_AW_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(new_sr); return; @@ -20953,7 +20953,7 @@ void m68000_base_device::x46f9_move_w_al_01234fc() { if(m_s_flag) { - uint32_t new_sr = OPER_AL_16(); + u32 new_sr = OPER_AL_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(new_sr); return; @@ -20966,7 +20966,7 @@ void m68000_base_device::x46fa_move_w_pcdi_01234fc() { if(m_s_flag) { - uint32_t new_sr = OPER_PCDI_16(); + u32 new_sr = OPER_PCDI_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(new_sr); return; @@ -20979,7 +20979,7 @@ void m68000_base_device::x46fb_move_w_pcix_01234fc() { if(m_s_flag) { - uint32_t new_sr = OPER_PCIX_16(); + u32 new_sr = OPER_PCIX_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(new_sr); return; @@ -20992,7 +20992,7 @@ void m68000_base_device::x46fc_move_w_i_01234fc() { if(m_s_flag) { - uint32_t new_sr = OPER_I_16(); + u32 new_sr = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(new_sr); return; @@ -21030,7 +21030,7 @@ void m68000_base_device::x4e7a_movec_l_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); + u32 word2 = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ switch (word2 & 0xfff) @@ -21244,7 +21244,7 @@ void m68000_base_device::x4e7b_movec_l_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); + u32 word2 = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ switch (word2 & 0xfff) @@ -21494,10 +21494,10 @@ void m68000_base_device::x4e7b_movec_l_1234fc() } void m68000_base_device::x48a0_movem_w_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = AY(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = AY(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21514,10 +21514,10 @@ void m68000_base_device::x48a0_movem_w_01234fc() } void m68000_base_device::x4890_movem_w_ai_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AY_AI_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AY_AI_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21533,10 +21533,10 @@ void m68000_base_device::x4890_movem_w_ai_01234fc() } void m68000_base_device::x48a8_movem_w_di_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AY_DI_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AY_DI_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21552,10 +21552,10 @@ void m68000_base_device::x48a8_movem_w_di_01234fc() } void m68000_base_device::x48b0_movem_w_ix_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AY_IX_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AY_IX_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21571,10 +21571,10 @@ void m68000_base_device::x48b0_movem_w_ix_01234fc() } void m68000_base_device::x48b8_movem_w_aw_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AW_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AW_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21590,10 +21590,10 @@ void m68000_base_device::x48b8_movem_w_aw_01234fc() } void m68000_base_device::x48b9_movem_w_al_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AL_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AL_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21609,10 +21609,10 @@ void m68000_base_device::x48b9_movem_w_al_01234fc() } void m68000_base_device::x48e0_movem_l_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = AY(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = AY(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21630,10 +21630,10 @@ void m68000_base_device::x48e0_movem_l_01234fc() } void m68000_base_device::x48d0_movem_l_ai_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AY_AI_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AY_AI_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21649,10 +21649,10 @@ void m68000_base_device::x48d0_movem_l_ai_01234fc() } void m68000_base_device::x48e8_movem_l_di_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AY_DI_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AY_DI_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21668,10 +21668,10 @@ void m68000_base_device::x48e8_movem_l_di_01234fc() } void m68000_base_device::x48f0_movem_l_ix_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AY_IX_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AY_IX_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21687,10 +21687,10 @@ void m68000_base_device::x48f0_movem_l_ix_01234fc() } void m68000_base_device::x48f8_movem_l_aw_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AW_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AW_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21706,10 +21706,10 @@ void m68000_base_device::x48f8_movem_l_aw_01234fc() } void m68000_base_device::x48f9_movem_l_al_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AL_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AL_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21725,10 +21725,10 @@ void m68000_base_device::x48f9_movem_l_al_01234fc() } void m68000_base_device::x4c98_movem_w_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = AY(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = AY(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21745,10 +21745,10 @@ void m68000_base_device::x4c98_movem_w_01234fc() } void m68000_base_device::x4cba_movem_w_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_PCDI_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_PCDI_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21764,10 +21764,10 @@ void m68000_base_device::x4cba_movem_w_01234fc() } void m68000_base_device::x4cbb_movem_w_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_PCIX_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_PCIX_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21783,10 +21783,10 @@ void m68000_base_device::x4cbb_movem_w_01234fc() } void m68000_base_device::x4c90_movem_w_ai_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AY_AI_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AY_AI_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21802,10 +21802,10 @@ void m68000_base_device::x4c90_movem_w_ai_01234fc() } void m68000_base_device::x4ca8_movem_w_di_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AY_DI_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AY_DI_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21821,10 +21821,10 @@ void m68000_base_device::x4ca8_movem_w_di_01234fc() } void m68000_base_device::x4cb0_movem_w_ix_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AY_IX_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AY_IX_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21840,10 +21840,10 @@ void m68000_base_device::x4cb0_movem_w_ix_01234fc() } void m68000_base_device::x4cb8_movem_w_aw_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AW_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AW_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21859,10 +21859,10 @@ void m68000_base_device::x4cb8_movem_w_aw_01234fc() } void m68000_base_device::x4cb9_movem_w_al_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AL_16(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AL_16(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21878,10 +21878,10 @@ void m68000_base_device::x4cb9_movem_w_al_01234fc() } void m68000_base_device::x4cd8_movem_l_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = AY(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = AY(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21898,10 +21898,10 @@ void m68000_base_device::x4cd8_movem_l_01234fc() } void m68000_base_device::x4cfa_movem_l_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_PCDI_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_PCDI_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21917,10 +21917,10 @@ void m68000_base_device::x4cfa_movem_l_01234fc() } void m68000_base_device::x4cfb_movem_l_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_PCIX_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_PCIX_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21936,10 +21936,10 @@ void m68000_base_device::x4cfb_movem_l_01234fc() } void m68000_base_device::x4cd0_movem_l_ai_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AY_AI_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AY_AI_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21955,10 +21955,10 @@ void m68000_base_device::x4cd0_movem_l_ai_01234fc() } void m68000_base_device::x4ce8_movem_l_di_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AY_DI_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AY_DI_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21974,10 +21974,10 @@ void m68000_base_device::x4ce8_movem_l_di_01234fc() } void m68000_base_device::x4cf0_movem_l_ix_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AY_IX_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AY_IX_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -21993,10 +21993,10 @@ void m68000_base_device::x4cf0_movem_l_ix_01234fc() } void m68000_base_device::x4cf8_movem_l_aw_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AW_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AW_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -22012,10 +22012,10 @@ void m68000_base_device::x4cf8_movem_l_aw_01234fc() } void m68000_base_device::x4cf9_movem_l_al_01234fc() { - uint32_t i = 0; - uint32_t register_list = OPER_I_16(); - uint32_t ea = EA_AL_32(); - uint32_t count = 0; + u32 i = 0; + u32 register_list = OPER_I_16(); + u32 ea = EA_AL_32(); + u32 count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -22031,8 +22031,8 @@ void m68000_base_device::x4cf9_movem_l_al_01234fc() } void m68000_base_device::x0188_movep_w_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t src = DX(); + u32 ea = EA_AY_DI_16(); + u32 src = DX(); m68ki_write_8(ea, MASK_OUT_ABOVE_8(src >> 8)); m68ki_write_8(ea += 2, MASK_OUT_ABOVE_8(src)); @@ -22041,8 +22041,8 @@ void m68000_base_device::x0188_movep_w_01234fc() } void m68000_base_device::x01c8_movep_l_01234fc() { - uint32_t ea = EA_AY_DI_32(); - uint32_t src = DX(); + u32 ea = EA_AY_DI_32(); + u32 src = DX(); m68ki_write_8(ea, MASK_OUT_ABOVE_8(src >> 24)); m68ki_write_8(ea += 2, MASK_OUT_ABOVE_8(src >> 16)); @@ -22053,8 +22053,8 @@ void m68000_base_device::x01c8_movep_l_01234fc() } void m68000_base_device::x0108_movep_w_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t* r_dst = &DX(); + u32 ea = EA_AY_DI_16(); + u32* r_dst = &DX(); *r_dst = MASK_OUT_BELOW_16(*r_dst) | ((m68ki_read_8(ea) << 8) + m68ki_read_8(ea + 2)); @@ -22062,7 +22062,7 @@ void m68000_base_device::x0108_movep_w_01234fc() } void m68000_base_device::x0148_movep_l_01234fc() { - uint32_t ea = EA_AY_DI_32(); + u32 ea = EA_AY_DI_32(); DX() = (m68ki_read_8(ea) << 24) + (m68ki_read_8(ea + 2) << 16) + (m68ki_read_8(ea + 4) << 8) + m68ki_read_8(ea + 6); @@ -22075,8 +22075,8 @@ void m68000_base_device::x0e10_moves_b_ai_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_AI_8(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_AI_8(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22110,8 +22110,8 @@ void m68000_base_device::x0e18_moves_b_pi_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_PI_8(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_PI_8(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22145,8 +22145,8 @@ void m68000_base_device::x0e1f_moves_b_pi7_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_A7_PI_8(); + u32 word2 = OPER_I_16(); + u32 ea = EA_A7_PI_8(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22180,8 +22180,8 @@ void m68000_base_device::x0e20_moves_b_pd_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_PD_8(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_PD_8(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22215,8 +22215,8 @@ void m68000_base_device::x0e27_moves_b_pd7_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_A7_PD_8(); + u32 word2 = OPER_I_16(); + u32 ea = EA_A7_PD_8(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22250,8 +22250,8 @@ void m68000_base_device::x0e28_moves_b_di_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_DI_8(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_DI_8(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22285,8 +22285,8 @@ void m68000_base_device::x0e30_moves_b_ix_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_IX_8(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_IX_8(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22320,8 +22320,8 @@ void m68000_base_device::x0e38_moves_b_aw_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AW_8(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AW_8(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22355,8 +22355,8 @@ void m68000_base_device::x0e39_moves_b_al_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AL_8(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AL_8(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22390,8 +22390,8 @@ void m68000_base_device::x0e50_moves_w_ai_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_AI_16(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_AI_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22425,8 +22425,8 @@ void m68000_base_device::x0e58_moves_w_pi_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_PI_16(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_PI_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22460,8 +22460,8 @@ void m68000_base_device::x0e60_moves_w_pd_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_PD_16(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_PD_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22495,8 +22495,8 @@ void m68000_base_device::x0e68_moves_w_di_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_DI_16(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_DI_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22530,8 +22530,8 @@ void m68000_base_device::x0e70_moves_w_ix_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_IX_16(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_IX_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22565,8 +22565,8 @@ void m68000_base_device::x0e78_moves_w_aw_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AW_16(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AW_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22600,8 +22600,8 @@ void m68000_base_device::x0e79_moves_w_al_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AL_16(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AL_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22635,8 +22635,8 @@ void m68000_base_device::x0e90_moves_l_ai_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_AI_32(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_AI_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22665,8 +22665,8 @@ void m68000_base_device::x0e98_moves_l_pi_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_PI_32(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_PI_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22695,8 +22695,8 @@ void m68000_base_device::x0ea0_moves_l_pd_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_PD_32(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_PD_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22725,8 +22725,8 @@ void m68000_base_device::x0ea8_moves_l_di_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_DI_32(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_DI_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22755,8 +22755,8 @@ void m68000_base_device::x0eb0_moves_l_ix_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AY_IX_32(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AY_IX_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22785,8 +22785,8 @@ void m68000_base_device::x0eb8_moves_l_aw_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AW_32(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AW_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22815,8 +22815,8 @@ void m68000_base_device::x0eb9_moves_l_al_1234fc() { if(m_s_flag) { - uint32_t word2 = OPER_I_16(); - uint32_t ea = EA_AL_32(); + u32 word2 = OPER_I_16(); + u32 ea = EA_AL_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -22841,7 +22841,7 @@ void m68000_base_device::x0eb9_moves_l_al_1234fc() } void m68000_base_device::x7000_moveq_l_01234fc() { - uint32_t res = DX() = MAKE_INT_8(MASK_OUT_ABOVE_8(m_ir)); + u32 res = DX() = MAKE_INT_8(MASK_OUT_ABOVE_8(m_ir)); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -22852,7 +22852,7 @@ void m68000_base_device::x7000_moveq_l_01234fc() } void m68000_base_device::xf620_move16_l_4fc() { - uint16_t w2 = OPER_I_16(); + u16 w2 = OPER_I_16(); int ax = m_ir & 7; int ay = (w2 >> 12) & 7; m68ki_write_32(REG_A()[ay], m68ki_read_32(REG_A()[ax])); @@ -22867,8 +22867,8 @@ void m68000_base_device::xf620_move16_l_4fc() } void m68000_base_device::xc1c0_muls_w_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(DY()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(DY()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -22881,8 +22881,8 @@ void m68000_base_device::xc1c0_muls_w_01234fc() } void m68000_base_device::xc1d0_muls_w_ai_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_AI_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_AI_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -22895,8 +22895,8 @@ void m68000_base_device::xc1d0_muls_w_ai_01234fc() } void m68000_base_device::xc1d8_muls_w_pi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_PI_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_PI_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -22909,8 +22909,8 @@ void m68000_base_device::xc1d8_muls_w_pi_01234fc() } void m68000_base_device::xc1e0_muls_w_pd_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_PD_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_PD_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -22923,8 +22923,8 @@ void m68000_base_device::xc1e0_muls_w_pd_01234fc() } void m68000_base_device::xc1e8_muls_w_di_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_DI_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_DI_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -22937,8 +22937,8 @@ void m68000_base_device::xc1e8_muls_w_di_01234fc() } void m68000_base_device::xc1f0_muls_w_ix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_IX_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_IX_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -22951,8 +22951,8 @@ void m68000_base_device::xc1f0_muls_w_ix_01234fc() } void m68000_base_device::xc1f8_muls_w_aw_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AW_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AW_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -22965,8 +22965,8 @@ void m68000_base_device::xc1f8_muls_w_aw_01234fc() } void m68000_base_device::xc1f9_muls_w_al_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AL_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AL_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -22979,8 +22979,8 @@ void m68000_base_device::xc1f9_muls_w_al_01234fc() } void m68000_base_device::xc1fa_muls_w_pcdi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_PCDI_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_PCDI_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -22993,8 +22993,8 @@ void m68000_base_device::xc1fa_muls_w_pcdi_01234fc() } void m68000_base_device::xc1fb_muls_w_pcix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_PCIX_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_PCIX_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -23007,8 +23007,8 @@ void m68000_base_device::xc1fb_muls_w_pcix_01234fc() } void m68000_base_device::xc1fc_muls_w_i_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_I_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_I_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -23021,8 +23021,8 @@ void m68000_base_device::xc1fc_muls_w_i_01234fc() } void m68000_base_device::xc0c0_mulu_w_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = MASK_OUT_ABOVE_16(DY()) * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = MASK_OUT_ABOVE_16(DY()) * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -23035,8 +23035,8 @@ void m68000_base_device::xc0c0_mulu_w_01234fc() } void m68000_base_device::xc0d0_mulu_w_ai_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = OPER_AY_AI_16() * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = OPER_AY_AI_16() * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -23049,8 +23049,8 @@ void m68000_base_device::xc0d0_mulu_w_ai_01234fc() } void m68000_base_device::xc0d8_mulu_w_pi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = OPER_AY_PI_16() * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = OPER_AY_PI_16() * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -23063,8 +23063,8 @@ void m68000_base_device::xc0d8_mulu_w_pi_01234fc() } void m68000_base_device::xc0e0_mulu_w_pd_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = OPER_AY_PD_16() * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = OPER_AY_PD_16() * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -23077,8 +23077,8 @@ void m68000_base_device::xc0e0_mulu_w_pd_01234fc() } void m68000_base_device::xc0e8_mulu_w_di_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = OPER_AY_DI_16() * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = OPER_AY_DI_16() * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -23091,8 +23091,8 @@ void m68000_base_device::xc0e8_mulu_w_di_01234fc() } void m68000_base_device::xc0f0_mulu_w_ix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = OPER_AY_IX_16() * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = OPER_AY_IX_16() * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -23105,8 +23105,8 @@ void m68000_base_device::xc0f0_mulu_w_ix_01234fc() } void m68000_base_device::xc0f8_mulu_w_aw_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = OPER_AW_16() * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = OPER_AW_16() * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -23119,8 +23119,8 @@ void m68000_base_device::xc0f8_mulu_w_aw_01234fc() } void m68000_base_device::xc0f9_mulu_w_al_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = OPER_AL_16() * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = OPER_AL_16() * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -23133,8 +23133,8 @@ void m68000_base_device::xc0f9_mulu_w_al_01234fc() } void m68000_base_device::xc0fa_mulu_w_pcdi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = OPER_PCDI_16() * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = OPER_PCDI_16() * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -23147,8 +23147,8 @@ void m68000_base_device::xc0fa_mulu_w_pcdi_01234fc() } void m68000_base_device::xc0fb_mulu_w_pcix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = OPER_PCIX_16() * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = OPER_PCIX_16() * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -23161,8 +23161,8 @@ void m68000_base_device::xc0fb_mulu_w_pcix_01234fc() } void m68000_base_device::xc0fc_mulu_w_i_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t res = OPER_I_16() * MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DX(); + u32 res = OPER_I_16() * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -23177,21 +23177,21 @@ void m68000_base_device::x4c00_mull_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = DY(); - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = DY(); + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -23227,21 +23227,21 @@ void m68000_base_device::x4c10_mull_l_ai_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = OPER_AY_AI_32(); - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = OPER_AY_AI_32(); + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -23277,21 +23277,21 @@ void m68000_base_device::x4c18_mull_l_pi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = OPER_AY_PI_32(); - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = OPER_AY_PI_32(); + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -23327,21 +23327,21 @@ void m68000_base_device::x4c20_mull_l_pd_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = OPER_AY_PD_32(); - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = OPER_AY_PD_32(); + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -23377,21 +23377,21 @@ void m68000_base_device::x4c28_mull_l_di_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = OPER_AY_DI_32(); - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = OPER_AY_DI_32(); + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -23427,21 +23427,21 @@ void m68000_base_device::x4c30_mull_l_ix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = OPER_AY_IX_32(); - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = OPER_AY_IX_32(); + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -23477,21 +23477,21 @@ void m68000_base_device::x4c38_mull_l_aw_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = OPER_AW_32(); - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = OPER_AW_32(); + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -23527,21 +23527,21 @@ void m68000_base_device::x4c39_mull_l_al_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = OPER_AL_32(); - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = OPER_AL_32(); + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -23577,21 +23577,21 @@ void m68000_base_device::x4c3a_mull_l_pcdi_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = OPER_PCDI_32(); - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = OPER_PCDI_32(); + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -23627,21 +23627,21 @@ void m68000_base_device::x4c3b_mull_l_pcix_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = OPER_PCIX_32(); - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = OPER_PCIX_32(); + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -23677,21 +23677,21 @@ void m68000_base_device::x4c3c_mull_l_i_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t word2 = OPER_I_16(); - uint64_t src = OPER_I_32(); - uint64_t dst = REG_D()[(word2 >> 12) & 7]; - uint64_t res; + u32 word2 = OPER_I_16(); + u64 src = OPER_I_32(); + u64 dst = REG_D()[(word2 >> 12) & 7]; + u64 res; m_c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); + res = (s64)((s32)src) * (s64)((s32)dst); if(!BIT_A(word2)) { m_not_z_flag = MASK_OUT_ABOVE_32(res); m_n_flag = NFLAG_32(res); - m_v_flag = ((int64_t)res != (int32_t)res)<<7; + m_v_flag = ((s64)res != (s32)res)<<7; REG_D()[(word2 >> 12) & 7] = m_not_z_flag; return; } @@ -23725,9 +23725,9 @@ void m68000_base_device::x4c3c_mull_l_i_234fc() } void m68000_base_device::x4800_nbcd_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = -dst - XFLAG_1(); + u32* r_dst = &DY(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = -dst - XFLAG_1(); if(res != 0) { @@ -23758,9 +23758,9 @@ void m68000_base_device::x4800_nbcd_b_01234fc() } void m68000_base_device::x4810_nbcd_b_ai_01234fc() { - uint32_t ea = EA_AY_AI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = -dst - XFLAG_1(); + u32 ea = EA_AY_AI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = -dst - XFLAG_1(); if(res != 0) { @@ -23791,9 +23791,9 @@ void m68000_base_device::x4810_nbcd_b_ai_01234fc() } void m68000_base_device::x4818_nbcd_b_pi_01234fc() { - uint32_t ea = EA_AY_PI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = -dst - XFLAG_1(); + u32 ea = EA_AY_PI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = -dst - XFLAG_1(); if(res != 0) { @@ -23824,9 +23824,9 @@ void m68000_base_device::x4818_nbcd_b_pi_01234fc() } void m68000_base_device::x481f_nbcd_b_pi7_01234fc() { - uint32_t ea = EA_A7_PI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = -dst - XFLAG_1(); + u32 ea = EA_A7_PI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = -dst - XFLAG_1(); if(res != 0) { @@ -23857,9 +23857,9 @@ void m68000_base_device::x481f_nbcd_b_pi7_01234fc() } void m68000_base_device::x4820_nbcd_b_pd_01234fc() { - uint32_t ea = EA_AY_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = -dst - XFLAG_1(); + u32 ea = EA_AY_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = -dst - XFLAG_1(); if(res != 0) { @@ -23890,9 +23890,9 @@ void m68000_base_device::x4820_nbcd_b_pd_01234fc() } void m68000_base_device::x4827_nbcd_b_pd7_01234fc() { - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = -dst - XFLAG_1(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = -dst - XFLAG_1(); if(res != 0) { @@ -23923,9 +23923,9 @@ void m68000_base_device::x4827_nbcd_b_pd7_01234fc() } void m68000_base_device::x4828_nbcd_b_di_01234fc() { - uint32_t ea = EA_AY_DI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = -dst - XFLAG_1(); + u32 ea = EA_AY_DI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = -dst - XFLAG_1(); if(res != 0) { @@ -23956,9 +23956,9 @@ void m68000_base_device::x4828_nbcd_b_di_01234fc() } void m68000_base_device::x4830_nbcd_b_ix_01234fc() { - uint32_t ea = EA_AY_IX_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = -dst - XFLAG_1(); + u32 ea = EA_AY_IX_8(); + u32 dst = m68ki_read_8(ea); + u32 res = -dst - XFLAG_1(); if(res != 0) { @@ -23989,9 +23989,9 @@ void m68000_base_device::x4830_nbcd_b_ix_01234fc() } void m68000_base_device::x4838_nbcd_b_aw_01234fc() { - uint32_t ea = EA_AW_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = -dst - XFLAG_1(); + u32 ea = EA_AW_8(); + u32 dst = m68ki_read_8(ea); + u32 res = -dst - XFLAG_1(); if(res != 0) { @@ -24022,9 +24022,9 @@ void m68000_base_device::x4838_nbcd_b_aw_01234fc() } void m68000_base_device::x4839_nbcd_b_al_01234fc() { - uint32_t ea = EA_AL_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = -dst - XFLAG_1(); + u32 ea = EA_AL_8(); + u32 dst = m68ki_read_8(ea); + u32 res = -dst - XFLAG_1(); if(res != 0) { @@ -24055,8 +24055,8 @@ void m68000_base_device::x4839_nbcd_b_al_01234fc() } void m68000_base_device::x4400_neg_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t res = 0 - MASK_OUT_ABOVE_8(*r_dst); + u32* r_dst = &DY(); + u32 res = 0 - MASK_OUT_ABOVE_8(*r_dst); m_n_flag = NFLAG_8(res); m_c_flag = m_x_flag = CFLAG_8(res); @@ -24069,9 +24069,9 @@ void m68000_base_device::x4400_neg_b_01234fc() } void m68000_base_device::x4410_neg_b_ai_01234fc() { - uint32_t ea = EA_AY_AI_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_AI_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src; m_n_flag = NFLAG_8(res); m_c_flag = m_x_flag = CFLAG_8(res); @@ -24084,9 +24084,9 @@ void m68000_base_device::x4410_neg_b_ai_01234fc() } void m68000_base_device::x4418_neg_b_pi_01234fc() { - uint32_t ea = EA_AY_PI_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_PI_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src; m_n_flag = NFLAG_8(res); m_c_flag = m_x_flag = CFLAG_8(res); @@ -24099,9 +24099,9 @@ void m68000_base_device::x4418_neg_b_pi_01234fc() } void m68000_base_device::x441f_neg_b_pi7_01234fc() { - uint32_t ea = EA_A7_PI_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src; + u32 ea = EA_A7_PI_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src; m_n_flag = NFLAG_8(res); m_c_flag = m_x_flag = CFLAG_8(res); @@ -24114,9 +24114,9 @@ void m68000_base_device::x441f_neg_b_pi7_01234fc() } void m68000_base_device::x4420_neg_b_pd_01234fc() { - uint32_t ea = EA_AY_PD_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_PD_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src; m_n_flag = NFLAG_8(res); m_c_flag = m_x_flag = CFLAG_8(res); @@ -24129,9 +24129,9 @@ void m68000_base_device::x4420_neg_b_pd_01234fc() } void m68000_base_device::x4427_neg_b_pd7_01234fc() { - uint32_t ea = EA_A7_PD_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src; + u32 ea = EA_A7_PD_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src; m_n_flag = NFLAG_8(res); m_c_flag = m_x_flag = CFLAG_8(res); @@ -24144,9 +24144,9 @@ void m68000_base_device::x4427_neg_b_pd7_01234fc() } void m68000_base_device::x4428_neg_b_di_01234fc() { - uint32_t ea = EA_AY_DI_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_DI_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src; m_n_flag = NFLAG_8(res); m_c_flag = m_x_flag = CFLAG_8(res); @@ -24159,9 +24159,9 @@ void m68000_base_device::x4428_neg_b_di_01234fc() } void m68000_base_device::x4430_neg_b_ix_01234fc() { - uint32_t ea = EA_AY_IX_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_IX_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src; m_n_flag = NFLAG_8(res); m_c_flag = m_x_flag = CFLAG_8(res); @@ -24174,9 +24174,9 @@ void m68000_base_device::x4430_neg_b_ix_01234fc() } void m68000_base_device::x4438_neg_b_aw_01234fc() { - uint32_t ea = EA_AW_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src; + u32 ea = EA_AW_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src; m_n_flag = NFLAG_8(res); m_c_flag = m_x_flag = CFLAG_8(res); @@ -24189,9 +24189,9 @@ void m68000_base_device::x4438_neg_b_aw_01234fc() } void m68000_base_device::x4439_neg_b_al_01234fc() { - uint32_t ea = EA_AL_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src; + u32 ea = EA_AL_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src; m_n_flag = NFLAG_8(res); m_c_flag = m_x_flag = CFLAG_8(res); @@ -24204,8 +24204,8 @@ void m68000_base_device::x4439_neg_b_al_01234fc() } void m68000_base_device::x4440_neg_w_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t res = 0 - MASK_OUT_ABOVE_16(*r_dst); + u32* r_dst = &DY(); + u32 res = 0 - MASK_OUT_ABOVE_16(*r_dst); m_n_flag = NFLAG_16(res); m_c_flag = m_x_flag = CFLAG_16(res); @@ -24218,9 +24218,9 @@ void m68000_base_device::x4440_neg_w_01234fc() } void m68000_base_device::x4450_neg_w_ai_01234fc() { - uint32_t ea = EA_AY_AI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_AI_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - src; m_n_flag = NFLAG_16(res); m_c_flag = m_x_flag = CFLAG_16(res); @@ -24233,9 +24233,9 @@ void m68000_base_device::x4450_neg_w_ai_01234fc() } void m68000_base_device::x4458_neg_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_PI_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - src; m_n_flag = NFLAG_16(res); m_c_flag = m_x_flag = CFLAG_16(res); @@ -24248,9 +24248,9 @@ void m68000_base_device::x4458_neg_w_pi_01234fc() } void m68000_base_device::x4460_neg_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_PD_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - src; m_n_flag = NFLAG_16(res); m_c_flag = m_x_flag = CFLAG_16(res); @@ -24263,9 +24263,9 @@ void m68000_base_device::x4460_neg_w_pd_01234fc() } void m68000_base_device::x4468_neg_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_DI_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - src; m_n_flag = NFLAG_16(res); m_c_flag = m_x_flag = CFLAG_16(res); @@ -24278,9 +24278,9 @@ void m68000_base_device::x4468_neg_w_di_01234fc() } void m68000_base_device::x4470_neg_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_IX_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - src; m_n_flag = NFLAG_16(res); m_c_flag = m_x_flag = CFLAG_16(res); @@ -24293,9 +24293,9 @@ void m68000_base_device::x4470_neg_w_ix_01234fc() } void m68000_base_device::x4478_neg_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - src; + u32 ea = EA_AW_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - src; m_n_flag = NFLAG_16(res); m_c_flag = m_x_flag = CFLAG_16(res); @@ -24308,9 +24308,9 @@ void m68000_base_device::x4478_neg_w_aw_01234fc() } void m68000_base_device::x4479_neg_w_al_01234fc() { - uint32_t ea = EA_AL_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - src; + u32 ea = EA_AL_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - src; m_n_flag = NFLAG_16(res); m_c_flag = m_x_flag = CFLAG_16(res); @@ -24323,8 +24323,8 @@ void m68000_base_device::x4479_neg_w_al_01234fc() } void m68000_base_device::x4480_neg_l_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t res = 0 - *r_dst; + u32* r_dst = &DY(); + u32 res = 0 - *r_dst; m_n_flag = NFLAG_32(res); m_c_flag = m_x_flag = CFLAG_SUB_32(*r_dst, 0, res); @@ -24337,9 +24337,9 @@ void m68000_base_device::x4480_neg_l_01234fc() } void m68000_base_device::x4490_neg_l_ai_01234fc() { - uint32_t ea = EA_AY_AI_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_AI_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - src; m_n_flag = NFLAG_32(res); m_c_flag = m_x_flag = CFLAG_SUB_32(src, 0, res); @@ -24352,9 +24352,9 @@ void m68000_base_device::x4490_neg_l_ai_01234fc() } void m68000_base_device::x4498_neg_l_pi_01234fc() { - uint32_t ea = EA_AY_PI_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_PI_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - src; m_n_flag = NFLAG_32(res); m_c_flag = m_x_flag = CFLAG_SUB_32(src, 0, res); @@ -24367,9 +24367,9 @@ void m68000_base_device::x4498_neg_l_pi_01234fc() } void m68000_base_device::x44a0_neg_l_pd_01234fc() { - uint32_t ea = EA_AY_PD_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_PD_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - src; m_n_flag = NFLAG_32(res); m_c_flag = m_x_flag = CFLAG_SUB_32(src, 0, res); @@ -24382,9 +24382,9 @@ void m68000_base_device::x44a0_neg_l_pd_01234fc() } void m68000_base_device::x44a8_neg_l_di_01234fc() { - uint32_t ea = EA_AY_DI_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_DI_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - src; m_n_flag = NFLAG_32(res); m_c_flag = m_x_flag = CFLAG_SUB_32(src, 0, res); @@ -24397,9 +24397,9 @@ void m68000_base_device::x44a8_neg_l_di_01234fc() } void m68000_base_device::x44b0_neg_l_ix_01234fc() { - uint32_t ea = EA_AY_IX_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - src; + u32 ea = EA_AY_IX_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - src; m_n_flag = NFLAG_32(res); m_c_flag = m_x_flag = CFLAG_SUB_32(src, 0, res); @@ -24412,9 +24412,9 @@ void m68000_base_device::x44b0_neg_l_ix_01234fc() } void m68000_base_device::x44b8_neg_l_aw_01234fc() { - uint32_t ea = EA_AW_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - src; + u32 ea = EA_AW_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - src; m_n_flag = NFLAG_32(res); m_c_flag = m_x_flag = CFLAG_SUB_32(src, 0, res); @@ -24427,9 +24427,9 @@ void m68000_base_device::x44b8_neg_l_aw_01234fc() } void m68000_base_device::x44b9_neg_l_al_01234fc() { - uint32_t ea = EA_AL_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - src; + u32 ea = EA_AL_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - src; m_n_flag = NFLAG_32(res); m_c_flag = m_x_flag = CFLAG_SUB_32(src, 0, res); @@ -24442,8 +24442,8 @@ void m68000_base_device::x44b9_neg_l_al_01234fc() } void m68000_base_device::x4000_negx_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t res = 0 - MASK_OUT_ABOVE_8(*r_dst) - XFLAG_1(); + u32* r_dst = &DY(); + u32 res = 0 - MASK_OUT_ABOVE_8(*r_dst) - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -24458,9 +24458,9 @@ void m68000_base_device::x4000_negx_b_01234fc() } void m68000_base_device::x4010_negx_b_ai_01234fc() { - uint32_t ea = EA_AY_AI_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src - XFLAG_1(); + u32 ea = EA_AY_AI_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -24475,9 +24475,9 @@ void m68000_base_device::x4010_negx_b_ai_01234fc() } void m68000_base_device::x4018_negx_b_pi_01234fc() { - uint32_t ea = EA_AY_PI_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src - XFLAG_1(); + u32 ea = EA_AY_PI_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -24492,9 +24492,9 @@ void m68000_base_device::x4018_negx_b_pi_01234fc() } void m68000_base_device::x401f_negx_b_pi7_01234fc() { - uint32_t ea = EA_A7_PI_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src - XFLAG_1(); + u32 ea = EA_A7_PI_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -24509,9 +24509,9 @@ void m68000_base_device::x401f_negx_b_pi7_01234fc() } void m68000_base_device::x4020_negx_b_pd_01234fc() { - uint32_t ea = EA_AY_PD_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src - XFLAG_1(); + u32 ea = EA_AY_PD_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -24526,9 +24526,9 @@ void m68000_base_device::x4020_negx_b_pd_01234fc() } void m68000_base_device::x4027_negx_b_pd7_01234fc() { - uint32_t ea = EA_A7_PD_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src - XFLAG_1(); + u32 ea = EA_A7_PD_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -24543,9 +24543,9 @@ void m68000_base_device::x4027_negx_b_pd7_01234fc() } void m68000_base_device::x4028_negx_b_di_01234fc() { - uint32_t ea = EA_AY_DI_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src - XFLAG_1(); + u32 ea = EA_AY_DI_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -24560,9 +24560,9 @@ void m68000_base_device::x4028_negx_b_di_01234fc() } void m68000_base_device::x4030_negx_b_ix_01234fc() { - uint32_t ea = EA_AY_IX_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src - XFLAG_1(); + u32 ea = EA_AY_IX_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -24577,9 +24577,9 @@ void m68000_base_device::x4030_negx_b_ix_01234fc() } void m68000_base_device::x4038_negx_b_aw_01234fc() { - uint32_t ea = EA_AW_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src - XFLAG_1(); + u32 ea = EA_AW_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -24594,9 +24594,9 @@ void m68000_base_device::x4038_negx_b_aw_01234fc() } void m68000_base_device::x4039_negx_b_al_01234fc() { - uint32_t ea = EA_AL_8(); - uint32_t src = m68ki_read_8(ea); - uint32_t res = 0 - src - XFLAG_1(); + u32 ea = EA_AL_8(); + u32 src = m68ki_read_8(ea); + u32 res = 0 - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -24611,8 +24611,8 @@ void m68000_base_device::x4039_negx_b_al_01234fc() } void m68000_base_device::x4040_negx_w_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t res = 0 - MASK_OUT_ABOVE_16(*r_dst) - XFLAG_1(); + u32* r_dst = &DY(); + u32 res = 0 - MASK_OUT_ABOVE_16(*r_dst) - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -24627,9 +24627,9 @@ void m68000_base_device::x4040_negx_w_01234fc() } void m68000_base_device::x4050_negx_w_ai_01234fc() { - uint32_t ea = EA_AY_AI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); + u32 ea = EA_AY_AI_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -24644,9 +24644,9 @@ void m68000_base_device::x4050_negx_w_ai_01234fc() } void m68000_base_device::x4058_negx_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); + u32 ea = EA_AY_PI_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -24661,9 +24661,9 @@ void m68000_base_device::x4058_negx_w_pi_01234fc() } void m68000_base_device::x4060_negx_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); + u32 ea = EA_AY_PD_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -24678,9 +24678,9 @@ void m68000_base_device::x4060_negx_w_pd_01234fc() } void m68000_base_device::x4068_negx_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); + u32 ea = EA_AY_DI_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -24695,9 +24695,9 @@ void m68000_base_device::x4068_negx_w_di_01234fc() } void m68000_base_device::x4070_negx_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); + u32 ea = EA_AY_IX_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -24712,9 +24712,9 @@ void m68000_base_device::x4070_negx_w_ix_01234fc() } void m68000_base_device::x4078_negx_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); + u32 ea = EA_AW_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -24729,9 +24729,9 @@ void m68000_base_device::x4078_negx_w_aw_01234fc() } void m68000_base_device::x4079_negx_w_al_01234fc() { - uint32_t ea = EA_AL_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); + u32 ea = EA_AL_16(); + u32 src = m68ki_read_16(ea); + u32 res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -24746,8 +24746,8 @@ void m68000_base_device::x4079_negx_w_al_01234fc() } void m68000_base_device::x4080_negx_l_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t res = 0 - MASK_OUT_ABOVE_32(*r_dst) - XFLAG_1(); + u32* r_dst = &DY(); + u32 res = 0 - MASK_OUT_ABOVE_32(*r_dst) - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(*r_dst, 0, res); @@ -24762,9 +24762,9 @@ void m68000_base_device::x4080_negx_l_01234fc() } void m68000_base_device::x4090_negx_l_ai_01234fc() { - uint32_t ea = EA_AY_AI_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); + u32 ea = EA_AY_AI_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, 0, res); @@ -24779,9 +24779,9 @@ void m68000_base_device::x4090_negx_l_ai_01234fc() } void m68000_base_device::x4098_negx_l_pi_01234fc() { - uint32_t ea = EA_AY_PI_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); + u32 ea = EA_AY_PI_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, 0, res); @@ -24796,9 +24796,9 @@ void m68000_base_device::x4098_negx_l_pi_01234fc() } void m68000_base_device::x40a0_negx_l_pd_01234fc() { - uint32_t ea = EA_AY_PD_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); + u32 ea = EA_AY_PD_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, 0, res); @@ -24813,9 +24813,9 @@ void m68000_base_device::x40a0_negx_l_pd_01234fc() } void m68000_base_device::x40a8_negx_l_di_01234fc() { - uint32_t ea = EA_AY_DI_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); + u32 ea = EA_AY_DI_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, 0, res); @@ -24830,9 +24830,9 @@ void m68000_base_device::x40a8_negx_l_di_01234fc() } void m68000_base_device::x40b0_negx_l_ix_01234fc() { - uint32_t ea = EA_AY_IX_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); + u32 ea = EA_AY_IX_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, 0, res); @@ -24847,9 +24847,9 @@ void m68000_base_device::x40b0_negx_l_ix_01234fc() } void m68000_base_device::x40b8_negx_l_aw_01234fc() { - uint32_t ea = EA_AW_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); + u32 ea = EA_AW_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, 0, res); @@ -24864,9 +24864,9 @@ void m68000_base_device::x40b8_negx_l_aw_01234fc() } void m68000_base_device::x40b9_negx_l_al_01234fc() { - uint32_t ea = EA_AL_32(); - uint32_t src = m68ki_read_32(ea); - uint32_t res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); + u32 ea = EA_AL_32(); + u32 src = m68ki_read_32(ea); + u32 res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, 0, res); @@ -24887,8 +24887,8 @@ void m68000_base_device::x4e71_nop_01234fc() } void m68000_base_device::x4600_not_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_8(~*r_dst); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_8(~*r_dst); *r_dst = MASK_OUT_BELOW_8(*r_dst) | res; @@ -24901,8 +24901,8 @@ void m68000_base_device::x4600_not_b_01234fc() } void m68000_base_device::x4610_not_b_ai_01234fc() { - uint32_t ea = EA_AY_AI_8(); - uint32_t res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); + u32 ea = EA_AY_AI_8(); + u32 res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -24915,8 +24915,8 @@ void m68000_base_device::x4610_not_b_ai_01234fc() } void m68000_base_device::x4618_not_b_pi_01234fc() { - uint32_t ea = EA_AY_PI_8(); - uint32_t res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); + u32 ea = EA_AY_PI_8(); + u32 res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -24929,8 +24929,8 @@ void m68000_base_device::x4618_not_b_pi_01234fc() } void m68000_base_device::x461f_not_b_pi7_01234fc() { - uint32_t ea = EA_A7_PI_8(); - uint32_t res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); + u32 ea = EA_A7_PI_8(); + u32 res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -24943,8 +24943,8 @@ void m68000_base_device::x461f_not_b_pi7_01234fc() } void m68000_base_device::x4620_not_b_pd_01234fc() { - uint32_t ea = EA_AY_PD_8(); - uint32_t res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); + u32 ea = EA_AY_PD_8(); + u32 res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -24957,8 +24957,8 @@ void m68000_base_device::x4620_not_b_pd_01234fc() } void m68000_base_device::x4627_not_b_pd7_01234fc() { - uint32_t ea = EA_A7_PD_8(); - uint32_t res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); + u32 ea = EA_A7_PD_8(); + u32 res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -24971,8 +24971,8 @@ void m68000_base_device::x4627_not_b_pd7_01234fc() } void m68000_base_device::x4628_not_b_di_01234fc() { - uint32_t ea = EA_AY_DI_8(); - uint32_t res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); + u32 ea = EA_AY_DI_8(); + u32 res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -24985,8 +24985,8 @@ void m68000_base_device::x4628_not_b_di_01234fc() } void m68000_base_device::x4630_not_b_ix_01234fc() { - uint32_t ea = EA_AY_IX_8(); - uint32_t res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); + u32 ea = EA_AY_IX_8(); + u32 res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -24999,8 +24999,8 @@ void m68000_base_device::x4630_not_b_ix_01234fc() } void m68000_base_device::x4638_not_b_aw_01234fc() { - uint32_t ea = EA_AW_8(); - uint32_t res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); + u32 ea = EA_AW_8(); + u32 res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25013,8 +25013,8 @@ void m68000_base_device::x4638_not_b_aw_01234fc() } void m68000_base_device::x4639_not_b_al_01234fc() { - uint32_t ea = EA_AL_8(); - uint32_t res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); + u32 ea = EA_AL_8(); + u32 res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25027,8 +25027,8 @@ void m68000_base_device::x4639_not_b_al_01234fc() } void m68000_base_device::x4640_not_w_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t res = MASK_OUT_ABOVE_16(~*r_dst); + u32* r_dst = &DY(); + u32 res = MASK_OUT_ABOVE_16(~*r_dst); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; @@ -25041,8 +25041,8 @@ void m68000_base_device::x4640_not_w_01234fc() } void m68000_base_device::x4650_not_w_ai_01234fc() { - uint32_t ea = EA_AY_AI_16(); - uint32_t res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); + u32 ea = EA_AY_AI_16(); + u32 res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25055,8 +25055,8 @@ void m68000_base_device::x4650_not_w_ai_01234fc() } void m68000_base_device::x4658_not_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); - uint32_t res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); + u32 ea = EA_AY_PI_16(); + u32 res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25069,8 +25069,8 @@ void m68000_base_device::x4658_not_w_pi_01234fc() } void m68000_base_device::x4660_not_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); - uint32_t res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); + u32 ea = EA_AY_PD_16(); + u32 res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25083,8 +25083,8 @@ void m68000_base_device::x4660_not_w_pd_01234fc() } void m68000_base_device::x4668_not_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); + u32 ea = EA_AY_DI_16(); + u32 res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25097,8 +25097,8 @@ void m68000_base_device::x4668_not_w_di_01234fc() } void m68000_base_device::x4670_not_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); - uint32_t res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); + u32 ea = EA_AY_IX_16(); + u32 res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25111,8 +25111,8 @@ void m68000_base_device::x4670_not_w_ix_01234fc() } void m68000_base_device::x4678_not_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); - uint32_t res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); + u32 ea = EA_AW_16(); + u32 res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25125,8 +25125,8 @@ void m68000_base_device::x4678_not_w_aw_01234fc() } void m68000_base_device::x4679_not_w_al_01234fc() { - uint32_t ea = EA_AL_16(); - uint32_t res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); + u32 ea = EA_AL_16(); + u32 res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25139,8 +25139,8 @@ void m68000_base_device::x4679_not_w_al_01234fc() } void m68000_base_device::x4680_not_l_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t res = *r_dst = MASK_OUT_ABOVE_32(~*r_dst); + u32* r_dst = &DY(); + u32 res = *r_dst = MASK_OUT_ABOVE_32(~*r_dst); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -25151,8 +25151,8 @@ void m68000_base_device::x4680_not_l_01234fc() } void m68000_base_device::x4690_not_l_ai_01234fc() { - uint32_t ea = EA_AY_AI_32(); - uint32_t res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); + u32 ea = EA_AY_AI_32(); + u32 res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); m68ki_write_32(ea, res); @@ -25165,8 +25165,8 @@ void m68000_base_device::x4690_not_l_ai_01234fc() } void m68000_base_device::x4698_not_l_pi_01234fc() { - uint32_t ea = EA_AY_PI_32(); - uint32_t res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); + u32 ea = EA_AY_PI_32(); + u32 res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); m68ki_write_32(ea, res); @@ -25179,8 +25179,8 @@ void m68000_base_device::x4698_not_l_pi_01234fc() } void m68000_base_device::x46a0_not_l_pd_01234fc() { - uint32_t ea = EA_AY_PD_32(); - uint32_t res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); + u32 ea = EA_AY_PD_32(); + u32 res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); m68ki_write_32(ea, res); @@ -25193,8 +25193,8 @@ void m68000_base_device::x46a0_not_l_pd_01234fc() } void m68000_base_device::x46a8_not_l_di_01234fc() { - uint32_t ea = EA_AY_DI_32(); - uint32_t res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); + u32 ea = EA_AY_DI_32(); + u32 res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); m68ki_write_32(ea, res); @@ -25207,8 +25207,8 @@ void m68000_base_device::x46a8_not_l_di_01234fc() } void m68000_base_device::x46b0_not_l_ix_01234fc() { - uint32_t ea = EA_AY_IX_32(); - uint32_t res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); + u32 ea = EA_AY_IX_32(); + u32 res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); m68ki_write_32(ea, res); @@ -25221,8 +25221,8 @@ void m68000_base_device::x46b0_not_l_ix_01234fc() } void m68000_base_device::x46b8_not_l_aw_01234fc() { - uint32_t ea = EA_AW_32(); - uint32_t res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); + u32 ea = EA_AW_32(); + u32 res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); m68ki_write_32(ea, res); @@ -25235,8 +25235,8 @@ void m68000_base_device::x46b8_not_l_aw_01234fc() } void m68000_base_device::x46b9_not_l_al_01234fc() { - uint32_t ea = EA_AL_32(); - uint32_t res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); + u32 ea = EA_AL_32(); + u32 res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea)); m68ki_write_32(ea, res); @@ -25249,7 +25249,7 @@ void m68000_base_device::x46b9_not_l_al_01234fc() } void m68000_base_device::x8000_or_b_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= MASK_OUT_ABOVE_8(DY()))); + u32 res = MASK_OUT_ABOVE_8((DX() |= MASK_OUT_ABOVE_8(DY()))); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25260,7 +25260,7 @@ void m68000_base_device::x8000_or_b_01234fc() } void m68000_base_device::x8010_or_b_ai_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= OPER_AY_AI_8())); + u32 res = MASK_OUT_ABOVE_8((DX() |= OPER_AY_AI_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25271,7 +25271,7 @@ void m68000_base_device::x8010_or_b_ai_01234fc() } void m68000_base_device::x8018_or_b_pi_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= OPER_AY_PI_8())); + u32 res = MASK_OUT_ABOVE_8((DX() |= OPER_AY_PI_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25282,7 +25282,7 @@ void m68000_base_device::x8018_or_b_pi_01234fc() } void m68000_base_device::x801f_or_b_pi7_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= OPER_A7_PI_8())); + u32 res = MASK_OUT_ABOVE_8((DX() |= OPER_A7_PI_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25293,7 +25293,7 @@ void m68000_base_device::x801f_or_b_pi7_01234fc() } void m68000_base_device::x8020_or_b_pd_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= OPER_AY_PD_8())); + u32 res = MASK_OUT_ABOVE_8((DX() |= OPER_AY_PD_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25304,7 +25304,7 @@ void m68000_base_device::x8020_or_b_pd_01234fc() } void m68000_base_device::x8027_or_b_pd7_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= OPER_A7_PD_8())); + u32 res = MASK_OUT_ABOVE_8((DX() |= OPER_A7_PD_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25315,7 +25315,7 @@ void m68000_base_device::x8027_or_b_pd7_01234fc() } void m68000_base_device::x8028_or_b_di_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= OPER_AY_DI_8())); + u32 res = MASK_OUT_ABOVE_8((DX() |= OPER_AY_DI_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25326,7 +25326,7 @@ void m68000_base_device::x8028_or_b_di_01234fc() } void m68000_base_device::x8030_or_b_ix_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= OPER_AY_IX_8())); + u32 res = MASK_OUT_ABOVE_8((DX() |= OPER_AY_IX_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25337,7 +25337,7 @@ void m68000_base_device::x8030_or_b_ix_01234fc() } void m68000_base_device::x8038_or_b_aw_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= OPER_AW_8())); + u32 res = MASK_OUT_ABOVE_8((DX() |= OPER_AW_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25348,7 +25348,7 @@ void m68000_base_device::x8038_or_b_aw_01234fc() } void m68000_base_device::x8039_or_b_al_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= OPER_AL_8())); + u32 res = MASK_OUT_ABOVE_8((DX() |= OPER_AL_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25359,7 +25359,7 @@ void m68000_base_device::x8039_or_b_al_01234fc() } void m68000_base_device::x803a_or_b_pcdi_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= OPER_PCDI_8())); + u32 res = MASK_OUT_ABOVE_8((DX() |= OPER_PCDI_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25370,7 +25370,7 @@ void m68000_base_device::x803a_or_b_pcdi_01234fc() } void m68000_base_device::x803b_or_b_pcix_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= OPER_PCIX_8())); + u32 res = MASK_OUT_ABOVE_8((DX() |= OPER_PCIX_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25381,7 +25381,7 @@ void m68000_base_device::x803b_or_b_pcix_01234fc() } void m68000_base_device::x803c_or_b_i_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DX() |= OPER_I_8())); + u32 res = MASK_OUT_ABOVE_8((DX() |= OPER_I_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25392,7 +25392,7 @@ void m68000_base_device::x803c_or_b_i_01234fc() } void m68000_base_device::x8040_or_w_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16((DX() |= MASK_OUT_ABOVE_16(DY()))); + u32 res = MASK_OUT_ABOVE_16((DX() |= MASK_OUT_ABOVE_16(DY()))); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -25403,7 +25403,7 @@ void m68000_base_device::x8040_or_w_01234fc() } void m68000_base_device::x8050_or_w_ai_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16((DX() |= OPER_AY_AI_16())); + u32 res = MASK_OUT_ABOVE_16((DX() |= OPER_AY_AI_16())); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -25414,7 +25414,7 @@ void m68000_base_device::x8050_or_w_ai_01234fc() } void m68000_base_device::x8058_or_w_pi_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16((DX() |= OPER_AY_PI_16())); + u32 res = MASK_OUT_ABOVE_16((DX() |= OPER_AY_PI_16())); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -25425,7 +25425,7 @@ void m68000_base_device::x8058_or_w_pi_01234fc() } void m68000_base_device::x8060_or_w_pd_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16((DX() |= OPER_AY_PD_16())); + u32 res = MASK_OUT_ABOVE_16((DX() |= OPER_AY_PD_16())); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -25436,7 +25436,7 @@ void m68000_base_device::x8060_or_w_pd_01234fc() } void m68000_base_device::x8068_or_w_di_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16((DX() |= OPER_AY_DI_16())); + u32 res = MASK_OUT_ABOVE_16((DX() |= OPER_AY_DI_16())); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -25447,7 +25447,7 @@ void m68000_base_device::x8068_or_w_di_01234fc() } void m68000_base_device::x8070_or_w_ix_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16((DX() |= OPER_AY_IX_16())); + u32 res = MASK_OUT_ABOVE_16((DX() |= OPER_AY_IX_16())); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -25458,7 +25458,7 @@ void m68000_base_device::x8070_or_w_ix_01234fc() } void m68000_base_device::x8078_or_w_aw_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16((DX() |= OPER_AW_16())); + u32 res = MASK_OUT_ABOVE_16((DX() |= OPER_AW_16())); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -25469,7 +25469,7 @@ void m68000_base_device::x8078_or_w_aw_01234fc() } void m68000_base_device::x8079_or_w_al_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16((DX() |= OPER_AL_16())); + u32 res = MASK_OUT_ABOVE_16((DX() |= OPER_AL_16())); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -25480,7 +25480,7 @@ void m68000_base_device::x8079_or_w_al_01234fc() } void m68000_base_device::x807a_or_w_pcdi_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16((DX() |= OPER_PCDI_16())); + u32 res = MASK_OUT_ABOVE_16((DX() |= OPER_PCDI_16())); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -25491,7 +25491,7 @@ void m68000_base_device::x807a_or_w_pcdi_01234fc() } void m68000_base_device::x807b_or_w_pcix_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16((DX() |= OPER_PCIX_16())); + u32 res = MASK_OUT_ABOVE_16((DX() |= OPER_PCIX_16())); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -25502,7 +25502,7 @@ void m68000_base_device::x807b_or_w_pcix_01234fc() } void m68000_base_device::x807c_or_w_i_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16((DX() |= OPER_I_16())); + u32 res = MASK_OUT_ABOVE_16((DX() |= OPER_I_16())); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -25513,7 +25513,7 @@ void m68000_base_device::x807c_or_w_i_01234fc() } void m68000_base_device::x8080_or_l_01234fc() { - uint32_t res = DX() |= DY(); + u32 res = DX() |= DY(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -25524,7 +25524,7 @@ void m68000_base_device::x8080_or_l_01234fc() } void m68000_base_device::x8090_or_l_ai_01234fc() { - uint32_t res = DX() |= OPER_AY_AI_32(); + u32 res = DX() |= OPER_AY_AI_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -25535,7 +25535,7 @@ void m68000_base_device::x8090_or_l_ai_01234fc() } void m68000_base_device::x8098_or_l_pi_01234fc() { - uint32_t res = DX() |= OPER_AY_PI_32(); + u32 res = DX() |= OPER_AY_PI_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -25546,7 +25546,7 @@ void m68000_base_device::x8098_or_l_pi_01234fc() } void m68000_base_device::x80a0_or_l_pd_01234fc() { - uint32_t res = DX() |= OPER_AY_PD_32(); + u32 res = DX() |= OPER_AY_PD_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -25557,7 +25557,7 @@ void m68000_base_device::x80a0_or_l_pd_01234fc() } void m68000_base_device::x80a8_or_l_di_01234fc() { - uint32_t res = DX() |= OPER_AY_DI_32(); + u32 res = DX() |= OPER_AY_DI_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -25568,7 +25568,7 @@ void m68000_base_device::x80a8_or_l_di_01234fc() } void m68000_base_device::x80b0_or_l_ix_01234fc() { - uint32_t res = DX() |= OPER_AY_IX_32(); + u32 res = DX() |= OPER_AY_IX_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -25579,7 +25579,7 @@ void m68000_base_device::x80b0_or_l_ix_01234fc() } void m68000_base_device::x80b8_or_l_aw_01234fc() { - uint32_t res = DX() |= OPER_AW_32(); + u32 res = DX() |= OPER_AW_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -25590,7 +25590,7 @@ void m68000_base_device::x80b8_or_l_aw_01234fc() } void m68000_base_device::x80b9_or_l_al_01234fc() { - uint32_t res = DX() |= OPER_AL_32(); + u32 res = DX() |= OPER_AL_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -25601,7 +25601,7 @@ void m68000_base_device::x80b9_or_l_al_01234fc() } void m68000_base_device::x80ba_or_l_pcdi_01234fc() { - uint32_t res = DX() |= OPER_PCDI_32(); + u32 res = DX() |= OPER_PCDI_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -25612,7 +25612,7 @@ void m68000_base_device::x80ba_or_l_pcdi_01234fc() } void m68000_base_device::x80bb_or_l_pcix_01234fc() { - uint32_t res = DX() |= OPER_PCIX_32(); + u32 res = DX() |= OPER_PCIX_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -25623,7 +25623,7 @@ void m68000_base_device::x80bb_or_l_pcix_01234fc() } void m68000_base_device::x80bc_or_l_i_01234fc() { - uint32_t res = DX() |= OPER_I_32(); + u32 res = DX() |= OPER_I_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -25634,8 +25634,8 @@ void m68000_base_device::x80bc_or_l_i_01234fc() } void m68000_base_device::x8110_or_b_ai_01234fc() { - uint32_t ea = EA_AY_AI_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); + u32 ea = EA_AY_AI_8(); + u32 res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25648,8 +25648,8 @@ void m68000_base_device::x8110_or_b_ai_01234fc() } void m68000_base_device::x8118_or_b_pi_01234fc() { - uint32_t ea = EA_AY_PI_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); + u32 ea = EA_AY_PI_8(); + u32 res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25662,8 +25662,8 @@ void m68000_base_device::x8118_or_b_pi_01234fc() } void m68000_base_device::x811f_or_b_pi7_01234fc() { - uint32_t ea = EA_A7_PI_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); + u32 ea = EA_A7_PI_8(); + u32 res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25676,8 +25676,8 @@ void m68000_base_device::x811f_or_b_pi7_01234fc() } void m68000_base_device::x8120_or_b_pd_01234fc() { - uint32_t ea = EA_AY_PD_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); + u32 ea = EA_AY_PD_8(); + u32 res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25690,8 +25690,8 @@ void m68000_base_device::x8120_or_b_pd_01234fc() } void m68000_base_device::x8127_or_b_pd7_01234fc() { - uint32_t ea = EA_A7_PD_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); + u32 ea = EA_A7_PD_8(); + u32 res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25704,8 +25704,8 @@ void m68000_base_device::x8127_or_b_pd7_01234fc() } void m68000_base_device::x8128_or_b_di_01234fc() { - uint32_t ea = EA_AY_DI_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); + u32 ea = EA_AY_DI_8(); + u32 res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25718,8 +25718,8 @@ void m68000_base_device::x8128_or_b_di_01234fc() } void m68000_base_device::x8130_or_b_ix_01234fc() { - uint32_t ea = EA_AY_IX_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); + u32 ea = EA_AY_IX_8(); + u32 res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25732,8 +25732,8 @@ void m68000_base_device::x8130_or_b_ix_01234fc() } void m68000_base_device::x8138_or_b_aw_01234fc() { - uint32_t ea = EA_AW_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); + u32 ea = EA_AW_8(); + u32 res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25746,8 +25746,8 @@ void m68000_base_device::x8138_or_b_aw_01234fc() } void m68000_base_device::x8139_or_b_al_01234fc() { - uint32_t ea = EA_AL_8(); - uint32_t res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); + u32 ea = EA_AL_8(); + u32 res = MASK_OUT_ABOVE_8(DX() | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25760,8 +25760,8 @@ void m68000_base_device::x8139_or_b_al_01234fc() } void m68000_base_device::x8150_or_w_ai_01234fc() { - uint32_t ea = EA_AY_AI_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); + u32 ea = EA_AY_AI_16(); + u32 res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25774,8 +25774,8 @@ void m68000_base_device::x8150_or_w_ai_01234fc() } void m68000_base_device::x8158_or_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); + u32 ea = EA_AY_PI_16(); + u32 res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25788,8 +25788,8 @@ void m68000_base_device::x8158_or_w_pi_01234fc() } void m68000_base_device::x8160_or_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); + u32 ea = EA_AY_PD_16(); + u32 res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25802,8 +25802,8 @@ void m68000_base_device::x8160_or_w_pd_01234fc() } void m68000_base_device::x8168_or_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); + u32 ea = EA_AY_DI_16(); + u32 res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25816,8 +25816,8 @@ void m68000_base_device::x8168_or_w_di_01234fc() } void m68000_base_device::x8170_or_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); + u32 ea = EA_AY_IX_16(); + u32 res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25830,8 +25830,8 @@ void m68000_base_device::x8170_or_w_ix_01234fc() } void m68000_base_device::x8178_or_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); + u32 ea = EA_AW_16(); + u32 res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25844,8 +25844,8 @@ void m68000_base_device::x8178_or_w_aw_01234fc() } void m68000_base_device::x8179_or_w_al_01234fc() { - uint32_t ea = EA_AL_16(); - uint32_t res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); + u32 ea = EA_AL_16(); + u32 res = MASK_OUT_ABOVE_16(DX() | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -25858,8 +25858,8 @@ void m68000_base_device::x8179_or_w_al_01234fc() } void m68000_base_device::x8190_or_l_ai_01234fc() { - uint32_t ea = EA_AY_AI_32(); - uint32_t res = DX() | m68ki_read_32(ea); + u32 ea = EA_AY_AI_32(); + u32 res = DX() | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -25872,8 +25872,8 @@ void m68000_base_device::x8190_or_l_ai_01234fc() } void m68000_base_device::x8198_or_l_pi_01234fc() { - uint32_t ea = EA_AY_PI_32(); - uint32_t res = DX() | m68ki_read_32(ea); + u32 ea = EA_AY_PI_32(); + u32 res = DX() | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -25886,8 +25886,8 @@ void m68000_base_device::x8198_or_l_pi_01234fc() } void m68000_base_device::x81a0_or_l_pd_01234fc() { - uint32_t ea = EA_AY_PD_32(); - uint32_t res = DX() | m68ki_read_32(ea); + u32 ea = EA_AY_PD_32(); + u32 res = DX() | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -25900,8 +25900,8 @@ void m68000_base_device::x81a0_or_l_pd_01234fc() } void m68000_base_device::x81a8_or_l_di_01234fc() { - uint32_t ea = EA_AY_DI_32(); - uint32_t res = DX() | m68ki_read_32(ea); + u32 ea = EA_AY_DI_32(); + u32 res = DX() | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -25914,8 +25914,8 @@ void m68000_base_device::x81a8_or_l_di_01234fc() } void m68000_base_device::x81b0_or_l_ix_01234fc() { - uint32_t ea = EA_AY_IX_32(); - uint32_t res = DX() | m68ki_read_32(ea); + u32 ea = EA_AY_IX_32(); + u32 res = DX() | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -25928,8 +25928,8 @@ void m68000_base_device::x81b0_or_l_ix_01234fc() } void m68000_base_device::x81b8_or_l_aw_01234fc() { - uint32_t ea = EA_AW_32(); - uint32_t res = DX() | m68ki_read_32(ea); + u32 ea = EA_AW_32(); + u32 res = DX() | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -25942,8 +25942,8 @@ void m68000_base_device::x81b8_or_l_aw_01234fc() } void m68000_base_device::x81b9_or_l_al_01234fc() { - uint32_t ea = EA_AL_32(); - uint32_t res = DX() | m68ki_read_32(ea); + u32 ea = EA_AL_32(); + u32 res = DX() | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -25956,7 +25956,7 @@ void m68000_base_device::x81b9_or_l_al_01234fc() } void m68000_base_device::x0000_ori_b_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8((DY() |= OPER_I_8())); + u32 res = MASK_OUT_ABOVE_8((DY() |= OPER_I_8())); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -25967,9 +25967,9 @@ void m68000_base_device::x0000_ori_b_01234fc() } void m68000_base_device::x0010_ori_b_ai_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_AI_8(); - uint32_t res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); + u32 src = OPER_I_8(); + u32 ea = EA_AY_AI_8(); + u32 res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25982,9 +25982,9 @@ void m68000_base_device::x0010_ori_b_ai_01234fc() } void m68000_base_device::x0018_ori_b_pi_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_PI_8(); - uint32_t res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); + u32 src = OPER_I_8(); + u32 ea = EA_AY_PI_8(); + u32 res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -25997,9 +25997,9 @@ void m68000_base_device::x0018_ori_b_pi_01234fc() } void m68000_base_device::x001f_ori_b_pi7_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_A7_PI_8(); - uint32_t res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); + u32 src = OPER_I_8(); + u32 ea = EA_A7_PI_8(); + u32 res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -26012,9 +26012,9 @@ void m68000_base_device::x001f_ori_b_pi7_01234fc() } void m68000_base_device::x0020_ori_b_pd_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_PD_8(); - uint32_t res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); + u32 src = OPER_I_8(); + u32 ea = EA_AY_PD_8(); + u32 res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -26027,9 +26027,9 @@ void m68000_base_device::x0020_ori_b_pd_01234fc() } void m68000_base_device::x0027_ori_b_pd7_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); + u32 src = OPER_I_8(); + u32 ea = EA_A7_PD_8(); + u32 res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -26042,9 +26042,9 @@ void m68000_base_device::x0027_ori_b_pd7_01234fc() } void m68000_base_device::x0028_ori_b_di_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_DI_8(); - uint32_t res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); + u32 src = OPER_I_8(); + u32 ea = EA_AY_DI_8(); + u32 res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -26057,9 +26057,9 @@ void m68000_base_device::x0028_ori_b_di_01234fc() } void m68000_base_device::x0030_ori_b_ix_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_IX_8(); - uint32_t res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); + u32 src = OPER_I_8(); + u32 ea = EA_AY_IX_8(); + u32 res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -26072,9 +26072,9 @@ void m68000_base_device::x0030_ori_b_ix_01234fc() } void m68000_base_device::x0038_ori_b_aw_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AW_8(); - uint32_t res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); + u32 src = OPER_I_8(); + u32 ea = EA_AW_8(); + u32 res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -26087,9 +26087,9 @@ void m68000_base_device::x0038_ori_b_aw_01234fc() } void m68000_base_device::x0039_ori_b_al_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AL_8(); - uint32_t res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); + u32 src = OPER_I_8(); + u32 ea = EA_AL_8(); + u32 res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea)); m68ki_write_8(ea, res); @@ -26102,7 +26102,7 @@ void m68000_base_device::x0039_ori_b_al_01234fc() } void m68000_base_device::x0040_ori_w_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16(DY() |= OPER_I_16()); + u32 res = MASK_OUT_ABOVE_16(DY() |= OPER_I_16()); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -26113,9 +26113,9 @@ void m68000_base_device::x0040_ori_w_01234fc() } void m68000_base_device::x0050_ori_w_ai_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_AI_16(); - uint32_t res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); + u32 src = OPER_I_16(); + u32 ea = EA_AY_AI_16(); + u32 res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -26128,9 +26128,9 @@ void m68000_base_device::x0050_ori_w_ai_01234fc() } void m68000_base_device::x0058_ori_w_pi_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_PI_16(); - uint32_t res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); + u32 src = OPER_I_16(); + u32 ea = EA_AY_PI_16(); + u32 res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -26143,9 +26143,9 @@ void m68000_base_device::x0058_ori_w_pi_01234fc() } void m68000_base_device::x0060_ori_w_pd_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_PD_16(); - uint32_t res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); + u32 src = OPER_I_16(); + u32 ea = EA_AY_PD_16(); + u32 res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -26158,9 +26158,9 @@ void m68000_base_device::x0060_ori_w_pd_01234fc() } void m68000_base_device::x0068_ori_w_di_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_DI_16(); - uint32_t res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); + u32 src = OPER_I_16(); + u32 ea = EA_AY_DI_16(); + u32 res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -26173,9 +26173,9 @@ void m68000_base_device::x0068_ori_w_di_01234fc() } void m68000_base_device::x0070_ori_w_ix_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_IX_16(); - uint32_t res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); + u32 src = OPER_I_16(); + u32 ea = EA_AY_IX_16(); + u32 res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -26188,9 +26188,9 @@ void m68000_base_device::x0070_ori_w_ix_01234fc() } void m68000_base_device::x0078_ori_w_aw_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AW_16(); - uint32_t res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); + u32 src = OPER_I_16(); + u32 ea = EA_AW_16(); + u32 res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -26203,9 +26203,9 @@ void m68000_base_device::x0078_ori_w_aw_01234fc() } void m68000_base_device::x0079_ori_w_al_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AL_16(); - uint32_t res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); + u32 src = OPER_I_16(); + u32 ea = EA_AL_16(); + u32 res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea)); m68ki_write_16(ea, res); @@ -26218,7 +26218,7 @@ void m68000_base_device::x0079_ori_w_al_01234fc() } void m68000_base_device::x0080_ori_l_01234fc() { - uint32_t res = DY() |= OPER_I_32(); + u32 res = DY() |= OPER_I_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -26229,9 +26229,9 @@ void m68000_base_device::x0080_ori_l_01234fc() } void m68000_base_device::x0090_ori_l_ai_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_AI_32(); - uint32_t res = src | m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_AI_32(); + u32 res = src | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -26244,9 +26244,9 @@ void m68000_base_device::x0090_ori_l_ai_01234fc() } void m68000_base_device::x0098_ori_l_pi_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_PI_32(); - uint32_t res = src | m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_PI_32(); + u32 res = src | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -26259,9 +26259,9 @@ void m68000_base_device::x0098_ori_l_pi_01234fc() } void m68000_base_device::x00a0_ori_l_pd_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_PD_32(); - uint32_t res = src | m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_PD_32(); + u32 res = src | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -26274,9 +26274,9 @@ void m68000_base_device::x00a0_ori_l_pd_01234fc() } void m68000_base_device::x00a8_ori_l_di_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_DI_32(); - uint32_t res = src | m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_DI_32(); + u32 res = src | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -26289,9 +26289,9 @@ void m68000_base_device::x00a8_ori_l_di_01234fc() } void m68000_base_device::x00b0_ori_l_ix_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_IX_32(); - uint32_t res = src | m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AY_IX_32(); + u32 res = src | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -26304,9 +26304,9 @@ void m68000_base_device::x00b0_ori_l_ix_01234fc() } void m68000_base_device::x00b8_ori_l_aw_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AW_32(); - uint32_t res = src | m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AW_32(); + u32 res = src | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -26319,9 +26319,9 @@ void m68000_base_device::x00b8_ori_l_aw_01234fc() } void m68000_base_device::x00b9_ori_l_al_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AL_32(); - uint32_t res = src | m68ki_read_32(ea); + u32 src = OPER_I_32(); + u32 ea = EA_AL_32(); + u32 res = src | m68ki_read_32(ea); m68ki_write_32(ea, res); @@ -26342,7 +26342,7 @@ void m68000_base_device::x007c_ori_w_01234fc() { if(m_s_flag) { - uint32_t src = OPER_I_16(); + u32 src = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr(m68ki_get_sr() | src); return; @@ -26356,8 +26356,8 @@ void m68000_base_device::x8140_pack_w_234fc() if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: DX() and DY() are reversed in Motorola's docs */ - uint32_t src = DY() + OPER_I_16(); - uint32_t* r_dst = &DX(); + u32 src = DY() + OPER_I_16(); + u32* r_dst = &DX(); *r_dst = MASK_OUT_BELOW_8(*r_dst) | ((src >> 4) & 0x00f0) | (src & 0x000f); return; @@ -26371,8 +26371,8 @@ void m68000_base_device::x8f48_pack_w_234fc() if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: AX and AY are reversed in Motorola's docs */ - uint32_t ea_src = EA_AY_PD_8(); - uint32_t src = m68ki_read_8(ea_src); + u32 ea_src = EA_AY_PD_8(); + u32 src = m68ki_read_8(ea_src); ea_src = EA_AY_PD_8(); src = ((src << 8) | m68ki_read_8(ea_src)) + OPER_I_16(); @@ -26388,8 +26388,8 @@ void m68000_base_device::x814f_pack_w_234fc() if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: AX and AY are reversed in Motorola's docs */ - uint32_t ea_src = EA_A7_PD_8(); - uint32_t src = m68ki_read_8(ea_src); + u32 ea_src = EA_A7_PD_8(); + u32 src = m68ki_read_8(ea_src); ea_src = EA_A7_PD_8(); src = (src | (m68ki_read_8(ea_src) << 8)) + OPER_I_16(); @@ -26404,8 +26404,8 @@ void m68000_base_device::x8f4f_pack_w_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t ea_src = EA_A7_PD_8(); - uint32_t src = m68ki_read_8(ea_src); + u32 ea_src = EA_A7_PD_8(); + u32 src = m68ki_read_8(ea_src); ea_src = EA_A7_PD_8(); src = (src | (m68ki_read_8(ea_src) << 8)) + OPER_I_16(); @@ -26421,8 +26421,8 @@ void m68000_base_device::x8148_pack_w_234fc() if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: AX and AY are reversed in Motorola's docs */ - uint32_t ea_src = EA_AY_PD_8(); - uint32_t src = m68ki_read_8(ea_src); + u32 ea_src = EA_AY_PD_8(); + u32 src = m68ki_read_8(ea_src); ea_src = EA_AY_PD_8(); src = (src | (m68ki_read_8(ea_src) << 8)) + OPER_I_16(); @@ -26435,7 +26435,7 @@ void m68000_base_device::x8148_pack_w_234fc() } void m68000_base_device::x4850_pea_l_ai_01234fc() { - uint32_t ea = EA_AY_AI_32(); + u32 ea = EA_AY_AI_32(); m68ki_push_32(ea); @@ -26443,7 +26443,7 @@ void m68000_base_device::x4850_pea_l_ai_01234fc() } void m68000_base_device::x4868_pea_l_di_01234fc() { - uint32_t ea = EA_AY_DI_32(); + u32 ea = EA_AY_DI_32(); m68ki_push_32(ea); @@ -26451,7 +26451,7 @@ void m68000_base_device::x4868_pea_l_di_01234fc() } void m68000_base_device::x4870_pea_l_ix_01234fc() { - uint32_t ea = EA_AY_IX_32(); + u32 ea = EA_AY_IX_32(); m68ki_push_32(ea); @@ -26459,7 +26459,7 @@ void m68000_base_device::x4870_pea_l_ix_01234fc() } void m68000_base_device::x4878_pea_l_aw_01234fc() { - uint32_t ea = EA_AW_32(); + u32 ea = EA_AW_32(); m68ki_push_32(ea); @@ -26467,7 +26467,7 @@ void m68000_base_device::x4878_pea_l_aw_01234fc() } void m68000_base_device::x4879_pea_l_al_01234fc() { - uint32_t ea = EA_AL_32(); + u32 ea = EA_AL_32(); m68ki_push_32(ea); @@ -26475,7 +26475,7 @@ void m68000_base_device::x4879_pea_l_al_01234fc() } void m68000_base_device::x487a_pea_l_pcdi_01234fc() { - uint32_t ea = EA_PCDI_32(); + u32 ea = EA_PCDI_32(); m68ki_push_32(ea); @@ -26483,7 +26483,7 @@ void m68000_base_device::x487a_pea_l_pcdi_01234fc() } void m68000_base_device::x487b_pea_l_pcix_01234fc() { - uint32_t ea = EA_PCIX_32(); + u32 ea = EA_PCIX_32(); m68ki_push_32(ea); @@ -26554,11 +26554,11 @@ void m68000_base_device::x4e70_reset_01234fc() } void m68000_base_device::xe018_ror_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t orig_shift = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t shift = orig_shift & 7; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = ROR_8(src, shift); + u32* r_dst = &DY(); + u32 orig_shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 shift = orig_shift & 7; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = ROR_8(src, shift); if(orig_shift != 0) m_icount -= orig_shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = ROR_16(src, shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = ROR_16(src, shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint64_t src = *r_dst; - uint32_t res = ROR_32(src, shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u64 src = *r_dst; + u32 res = ROR_32(src, shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t shift = orig_shift & 7; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = ROL_8(src, shift); + u32* r_dst = &DY(); + u32 orig_shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 shift = orig_shift & 7; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = ROL_8(src, shift); if(orig_shift != 0) m_icount -= orig_shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = ROL_16(src, shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = ROL_16(src, shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint64_t src = *r_dst; - uint32_t res = ROL_32(src, shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u64 src = *r_dst; + u32 res = ROL_32(src, shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = ROR_9(src | (XFLAG_1() << 8), shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = ROR_9(src | (XFLAG_1() << 8), shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = ROR_17(src | (XFLAG_1() << 16), shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = ROR_17(src | (XFLAG_1() << 16), shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint64_t src = *r_dst; - uint64_t res = src | (((uint64_t)XFLAG_1()) << 32); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u64 src = *r_dst; + u64 res = src | (((u64)XFLAG_1()) << 32); if(shift != 0) m_icount -= shift<> 8; res = MASK_OUT_ABOVE_16(res); @@ -27233,9 +27233,9 @@ void m68000_base_device::xe4d0_roxr_w_ai_01234fc() } void m68000_base_device::xe4d8_roxr_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = ROR_17(src | (XFLAG_1() << 16), 1); + u32 ea = EA_AY_PI_16(); + u32 src = m68ki_read_16(ea); + u32 res = ROR_17(src | (XFLAG_1() << 16), 1); m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -27250,9 +27250,9 @@ void m68000_base_device::xe4d8_roxr_w_pi_01234fc() } void m68000_base_device::xe4e0_roxr_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = ROR_17(src | (XFLAG_1() << 16), 1); + u32 ea = EA_AY_PD_16(); + u32 src = m68ki_read_16(ea); + u32 res = ROR_17(src | (XFLAG_1() << 16), 1); m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -27267,9 +27267,9 @@ void m68000_base_device::xe4e0_roxr_w_pd_01234fc() } void m68000_base_device::xe4e8_roxr_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = ROR_17(src | (XFLAG_1() << 16), 1); + u32 ea = EA_AY_DI_16(); + u32 src = m68ki_read_16(ea); + u32 res = ROR_17(src | (XFLAG_1() << 16), 1); m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -27284,9 +27284,9 @@ void m68000_base_device::xe4e8_roxr_w_di_01234fc() } void m68000_base_device::xe4f0_roxr_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = ROR_17(src | (XFLAG_1() << 16), 1); + u32 ea = EA_AY_IX_16(); + u32 src = m68ki_read_16(ea); + u32 res = ROR_17(src | (XFLAG_1() << 16), 1); m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -27301,9 +27301,9 @@ void m68000_base_device::xe4f0_roxr_w_ix_01234fc() } void m68000_base_device::xe4f8_roxr_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = ROR_17(src | (XFLAG_1() << 16), 1); + u32 ea = EA_AW_16(); + u32 src = m68ki_read_16(ea); + u32 res = ROR_17(src | (XFLAG_1() << 16), 1); m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -27318,9 +27318,9 @@ void m68000_base_device::xe4f8_roxr_w_aw_01234fc() } void m68000_base_device::xe4f9_roxr_w_al_01234fc() { - uint32_t ea = EA_AL_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = ROR_17(src | (XFLAG_1() << 16), 1); + u32 ea = EA_AL_16(); + u32 src = m68ki_read_16(ea); + u32 res = ROR_17(src | (XFLAG_1() << 16), 1); m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -27335,10 +27335,10 @@ void m68000_base_device::xe4f9_roxr_w_al_01234fc() } void m68000_base_device::xe110_roxl_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t shift = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = ROL_9(src | (XFLAG_1() << 8), shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_8(*r_dst); + u32 res = ROL_9(src | (XFLAG_1() << 8), shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint32_t src = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = ROL_17(src | (XFLAG_1() << 16), shift); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u32 src = MASK_OUT_ABOVE_16(*r_dst); + u32 res = ROL_17(src | (XFLAG_1() << 16), shift); if(shift != 0) m_icount -= shift<> 9) - 1) & 7) + 1; - uint64_t src = *r_dst; - uint64_t res = src | (((uint64_t)XFLAG_1()) << 32); + u32* r_dst = &DY(); + u32 shift = (((m_ir >> 9) - 1) & 7) + 1; + u64 src = *r_dst; + u64 res = src | (((u64)XFLAG_1()) << 32); if(shift != 0) m_icount -= shift<> 8; res = MASK_OUT_ABOVE_16(res); @@ -27510,9 +27510,9 @@ void m68000_base_device::xe5d0_roxl_w_ai_01234fc() } void m68000_base_device::xe5d8_roxl_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = ROL_17(src | (XFLAG_1() << 16), 1); + u32 ea = EA_AY_PI_16(); + u32 src = m68ki_read_16(ea); + u32 res = ROL_17(src | (XFLAG_1() << 16), 1); m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -27527,9 +27527,9 @@ void m68000_base_device::xe5d8_roxl_w_pi_01234fc() } void m68000_base_device::xe5e0_roxl_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = ROL_17(src | (XFLAG_1() << 16), 1); + u32 ea = EA_AY_PD_16(); + u32 src = m68ki_read_16(ea); + u32 res = ROL_17(src | (XFLAG_1() << 16), 1); m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -27544,9 +27544,9 @@ void m68000_base_device::xe5e0_roxl_w_pd_01234fc() } void m68000_base_device::xe5e8_roxl_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = ROL_17(src | (XFLAG_1() << 16), 1); + u32 ea = EA_AY_DI_16(); + u32 src = m68ki_read_16(ea); + u32 res = ROL_17(src | (XFLAG_1() << 16), 1); m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -27561,9 +27561,9 @@ void m68000_base_device::xe5e8_roxl_w_di_01234fc() } void m68000_base_device::xe5f0_roxl_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = ROL_17(src | (XFLAG_1() << 16), 1); + u32 ea = EA_AY_IX_16(); + u32 src = m68ki_read_16(ea); + u32 res = ROL_17(src | (XFLAG_1() << 16), 1); m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -27578,9 +27578,9 @@ void m68000_base_device::xe5f0_roxl_w_ix_01234fc() } void m68000_base_device::xe5f8_roxl_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = ROL_17(src | (XFLAG_1() << 16), 1); + u32 ea = EA_AW_16(); + u32 src = m68ki_read_16(ea); + u32 res = ROL_17(src | (XFLAG_1() << 16), 1); m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -27595,9 +27595,9 @@ void m68000_base_device::xe5f8_roxl_w_aw_01234fc() } void m68000_base_device::xe5f9_roxl_w_al_01234fc() { - uint32_t ea = EA_AL_16(); - uint32_t src = m68ki_read_16(ea); - uint32_t res = ROL_17(src | (XFLAG_1() << 16), 1); + u32 ea = EA_AL_16(); + u32 src = m68ki_read_16(ea); + u32 res = ROL_17(src | (XFLAG_1() << 16), 1); m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -27614,7 +27614,7 @@ void m68000_base_device::x4e74_rtd_l_1234fc() { if(CPU_TYPE_IS_010_PLUS()) { - uint32_t new_pc = m68ki_pull_32(); + u32 new_pc = m68ki_pull_32(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ REG_A()[7] = MASK_OUT_ABOVE_32(REG_A()[7] + MAKE_INT_16(OPER_I_16())); @@ -27629,9 +27629,9 @@ void m68000_base_device::x4e73_rte_l_01234fc() { if(m_s_flag) { - uint32_t new_sr; - uint32_t new_pc; - uint32_t format_word; + u32 new_sr; + u32 new_pc; + u32 format_word; if (!m_rte_instr_callback.isnull()) (m_rte_instr_callback)(1); @@ -27819,11 +27819,11 @@ void m68000_base_device::x4e75_rts_l_01234fc() } void m68000_base_device::x8100_sbcd_b_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = DY(); - uint32_t dst = *r_dst; - uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); - uint32_t corf = 0; + u32* r_dst = &DX(); + u32 src = DY(); + u32 dst = *r_dst; + u32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); + u32 corf = 0; if(res > 0xf) corf = 6; @@ -27851,11 +27851,11 @@ void m68000_base_device::x8100_sbcd_b_01234fc() } void m68000_base_device::x8f08_sbcd_b_01234fc() { - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_AY_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); + u32 corf = 0; if(res > 0xf) corf = 6; @@ -27883,11 +27883,11 @@ void m68000_base_device::x8f08_sbcd_b_01234fc() } void m68000_base_device::x810f_sbcd_b_01234fc() { - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_A7_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); + u32 corf = 0; if(res > 0xf) corf = 6; @@ -27915,11 +27915,11 @@ void m68000_base_device::x810f_sbcd_b_01234fc() } void m68000_base_device::x8f0f_sbcd_b_01234fc() { - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_A7_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); + u32 corf = 0; if(res > 0xf) corf = 6; @@ -27947,11 +27947,11 @@ void m68000_base_device::x8f0f_sbcd_b_01234fc() } void m68000_base_device::x8108_sbcd_b_01234fc() { - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); - uint32_t corf = 0; + u32 src = OPER_AY_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_1(); + u32 corf = 0; if(res > 0xf) corf = 6; @@ -29025,7 +29025,7 @@ void m68000_base_device::x4e72_stop_01234fc() { if(m_s_flag) { - uint32_t new_sr = OPER_I_16(); + u32 new_sr = OPER_I_16(); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_stopped |= STOP_LEVEL_STOP; m68ki_set_sr(new_sr); @@ -29038,10 +29038,10 @@ void m68000_base_device::x4e72_stop_01234fc() } void m68000_base_device::x9000_sub_b_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_8(DY()); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_8(DY()); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29054,10 +29054,10 @@ void m68000_base_device::x9000_sub_b_01234fc() } void m68000_base_device::x9010_sub_b_ai_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_AI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_AI_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29070,10 +29070,10 @@ void m68000_base_device::x9010_sub_b_ai_01234fc() } void m68000_base_device::x9018_sub_b_pi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_PI_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29086,10 +29086,10 @@ void m68000_base_device::x9018_sub_b_pi_01234fc() } void m68000_base_device::x901f_sub_b_pi7_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_A7_PI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_A7_PI_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29102,10 +29102,10 @@ void m68000_base_device::x901f_sub_b_pi7_01234fc() } void m68000_base_device::x9020_sub_b_pd_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PD_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_PD_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29118,10 +29118,10 @@ void m68000_base_device::x9020_sub_b_pd_01234fc() } void m68000_base_device::x9027_sub_b_pd7_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_A7_PD_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_A7_PD_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29134,10 +29134,10 @@ void m68000_base_device::x9027_sub_b_pd7_01234fc() } void m68000_base_device::x9028_sub_b_di_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_DI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_DI_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29150,10 +29150,10 @@ void m68000_base_device::x9028_sub_b_di_01234fc() } void m68000_base_device::x9030_sub_b_ix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_IX_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_IX_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29166,10 +29166,10 @@ void m68000_base_device::x9030_sub_b_ix_01234fc() } void m68000_base_device::x9038_sub_b_aw_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AW_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AW_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29182,10 +29182,10 @@ void m68000_base_device::x9038_sub_b_aw_01234fc() } void m68000_base_device::x9039_sub_b_al_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AL_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AL_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29198,10 +29198,10 @@ void m68000_base_device::x9039_sub_b_al_01234fc() } void m68000_base_device::x903a_sub_b_pcdi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCDI_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_PCDI_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29214,10 +29214,10 @@ void m68000_base_device::x903a_sub_b_pcdi_01234fc() } void m68000_base_device::x903b_sub_b_pcix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCIX_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_PCIX_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29230,10 +29230,10 @@ void m68000_base_device::x903b_sub_b_pcix_01234fc() } void m68000_base_device::x903c_sub_b_i_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_I_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_I_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -29246,10 +29246,10 @@ void m68000_base_device::x903c_sub_b_i_01234fc() } void m68000_base_device::x9040_sub_w_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(DY()); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(DY()); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -29262,10 +29262,10 @@ void m68000_base_device::x9040_sub_w_01234fc() } void m68000_base_device::x9048_sub_w_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(AY()); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(AY()); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -29278,10 +29278,10 @@ void m68000_base_device::x9048_sub_w_01234fc() } void m68000_base_device::x9050_sub_w_ai_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_AI_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_AI_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -29294,10 +29294,10 @@ void m68000_base_device::x9050_sub_w_ai_01234fc() } void m68000_base_device::x9058_sub_w_pi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PI_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_PI_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -29310,10 +29310,10 @@ void m68000_base_device::x9058_sub_w_pi_01234fc() } void m68000_base_device::x9060_sub_w_pd_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PD_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_PD_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -29326,10 +29326,10 @@ void m68000_base_device::x9060_sub_w_pd_01234fc() } void m68000_base_device::x9068_sub_w_di_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_DI_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_DI_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -29342,10 +29342,10 @@ void m68000_base_device::x9068_sub_w_di_01234fc() } void m68000_base_device::x9070_sub_w_ix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_IX_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_IX_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -29358,10 +29358,10 @@ void m68000_base_device::x9070_sub_w_ix_01234fc() } void m68000_base_device::x9078_sub_w_aw_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AW_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AW_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -29374,10 +29374,10 @@ void m68000_base_device::x9078_sub_w_aw_01234fc() } void m68000_base_device::x9079_sub_w_al_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AL_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AL_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -29390,10 +29390,10 @@ void m68000_base_device::x9079_sub_w_al_01234fc() } void m68000_base_device::x907a_sub_w_pcdi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCDI_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_PCDI_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -29406,10 +29406,10 @@ void m68000_base_device::x907a_sub_w_pcdi_01234fc() } void m68000_base_device::x907b_sub_w_pcix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCIX_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_PCIX_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -29422,10 +29422,10 @@ void m68000_base_device::x907b_sub_w_pcix_01234fc() } void m68000_base_device::x907c_sub_w_i_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_I_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_I_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -29438,10 +29438,10 @@ void m68000_base_device::x907c_sub_w_i_01234fc() } void m68000_base_device::x9080_sub_l_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = DY(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = DY(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -29454,10 +29454,10 @@ void m68000_base_device::x9080_sub_l_01234fc() } void m68000_base_device::x9088_sub_l_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = AY(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = AY(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -29470,10 +29470,10 @@ void m68000_base_device::x9088_sub_l_01234fc() } void m68000_base_device::x9090_sub_l_ai_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_AI_32(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_AI_32(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -29486,10 +29486,10 @@ void m68000_base_device::x9090_sub_l_ai_01234fc() } void m68000_base_device::x9098_sub_l_pi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PI_32(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_PI_32(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -29502,10 +29502,10 @@ void m68000_base_device::x9098_sub_l_pi_01234fc() } void m68000_base_device::x90a0_sub_l_pd_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_PD_32(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_PD_32(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -29518,10 +29518,10 @@ void m68000_base_device::x90a0_sub_l_pd_01234fc() } void m68000_base_device::x90a8_sub_l_di_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_DI_32(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_DI_32(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -29534,10 +29534,10 @@ void m68000_base_device::x90a8_sub_l_di_01234fc() } void m68000_base_device::x90b0_sub_l_ix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AY_IX_32(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AY_IX_32(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -29550,10 +29550,10 @@ void m68000_base_device::x90b0_sub_l_ix_01234fc() } void m68000_base_device::x90b8_sub_l_aw_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AW_32(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AW_32(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -29566,10 +29566,10 @@ void m68000_base_device::x90b8_sub_l_aw_01234fc() } void m68000_base_device::x90b9_sub_l_al_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_AL_32(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_AL_32(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -29582,10 +29582,10 @@ void m68000_base_device::x90b9_sub_l_al_01234fc() } void m68000_base_device::x90ba_sub_l_pcdi_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCDI_32(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_PCDI_32(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -29598,10 +29598,10 @@ void m68000_base_device::x90ba_sub_l_pcdi_01234fc() } void m68000_base_device::x90bb_sub_l_pcix_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_PCIX_32(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_PCIX_32(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -29614,10 +29614,10 @@ void m68000_base_device::x90bb_sub_l_pcix_01234fc() } void m68000_base_device::x90bc_sub_l_i_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = OPER_I_32(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DX(); + u32 src = OPER_I_32(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -29630,10 +29630,10 @@ void m68000_base_device::x90bc_sub_l_i_01234fc() } void m68000_base_device::x9110_sub_b_ai_01234fc() { - uint32_t ea = EA_AY_AI_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_AI_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -29646,10 +29646,10 @@ void m68000_base_device::x9110_sub_b_ai_01234fc() } void m68000_base_device::x9118_sub_b_pi_01234fc() { - uint32_t ea = EA_AY_PI_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_PI_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -29662,10 +29662,10 @@ void m68000_base_device::x9118_sub_b_pi_01234fc() } void m68000_base_device::x911f_sub_b_pi7_01234fc() { - uint32_t ea = EA_A7_PI_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 ea = EA_A7_PI_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -29678,10 +29678,10 @@ void m68000_base_device::x911f_sub_b_pi7_01234fc() } void m68000_base_device::x9120_sub_b_pd_01234fc() { - uint32_t ea = EA_AY_PD_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_PD_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -29694,10 +29694,10 @@ void m68000_base_device::x9120_sub_b_pd_01234fc() } void m68000_base_device::x9127_sub_b_pd7_01234fc() { - uint32_t ea = EA_A7_PD_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 ea = EA_A7_PD_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -29710,10 +29710,10 @@ void m68000_base_device::x9127_sub_b_pd7_01234fc() } void m68000_base_device::x9128_sub_b_di_01234fc() { - uint32_t ea = EA_AY_DI_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_DI_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -29726,10 +29726,10 @@ void m68000_base_device::x9128_sub_b_di_01234fc() } void m68000_base_device::x9130_sub_b_ix_01234fc() { - uint32_t ea = EA_AY_IX_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_IX_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -29742,10 +29742,10 @@ void m68000_base_device::x9130_sub_b_ix_01234fc() } void m68000_base_device::x9138_sub_b_aw_01234fc() { - uint32_t ea = EA_AW_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 ea = EA_AW_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -29758,10 +29758,10 @@ void m68000_base_device::x9138_sub_b_aw_01234fc() } void m68000_base_device::x9139_sub_b_al_01234fc() { - uint32_t ea = EA_AL_8(); - uint32_t src = MASK_OUT_ABOVE_8(DX()); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 ea = EA_AL_8(); + u32 src = MASK_OUT_ABOVE_8(DX()); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -29774,10 +29774,10 @@ void m68000_base_device::x9139_sub_b_al_01234fc() } void m68000_base_device::x9150_sub_w_ai_01234fc() { - uint32_t ea = EA_AY_AI_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_AI_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -29790,10 +29790,10 @@ void m68000_base_device::x9150_sub_w_ai_01234fc() } void m68000_base_device::x9158_sub_w_pi_01234fc() { - uint32_t ea = EA_AY_PI_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_PI_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -29806,10 +29806,10 @@ void m68000_base_device::x9158_sub_w_pi_01234fc() } void m68000_base_device::x9160_sub_w_pd_01234fc() { - uint32_t ea = EA_AY_PD_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_PD_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -29822,10 +29822,10 @@ void m68000_base_device::x9160_sub_w_pd_01234fc() } void m68000_base_device::x9168_sub_w_di_01234fc() { - uint32_t ea = EA_AY_DI_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_DI_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -29838,10 +29838,10 @@ void m68000_base_device::x9168_sub_w_di_01234fc() } void m68000_base_device::x9170_sub_w_ix_01234fc() { - uint32_t ea = EA_AY_IX_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_IX_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -29854,10 +29854,10 @@ void m68000_base_device::x9170_sub_w_ix_01234fc() } void m68000_base_device::x9178_sub_w_aw_01234fc() { - uint32_t ea = EA_AW_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 ea = EA_AW_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -29870,10 +29870,10 @@ void m68000_base_device::x9178_sub_w_aw_01234fc() } void m68000_base_device::x9179_sub_w_al_01234fc() { - uint32_t ea = EA_AL_16(); - uint32_t src = MASK_OUT_ABOVE_16(DX()); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 ea = EA_AL_16(); + u32 src = MASK_OUT_ABOVE_16(DX()); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -29886,10 +29886,10 @@ void m68000_base_device::x9179_sub_w_al_01234fc() } void m68000_base_device::x9190_sub_l_ai_01234fc() { - uint32_t ea = EA_AY_AI_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_AI_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -29902,10 +29902,10 @@ void m68000_base_device::x9190_sub_l_ai_01234fc() } void m68000_base_device::x9198_sub_l_pi_01234fc() { - uint32_t ea = EA_AY_PI_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_PI_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -29918,10 +29918,10 @@ void m68000_base_device::x9198_sub_l_pi_01234fc() } void m68000_base_device::x91a0_sub_l_pd_01234fc() { - uint32_t ea = EA_AY_PD_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_PD_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -29934,10 +29934,10 @@ void m68000_base_device::x91a0_sub_l_pd_01234fc() } void m68000_base_device::x91a8_sub_l_di_01234fc() { - uint32_t ea = EA_AY_DI_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_DI_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -29950,10 +29950,10 @@ void m68000_base_device::x91a8_sub_l_di_01234fc() } void m68000_base_device::x91b0_sub_l_ix_01234fc() { - uint32_t ea = EA_AY_IX_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 ea = EA_AY_IX_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -29966,10 +29966,10 @@ void m68000_base_device::x91b0_sub_l_ix_01234fc() } void m68000_base_device::x91b8_sub_l_aw_01234fc() { - uint32_t ea = EA_AW_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 ea = EA_AW_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -29982,10 +29982,10 @@ void m68000_base_device::x91b8_sub_l_aw_01234fc() } void m68000_base_device::x91b9_sub_l_al_01234fc() { - uint32_t ea = EA_AL_32(); - uint32_t src = DX(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 ea = EA_AL_32(); + u32 src = DX(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -29998,7 +29998,7 @@ void m68000_base_device::x91b9_sub_l_al_01234fc() } void m68000_base_device::x90c0_suba_w_01234fc() { - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(DY())); @@ -30006,7 +30006,7 @@ void m68000_base_device::x90c0_suba_w_01234fc() } void m68000_base_device::x90c8_suba_w_01234fc() { - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(AY())); @@ -30014,8 +30014,8 @@ void m68000_base_device::x90c8_suba_w_01234fc() } void m68000_base_device::x90d0_suba_w_ai_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AY_AI_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AY_AI_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30023,8 +30023,8 @@ void m68000_base_device::x90d0_suba_w_ai_01234fc() } void m68000_base_device::x90d8_suba_w_pi_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AY_PI_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AY_PI_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30032,8 +30032,8 @@ void m68000_base_device::x90d8_suba_w_pi_01234fc() } void m68000_base_device::x90e0_suba_w_pd_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AY_PD_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AY_PD_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30041,8 +30041,8 @@ void m68000_base_device::x90e0_suba_w_pd_01234fc() } void m68000_base_device::x90e8_suba_w_di_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AY_DI_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AY_DI_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30050,8 +30050,8 @@ void m68000_base_device::x90e8_suba_w_di_01234fc() } void m68000_base_device::x90f0_suba_w_ix_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AY_IX_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AY_IX_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30059,8 +30059,8 @@ void m68000_base_device::x90f0_suba_w_ix_01234fc() } void m68000_base_device::x90f8_suba_w_aw_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AW_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AW_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30068,8 +30068,8 @@ void m68000_base_device::x90f8_suba_w_aw_01234fc() } void m68000_base_device::x90f9_suba_w_al_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_AL_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_AL_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30077,8 +30077,8 @@ void m68000_base_device::x90f9_suba_w_al_01234fc() } void m68000_base_device::x90fa_suba_w_pcdi_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_PCDI_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_PCDI_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30086,8 +30086,8 @@ void m68000_base_device::x90fa_suba_w_pcdi_01234fc() } void m68000_base_device::x90fb_suba_w_pcix_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_PCIX_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_PCIX_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30095,8 +30095,8 @@ void m68000_base_device::x90fb_suba_w_pcix_01234fc() } void m68000_base_device::x90fc_suba_w_i_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = MAKE_INT_16(OPER_I_16()); + u32* r_dst = &AX(); + u32 src = MAKE_INT_16(OPER_I_16()); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30104,7 +30104,7 @@ void m68000_base_device::x90fc_suba_w_i_01234fc() } void m68000_base_device::x91c0_suba_l_01234fc() { - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - DY()); @@ -30112,7 +30112,7 @@ void m68000_base_device::x91c0_suba_l_01234fc() } void m68000_base_device::x91c8_suba_l_01234fc() { - uint32_t* r_dst = &AX(); + u32* r_dst = &AX(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - AY()); @@ -30120,8 +30120,8 @@ void m68000_base_device::x91c8_suba_l_01234fc() } void m68000_base_device::x91d0_suba_l_ai_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AY_AI_32(); + u32* r_dst = &AX(); + u32 src = OPER_AY_AI_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30129,8 +30129,8 @@ void m68000_base_device::x91d0_suba_l_ai_01234fc() } void m68000_base_device::x91d8_suba_l_pi_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AY_PI_32(); + u32* r_dst = &AX(); + u32 src = OPER_AY_PI_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30138,8 +30138,8 @@ void m68000_base_device::x91d8_suba_l_pi_01234fc() } void m68000_base_device::x91e0_suba_l_pd_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AY_PD_32(); + u32* r_dst = &AX(); + u32 src = OPER_AY_PD_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30147,8 +30147,8 @@ void m68000_base_device::x91e0_suba_l_pd_01234fc() } void m68000_base_device::x91e8_suba_l_di_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AY_DI_32(); + u32* r_dst = &AX(); + u32 src = OPER_AY_DI_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30156,8 +30156,8 @@ void m68000_base_device::x91e8_suba_l_di_01234fc() } void m68000_base_device::x91f0_suba_l_ix_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AY_IX_32(); + u32* r_dst = &AX(); + u32 src = OPER_AY_IX_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30165,8 +30165,8 @@ void m68000_base_device::x91f0_suba_l_ix_01234fc() } void m68000_base_device::x91f8_suba_l_aw_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AW_32(); + u32* r_dst = &AX(); + u32 src = OPER_AW_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30174,8 +30174,8 @@ void m68000_base_device::x91f8_suba_l_aw_01234fc() } void m68000_base_device::x91f9_suba_l_al_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_AL_32(); + u32* r_dst = &AX(); + u32 src = OPER_AL_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30183,8 +30183,8 @@ void m68000_base_device::x91f9_suba_l_al_01234fc() } void m68000_base_device::x91fa_suba_l_pcdi_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_PCDI_32(); + u32* r_dst = &AX(); + u32 src = OPER_PCDI_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30192,8 +30192,8 @@ void m68000_base_device::x91fa_suba_l_pcdi_01234fc() } void m68000_base_device::x91fb_suba_l_pcix_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_PCIX_32(); + u32* r_dst = &AX(); + u32 src = OPER_PCIX_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30201,8 +30201,8 @@ void m68000_base_device::x91fb_suba_l_pcix_01234fc() } void m68000_base_device::x91fc_suba_l_i_01234fc() { - uint32_t* r_dst = &AX(); - uint32_t src = OPER_I_32(); + u32* r_dst = &AX(); + u32 src = OPER_I_32(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); @@ -30210,10 +30210,10 @@ void m68000_base_device::x91fc_suba_l_i_01234fc() } void m68000_base_device::x0400_subi_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t src = OPER_I_8(); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DY(); + u32 src = OPER_I_8(); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30226,10 +30226,10 @@ void m68000_base_device::x0400_subi_b_01234fc() } void m68000_base_device::x0410_subi_b_ai_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_AI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 ea = EA_AY_AI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30242,10 +30242,10 @@ void m68000_base_device::x0410_subi_b_ai_01234fc() } void m68000_base_device::x0418_subi_b_pi_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_PI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 ea = EA_AY_PI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30258,10 +30258,10 @@ void m68000_base_device::x0418_subi_b_pi_01234fc() } void m68000_base_device::x041f_subi_b_pi7_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_A7_PI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 ea = EA_A7_PI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30274,10 +30274,10 @@ void m68000_base_device::x041f_subi_b_pi7_01234fc() } void m68000_base_device::x0420_subi_b_pd_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 ea = EA_AY_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30290,10 +30290,10 @@ void m68000_base_device::x0420_subi_b_pd_01234fc() } void m68000_base_device::x0427_subi_b_pd7_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30306,10 +30306,10 @@ void m68000_base_device::x0427_subi_b_pd7_01234fc() } void m68000_base_device::x0428_subi_b_di_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_DI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 ea = EA_AY_DI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30322,10 +30322,10 @@ void m68000_base_device::x0428_subi_b_di_01234fc() } void m68000_base_device::x0430_subi_b_ix_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AY_IX_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 ea = EA_AY_IX_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30338,10 +30338,10 @@ void m68000_base_device::x0430_subi_b_ix_01234fc() } void m68000_base_device::x0438_subi_b_aw_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AW_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 ea = EA_AW_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30354,10 +30354,10 @@ void m68000_base_device::x0438_subi_b_aw_01234fc() } void m68000_base_device::x0439_subi_b_al_01234fc() { - uint32_t src = OPER_I_8(); - uint32_t ea = EA_AL_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = OPER_I_8(); + u32 ea = EA_AL_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30370,10 +30370,10 @@ void m68000_base_device::x0439_subi_b_al_01234fc() } void m68000_base_device::x0440_subi_w_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t src = OPER_I_16(); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DY(); + u32 src = OPER_I_16(); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30386,10 +30386,10 @@ void m68000_base_device::x0440_subi_w_01234fc() } void m68000_base_device::x0450_subi_w_ai_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_AI_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 ea = EA_AY_AI_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30402,10 +30402,10 @@ void m68000_base_device::x0450_subi_w_ai_01234fc() } void m68000_base_device::x0458_subi_w_pi_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_PI_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 ea = EA_AY_PI_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30418,10 +30418,10 @@ void m68000_base_device::x0458_subi_w_pi_01234fc() } void m68000_base_device::x0460_subi_w_pd_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_PD_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 ea = EA_AY_PD_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30434,10 +30434,10 @@ void m68000_base_device::x0460_subi_w_pd_01234fc() } void m68000_base_device::x0468_subi_w_di_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_DI_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 ea = EA_AY_DI_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30450,10 +30450,10 @@ void m68000_base_device::x0468_subi_w_di_01234fc() } void m68000_base_device::x0470_subi_w_ix_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AY_IX_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 ea = EA_AY_IX_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30466,10 +30466,10 @@ void m68000_base_device::x0470_subi_w_ix_01234fc() } void m68000_base_device::x0478_subi_w_aw_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AW_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 ea = EA_AW_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30482,10 +30482,10 @@ void m68000_base_device::x0478_subi_w_aw_01234fc() } void m68000_base_device::x0479_subi_w_al_01234fc() { - uint32_t src = OPER_I_16(); - uint32_t ea = EA_AL_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = OPER_I_16(); + u32 ea = EA_AL_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30498,10 +30498,10 @@ void m68000_base_device::x0479_subi_w_al_01234fc() } void m68000_base_device::x0480_subi_l_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t src = OPER_I_32(); - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DY(); + u32 src = OPER_I_32(); + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -30514,10 +30514,10 @@ void m68000_base_device::x0480_subi_l_01234fc() } void m68000_base_device::x0490_subi_l_ai_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_AI_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 ea = EA_AY_AI_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -30530,10 +30530,10 @@ void m68000_base_device::x0490_subi_l_ai_01234fc() } void m68000_base_device::x0498_subi_l_pi_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_PI_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 ea = EA_AY_PI_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -30546,10 +30546,10 @@ void m68000_base_device::x0498_subi_l_pi_01234fc() } void m68000_base_device::x04a0_subi_l_pd_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_PD_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 ea = EA_AY_PD_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -30562,10 +30562,10 @@ void m68000_base_device::x04a0_subi_l_pd_01234fc() } void m68000_base_device::x04a8_subi_l_di_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_DI_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 ea = EA_AY_DI_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -30578,10 +30578,10 @@ void m68000_base_device::x04a8_subi_l_di_01234fc() } void m68000_base_device::x04b0_subi_l_ix_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AY_IX_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 ea = EA_AY_IX_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -30594,10 +30594,10 @@ void m68000_base_device::x04b0_subi_l_ix_01234fc() } void m68000_base_device::x04b8_subi_l_aw_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AW_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 ea = EA_AW_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -30610,10 +30610,10 @@ void m68000_base_device::x04b8_subi_l_aw_01234fc() } void m68000_base_device::x04b9_subi_l_al_01234fc() { - uint32_t src = OPER_I_32(); - uint32_t ea = EA_AL_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = OPER_I_32(); + u32 ea = EA_AL_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -30626,10 +30626,10 @@ void m68000_base_device::x04b9_subi_l_al_01234fc() } void m68000_base_device::x5100_subq_b_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DY(); + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30642,10 +30642,10 @@ void m68000_base_device::x5100_subq_b_01234fc() } void m68000_base_device::x5110_subq_b_ai_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_AI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_AI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30658,10 +30658,10 @@ void m68000_base_device::x5110_subq_b_ai_01234fc() } void m68000_base_device::x5118_subq_b_pi_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_PI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_PI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30674,10 +30674,10 @@ void m68000_base_device::x5118_subq_b_pi_01234fc() } void m68000_base_device::x511f_subq_b_pi7_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_A7_PI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_A7_PI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30690,10 +30690,10 @@ void m68000_base_device::x511f_subq_b_pi7_01234fc() } void m68000_base_device::x5120_subq_b_pd_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30706,10 +30706,10 @@ void m68000_base_device::x5120_subq_b_pd_01234fc() } void m68000_base_device::x5127_subq_b_pd7_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30722,10 +30722,10 @@ void m68000_base_device::x5127_subq_b_pd7_01234fc() } void m68000_base_device::x5128_subq_b_di_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_DI_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_DI_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30738,10 +30738,10 @@ void m68000_base_device::x5128_subq_b_di_01234fc() } void m68000_base_device::x5130_subq_b_ix_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_IX_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_IX_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30754,10 +30754,10 @@ void m68000_base_device::x5130_subq_b_ix_01234fc() } void m68000_base_device::x5138_subq_b_aw_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AW_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AW_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30770,10 +30770,10 @@ void m68000_base_device::x5138_subq_b_aw_01234fc() } void m68000_base_device::x5139_subq_b_al_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AL_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AL_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src; m_n_flag = NFLAG_8(res); m_not_z_flag = MASK_OUT_ABOVE_8(res); @@ -30786,10 +30786,10 @@ void m68000_base_device::x5139_subq_b_al_01234fc() } void m68000_base_device::x5140_subq_w_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src; + u32* r_dst = &DY(); + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30802,7 +30802,7 @@ void m68000_base_device::x5140_subq_w_01234fc() } void m68000_base_device::x5148_subq_w_01234fc() { - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - ((((m_ir >> 9) - 1) & 7) + 1)); @@ -30810,10 +30810,10 @@ void m68000_base_device::x5148_subq_w_01234fc() } void m68000_base_device::x5150_subq_w_ai_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_AI_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_AI_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30826,10 +30826,10 @@ void m68000_base_device::x5150_subq_w_ai_01234fc() } void m68000_base_device::x5158_subq_w_pi_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_PI_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_PI_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30842,10 +30842,10 @@ void m68000_base_device::x5158_subq_w_pi_01234fc() } void m68000_base_device::x5160_subq_w_pd_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_PD_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_PD_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30858,10 +30858,10 @@ void m68000_base_device::x5160_subq_w_pd_01234fc() } void m68000_base_device::x5168_subq_w_di_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_DI_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_DI_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30874,10 +30874,10 @@ void m68000_base_device::x5168_subq_w_di_01234fc() } void m68000_base_device::x5170_subq_w_ix_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_IX_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_IX_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30890,10 +30890,10 @@ void m68000_base_device::x5170_subq_w_ix_01234fc() } void m68000_base_device::x5178_subq_w_aw_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AW_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AW_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30906,10 +30906,10 @@ void m68000_base_device::x5178_subq_w_aw_01234fc() } void m68000_base_device::x5179_subq_w_al_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AL_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AL_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src; m_n_flag = NFLAG_16(res); m_not_z_flag = MASK_OUT_ABOVE_16(res); @@ -30922,10 +30922,10 @@ void m68000_base_device::x5179_subq_w_al_01234fc() } void m68000_base_device::x5180_subq_l_01234fc() { - uint32_t* r_dst = &DY(); - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t dst = *r_dst; - uint32_t res = dst - src; + u32* r_dst = &DY(); + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 dst = *r_dst; + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -30938,7 +30938,7 @@ void m68000_base_device::x5180_subq_l_01234fc() } void m68000_base_device::x5188_subq_l_01234fc() { - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); *r_dst = MASK_OUT_ABOVE_32(*r_dst - ((((m_ir >> 9) - 1) & 7) + 1)); @@ -30946,10 +30946,10 @@ void m68000_base_device::x5188_subq_l_01234fc() } void m68000_base_device::x5190_subq_l_ai_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_AI_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_AI_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -30962,10 +30962,10 @@ void m68000_base_device::x5190_subq_l_ai_01234fc() } void m68000_base_device::x5198_subq_l_pi_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_PI_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_PI_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -30978,10 +30978,10 @@ void m68000_base_device::x5198_subq_l_pi_01234fc() } void m68000_base_device::x51a0_subq_l_pd_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_PD_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_PD_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -30994,10 +30994,10 @@ void m68000_base_device::x51a0_subq_l_pd_01234fc() } void m68000_base_device::x51a8_subq_l_di_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_DI_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_DI_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -31010,10 +31010,10 @@ void m68000_base_device::x51a8_subq_l_di_01234fc() } void m68000_base_device::x51b0_subq_l_ix_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AY_IX_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AY_IX_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -31026,10 +31026,10 @@ void m68000_base_device::x51b0_subq_l_ix_01234fc() } void m68000_base_device::x51b8_subq_l_aw_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AW_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AW_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -31042,10 +31042,10 @@ void m68000_base_device::x51b8_subq_l_aw_01234fc() } void m68000_base_device::x51b9_subq_l_al_01234fc() { - uint32_t src = (((m_ir >> 9) - 1) & 7) + 1; - uint32_t ea = EA_AL_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src; + u32 src = (((m_ir >> 9) - 1) & 7) + 1; + u32 ea = EA_AL_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src; m_n_flag = NFLAG_32(res); m_not_z_flag = MASK_OUT_ABOVE_32(res); @@ -31058,10 +31058,10 @@ void m68000_base_device::x51b9_subq_l_al_01234fc() } void m68000_base_device::x9100_subx_b_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_8(DY()); - uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); - uint32_t res = dst - src - XFLAG_1(); + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_8(DY()); + u32 dst = MASK_OUT_ABOVE_8(*r_dst); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -31076,10 +31076,10 @@ void m68000_base_device::x9100_subx_b_01234fc() } void m68000_base_device::x9140_subx_w_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = MASK_OUT_ABOVE_16(DY()); - uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); - uint32_t res = dst - src - XFLAG_1(); + u32* r_dst = &DX(); + u32 src = MASK_OUT_ABOVE_16(DY()); + u32 dst = MASK_OUT_ABOVE_16(*r_dst); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -31094,10 +31094,10 @@ void m68000_base_device::x9140_subx_w_01234fc() } void m68000_base_device::x9180_subx_l_01234fc() { - uint32_t* r_dst = &DX(); - uint32_t src = DY(); - uint32_t dst = *r_dst; - uint32_t res = dst - src - XFLAG_1(); + u32* r_dst = &DX(); + u32 src = DY(); + u32 dst = *r_dst; + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -31112,10 +31112,10 @@ void m68000_base_device::x9180_subx_l_01234fc() } void m68000_base_device::x9f08_subx_b_01234fc() { - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src - XFLAG_1(); + u32 src = OPER_AY_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -31130,10 +31130,10 @@ void m68000_base_device::x9f08_subx_b_01234fc() } void m68000_base_device::x910f_subx_b_01234fc() { - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src - XFLAG_1(); + u32 src = OPER_A7_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -31148,10 +31148,10 @@ void m68000_base_device::x910f_subx_b_01234fc() } void m68000_base_device::x9f0f_subx_b_01234fc() { - uint32_t src = OPER_A7_PD_8(); - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src - XFLAG_1(); + u32 src = OPER_A7_PD_8(); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -31166,10 +31166,10 @@ void m68000_base_device::x9f0f_subx_b_01234fc() } void m68000_base_device::x9108_subx_b_01234fc() { - uint32_t src = OPER_AY_PD_8(); - uint32_t ea = EA_AX_PD_8(); - uint32_t dst = m68ki_read_8(ea); - uint32_t res = dst - src - XFLAG_1(); + u32 src = OPER_AY_PD_8(); + u32 ea = EA_AX_PD_8(); + u32 dst = m68ki_read_8(ea); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_8(res); m_x_flag = m_c_flag = CFLAG_8(res); @@ -31184,10 +31184,10 @@ void m68000_base_device::x9108_subx_b_01234fc() } void m68000_base_device::x9148_subx_w_01234fc() { - uint32_t src = OPER_AY_PD_16(); - uint32_t ea = EA_AX_PD_16(); - uint32_t dst = m68ki_read_16(ea); - uint32_t res = dst - src - XFLAG_1(); + u32 src = OPER_AY_PD_16(); + u32 ea = EA_AX_PD_16(); + u32 dst = m68ki_read_16(ea); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_16(res); m_x_flag = m_c_flag = CFLAG_16(res); @@ -31202,10 +31202,10 @@ void m68000_base_device::x9148_subx_w_01234fc() } void m68000_base_device::x9188_subx_l_01234fc() { - uint32_t src = OPER_AY_PD_32(); - uint32_t ea = EA_AX_PD_32(); - uint32_t dst = m68ki_read_32(ea); - uint32_t res = dst - src - XFLAG_1(); + u32 src = OPER_AY_PD_32(); + u32 ea = EA_AX_PD_32(); + u32 dst = m68ki_read_32(ea); + u32 res = dst - src - XFLAG_1(); m_n_flag = NFLAG_32(res); m_x_flag = m_c_flag = CFLAG_SUB_32(src, dst, res); @@ -31220,7 +31220,7 @@ void m68000_base_device::x9188_subx_l_01234fc() } void m68000_base_device::x4840_swap_l_01234fc() { - uint32_t* r_dst = &DY(); + u32* r_dst = &DY(); m_not_z_flag = MASK_OUT_ABOVE_32(*r_dst<<16); *r_dst = (*r_dst>>16) | m_not_z_flag; @@ -31234,7 +31234,7 @@ void m68000_base_device::x4840_swap_l_01234fc() } void m68000_base_device::x4ac0_tas_b_01234fc() { - uint32_t* r_dst = &DY(); + u32* r_dst = &DY(); m_not_z_flag = MASK_OUT_ABOVE_8(*r_dst); m_n_flag = NFLAG_8(*r_dst); @@ -31246,8 +31246,8 @@ void m68000_base_device::x4ac0_tas_b_01234fc() } void m68000_base_device::x4ad0_tas_b_ai_01234fc() { - uint32_t ea = EA_AY_AI_8(); - uint32_t dst = m68ki_read_8(ea); + u32 ea = EA_AY_AI_8(); + u32 dst = m68ki_read_8(ea); m_not_z_flag = dst; m_n_flag = NFLAG_8(dst); @@ -31268,8 +31268,8 @@ void m68000_base_device::x4ad0_tas_b_ai_01234fc() } void m68000_base_device::x4ad8_tas_b_pi_01234fc() { - uint32_t ea = EA_AY_PI_8(); - uint32_t dst = m68ki_read_8(ea); + u32 ea = EA_AY_PI_8(); + u32 dst = m68ki_read_8(ea); m_not_z_flag = dst; m_n_flag = NFLAG_8(dst); @@ -31290,8 +31290,8 @@ void m68000_base_device::x4ad8_tas_b_pi_01234fc() } void m68000_base_device::x4adf_tas_b_pi7_01234fc() { - uint32_t ea = EA_A7_PI_8(); - uint32_t dst = m68ki_read_8(ea); + u32 ea = EA_A7_PI_8(); + u32 dst = m68ki_read_8(ea); m_not_z_flag = dst; m_n_flag = NFLAG_8(dst); @@ -31312,8 +31312,8 @@ void m68000_base_device::x4adf_tas_b_pi7_01234fc() } void m68000_base_device::x4ae0_tas_b_pd_01234fc() { - uint32_t ea = EA_AY_PD_8(); - uint32_t dst = m68ki_read_8(ea); + u32 ea = EA_AY_PD_8(); + u32 dst = m68ki_read_8(ea); m_not_z_flag = dst; m_n_flag = NFLAG_8(dst); @@ -31334,8 +31334,8 @@ void m68000_base_device::x4ae0_tas_b_pd_01234fc() } void m68000_base_device::x4ae7_tas_b_pd7_01234fc() { - uint32_t ea = EA_A7_PD_8(); - uint32_t dst = m68ki_read_8(ea); + u32 ea = EA_A7_PD_8(); + u32 dst = m68ki_read_8(ea); m_not_z_flag = dst; m_n_flag = NFLAG_8(dst); @@ -31356,8 +31356,8 @@ void m68000_base_device::x4ae7_tas_b_pd7_01234fc() } void m68000_base_device::x4ae8_tas_b_di_01234fc() { - uint32_t ea = EA_AY_DI_8(); - uint32_t dst = m68ki_read_8(ea); + u32 ea = EA_AY_DI_8(); + u32 dst = m68ki_read_8(ea); m_not_z_flag = dst; m_n_flag = NFLAG_8(dst); @@ -31378,8 +31378,8 @@ void m68000_base_device::x4ae8_tas_b_di_01234fc() } void m68000_base_device::x4af0_tas_b_ix_01234fc() { - uint32_t ea = EA_AY_IX_8(); - uint32_t dst = m68ki_read_8(ea); + u32 ea = EA_AY_IX_8(); + u32 dst = m68ki_read_8(ea); m_not_z_flag = dst; m_n_flag = NFLAG_8(dst); @@ -31400,8 +31400,8 @@ void m68000_base_device::x4af0_tas_b_ix_01234fc() } void m68000_base_device::x4af8_tas_b_aw_01234fc() { - uint32_t ea = EA_AW_8(); - uint32_t dst = m68ki_read_8(ea); + u32 ea = EA_AW_8(); + u32 dst = m68ki_read_8(ea); m_not_z_flag = dst; m_n_flag = NFLAG_8(dst); @@ -31422,8 +31422,8 @@ void m68000_base_device::x4af8_tas_b_aw_01234fc() } void m68000_base_device::x4af9_tas_b_al_01234fc() { - uint32_t ea = EA_AL_8(); - uint32_t dst = m68ki_read_8(ea); + u32 ea = EA_AL_8(); + u32 dst = m68ki_read_8(ea); m_not_z_flag = dst; m_n_flag = NFLAG_8(dst); @@ -32142,7 +32142,7 @@ void m68000_base_device::x4e76_trapv_01234fc() } void m68000_base_device::x4a00_tst_b_01234fc() { - uint32_t res = MASK_OUT_ABOVE_8(DY()); + u32 res = MASK_OUT_ABOVE_8(DY()); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32153,7 +32153,7 @@ void m68000_base_device::x4a00_tst_b_01234fc() } void m68000_base_device::x4a10_tst_b_ai_01234fc() { - uint32_t res = OPER_AY_AI_8(); + u32 res = OPER_AY_AI_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32164,7 +32164,7 @@ void m68000_base_device::x4a10_tst_b_ai_01234fc() } void m68000_base_device::x4a18_tst_b_pi_01234fc() { - uint32_t res = OPER_AY_PI_8(); + u32 res = OPER_AY_PI_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32175,7 +32175,7 @@ void m68000_base_device::x4a18_tst_b_pi_01234fc() } void m68000_base_device::x4a1f_tst_b_pi7_01234fc() { - uint32_t res = OPER_A7_PI_8(); + u32 res = OPER_A7_PI_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32186,7 +32186,7 @@ void m68000_base_device::x4a1f_tst_b_pi7_01234fc() } void m68000_base_device::x4a20_tst_b_pd_01234fc() { - uint32_t res = OPER_AY_PD_8(); + u32 res = OPER_AY_PD_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32197,7 +32197,7 @@ void m68000_base_device::x4a20_tst_b_pd_01234fc() } void m68000_base_device::x4a27_tst_b_pd7_01234fc() { - uint32_t res = OPER_A7_PD_8(); + u32 res = OPER_A7_PD_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32208,7 +32208,7 @@ void m68000_base_device::x4a27_tst_b_pd7_01234fc() } void m68000_base_device::x4a28_tst_b_di_01234fc() { - uint32_t res = OPER_AY_DI_8(); + u32 res = OPER_AY_DI_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32219,7 +32219,7 @@ void m68000_base_device::x4a28_tst_b_di_01234fc() } void m68000_base_device::x4a30_tst_b_ix_01234fc() { - uint32_t res = OPER_AY_IX_8(); + u32 res = OPER_AY_IX_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32230,7 +32230,7 @@ void m68000_base_device::x4a30_tst_b_ix_01234fc() } void m68000_base_device::x4a38_tst_b_aw_01234fc() { - uint32_t res = OPER_AW_8(); + u32 res = OPER_AW_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32241,7 +32241,7 @@ void m68000_base_device::x4a38_tst_b_aw_01234fc() } void m68000_base_device::x4a39_tst_b_al_01234fc() { - uint32_t res = OPER_AL_8(); + u32 res = OPER_AL_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32254,7 +32254,7 @@ void m68000_base_device::x4a3a_tst_b_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_PCDI_8(); + u32 res = OPER_PCDI_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32270,7 +32270,7 @@ void m68000_base_device::x4a3b_tst_b_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_PCIX_8(); + u32 res = OPER_PCIX_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32286,7 +32286,7 @@ void m68000_base_device::x4a3c_tst_b_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_I_8(); + u32 res = OPER_I_8(); m_n_flag = NFLAG_8(res); m_not_z_flag = res; @@ -32300,7 +32300,7 @@ void m68000_base_device::x4a3c_tst_b_234fc() } void m68000_base_device::x4a40_tst_w_01234fc() { - uint32_t res = MASK_OUT_ABOVE_16(DY()); + u32 res = MASK_OUT_ABOVE_16(DY()); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -32313,7 +32313,7 @@ void m68000_base_device::x4a48_tst_w_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = MAKE_INT_16(AY()); + u32 res = MAKE_INT_16(AY()); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -32327,7 +32327,7 @@ void m68000_base_device::x4a48_tst_w_234fc() } void m68000_base_device::x4a50_tst_w_ai_01234fc() { - uint32_t res = OPER_AY_AI_16(); + u32 res = OPER_AY_AI_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -32338,7 +32338,7 @@ void m68000_base_device::x4a50_tst_w_ai_01234fc() } void m68000_base_device::x4a58_tst_w_pi_01234fc() { - uint32_t res = OPER_AY_PI_16(); + u32 res = OPER_AY_PI_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -32349,7 +32349,7 @@ void m68000_base_device::x4a58_tst_w_pi_01234fc() } void m68000_base_device::x4a60_tst_w_pd_01234fc() { - uint32_t res = OPER_AY_PD_16(); + u32 res = OPER_AY_PD_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -32360,7 +32360,7 @@ void m68000_base_device::x4a60_tst_w_pd_01234fc() } void m68000_base_device::x4a68_tst_w_di_01234fc() { - uint32_t res = OPER_AY_DI_16(); + u32 res = OPER_AY_DI_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -32371,7 +32371,7 @@ void m68000_base_device::x4a68_tst_w_di_01234fc() } void m68000_base_device::x4a70_tst_w_ix_01234fc() { - uint32_t res = OPER_AY_IX_16(); + u32 res = OPER_AY_IX_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -32382,7 +32382,7 @@ void m68000_base_device::x4a70_tst_w_ix_01234fc() } void m68000_base_device::x4a78_tst_w_aw_01234fc() { - uint32_t res = OPER_AW_16(); + u32 res = OPER_AW_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -32393,7 +32393,7 @@ void m68000_base_device::x4a78_tst_w_aw_01234fc() } void m68000_base_device::x4a79_tst_w_al_01234fc() { - uint32_t res = OPER_AL_16(); + u32 res = OPER_AL_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -32406,7 +32406,7 @@ void m68000_base_device::x4a7a_tst_w_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_PCDI_16(); + u32 res = OPER_PCDI_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -32422,7 +32422,7 @@ void m68000_base_device::x4a7b_tst_w_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_PCIX_16(); + u32 res = OPER_PCIX_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -32438,7 +32438,7 @@ void m68000_base_device::x4a7c_tst_w_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_I_16(); + u32 res = OPER_I_16(); m_n_flag = NFLAG_16(res); m_not_z_flag = res; @@ -32452,7 +32452,7 @@ void m68000_base_device::x4a7c_tst_w_234fc() } void m68000_base_device::x4a80_tst_l_01234fc() { - uint32_t res = DY(); + u32 res = DY(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -32465,7 +32465,7 @@ void m68000_base_device::x4a88_tst_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = AY(); + u32 res = AY(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -32479,7 +32479,7 @@ void m68000_base_device::x4a88_tst_l_234fc() } void m68000_base_device::x4a90_tst_l_ai_01234fc() { - uint32_t res = OPER_AY_AI_32(); + u32 res = OPER_AY_AI_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -32490,7 +32490,7 @@ void m68000_base_device::x4a90_tst_l_ai_01234fc() } void m68000_base_device::x4a98_tst_l_pi_01234fc() { - uint32_t res = OPER_AY_PI_32(); + u32 res = OPER_AY_PI_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -32501,7 +32501,7 @@ void m68000_base_device::x4a98_tst_l_pi_01234fc() } void m68000_base_device::x4aa0_tst_l_pd_01234fc() { - uint32_t res = OPER_AY_PD_32(); + u32 res = OPER_AY_PD_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -32512,7 +32512,7 @@ void m68000_base_device::x4aa0_tst_l_pd_01234fc() } void m68000_base_device::x4aa8_tst_l_di_01234fc() { - uint32_t res = OPER_AY_DI_32(); + u32 res = OPER_AY_DI_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -32523,7 +32523,7 @@ void m68000_base_device::x4aa8_tst_l_di_01234fc() } void m68000_base_device::x4ab0_tst_l_ix_01234fc() { - uint32_t res = OPER_AY_IX_32(); + u32 res = OPER_AY_IX_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -32534,7 +32534,7 @@ void m68000_base_device::x4ab0_tst_l_ix_01234fc() } void m68000_base_device::x4ab8_tst_l_aw_01234fc() { - uint32_t res = OPER_AW_32(); + u32 res = OPER_AW_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -32545,7 +32545,7 @@ void m68000_base_device::x4ab8_tst_l_aw_01234fc() } void m68000_base_device::x4ab9_tst_l_al_01234fc() { - uint32_t res = OPER_AL_32(); + u32 res = OPER_AL_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -32558,7 +32558,7 @@ void m68000_base_device::x4aba_tst_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_PCDI_32(); + u32 res = OPER_PCDI_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -32574,7 +32574,7 @@ void m68000_base_device::x4abb_tst_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_PCIX_32(); + u32 res = OPER_PCIX_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -32590,7 +32590,7 @@ void m68000_base_device::x4abc_tst_l_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t res = OPER_I_32(); + u32 res = OPER_I_32(); m_n_flag = NFLAG_32(res); m_not_z_flag = res; @@ -32610,7 +32610,7 @@ void m68000_base_device::x4e5f_unlk_l_01234fc() } void m68000_base_device::x4e58_unlk_l_01234fc() { - uint32_t* r_dst = &AY(); + u32* r_dst = &AY(); REG_A()[7] = *r_dst; *r_dst = m68ki_pull_32(); @@ -32622,8 +32622,8 @@ void m68000_base_device::x8180_unpk_w_234fc() if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: DX() and DY() are reversed in Motorola's docs */ - uint32_t src = DY(); - uint32_t* r_dst = &DX(); + u32 src = DY(); + u32* r_dst = &DX(); *r_dst = MASK_OUT_BELOW_16(*r_dst) | (((((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16()) & 0xffff); return; @@ -32637,8 +32637,8 @@ void m68000_base_device::x8f88_unpk_w_234fc() if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: AX and AY are reversed in Motorola's docs */ - uint32_t src = OPER_AY_PD_8(); - uint32_t ea_dst; + u32 src = OPER_AY_PD_8(); + u32 ea_dst; src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(); ea_dst = EA_A7_PD_8(); @@ -32656,8 +32656,8 @@ void m68000_base_device::x818f_unpk_w_234fc() if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: AX and AY are reversed in Motorola's docs */ - uint32_t src = OPER_A7_PD_8(); - uint32_t ea_dst; + u32 src = OPER_A7_PD_8(); + u32 ea_dst; src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(); ea_dst = EA_AX_PD_8(); @@ -32674,8 +32674,8 @@ void m68000_base_device::x8f8f_unpk_w_234fc() { if(CPU_TYPE_IS_EC020_PLUS()) { - uint32_t src = OPER_A7_PD_8(); - uint32_t ea_dst; + u32 src = OPER_A7_PD_8(); + u32 ea_dst; src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(); ea_dst = EA_A7_PD_8(); @@ -32693,8 +32693,8 @@ void m68000_base_device::x8188_unpk_w_234fc() if(CPU_TYPE_IS_EC020_PLUS()) { /* Note: AX and AY are reversed in Motorola's docs */ - uint32_t src = OPER_AY_PD_8(); - uint32_t ea_dst; + u32 src = OPER_AY_PD_8(); + u32 ea_dst; src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(); ea_dst = EA_AX_PD_8(); @@ -32711,9 +32711,9 @@ void m68000_base_device::xf400_cinv_l_4() { if(CPU_TYPE_IS_040_PLUS()) { - uint16_t ir = m_ir; - uint8_t cache = (ir >> 6) & 3; - // uint8_t scope = (ir >> 3) & 3; + u16 ir = m_ir; + u8 cache = (ir >> 6) & 3; + // u8 scope = (ir >> 3) & 3; // logerror("68040 %s: pc=%08x ir=%04x cache=%d scope=%d register=%d\n", ir & 0x0020 ? "cpush" : "cinv", m_ppc, ir, cache, scope, ir & 7); switch (cache) { -- cgit v1.2.3