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

Code maintenance. Remove commented out directives. (nw)

Browse Source
This commit is contained in:
couriersud 2015-05-31 18:01:46 +02:00
parent a3806ce7a1
commit b7a823de3f
16 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emu/netlist/analog/nld_bjt.h
View File

@ -46,8 +46,8 @@ public:
inline bool is_qtype(q_type atype) const { return m_qtype == atype; }
inline void set_qtype(q_type atype) { m_qtype = atype; }
protected:
/* ATTR_COLD */ virtual void start();
/* ATTR_COLD */ virtual void reset();
virtual void start();
virtual void reset();
ATTR_HOT void update();
netlist_param_model_t m_model;
@ -110,9 +110,9 @@ public:
protected:
/* ATTR_COLD */ virtual void start();
virtual void start();
ATTR_HOT virtual void update_param();
/* ATTR_COLD */ virtual void reset();
virtual void reset();
NETLIB_UPDATE_TERMINALSI();
nl_double m_gB; // base conductance / switch on
@ -142,8 +142,8 @@ public:
protected:
/* ATTR_COLD */ virtual void start();
/* ATTR_COLD */ virtual void reset();
virtual void start();
virtual void reset();
ATTR_HOT void update_param();
ATTR_HOT void virtual update();
NETLIB_UPDATE_TERMINALSI();

18
src/emu/netlist/analog/nld_fourterm.h
View File

@ -56,9 +56,9 @@ public:
: netlist_device_t(afamily), m_gfac(1.0) { }
protected:
/* ATTR_COLD */ virtual void start();
/* ATTR_COLD */ virtual void reset();
/* ATTR_COLD */ virtual void update_param();
virtual void start();
virtual void reset();
virtual void update_param();
ATTR_HOT void update();
ATTR_COLD void start_internal(const nl_double def_RI);
@ -112,9 +112,9 @@ public:
//: netlist_device_t(afamily), m_gfac(1.0) { }
protected:
/* ATTR_COLD */ virtual void start();
/* ATTR_COLD */ virtual void reset();
/* ATTR_COLD */ virtual void update_param();
virtual void start();
virtual void reset();
virtual void update_param();
ATTR_HOT void update();
nl_double m_gfac;
@ -156,9 +156,9 @@ public:
: NETLIB_NAME(VCCS)(VCVS) { }
protected:
/* ATTR_COLD */ virtual void start();
/* ATTR_COLD */ virtual void reset();
/* ATTR_COLD */ virtual void update_param();
virtual void start();
virtual void reset();
virtual void update_param();
//ATTR_HOT void update();
netlist_terminal_t m_OP2;

6
src/emu/netlist/analog/nld_ms_direct.h
View File

@ -20,15 +20,15 @@ public:
virtual ~netlist_matrix_solver_direct_t();
/* ATTR_COLD */ virtual void vsetup(netlist_analog_net_t::list_t &nets);
/* ATTR_COLD */ virtual void reset() { netlist_matrix_solver_t::reset(); }
virtual void vsetup(netlist_analog_net_t::list_t &nets);
virtual void reset() { netlist_matrix_solver_t::reset(); }
ATTR_HOT inline unsigned N() const { if (m_N == 0) return m_dim; else return m_N; }
ATTR_HOT inline int vsolve_non_dynamic(const bool newton_raphson);
protected:
/* ATTR_COLD */ virtual void add_term(int net_idx, netlist_terminal_t *term);
virtual void add_term(int net_idx, netlist_terminal_t *term);
ATTR_HOT virtual nl_double vsolve();

2
src/emu/netlist/analog/nld_ms_jakobi.h
View File

@ -31,7 +31,7 @@ public:
virtual ~netlist_matrix_solver_SOR_t() {}
/* ATTR_COLD */ virtual void log_stats();
virtual void log_stats();
ATTR_HOT inline int vsolve_non_dynamic();
protected:

2
src/emu/netlist/analog/nld_ms_sor.h
View File

@ -30,7 +30,7 @@ public:
virtual ~netlist_matrix_solver_SOR_t() {}
/* ATTR_COLD */ virtual void log_stats();
virtual void log_stats();
ATTR_HOT virtual int vsolve_non_dynamic(const bool newton_raphson);
protected:

