From a232a127f49c6ee4a566f6775b74f6b327a19496 Mon Sep 17 00:00:00 2001 From: couriersud Date: Sun, 12 Jun 2016 20:05:07 +0200 Subject: [PATCH] Remove last traces of ATTR_ALIGN. (nw) --- src/devices/machine/netlist.cpp | 4 ++-- src/lib/netlist/plib/palloc.h | 20 -------------------- src/lib/netlist/prg/nltool.cpp | 10 ---------- src/lib/netlist/solver/nld_ms_direct.h | 8 ++++---- src/lib/netlist/solver/nld_ms_direct_lu.h | 10 +++++----- src/lib/netlist/solver/nld_ms_gcr.h | 4 ++-- src/lib/netlist/solver/nld_ms_gmres.h | 4 ++-- src/lib/netlist/solver/nld_ms_sm.h | 16 ++++++++-------- src/lib/netlist/solver/nld_ms_sor.h | 8 ++++---- src/lib/netlist/solver/nld_ms_sor_mat.h | 2 +- src/lib/netlist/solver/nld_ms_w.h | 16 ++++++++-------- 11 files changed, 36 insertions(+), 66 deletions(-) diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index 9f448ade849..7160b696b52 100644 --- a/src/devices/machine/netlist.cpp +++ b/src/devices/machine/netlist.cpp @@ -414,7 +414,7 @@ void netlist_mame_device_t::device_timer(emu_timer &timer, device_timer_id id, i { } -ATTR_HOT ATTR_ALIGN void netlist_mame_device_t::update_time_x() +void netlist_mame_device_t::update_time_x() { const netlist::netlist_time newt(netlist().time()); const netlist::netlist_time delta(newt - m_old + m_rem); @@ -424,7 +424,7 @@ ATTR_HOT ATTR_ALIGN void netlist_mame_device_t::update_time_x() m_icount -= d; } -ATTR_HOT ATTR_ALIGN void netlist_mame_device_t::check_mame_abort_slice() +void netlist_mame_device_t::check_mame_abort_slice() { if (m_icount <= 0) netlist().abort_current_queue_slice(); diff --git a/src/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h index 80fa68e15d2..1529cd38194 100644 --- a/src/lib/netlist/plib/palloc.h +++ b/src/lib/netlist/plib/palloc.h @@ -16,26 +16,6 @@ #include "pconfig.h" #include "pstring.h" -#if (PSTANDALONE) -#include -#include - -#if defined(__GNUC__) && (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)) -#if !defined(__ppc__) && !defined (__PPC__) && !defined(__ppc64__) && !defined(__PPC64__) -#define ATTR_ALIGN __attribute__ ((aligned(64))) -#else -#define ATTR_ALIGN -#endif -#else -#define ATTR_ALIGN -#endif - -#else - -#define ATTR_ALIGN - -#endif - namespace plib { //============================================================ diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp index 473c478bff1..5687cd42078 100644 --- a/src/lib/netlist/prg/nltool.cpp +++ b/src/lib/netlist/prg/nltool.cpp @@ -11,12 +11,6 @@ #include #include -#ifdef PSTANDALONE -#if (PSTANDALONE) -#define PSTANDALONE_PROVIDED -#endif -#endif - #include "plib/poptions.h" #include "plib/pstring.h" #include "plib/plists.h" @@ -342,10 +336,6 @@ static void listdevices() main - primary entry point -------------------------------------------------*/ -#if (!PSTANDALONE) -#include "corealloc.h" -#endif - #if 0 static const char *pmf_verbose[] = { diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h index 5e4e016f6fd..ec67a7c02ee 100644 --- a/src/lib/netlist/solver/nld_ms_direct.h +++ b/src/lib/netlist/solver/nld_ms_direct.h @@ -161,18 +161,18 @@ protected: template inline nl_ext_double &RHS(const T1 &r) { return m_A[r][N()]; } #endif - ATTR_ALIGN nl_double m_last_RHS[storage_N]; // right hand side - contains currents + nl_double m_last_RHS[storage_N]; // right hand side - contains currents private: static const std::size_t m_pitch = (((storage_N + 1) + 7) / 8) * 8; //static const std::size_t m_pitch = (((storage_N + 1) + 15) / 16) * 16; //static const std::size_t m_pitch = (((storage_N + 1) + 31) / 32) * 32; #if (NL_USE_DYNAMIC_ALLOCATION) - ATTR_ALIGN nl_ext_double * RESTRICT m_A; + nl_ext_double * RESTRICT m_A; #else - ATTR_ALIGN nl_ext_double m_A[storage_N][m_pitch]; + nl_ext_double m_A[storage_N][m_pitch]; #endif - //ATTR_ALIGN nl_ext_double m_RHSx[storage_N]; + //nl_ext_double m_RHSx[storage_N]; const unsigned m_dim; diff --git a/src/lib/netlist/solver/nld_ms_direct_lu.h b/src/lib/netlist/solver/nld_ms_direct_lu.h index e5ede1e4a69..9c2ab0d1cd0 100644 --- a/src/lib/netlist/solver/nld_ms_direct_lu.h +++ b/src/lib/netlist/solver/nld_ms_direct_lu.h @@ -142,15 +142,15 @@ protected: template inline nl_ext_double &A(const T1 r, const T2 c) { return m_A[r][c]; } - //ATTR_ALIGN nl_double m_A[storage_N][((storage_N + 7) / 8) * 8]; - ATTR_ALIGN nl_double m_RHS[storage_N]; - ATTR_ALIGN nl_double m_last_RHS[storage_N]; // right hand side - contains currents - ATTR_ALIGN nl_double m_last_V[storage_N]; + //nl_double m_A[storage_N][((storage_N + 7) / 8) * 8]; + nl_double m_RHS[storage_N]; + nl_double m_last_RHS[storage_N]; // right hand side - contains currents + nl_double m_last_V[storage_N]; terms_t *m_rails_temp; private: - ATTR_ALIGN nl_ext_double m_A[storage_N][((storage_N + 7) / 8) * 8]; + nl_ext_double m_A[storage_N][((storage_N + 7) / 8) * 8]; const unsigned m_dim; nl_double m_lp_fact; diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h index 74733ac87ff..a9acfb0b0de 100644 --- a/src/lib/netlist/solver/nld_ms_gcr.h +++ b/src/lib/netlist/solver/nld_ms_gcr.h @@ -243,8 +243,8 @@ int matrix_solver_GCR_t::vsolve_non_dynamic(const bool newton_ra { const unsigned iN = this->N(); - ATTR_ALIGN nl_double RHS[storage_N]; - ATTR_ALIGN nl_double new_V[storage_N]; + nl_double RHS[storage_N]; + nl_double new_V[storage_N]; for (unsigned i=0, e=mat.nz_num; i::vsolve_non_dynamic(const bool newton_ */ //nz_num = 0; - ATTR_ALIGN nl_double RHS[storage_N]; - ATTR_ALIGN nl_double new_V[storage_N]; + nl_double RHS[storage_N]; + nl_double new_V[storage_N]; for (unsigned i=0, e=mat.nz_num; i inline nl_ext_double &lAinv(const T1 &r, const T2 &c) { return m_lAinv[r][c]; } - ATTR_ALIGN nl_double m_last_RHS[storage_N]; // right hand side - contains currents + nl_double m_last_RHS[storage_N]; // right hand side - contains currents private: static const std::size_t m_pitch = ((( storage_N) + 7) / 8) * 8; - ATTR_ALIGN nl_ext_double m_A[storage_N][m_pitch]; - ATTR_ALIGN nl_ext_double m_Ainv[storage_N][m_pitch]; - ATTR_ALIGN nl_ext_double m_W[storage_N][m_pitch]; - ATTR_ALIGN nl_ext_double m_RHS[storage_N]; // right hand side - contains currents + nl_ext_double m_A[storage_N][m_pitch]; + nl_ext_double m_Ainv[storage_N][m_pitch]; + nl_ext_double m_W[storage_N][m_pitch]; + nl_ext_double m_RHS[storage_N]; // right hand side - contains currents - ATTR_ALIGN nl_ext_double m_lA[storage_N][m_pitch]; - ATTR_ALIGN nl_ext_double m_lAinv[storage_N][m_pitch]; + nl_ext_double m_lA[storage_N][m_pitch]; + nl_ext_double m_lAinv[storage_N][m_pitch]; - //ATTR_ALIGN nl_ext_double m_RHSx[storage_N]; + //nl_ext_double m_RHSx[storage_N]; const unsigned m_dim; diff --git a/src/lib/netlist/solver/nld_ms_sor.h b/src/lib/netlist/solver/nld_ms_sor.h index 34a6acefcef..cf8dc8de5bf 100644 --- a/src/lib/netlist/solver/nld_ms_sor.h +++ b/src/lib/netlist/solver/nld_ms_sor.h @@ -70,10 +70,10 @@ int matrix_solver_SOR_t::vsolve_non_dynamic(const bool newton_ra const nl_double ws = this->m_params.m_sor; - ATTR_ALIGN nl_double w[storage_N]; - ATTR_ALIGN nl_double one_m_w[storage_N]; - ATTR_ALIGN nl_double RHS[storage_N]; - ATTR_ALIGN nl_double new_V[storage_N]; + nl_double w[storage_N]; + nl_double one_m_w[storage_N]; + nl_double RHS[storage_N]; + nl_double new_V[storage_N]; for (unsigned k = 0; k < iN; k++) { diff --git a/src/lib/netlist/solver/nld_ms_sor_mat.h b/src/lib/netlist/solver/nld_ms_sor_mat.h index 2ea00212164..781e6bb4eaa 100644 --- a/src/lib/netlist/solver/nld_ms_sor_mat.h +++ b/src/lib/netlist/solver/nld_ms_sor_mat.h @@ -123,7 +123,7 @@ int matrix_solver_SOR_mat_t::vsolve_non_dynamic(const bool newto */ - ATTR_ALIGN nl_double new_v[storage_N] = { 0.0 }; + nl_double new_v[storage_N] = { 0.0 }; const unsigned iN = this->N(); matrix_solver_t::build_LE_A(); diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h index f0f1cddf96e..294b2c4ccf4 100644 --- a/src/lib/netlist/solver/nld_ms_w.h +++ b/src/lib/netlist/solver/nld_ms_w.h @@ -95,26 +95,26 @@ protected: template inline nl_ext_double &lA(const T1 &r, const T2 &c) { return m_lA[r][c]; } - ATTR_ALIGN nl_double m_last_RHS[storage_N]; // right hand side - contains currents + nl_double m_last_RHS[storage_N]; // right hand side - contains currents private: static const std::size_t m_pitch = ((( storage_N) + 7) / 8) * 8; - ATTR_ALIGN nl_ext_double m_A[storage_N][m_pitch]; - ATTR_ALIGN nl_ext_double m_Ainv[storage_N][m_pitch]; - ATTR_ALIGN nl_ext_double m_W[storage_N][m_pitch]; - ATTR_ALIGN nl_ext_double m_RHS[storage_N]; // right hand side - contains currents + nl_ext_double m_A[storage_N][m_pitch]; + nl_ext_double m_Ainv[storage_N][m_pitch]; + nl_ext_double m_W[storage_N][m_pitch]; + nl_ext_double m_RHS[storage_N]; // right hand side - contains currents - ATTR_ALIGN nl_ext_double m_lA[storage_N][m_pitch]; + nl_ext_double m_lA[storage_N][m_pitch]; /* temporary */ - ATTR_ALIGN nl_double H[storage_N][m_pitch] ; + nl_double H[storage_N][m_pitch] ; unsigned rows[storage_N]; unsigned cols[storage_N][m_pitch]; unsigned colcount[storage_N]; unsigned m_cnt; - //ATTR_ALIGN nl_ext_double m_RHSx[storage_N]; + //nl_ext_double m_RHSx[storage_N]; const unsigned m_dim;