Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-03 17:08:39 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4740 from schnitzeltony/pokey-revert-regression

Browse Source 
Revert "pokey: yet another performance enhancement (#4735)"
This commit is contained in:
ajrhacker 2019-03-09 18:31:51 -05:00 committed by GitHub
commit 7412204a09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/devices/sound/pokey.cpp
View File

@ -243,7 +243,6 @@ void pokey_device::device_start()
m_out_filter = 0; m_out_filter = 0;
m_out_raw = 0; m_out_raw = 0;
m_old_raw_inval = true; m_old_raw_inval = true;
m_borrow_all_max = 0;
m_kbd_state = 0; m_kbd_state = 0;
/* reset more internal state */ /* reset more internal state */
@ -582,34 +581,15 @@ void pokey_device::step_one_clock(void)
clock_triggered[CLK_114] = 1; clock_triggered[CLK_114] = 1;
} }
/* in case
* no channel is at high speed AND
* no prescaler-clock has triggered AND
* we are not expecting a borrow-count finish
* => we are done and can exit here
*
* Note: for best performance on no-match case (matching case has to ask
* for all conditions anyway), the sequence chosen is:
* most likely no-match -> least likely no-match */
if (!clock_triggered[CLK_28] && !clock_triggered[CLK_114] &&
m_borrow_all_max == 0 &&
(m_AUDCTL & (CH1_HICLK || CH3_HICLK)) == 0)
{
/* not quite: high speed potentiometer requires handling on each
* cycle */
if ((m_SKCTL & SK_PADDLE) && (m_pot_counter < 228))
step_pot();
return;
}
int const base_clock = (m_AUDCTL & CLK_15KHZ) ? CLK_114 : CLK_28; int const base_clock = (m_AUDCTL & CLK_15KHZ) ? CLK_114 : CLK_28;
/* increment CHAN1 & CHAN3 at each cycle for high speed or on prescaler int clk = (m_AUDCTL & CH1_HICLK) ? CLK_1 : base_clock;
* clock trigger */ if (clock_triggered[clk])
if ((m_AUDCTL & CH1_HICLK) || clock_triggered[base_clock])
m_channel[CHAN1].inc_chan(); m_channel[CHAN1].inc_chan();
if ((m_AUDCTL & CH3_HICLK) || clock_triggered[base_clock])
clk = (m_AUDCTL & CH3_HICLK) ? CLK_1 : base_clock;
if (clock_triggered[clk])
m_channel[CHAN3].inc_chan(); m_channel[CHAN3].inc_chan();
/* same for CHAN2 & CHAN4 - if not joined as upper bits */
if (clock_triggered[base_clock]) if (clock_triggered[base_clock])
{ {
if (!(m_AUDCTL & CH12_JOINED)) if (!(m_AUDCTL & CH12_JOINED))
@ -627,10 +607,6 @@ void pokey_device::step_one_clock(void)
step_keyboard(); step_keyboard();
} }
/* performance-cheap decrement of shared helper max borrow counter */
if(m_borrow_all_max != 0)
m_borrow_all_max--;
/* do CHAN2 before CHAN1 because CHAN1 may set borrow! */ /* do CHAN2 before CHAN1 because CHAN1 may set borrow! */
if (m_channel[CHAN2].check_borrow()) if (m_channel[CHAN2].check_borrow())
{ {

4
src/devices/sound/pokey.h
View File

@ -242,8 +242,7 @@ private:
m_counter = (m_counter + 1) & 0xff; m_counter = (m_counter + 1) & 0xff;
if (m_counter == 0 && m_borrow_cnt == 0) if (m_counter == 0 && m_borrow_cnt == 0)
{ {
m_borrow_cnt = m_parent->m_borrow_all_max = 3; m_borrow_cnt = 3;
if (m_parent->m_IRQEN & m_INTMask) if (m_parent->m_IRQEN & m_INTMask)
{ {
/* Exposed state has changed: This should only be updated after a resync ... */ /* Exposed state has changed: This should only be updated after a resync ... */
@ -287,7 +286,6 @@ private:
uint32_t m_out_raw; /* raw output */ uint32_t m_out_raw; /* raw output */
bool m_old_raw_inval; /* true: recalc m_out_raw required */ bool m_old_raw_inval; /* true: recalc m_out_raw required */
uint32_t m_borrow_all_max; /* max borrow count for all channels */
double m_out_filter; /* filtered output */ double m_out_filter; /* filtered output */
int32_t m_clock_cnt[3]; /* clock counters */ int32_t m_clock_cnt[3]; /* clock counters */