2
src/emu/netlist/analog/nld_ms_sor_mat.h
View File

@ -36,7 +36,7 @@ public:
virtual ~netlist_matrix_solver_SOR_mat_t() {}
/* ATTR_COLD */ virtual void log_stats();
virtual void log_stats();
ATTR_HOT inline int vsolve_non_dynamic(const bool newton_raphson);
protected:

14
src/emu/netlist/analog/nld_solver.h
View File

@ -100,9 +100,9 @@ public:
};
ATTR_COLD netlist_matrix_solver_t(const eSolverType type, const netlist_solver_parameters_t *params);
/* ATTR_COLD */ virtual ~netlist_matrix_solver_t();
virtual ~netlist_matrix_solver_t();
/* ATTR_COLD */ virtual void vsetup(netlist_analog_net_t::list_t &nets) = 0;
virtual void vsetup(netlist_analog_net_t::list_t &nets) = 0;
template<class C>
void solve_base(C *p);
@ -120,11 +120,11 @@ public:
/* netdevice functions */
ATTR_HOT virtual void update();
/* ATTR_COLD */ virtual void start();
/* ATTR_COLD */ virtual void reset();
virtual void start();
virtual void reset();
ATTR_COLD int get_net_idx(netlist_net_t *net);
/* ATTR_COLD */ virtual void log_stats() {};
virtual void log_stats() {};
inline eSolverType type() const { return m_type; }
@ -136,7 +136,7 @@ protected:
// should return next time step
ATTR_HOT virtual nl_double vsolve() = 0;
/* ATTR_COLD */ virtual void add_term(int net_idx, netlist_terminal_t *term) = 0;
virtual void add_term(int net_idx, netlist_terminal_t *term) = 0;
plist_t<netlist_analog_net_t *> m_nets;
plist_t<netlist_analog_output_t *> m_inps;
@ -173,7 +173,7 @@ public:
NETLIB_NAME(solver)()
: netlist_device_t() { }
/* ATTR_COLD */ virtual ~NETLIB_NAME(solver)();
virtual ~NETLIB_NAME(solver)();
ATTR_COLD void post_start();
ATTR_COLD void stop();

18
src/emu/netlist/analog/nld_twoterm.h
View File

@ -122,8 +122,8 @@ public:
}
protected:
/* ATTR_COLD */ virtual void start();
/* ATTR_COLD */ virtual void reset();
virtual void start();
virtual void reset();
ATTR_HOT void update();
private:
@ -144,8 +144,8 @@ public:
}
protected:
/* ATTR_COLD */ virtual void start();
/* ATTR_COLD */ virtual void reset();
virtual void start();
virtual void reset();
ATTR_HOT void update();
};
@ -193,9 +193,9 @@ public:
}
protected:
/* ATTR_COLD */ virtual void start();
/* ATTR_COLD */ virtual void reset();
/* ATTR_COLD */ virtual void update_param();
virtual void start();
virtual void reset();
virtual void update_param();
ATTR_HOT void update();
netlist_param_double_t m_C;
@ -282,8 +282,8 @@ public:
NETLIB_UPDATE_TERMINALSI();
protected:
/* ATTR_COLD */ virtual void start();
/* ATTR_COLD */ virtual void update_param();
virtual void start();
virtual void update_param();
ATTR_HOT void update();
netlist_param_model_t m_model;

6
src/emu/netlist/devices/nld_signal.h
View File

