diff options
| author | 2015-01-28 09:20:10 +0100 | |
|---|---|---|
| committer | 2015-01-28 09:20:10 +0100 | |
| commit | 26e7a17b6326aa5a75a6276e52cf84a94c16d7a0 (patch) | |
| tree | bab4468226c59d590688e0ece892f5bfbca58736 /src/emu/netlist | |
| parent | 13b862c4fae88f0f819c2c4416d49249e4de45b9 (diff) | |
Cleanups and version bumpmame0158
Diffstat (limited to 'src/emu/netlist')
| -rw-r--r-- | src/emu/netlist/analog/nld_ms_direct.h | 44 | ||||
| -rw-r--r-- | src/emu/netlist/analog/nld_ms_gauss_seidel.h | 46 | ||||
| -rw-r--r-- | src/emu/netlist/analog/nld_opamps.c | 2 | ||||
| -rw-r--r-- | src/emu/netlist/analog/nld_solver.c | 16 | ||||
| -rw-r--r-- | src/emu/netlist/analog/nld_solver.h | 12 | ||||
| -rw-r--r-- | src/emu/netlist/devices/net_lib.c | 3 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_4020.c | 2 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_cmos.h | 10 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_system.h | 41 | ||||
| -rw-r--r-- | src/emu/netlist/nl_base.c | 1 | ||||
| -rw-r--r-- | src/emu/netlist/nl_base.h | 6 | ||||
| -rw-r--r-- | src/emu/netlist/nl_config.h | 30 | ||||
| -rw-r--r-- | src/emu/netlist/nl_factory.c | 16 | ||||
| -rw-r--r-- | src/emu/netlist/nl_setup.c | 10 | ||||
| -rw-r--r-- | src/emu/netlist/nl_setup.h | 10 | ||||
| -rw-r--r-- | src/emu/netlist/plists.h | 4 | ||||
| -rw-r--r-- | src/emu/netlist/pstate.c | 10 |
17 files changed, 130 insertions, 133 deletions
diff --git a/src/emu/netlist/analog/nld_ms_direct.h b/src/emu/netlist/analog/nld_ms_direct.h index 1e3f1f28b79..42e29d04b33 100644 --- a/src/emu/netlist/analog/nld_ms_direct.h +++ b/src/emu/netlist/analog/nld_ms_direct.h @@ -14,7 +14,7 @@ class netlist_matrix_solver_direct_t: public netlist_matrix_solver_t public: netlist_matrix_solver_direct_t(const netlist_solver_parameters_t ¶ms, int size); - netlist_matrix_solver_direct_t(const eSolverType type, const netlist_solver_parameters_t ¶ms, int size); + netlist_matrix_solver_direct_t(const eSolverType type, const netlist_solver_parameters_t ¶ms, int size); virtual ~netlist_matrix_solver_direct_t(); @@ -69,13 +69,13 @@ netlist_matrix_solver_direct_t<m_N, _storage_N>::~netlist_matrix_solver_direct_t { //delete[] m_A[k]; } - for (int k = 0; k < N(); k++) - { - nl_free(m_terms[k]); - nl_free(m_row_ops[k]); - } - nl_free(m_row_ops[N()]); - //delete[] m_last_RHS; + for (int k = 0; k < N(); k++) + { + nl_free(m_terms[k]); + nl_free(m_row_ops[k]); + } + nl_free(m_row_ops[N()]); + //delete[] m_last_RHS; //delete[] m_RHS; nl_free_array(m_terms); nl_free_array(m_rails_temp); @@ -193,17 +193,17 @@ ATTR_COLD void netlist_matrix_solver_direct_t<m_N, _storage_N>::vsetup(netlist_a * Sorting as a general matrix pre-conditioning is mentioned in * literature but I have found no articles about Gauss Seidel. * - * For Gaussian Elimination however increasing order is better suited. - * FIXME: Even better would be to sort on elements right of the matrix diagonal. - * + * For Gaussian Elimination however increasing order is better suited. + * FIXME: Even better would be to sort on elements right of the matrix diagonal. + * */ - int sort_order = (type() == GAUSS_SEIDEL ? 1 : -1); + int sort_order = (type() == GAUSS_SEIDEL ? 1 : -1); for (int k = 0; k < N() / 2; k++) for (int i = 0; i < N() - 1; i++) { - if ((m_terms[i]->m_railstart - m_terms[i+1]->m_railstart) * sort_order < 0) + if ((m_terms[i]->m_railstart - m_terms[i+1]->m_railstart) * sort_order < 0) { std::swap(m_terms[i],m_terms[i+1]); m_nets.swap(i, i+1); @@ -475,15 +475,15 @@ netlist_matrix_solver_direct_t<m_N, _storage_N>::netlist_matrix_solver_direct_t( , m_dim(size) , m_lp_fact(0) { - m_terms = nl_alloc_array(terms_t *, N()); - m_rails_temp = nl_alloc_array(terms_t, N()); - - for (int k = 0; k < N(); k++) - { - m_terms[k] = nl_alloc(terms_t); - m_row_ops[k] = vector_ops_t::create_ops(k); - } - m_row_ops[N()] = vector_ops_t::create_ops(N()); + m_terms = nl_alloc_array(terms_t *, N()); + m_rails_temp = nl_alloc_array(terms_t, N()); + + for (int k = 0; k < N(); k++) + { + m_terms[k] = nl_alloc(terms_t); + m_row_ops[k] = vector_ops_t::create_ops(k); + } + m_row_ops[N()] = vector_ops_t::create_ops(N()); } diff --git a/src/emu/netlist/analog/nld_ms_gauss_seidel.h b/src/emu/netlist/analog/nld_ms_gauss_seidel.h index 2cc7a8cda3d..a3641c0b29b 100644 --- a/src/emu/netlist/analog/nld_ms_gauss_seidel.h +++ b/src/emu/netlist/analog/nld_ms_gauss_seidel.h @@ -17,16 +17,16 @@ class ATTR_ALIGNED(64) netlist_matrix_solver_gauss_seidel_t: public netlist_matr public: netlist_matrix_solver_gauss_seidel_t(const netlist_solver_parameters_t ¶ms, int size) - : netlist_matrix_solver_direct_t<m_N, _storage_N>(netlist_matrix_solver_t::GAUSS_SEIDEL, params, size) + : netlist_matrix_solver_direct_t<m_N, _storage_N>(netlist_matrix_solver_t::GAUSS_SEIDEL, params, size) , m_lp_fact(0) , m_gs_fail(0) , m_gs_total(0) { - const char *p = osd_getenv("NETLIST_STATS"); - if (p != NULL) - m_log_stats = (bool) atoi(p); - else - m_log_stats = false; + const char *p = osd_getenv("NETLIST_STATS"); + if (p != NULL) + m_log_stats = (bool) atoi(p); + else + m_log_stats = false; } virtual ~netlist_matrix_solver_gauss_seidel_t() {} @@ -52,21 +52,21 @@ private: template <int m_N, int _storage_N> void netlist_matrix_solver_gauss_seidel_t<m_N, _storage_N>::log_stats() { - if (this->m_stat_calculations != 0 && m_log_stats) - { - printf("==============================================\n"); - printf("Solver %s\n", this->name().cstr()); - printf(" ==> %d nets\n", this->N()); //, (*(*groups[i].first())->m_core_terms.first())->name().cstr()); - printf(" has %s elements\n", this->is_dynamic() ? "dynamic" : "no dynamic"); - printf(" has %s elements\n", this->is_timestep() ? "timestep" : "no timestep"); - printf(" %6.3f average newton raphson loops\n", (double) this->m_stat_newton_raphson / (double) this->m_stat_vsolver_calls); - printf(" %10d invocations (%6d Hz) %10d gs fails (%6.2f%%) %6.3f average\n", - this->m_stat_calculations, - this->m_stat_calculations * 10 / (int) (this->netlist().time().as_double() * 10.0), - this->m_gs_fail, - 100.0 * (double) this->m_gs_fail / (double) this->m_stat_calculations, - (double) this->m_gs_total / (double) this->m_stat_calculations); - } + if (this->m_stat_calculations != 0 && m_log_stats) + { + printf("==============================================\n"); + printf("Solver %s\n", this->name().cstr()); + printf(" ==> %d nets\n", this->N()); //, (*(*groups[i].first())->m_core_terms.first())->name().cstr()); + printf(" has %s elements\n", this->is_dynamic() ? "dynamic" : "no dynamic"); + printf(" has %s elements\n", this->is_timestep() ? "timestep" : "no timestep"); + printf(" %6.3f average newton raphson loops\n", (double) this->m_stat_newton_raphson / (double) this->m_stat_vsolver_calls); + printf(" %10d invocations (%6d Hz) %10d gs fails (%6.2f%%) %6.3f average\n", + this->m_stat_calculations, + this->m_stat_calculations * 10 / (int) (this->netlist().time().as_double() * 10.0), + this->m_gs_fail, + 100.0 * (double) this->m_gs_fail / (double) this->m_stat_calculations, + (double) this->m_gs_total / (double) this->m_stat_calculations); + } } template <int m_N, int _storage_N> @@ -299,7 +299,7 @@ ATTR_HOT inline int netlist_matrix_solver_gauss_seidel_t<m_N, _storage_N>::vsolv //if (fabs(gabs_t - fabs(gtot_t)) > 1e-20) // printf("%d %e abs: %f tot: %f\n",k, gabs_t / gtot_t -1.0, gabs_t, gtot_t); - gabs_t *= 0.95; // avoid rounding issues + gabs_t *= 0.95; // avoid rounding issues if (!USE_GABS || gabs_t <= gtot_t) { w[k] = ws / gtot_t; @@ -343,7 +343,7 @@ ATTR_HOT inline int netlist_matrix_solver_gauss_seidel_t<m_N, _storage_N>::vsolv this->m_nets[k]->m_cur_Analog = new_V[k]; this->m_gs_total += resched_cnt; - this->m_stat_calculations++; + this->m_stat_calculations++; if (resched) { diff --git a/src/emu/netlist/analog/nld_opamps.c b/src/emu/netlist/analog/nld_opamps.c index 32d2457e71f..697b504e415 100644 --- a/src/emu/netlist/analog/nld_opamps.c +++ b/src/emu/netlist/analog/nld_opamps.c @@ -31,7 +31,7 @@ NETLIST_START(opamp_lm3900) NET_C(R1.2, R2.2, G1.ON) VCVS(G1) PARAM(G1.G, 10000000) - //PARAM(G1.RI, 1) + //PARAM(G1.RI, 1) PARAM(G1.RO, RES_K(8)) NETLIST_END() diff --git a/src/emu/netlist/analog/nld_solver.c b/src/emu/netlist/analog/nld_solver.c index c20277e507c..22a10ea1a3d 100644 --- a/src/emu/netlist/analog/nld_solver.c +++ b/src/emu/netlist/analog/nld_solver.c @@ -99,11 +99,11 @@ ATTR_COLD void terms_t::set_pointers() ATTR_COLD netlist_matrix_solver_t::netlist_matrix_solver_t(const eSolverType type, const netlist_solver_parameters_t ¶ms) : m_stat_calculations(0), - m_stat_newton_raphson(0), - m_stat_vsolver_calls(0), - m_params(params), - m_cur_ts(0), - m_type(type) + m_stat_newton_raphson(0), + m_stat_vsolver_calls(0), + m_params(params), + m_cur_ts(0), + m_type(type) { } @@ -257,7 +257,7 @@ ATTR_HOT void netlist_matrix_solver_t::step(const netlist_time delta) template<class C > void netlist_matrix_solver_t::solve_base(C *p) { - m_stat_vsolver_calls++; + m_stat_vsolver_calls++; if (is_dynamic()) { int this_resched; @@ -270,7 +270,7 @@ void netlist_matrix_solver_t::solve_base(C *p) newton_loops++; } while (this_resched > 1 && newton_loops < m_params.m_nr_loops); - m_stat_newton_raphson += newton_loops; + m_stat_newton_raphson += newton_loops; // reschedule .... if (this_resched > 1 && !m_Q_sync.net().is_queued()) { @@ -438,7 +438,7 @@ netlist_matrix_solver_t * NETLIB_NAME(solver)::create_solver(int size, const int return nl_alloc(netlist_matrix_solver_direct2_t, m_params); else { - typedef netlist_matrix_solver_gauss_seidel_t<m_N,_storage_N> solver_N; + typedef netlist_matrix_solver_gauss_seidel_t<m_N,_storage_N> solver_N; if (size >= gs_threshold) return nl_alloc(solver_N, m_params, size); else diff --git a/src/emu/netlist/analog/nld_solver.h b/src/emu/netlist/analog/nld_solver.h index b6baa1d31da..a0cdec5c786 100644 --- a/src/emu/netlist/analog/nld_solver.h +++ b/src/emu/netlist/analog/nld_solver.h @@ -197,8 +197,8 @@ public: enum eSolverType { - GAUSSIAN_ELIMINATION, - GAUSS_SEIDEL + GAUSSIAN_ELIMINATION, + GAUSS_SEIDEL }; ATTR_COLD netlist_matrix_solver_t(const eSolverType type, const netlist_solver_parameters_t ¶ms); @@ -243,9 +243,9 @@ protected: plinearlist_t<netlist_analog_net_t *> m_nets; plinearlist_t<netlist_analog_output_t *> m_inps; - int m_stat_calculations; - int m_stat_newton_raphson; - int m_stat_vsolver_calls; + int m_stat_calculations; + int m_stat_newton_raphson; + int m_stat_vsolver_calls; const netlist_solver_parameters_t &m_params; @@ -264,7 +264,7 @@ private: ATTR_HOT void update_inputs(); - const eSolverType m_type; + const eSolverType m_type; }; diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c index deb6411a3b0..8dc1d6760fb 100644 --- a/src/emu/netlist/devices/net_lib.c +++ b/src/emu/netlist/devices/net_lib.c @@ -78,7 +78,7 @@ void nl_initialize_factory(netlist_factory_t &factory) ENTRY(VCCS, VCCS, "-") ENTRY(CCCS, CCCS, "-") ENTRY(dummy_input, DUMMY_INPUT, "-") - ENTRY(frontier, FRONTIER, "+I,Q") + ENTRY(frontier, FRONTIER, "+I,Q") ENTRY(QBJT_EB, QBJT_EB, "model") ENTRY(QBJT_switch, QBJT_SW, "model") ENTRY(ttl_input, TTL_INPUT, "IN") @@ -148,4 +148,3 @@ void nl_initialize_factory(netlist_factory_t &factory) ENTRY(SN74LS629_dip, SN74LS629_DIP, "1.CAP1,2.CAP2") ENTRY(NE555_dip, NE555_DIP, "-") } - diff --git a/src/emu/netlist/devices/nld_4020.c b/src/emu/netlist/devices/nld_4020.c index 233c9cf41cf..48109d206d4 100644 --- a/src/emu/netlist/devices/nld_4020.c +++ b/src/emu/netlist/devices/nld_4020.c @@ -43,7 +43,7 @@ NETLIB_START(4020_sub) register_output("Q5", m_Q[4]); register_output("Q6", m_Q[5]); register_output("Q7", m_Q[6]); - register_output("Q8", m_Q[7]); + register_output("Q8", m_Q[7]); register_output("Q9", m_Q[8]); register_output("Q10", m_Q[9]); register_output("Q11", m_Q[10]); diff --git a/src/emu/netlist/devices/nld_cmos.h b/src/emu/netlist/devices/nld_cmos.h index e4cee52d7d8..b62b73701de 100644 --- a/src/emu/netlist/devices/nld_cmos.h +++ b/src/emu/netlist/devices/nld_cmos.h @@ -21,11 +21,11 @@ class nld_vdd_vss : public netlist_device_t protected: ATTR_HOT void update() {}; - ATTR_HOT void start() - { - register_input("VDD,", m_vdd); - register_input("VSS,", m_vss); - }; + ATTR_HOT void start() + { + register_input("VDD,", m_vdd); + register_input("VSS,", m_vss); + }; ATTR_HOT void reset() {}; public: diff --git a/src/emu/netlist/devices/nld_system.h b/src/emu/netlist/devices/nld_system.h index 16f61cd35fa..644264eea13 100644 --- a/src/emu/netlist/devices/nld_system.h +++ b/src/emu/netlist/devices/nld_system.h @@ -40,10 +40,9 @@ NET_REGISTER_DEV(dummy_input, _name) #define FRONTIER(_name, _IN, _OUT) \ - NET_REGISTER_DEV(frontier, _name) \ - NET_C(_IN, _name.I) \ - NET_C(_OUT, _name.Q) \ - + NET_REGISTER_DEV(frontier, _name) \ + NET_C(_IN, _name.I) \ + NET_C(_OUT, _name.Q) // ----------------------------------------------------------------------------- // mainclock // ----------------------------------------------------------------------------- @@ -159,31 +158,31 @@ private: class NETLIB_NAME(frontier) : public netlist_device_t { public: - ATTR_COLD NETLIB_NAME(frontier)() - : netlist_device_t(DUMMY) { } + ATTR_COLD NETLIB_NAME(frontier)() + : netlist_device_t(DUMMY) { } - ATTR_COLD virtual ~NETLIB_NAME(frontier)() {} + ATTR_COLD virtual ~NETLIB_NAME(frontier)() {} protected: - ATTR_COLD void start() - { - register_input("I", m_I); - register_output("Q", m_Q); - } + ATTR_COLD void start() + { + register_input("I", m_I); + register_output("Q", m_Q); + } - ATTR_COLD void reset() - { - } + ATTR_COLD void reset() + { + } - ATTR_HOT ATTR_ALIGN void update() - { - OUTANALOG(m_Q, INPANALOG(m_I)); - } + ATTR_HOT ATTR_ALIGN void update() + { + OUTANALOG(m_Q, INPANALOG(m_I)); + } private: - netlist_analog_input_t m_I; - netlist_analog_output_t m_Q; + netlist_analog_input_t m_I; + netlist_analog_output_t m_Q; }; diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c index 33659258790..8a4d0089c7b 100644 --- a/src/emu/netlist/nl_base.c +++ b/src/emu/netlist/nl_base.c @@ -1001,4 +1001,3 @@ NETLIB_UPDATE(mainclock) net.toggle_new_Q(); net.set_time(netlist().time() + m_inc); } - diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h index c26d445026a..d8af15e53f8 100644 --- a/src/emu/netlist/nl_base.h +++ b/src/emu/netlist/nl_base.h @@ -337,7 +337,7 @@ public: CAPACITOR, // Capacitor DIODE, // Diode DUMMY, // DUMMY device without function - FRONTIER, // Net frontier + FRONTIER, // Net frontier BJT_EB, // BJT(Ebers-Moll) BJT_SWITCH, // BJT(Switch) VCVS, // Voltage controlled voltage source @@ -1268,13 +1268,13 @@ ATTR_HOT inline netlist_logic_net_t & RESTRICT netlist_net_t::as_logic() ATTR_HOT inline const netlist_logic_net_t & RESTRICT netlist_net_t::as_logic() const { - nl_assert(family() == LOGIC); + nl_assert(family() == LOGIC); return static_cast<const netlist_logic_net_t &>(*this); } ATTR_HOT inline netlist_analog_net_t & RESTRICT netlist_net_t::as_analog() { - nl_assert(family() == ANALOG); + nl_assert(family() == ANALOG); return static_cast<netlist_analog_net_t &>(*this); } diff --git a/src/emu/netlist/nl_config.h b/src/emu/netlist/nl_config.h index d498d4f3ad3..966163bb053 100644 --- a/src/emu/netlist/nl_config.h +++ b/src/emu/netlist/nl_config.h @@ -121,21 +121,21 @@ class nl_fatalerror : public std::exception { public: - nl_fatalerror(const char *format, ...) ATTR_PRINTF(2,3) - { - char text[1024]; - va_list ap; - va_start(ap, format); - vsprintf(text, format, ap); - va_end(ap); - osd_printf_error("%s\n", text); - } - nl_fatalerror(const char *format, va_list ap) - { - char text[1024]; - vsprintf(text, format, ap); - osd_printf_error("%s\n", text); - } + nl_fatalerror(const char *format, ...) ATTR_PRINTF(2,3) + { + char text[1024]; + va_list ap; + va_start(ap, format); + vsprintf(text, format, ap); + va_end(ap); + osd_printf_error("%s\n", text); + } + nl_fatalerror(const char *format, va_list ap) + { + char text[1024]; + vsprintf(text, format, ap); + osd_printf_error("%s\n", text); + } }; //============================================================ diff --git a/src/emu/netlist/nl_factory.c b/src/emu/netlist/nl_factory.c index 2a2bf80c3a1..7c6f38dcac4 100644 --- a/src/emu/netlist/nl_factory.c +++ b/src/emu/netlist/nl_factory.c @@ -56,18 +56,18 @@ ATTR_COLD const nl_util::pstring_list net_device_t_base_factory::term_param_list() { - if (m_def_param.startsWith("+")) - return nl_util::split(m_def_param.substr(1), ","); - else - return nl_util::pstring_list(); + if (m_def_param.startsWith("+")) + return nl_util::split(m_def_param.substr(1), ","); + else + return nl_util::pstring_list(); } ATTR_COLD const nl_util::pstring_list net_device_t_base_factory::def_params() { - if (m_def_param.startsWith("+") || m_def_param.equals("-")) - return nl_util::pstring_list(); - else - return nl_util::split(m_def_param, ","); + if (m_def_param.startsWith("+") || m_def_param.equals("-")) + return nl_util::pstring_list(); + else + return nl_util::split(m_def_param, ","); } diff --git a/src/emu/netlist/nl_setup.c b/src/emu/netlist/nl_setup.c index 4ed1d2ae9ba..9bcb763f14d 100644 --- a/src/emu/netlist/nl_setup.c +++ b/src/emu/netlist/nl_setup.c @@ -97,10 +97,10 @@ netlist_device_t *netlist_setup_t::register_dev(netlist_device_t *dev, const pst netlist_device_t *netlist_setup_t::register_dev(const pstring &classname, const pstring &name) { - netlist_device_t *dev = factory().new_device_by_classname(classname); - if (dev == NULL) - netlist().error("Class %s not found!\n", classname.cstr()); - return register_dev(dev, name); + netlist_device_t *dev = factory().new_device_by_classname(classname); + if (dev == NULL) + netlist().error("Class %s not found!\n", classname.cstr()); + return register_dev(dev, name); } template <class T> @@ -697,7 +697,7 @@ void netlist_setup_t::resolve_inputs() void netlist_setup_t::start_devices() { - //FIXME: we need a nl_getenv + //FIXME: we need a nl_getenv if (getenv("NL_LOGS")) { NL_VERBOSE_OUT(("Creating dynamic logs ...\n")); diff --git a/src/emu/netlist/nl_setup.h b/src/emu/netlist/nl_setup.h index 5e4059f2be5..f385ed079c3 100644 --- a/src/emu/netlist/nl_setup.h +++ b/src/emu/netlist/nl_setup.h @@ -146,13 +146,13 @@ public: void namespace_push(const pstring &aname); void namespace_pop(); - netlist_factory_t &factory() { return *m_factory; } - const netlist_factory_t &factory() const { return *m_factory; } + netlist_factory_t &factory() { return *m_factory; } + const netlist_factory_t &factory() const { return *m_factory; } - /* not ideal, but needed for save_state */ - tagmap_terminal_t m_terminals; + /* not ideal, but needed for save_state */ + tagmap_terminal_t m_terminals; - void print_stats() const; + void print_stats() const; protected: diff --git a/src/emu/netlist/plists.h b/src/emu/netlist/plists.h index c2f758d0d70..c7eb594cdb2 100644 --- a/src/emu/netlist/plists.h +++ b/src/emu/netlist/plists.h @@ -60,7 +60,7 @@ public: ATTR_COLD ~plinearlist_t() { if (m_list != NULL) - nl_free_array(m_list); + nl_free_array(m_list); m_list = NULL; } @@ -183,7 +183,7 @@ private: else { if (m_list != NULL) - nl_free_array(m_list); + nl_free_array(m_list); m_list = NULL; m_count = 0; } diff --git a/src/emu/netlist/pstate.c b/src/emu/netlist/pstate.c index d38588ba054..8d7e1810f11 100644 --- a/src/emu/netlist/pstate.c +++ b/src/emu/netlist/pstate.c @@ -24,7 +24,7 @@ ATTR_COLD void pstate_manager_t::save_state_ptr(const pstring &stname, const pst "DT_INT8", "DT_INT", "DT_BOOLEAN", - "DT_FLOAT" + "DT_FLOAT" }; NL_VERBOSE_OUT(("SAVE: <%s> %s(%d) %p\n", fullname.cstr(), ts[dt].cstr(), size, ptr)); @@ -64,8 +64,8 @@ ATTR_COLD void pstate_manager_t::post_load() template<> ATTR_COLD void pstate_manager_t::save_item(pstate_callback_t &state, const void *owner, const pstring &stname) { - //save_state_ptr(stname, DT_CUSTOM, 0, 1, &state); - pstate_entry_t *p = nl_alloc(pstate_entry_t, stname, owner, &state); - m_save.add(p); - state.register_state(*this, stname); + //save_state_ptr(stname, DT_CUSTOM, 0, 1, &state); + pstate_entry_t *p = nl_alloc(pstate_entry_t, stname, owner, &state); + m_save.add(p); + state.register_state(*this, stname); } |
