diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/cpu/dspp/dspp.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/cpu/dspp/dspp.h')
-rw-r--r-- | src/devices/cpu/dspp/dspp.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/cpu/dspp/dspp.h b/src/devices/cpu/dspp/dspp.h index 302d141db13..9ebf08f6f6e 100644 --- a/src/devices/cpu/dspp/dspp.h +++ b/src/devices/cpu/dspp/dspp.h @@ -67,10 +67,10 @@ public: DECLARE_READ16_MEMBER( noise_r ); void update_fifo_dma(); - void print_sums() { printf("%04x: %04x\n", (uint16_t)m_core->m_arg0, (uint16_t)m_core->m_arg1); } - void print_branches() { printf("Branch: %d %d %d %d %d\n", m_core->m_arg0 ? 1 : 0, m_core->m_arg1 ? 1 : 0, m_core->m_arg2 ? 1 : 0, m_core->m_arg3 ? 1 : 0, m_core->m_arg4 ? 1 : 0); } - void print_value() { printf("Value is %08x\n", m_core->m_arg0); } - void print_addr() { printf("New value is %08x from %08x\n", m_core->m_arg0, m_core->m_arg1); } + void print_sums() { printf("%04x: %04x\n", (uint16_t)m_core->m_arg0, (uint16_t)m_core->m_arg1); } + void print_branches() { printf("Branch: %d %d %d %d %d\n", m_core->m_arg0 ? 1 : 0, m_core->m_arg1 ? 1 : 0, m_core->m_arg2 ? 1 : 0, m_core->m_arg3 ? 1 : 0, m_core->m_arg4 ? 1 : 0); } + void print_value() { printf("Value is %08x\n", m_core->m_arg0); } + void print_addr() { printf("New value is %08x from %08x\n", m_core->m_arg0, m_core->m_arg1); } protected: // device-level overrides @@ -232,10 +232,10 @@ private: const char *m_format; uint32_t m_arg0; - uint32_t m_arg1; - uint32_t m_arg2; - uint32_t m_arg3; - uint32_t m_arg4; + uint32_t m_arg1; + uint32_t m_arg2; + uint32_t m_arg3; + uint32_t m_arg4; struct { @@ -316,7 +316,7 @@ private: uint32_t cycles; /* accumulated cycles */ uint8_t checkints; /* need to check interrupts before next instruction */ uint8_t checksoftints; /* need to check software interrupts before next instruction */ - uml::code_label abortlabel; /* label to abort execution of this block */ + uml::code_label abortlabel; /* label to abort execution of this block */ uml::code_label labelnum; /* index for local labels */ }; |