@ -18,7 +18,7 @@
class NETLIB_NAME(_name) : public net_signal_t<_num_input, _check, _invert> \
{ \
public: \
ATTR_COLD NETLIB_NAME(_name) () \
NETLIB_NAME(_name) () \
: net_signal_t<_num_input, _check, _invert>() { } \
}
@ -35,7 +35,7 @@ public:
{
}
ATTR_COLD void start()
void start()
{
const char *sIN[8] = { "A", "B", "C", "D", "E", "F", "G", "H" };
@ -47,7 +47,7 @@ public:
save(NLNAME(m_active));
}
ATTR_COLD void reset()
void reset()
{
m_Q[0].initial(0);
m_active = 1;

4
src/emu/netlist/devices/nld_system.c
View File

@ -177,7 +177,7 @@ NETLIB_UPDATE_PARAM(analog_input)
// nld_d_to_a_proxy
// ----------------------------------------------------------------------------------------
ATTR_COLD void nld_d_to_a_proxy::start()
void nld_d_to_a_proxy::start()
{
nld_base_d_to_a_proxy::start();
@ -192,7 +192,7 @@ ATTR_COLD void nld_d_to_a_proxy::start()
m_Q.initial(0.0);
}
ATTR_COLD void nld_d_to_a_proxy::reset()
void nld_d_to_a_proxy::reset()
{
m_RV.do_reset();
m_is_timestep = m_RV.m_P.net().as_analog().solver()->is_timestep();

4
src/emu/netlist/devices/nld_truthtable.c
View File

@ -97,7 +97,7 @@ UINT32 truthtable_desc_t::get_ignored_extended(UINT32 i)
// desc
// ----------------------------------------------------------------------------------------
ATTR_COLD void truthtable_desc_t::help(unsigned cur, pstring_list_t list,
void truthtable_desc_t::help(unsigned cur, pstring_list_t list,
UINT64 state,UINT16 val, UINT8 *timing_index)
{
pstring elem = list[cur].trim();
@ -142,7 +142,7 @@ ATTR_COLD void truthtable_desc_t::help(unsigned cur, pstring_list_t list,
}
}
ATTR_COLD void truthtable_desc_t::setup(const pstring_list_t &truthtable, UINT32 disabled_ignore)
void truthtable_desc_t::setup(const pstring_list_t &truthtable, UINT32 disabled_ignore)
{
unsigned line = 0;

16
src/emu/netlist/devices/nld_truthtable.h
View File

@ -45,10 +45,10 @@ struct truthtable_desc_t
{
}
ATTR_COLD void setup(const pstring_list_t &desc, UINT32 disabled_ignore);
void setup(const pstring_list_t &desc, UINT32 disabled_ignore);
private:
ATTR_COLD void help(unsigned cur, pstring_list_t list,
void help(unsigned cur, pstring_list_t list,
UINT64 state,UINT16 val, UINT8 *timing_index);
static unsigned count_bits(UINT32 v);
static UINT32 set_bits(UINT32 v, UINT32 b);
@ -106,7 +106,7 @@ public:
m_desc = desc;
}
/* ATTR_COLD */ virtual void start()
virtual void start()
{
pstring header = m_desc[0];
@ -164,7 +164,7 @@ public:
}
ATTR_COLD void reset()
void reset()
{
m_active = 0;
for (unsigned i=0; i<m_NO;i++)
@ -174,7 +174,7 @@ public:
}
template<bool doOUT>
ATTR_HOT inline void process()
inline void process()
{
netlist_time mt = netlist_time::zero;
@ -262,7 +262,7 @@ class netlist_base_factory_truthtable_t : public netlist_base_factory_t
{
NETLIST_PREVENT_COPYING(netlist_base_factory_truthtable_t)
public:
ATTR_COLD netlist_base_factory_truthtable_t(const pstring &name, const pstring &classname,
netlist_base_factory_truthtable_t(const pstring &name, const pstring &classname,
const pstring &def_param)
: netlist_base_factory_t(name, classname, def_param)
{}
@ -275,11 +275,11 @@ class netlist_factory_truthtable_t : public netlist_base_factory_truthtable_t
{
NETLIST_PREVENT_COPYING(netlist_factory_truthtable_t)
public:
ATTR_COLD netlist_factory_truthtable_t(const pstring &name, const pstring &classname,
netlist_factory_truthtable_t(const pstring &name, const pstring &classname,
const pstring &def_param)
: netlist_base_factory_truthtable_t(name, classname, def_param) { }
ATTR_COLD netlist_device_t *Create()
netlist_device_t *Create()
{
typedef nld_truthtable_t<m_NI, m_NO, has_state> tt_type;
netlist_device_t *r = palloc(tt_type, &m_ttbl, m_desc);

66
src/emu/netlist/nl_base.h
View File

@ -173,7 +173,7 @@ class netlist_core_device_t;
#if (NL_PMF_TYPE == NL_PMF_TYPE_GNUC_PMF)
typedef void (netlist_core_device_t::*net_update_delegate)();
#elif ((NL_PMF_TYPE == NL_PMF_TYPE_GNUC_PMF_CONV) || (NL_PMF_TYPE == NL_PMF_TYPE_INTERNAL))
typedef void (*net_update_delegate)(netlist_core_device_t *);
typedef /*__thiscall */ void (*net_update_delegate)(netlist_core_device_t *);
#endif
//============================================================
@ -248,7 +248,7 @@ typedef void (*net_update_delegate)(netlist_core_device_t *);
, _priv)
#define NETLIB_LOGIC_FAMILY(_fam) \
/* ATTR_COLD */ virtual const netlist_logic_family_desc_t *default_logic_family() \
virtual const netlist_logic_family_desc_t *default_logic_family() \
{ \
return &netlist_family_ ## _fam; \
}
@ -409,9 +409,9 @@ public:
protected:
/* ATTR_COLD */ virtual void reset() = 0;
virtual void reset() = 0;
// must call parent save_register !
/* ATTR_COLD */ virtual void save_register() { };
virtual void save_register() { };
private:
pstring m_name;
@ -483,7 +483,7 @@ public:
ATTR_HOT /* inline */ void update_dev(const UINT32 mask);
protected:
/* ATTR_COLD */ virtual void save_register()
virtual void save_register()
{
save(NLNAME(m_state));
netlist_owned_object_t::save_register();
@ -537,9 +537,9 @@ public:
netlist_terminal_t *m_otherterm;
protected:
/* ATTR_COLD */ virtual void save_register();
virtual void save_register();
/* ATTR_COLD */ virtual void reset();
virtual void reset();
private:
ATTR_HOT void set_ptr(nl_double *ptr, const nl_double val)
{
@ -613,7 +613,7 @@ public:
ATTR_HOT void activate_lh();
protected:
/* ATTR_COLD */ virtual void reset()
virtual void reset()
{
//netlist_core_terminal_t::reset();
set_state(STATE_INP_ACTIVE);
@ -637,7 +637,7 @@ public:
ATTR_HOT nl_double Q_Analog() const;
protected:
/* ATTR_COLD */ virtual void reset()
virtual void reset()
{
//netlist_core_terminal_t::reset();
set_state(STATE_INP_ACTIVE);
@ -656,7 +656,7 @@ public:
typedef plist_t<netlist_net_t *> list_t;
ATTR_COLD netlist_net_t(const family_t afamily);
/* ATTR_COLD */ virtual ~netlist_net_t();
virtual ~netlist_net_t();
ATTR_COLD void init_object(netlist_base_t &nl, const pstring &aname);
@ -705,8 +705,8 @@ public:
protected: //FIXME: needed by current solver code
/* ATTR_COLD */ virtual void save_register();
/* ATTR_COLD */ virtual void reset();
virtual void save_register();
virtual void reset();
netlist_sig_t m_new_Q;
netlist_sig_t m_cur_Q;
@ -736,7 +736,7 @@ public:
typedef plist_t<netlist_logic_net_t *> list_t;
ATTR_COLD netlist_logic_net_t();
/* ATTR_COLD */ virtual ~netlist_logic_net_t() { };
virtual ~netlist_logic_net_t() { };
ATTR_HOT netlist_sig_t Q() const
{
@ -778,8 +778,8 @@ public:
protected: //FIXME: needed by current solver code
/* ATTR_COLD */ virtual void save_register();
/* ATTR_COLD */ virtual void reset();
virtual void save_register();
virtual void reset();
private:
@ -796,7 +796,7 @@ public:
typedef plist_t<netlist_analog_net_t *> list_t;
ATTR_COLD netlist_analog_net_t();
/* ATTR_COLD */ virtual ~netlist_analog_net_t() { };
virtual ~netlist_analog_net_t() { };
ATTR_HOT nl_double Q_Analog() const
{
@ -815,8 +815,8 @@ public:
protected:
/* ATTR_COLD */ virtual void save_register();
/* ATTR_COLD */ virtual void reset();
virtual void save_register();
virtual void reset();
private:
@ -841,7 +841,7 @@ public:
ATTR_COLD netlist_logic_output_t();
ATTR_COLD void init_object(netlist_core_device_t &dev, const pstring &aname);
/* ATTR_COLD */ virtual void reset()
virtual void reset()
{
set_state(STATE_OUT);
}
@ -865,7 +865,7 @@ public:
ATTR_COLD netlist_analog_output_t();
ATTR_COLD void init_object(netlist_core_device_t &dev, const pstring &aname);
/* ATTR_COLD */ virtual void reset()
virtual void reset()
{
set_state(STATE_OUT);
}
@ -903,7 +903,7 @@ public:
protected:
/* ATTR_COLD */ virtual void reset() { }
virtual void reset() { }
private:
const param_type_t m_param_type;
@ -920,7 +920,7 @@ public:
ATTR_HOT nl_double Value() const { return m_param; }
protected:
/* ATTR_COLD */ virtual void save_register()
virtual void save_register()
{
save(NLNAME(m_param));
netlist_param_t::save_register();
@ -942,7 +942,7 @@ public:
ATTR_HOT int Value() const { return m_param; }
protected:
/* ATTR_COLD */ virtual void save_register()
virtual void save_register()
{
save(NLNAME(m_param));
netlist_param_t::save_register();
@ -1005,9 +1005,9 @@ public:
ATTR_COLD netlist_core_device_t(const family_t afamily);
/* ATTR_COLD */ virtual ~netlist_core_device_t();
virtual ~netlist_core_device_t();
/* ATTR_COLD */ virtual void init(netlist_base_t &anetlist, const pstring &name);
virtual void init(netlist_base_t &anetlist, const pstring &name);
ATTR_HOT virtual void update_param() {}
ATTR_HOT void update_dev()
@ -1066,9 +1066,9 @@ public:
protected:
ATTR_HOT virtual void update() { }
/* ATTR_COLD */ virtual void start() { }
/* ATTR_COLD */ virtual void stop() { } \
/* ATTR_COLD */ virtual const netlist_logic_family_desc_t *default_logic_family()
virtual void start() { }
virtual void stop() { } \
virtual const netlist_logic_family_desc_t *default_logic_family()
{
return &netlist_family_TTL;
}
@ -1088,9 +1088,9 @@ public:
ATTR_COLD netlist_device_t();
ATTR_COLD netlist_device_t(const family_t afamily);
/* ATTR_COLD */ virtual ~netlist_device_t();
virtual ~netlist_device_t();
/* ATTR_COLD */ virtual void init(netlist_base_t &anetlist, const pstring &name);
virtual void init(netlist_base_t &anetlist, const pstring &name);
ATTR_COLD netlist_setup_t &setup();
@ -1245,12 +1245,12 @@ protected:
};
// any derived netlist must override this ...
/* ATTR_COLD */ virtual void verror(const loglevel_e level,
virtual void verror(const loglevel_e level,
const char *format, va_list ap) const = 0;
/* from netlist_object */
/* ATTR_COLD */ virtual void reset();
/* ATTR_COLD */ virtual void save_register();
virtual void reset();
virtual void save_register();
#if (NL_KEEP_STATISTICS)
// performance

2
src/emu/netlist/nl_config.h
View File

@ -47,7 +47,7 @@
*/
// This will be autodetected
// #define NL_PMF_TYPE 3
#define NL_PMF_TYPE 3
#define NL_PMF_TYPE_VIRTUAL 0
#define NL_PMF_TYPE_GNUC_PMF 1

4
src/emu/netlist/nl_factory.h
View File

@ -27,9 +27,9 @@ public:
: m_name(name), m_classname(classname), m_def_param(def_param)
{}
/* ATTR_COLD */ virtual ~netlist_base_factory_t() {}
virtual ~netlist_base_factory_t() {}
/* ATTR_COLD */ virtual netlist_device_t *Create() = 0;
virtual netlist_device_t *Create() = 0;
ATTR_COLD const pstring &name() const { return m_name; }
ATTR_COLD const pstring &classname() const { return m_classname; }

2
src/emu/netlist/plib/pconfig.h
View File

@ -134,7 +134,7 @@ typedef int64_t INT64;
* It derives a pointer to a member function.
*/
#if (PHAS_PMF_INTERNAL)
#if 1 || (PHAS_PMF_INTERNAL)
class pmfp
{
public: