Previous 199869 Revisions Next

r31040 Thursday 19th June, 2014 at 15:21:32 UTC by Couriersud
Removed a number of "uninitialized member" warnings by using a template wrapper around those members.
[src/emu/netlist]nl_base.h
[src/emu/netlist/devices]nld_4066.c nld_4066.h nld_74107.h nld_74123.h nld_74153.h nld_7448.h nld_7474.h nld_7483.h nld_7490.h nld_7493.h nld_74ls629.h nld_9316.c nld_9316.h nld_log.h nld_ne555.h

trunk/src/emu/netlist/devices/nld_log.h
r31039r31040
2828   ~NETLIB_NAME(log)();
2929   netlist_analog_input_t m_I;
3030protected:
31   FILE *m_file;
31    netlist_state_t<FILE *> m_file;
3232);
3333
3434#define LOGD(_name, _I, _I2)                                                 \
trunk/src/emu/netlist/devices/nld_74153.h
r31039r31040
6666
6767   netlist_ttl_output_t m_Y;
6868
69   int m_chan;
69   netlist_state_t<int> m_chan;
7070);
7171
7272NETLIB_DEVICE(74153,
trunk/src/emu/netlist/devices/nld_ne555.h
r31039r31040
3737   netlist_analog_input_t m_TRIG;
3838   netlist_analog_output_t m_OUT;
3939
40   bool m_last_out;
40   netlist_state_t<bool> m_last_out;
4141
4242   inline double clamp(const double v, const double a, const double b);
4343
trunk/src/emu/netlist/devices/nld_7483.h
r31039r31040
5555   netlist_ttl_input_t m_B3;
5656   netlist_ttl_input_t m_B4;
5757
58   UINT8 m_lastr;
58   netlist_state_t<UINT8> m_lastr;
5959
6060   netlist_ttl_output_t m_S1;
6161   netlist_ttl_output_t m_S2;
trunk/src/emu/netlist/devices/nld_7448.h
r31039r31040
4949   netlist_ttl_input_t m_D;
5050   netlist_ttl_input_t m_RBIQ;
5151
52   UINT8 m_state;
52   netlist_state_t<UINT8> m_state;
5353
5454   netlist_ttl_output_t m_a;
5555   netlist_ttl_output_t m_b;
trunk/src/emu/netlist/devices/nld_74123.h
r31039r31040
4343
4444    netlist_analog_input_t m_CV;
4545
46    netlist_sig_t m_last_trig;
47   UINT8         m_state;
48   double        m_KP;
46    netlist_state_t<netlist_sig_t> m_last_trig;
47    netlist_state_t<UINT8>         m_state;
48    netlist_state_t<double>        m_KP;
4949
5050    netlist_param_double_t m_K;
5151    netlist_param_double_t m_RI;
trunk/src/emu/netlist/devices/nld_74107.h
r31039r31040
8080   netlist_ttl_output_t m_Q;
8181   netlist_ttl_output_t m_QQ;
8282
83   netlist_sig_t m_Q1;
84   netlist_sig_t m_Q2;
85   netlist_sig_t m_F;
83   netlist_state_t<netlist_sig_t> m_Q1;
84   netlist_state_t<netlist_sig_t> m_Q2;
85   netlist_state_t<netlist_sig_t> m_F;
8686
8787   ATTR_HOT void newstate(const netlist_sig_t state);
8888
trunk/src/emu/netlist/devices/nld_4066.c
r31039r31040
3030
3131NETLIB_UPDATE(4066)
3232{
33   double sup = (m_supply->vdd() - m_supply->vss());
33   double sup = (m_supply.get()->vdd() - m_supply.get()->vss());
3434   double low = 0.45 * sup;
3535   double high = 0.55 * sup;
36   double in = INPANALOG(m_control) - m_supply->vss();
36   double in = INPANALOG(m_control) - m_supply.get()->vss();
3737   double rON = 270.0 * 5.0 / sup;
3838
3939   if (in < low)
trunk/src/emu/netlist/devices/nld_74ls629.h
r31039r31040
4040   netlist_logic_output_t m_Y;
4141
4242   netlist_time m_inc;
43   netlist_sig_t m_enableq;
43   netlist_state_t<netlist_sig_t> m_enableq;
4444);
4545
4646NETLIB_DEVICE_WITH_PARAMS(SN74LS629,
trunk/src/emu/netlist/devices/nld_9316.c
r31039r31040
7373   register_output("QD", m_QD);
7474   register_output("RC", m_RC);
7575
76   save(NAME(m_cnt));
77   save(NAME(m_loadq));
78   save(NAME(m_ent));
76   save(NAME(m_cnt.ref()));
77   save(NAME(m_loadq.ref()));
78   save(NAME(m_ent.ref()));
7979}
8080
8181NETLIB_RESET(9316_sub)
r31039r31040
103103   }
104104   else
105105   {
106      cnt = m_ABCD->read_ABCD();
106      cnt = m_ABCD.get()->read_ABCD();
107107      update_outputs_all(cnt);
108108      OUTLOGIC(m_RC, m_ent & (cnt == 0x0f), NLTIME_FROM_NS(20));
109109   }
trunk/src/emu/netlist/devices/nld_4066.h
r31039r31040
4545   netlist_analog_input_t m_control;
4646   NETLIB_NAME(R) m_R;
4747
48   NETLIB_NAME(vdd_vss) *m_supply;
48   netlist_state_t<NETLIB_NAME(vdd_vss) *>m_supply;
4949);
5050
5151NETLIB_DEVICE(4066_dip,
trunk/src/emu/netlist/devices/nld_9316.h
r31039r31040
8181
8282   netlist_ttl_input_t m_CLK;
8383
84   UINT8 m_cnt;
85   NETLIB_NAME(9316_subABCD) *m_ABCD;
86   netlist_sig_t m_loadq;
87   netlist_sig_t m_ent;
84   netlist_state_t<UINT8> m_cnt;
85   netlist_state_t<NETLIB_NAME(9316_subABCD) *> m_ABCD;
86   netlist_state_t<netlist_sig_t> m_loadq;
87   netlist_state_t<netlist_sig_t> m_ent;
8888
8989   netlist_ttl_output_t m_QA;
9090   netlist_ttl_output_t m_QB;
trunk/src/emu/netlist/devices/nld_7490.h
r31039r31040
8080   netlist_ttl_input_t m_A;
8181   netlist_ttl_input_t m_B;
8282
83   UINT8 m_cnt;
83   netlist_state_t<UINT8> m_cnt;
8484
8585   netlist_ttl_output_t m_Q[4];
8686);
trunk/src/emu/netlist/devices/nld_7474.h
r31039r31040
5757NETLIB_SUBDEVICE(7474sub,
5858   netlist_ttl_input_t m_CLK;
5959
60   UINT8 m_nextD;
60    netlist_state_t<UINT8> m_nextD;
6161   netlist_ttl_output_t m_Q;
6262   netlist_ttl_output_t m_QQ;
6363
trunk/src/emu/netlist/devices/nld_7493.h
r31039r31040
7373   netlist_ttl_input_t m_I;
7474   netlist_ttl_output_t m_Q;
7575
76   UINT8 m_reset;
76   netlist_state_t<UINT8> m_reset;
7777);
7878
7979NETLIB_DEVICE(7493,
trunk/src/emu/netlist/nl_base.h
r31039r31040
276276
277277extern netlist_logic_family_desc_t netlist_family_ttl;
278278
279
279280// ----------------------------------------------------------------------------------------
281// netlist_state_t
282// ----------------------------------------------------------------------------------------
283
284template< typename X>
285class netlist_state_t {
286public:
287  inline netlist_state_t() : m_x(static_cast<X>(0)) {}
288  inline netlist_state_t(const X& x_) : m_x(x_) {}
289  inline const X& get() const { return m_x; }
290  inline X& ref() { return m_x; }
291  inline operator const X&() const { return m_x; }
292  inline operator X&() { return m_x; }
293private:
294  X m_x;
295};
296
297// ----------------------------------------------------------------------------------------
280298// netlist_object_t
281299// ----------------------------------------------------------------------------------------
282300
r31039r31040
321339   ATTR_COLD const pstring &name() const;
322340
323341   PSTATE_INTERFACE_DECL()
342   template<typename C> ATTR_COLD void save(netlist_state_t<C> &state, const pstring &stname)
343   {
344       save(state.ref(), stname);
345   }
324346
325347   ATTR_HOT inline const type_t type() const { return m_objtype; }
326348   ATTR_HOT inline const family_t family() const { return m_family; }

Previous 199869 Revisions Next


© 1997-2024 The MAME Team