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

Improve readability. (nw)

Browse Source
This commit is contained in:
couriersud 2019-01-05 01:01:16 +01:00
parent 999c5b872e
commit 298e6c759c
2 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/devices/machine/netlist.cpp
View File

@ -131,7 +131,7 @@ public:
// avoid calls due to noise
if (std::fabs(cur - m_last) > 1e-6)
{
m_cpu_device->update_time_x();
m_cpu_device->update_icount();
m_callback(cur, m_cpu_device->local_time());
m_cpu_device->check_mame_abort_slice();
m_last = cur;
@ -179,7 +179,7 @@ public:
// avoid calls due to noise
if (cur != m_last)
{
m_cpu_device->update_time_x();
m_cpu_device->update_icount();
m_callback(cur, m_cpu_device->local_time());
m_cpu_device->check_mame_abort_slice();
m_last = cur;
@ -441,16 +441,15 @@ void netlist_mame_device::register_memregion_source(netlist::setup_t &setup, con
void netlist_mame_analog_input_device::write(const double val)
{
if (is_sound_device())
{
update_to_current_time();
m_param->setTo(val * m_mult + m_offset);
}
else
{
// FIXME: use device timer ....
m_param->setTo(val * m_mult + m_offset);
}
m_value_for_device_timer = val * m_mult + m_offset;
if (m_value_for_device_timer != (*m_param)())
synchronize(0, 0, &m_value_for_device_timer);
}
void netlist_mame_analog_input_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
update_to_current_time();
m_param->setTo(*((double *) ptr));
}
void netlist_mame_int_input_device::write(const uint32_t val)
@ -469,15 +468,13 @@ void netlist_mame_logic_input_device::write(const uint32_t val)
void netlist_mame_int_input_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
if (is_sound_device())
update_to_current_time();
update_to_current_time();
m_param->setTo(param);
}
void netlist_mame_logic_input_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
if (is_sound_device())
update_to_current_time();
update_to_current_time();
m_param->setTo(param);
}
@ -916,7 +913,7 @@ ATTR_COLD void netlist_mame_device::device_pre_save()
netlist().state().pre_save();
}
void netlist_mame_device::update_time_x()
void netlist_mame_device::update_icount()
{
const netlist::netlist_time newt(netlist().time());
const netlist::netlist_time delta(newt - m_old + m_rem);
@ -1043,13 +1040,13 @@ ATTR_HOT void netlist_mame_cpu_device::execute_run()
m_genPC &= 255;
debugger_instruction_hook(m_genPC);
netlist().process_queue(m_div);
update_time_x();
update_icount();
}
}
else
{
netlist().process_queue(m_div * m_icount);
update_time_x();
update_icount();
}
}
@ -1089,11 +1086,9 @@ offs_t netlist_disassembler::disassemble(std::ostream &stream, offs_t pc, const
netlist_mame_sound_device::netlist_mame_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: netlist_mame_device(mconfig, NETLIST_SOUND, tag, owner, clock)
, device_sound_interface(mconfig, *this)
, m_out{nullptr}
, m_in(nullptr)
, m_stream(nullptr)
, m_num_inputs(0)
, m_num_outputs(0)
{
}
@ -1109,18 +1104,17 @@ void netlist_mame_sound_device::device_start()
if (outdevs.size() == 0)
fatalerror("No output devices");
m_num_outputs = outdevs.size();
//m_num_outputs = outdevs.size();
/* resort channels */
for (int i=0; i < MAX_OUT; i++) m_out[i] = nullptr;
for (int i=0; i < m_num_outputs; i++)
for (int i=0; i < outdevs.size(); i++)
{
int chan = outdevs[i]->m_channel();
netlist().log().verbose("Output %d on channel %d", i, chan);
if (chan < 0 || chan >= MAX_OUT || chan >= outdevs.size())
fatalerror("illegal channel number");
//if (chan < 0 || chan >= MAX_OUT || chan >= outdevs.size())
// fatalerror("illegal channel number");
m_out[chan] = outdevs[i];
m_out[chan]->m_sample = netlist::netlist_time::from_hz(clock());
m_out[chan]->m_buffer = nullptr;
@ -1142,7 +1136,7 @@ void netlist_mame_sound_device::device_start()
}
/* initialize the stream(s) */
m_stream = machine().sound().stream_alloc(*this, m_num_inputs, m_num_outputs, clock());
m_stream = machine().sound().stream_alloc(*this, m_num_inputs, m_out.size(), clock());
}
@ -1155,11 +1149,13 @@ void netlist_mame_sound_device::nl_register_devices()
void netlist_mame_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
for (int i=0; i < m_num_outputs; i++)
for (auto &e : m_out)
{
m_out[i]->m_buffer = outputs[i];
e.second->m_buffer = outputs[e.first];
}
if (m_num_inputs)
m_in->buffer_reset();
@ -1174,9 +1170,9 @@ void netlist_mame_sound_device::sound_stream_update(sound_stream &stream, stream
cur += (m_div * samples);
for (int i=0; i < m_num_outputs; i++)
for (auto &e : m_out)
{
m_out[i]->sound_update(cur);
m_out[i]->buffer_reset(cur);
e.second->sound_update(cur);
e.second->buffer_reset(cur);
}
}

17
src/devices/machine/netlist.h
View File

@ -110,7 +110,7 @@ public:
ATTR_HOT inline netlist_mame_t &netlist() { return *m_netlist; }
ATTR_HOT inline const netlist::netlist_time last_time_update() { return m_old; }
ATTR_HOT void update_time_x();
ATTR_HOT void update_icount();
ATTR_HOT void check_mame_abort_slice();
static void register_memregion_source(netlist::setup_t &setup, const char *name);
@ -231,13 +231,10 @@ protected:
virtual void device_start() override;
private:
static constexpr int MAX_OUT = 10;
nld_sound_out *m_out[MAX_OUT];
std::map<int, nld_sound_out *> m_out;
nld_sound_in *m_in;
sound_stream *m_stream;
int m_num_inputs;
int m_num_outputs;
};
// ----------------------------------------------------------------------------------------
@ -260,9 +257,11 @@ public:
inline netlist_mame_device &nl_owner() const { return *m_owner; }
inline bool is_sound_device() const { return bool(m_sound); }
inline void update_to_current_time() { m_sound->get_stream()->update(); }
inline void update_to_current_time()
{
if (m_sound != nullptr)
m_sound->get_stream()->update();
}
void set_mult_offset(const double mult, const double offset);
@ -306,11 +305,13 @@ public:
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
private:
netlist::param_double_t *m_param;
bool m_auto_port;
const char *m_param_name;
double m_value_for_device_timer;
};
// ----------------------------------------------------------------------------------------