Remove last traces of ATTR_ALIGN. (nw)

This commit is contained in:
couriersud 2016-06-12 20:05:07 +02:00
parent 866ddad28a
commit a232a127f4
11 changed files with 36 additions and 66 deletions

View File

@ -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 newt(netlist().time());
const netlist::netlist_time delta(newt - m_old + m_rem); 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; 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) if (m_icount <= 0)
netlist().abort_current_queue_slice(); netlist().abort_current_queue_slice();

View File

@ -16,26 +16,6 @@
#include "pconfig.h" #include "pconfig.h"
#include "pstring.h" #include "pstring.h"
#if (PSTANDALONE)
#include <cstddef>
#include <new>
#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 { namespace plib {
//============================================================ //============================================================

View File

@ -11,12 +11,6 @@
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
#ifdef PSTANDALONE
#if (PSTANDALONE)
#define PSTANDALONE_PROVIDED
#endif
#endif
#include "plib/poptions.h" #include "plib/poptions.h"
#include "plib/pstring.h" #include "plib/pstring.h"
#include "plib/plists.h" #include "plib/plists.h"
@ -342,10 +336,6 @@ static void listdevices()
main - primary entry point main - primary entry point
-------------------------------------------------*/ -------------------------------------------------*/
#if (!PSTANDALONE)
#include "corealloc.h"
#endif
#if 0 #if 0
static const char *pmf_verbose[] = static const char *pmf_verbose[] =
{ {

View File

@ -161,18 +161,18 @@ protected:
template <typename T1> template <typename T1>
inline nl_ext_double &RHS(const T1 &r) { return m_A[r][N()]; } inline nl_ext_double &RHS(const T1 &r) { return m_A[r][N()]; }
#endif #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: private:
static const std::size_t m_pitch = (((storage_N + 1) + 7) / 8) * 8; 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) + 15) / 16) * 16;
//static const std::size_t m_pitch = (((storage_N + 1) + 31) / 32) * 32; //static const std::size_t m_pitch = (((storage_N + 1) + 31) / 32) * 32;
#if (NL_USE_DYNAMIC_ALLOCATION) #if (NL_USE_DYNAMIC_ALLOCATION)
ATTR_ALIGN nl_ext_double * RESTRICT m_A; nl_ext_double * RESTRICT m_A;
#else #else
ATTR_ALIGN nl_ext_double m_A[storage_N][m_pitch]; nl_ext_double m_A[storage_N][m_pitch];
#endif #endif
//ATTR_ALIGN nl_ext_double m_RHSx[storage_N]; //nl_ext_double m_RHSx[storage_N];
const unsigned m_dim; const unsigned m_dim;

View File

@ -142,15 +142,15 @@ protected:
template <typename T1, typename T2> template <typename T1, typename T2>
inline nl_ext_double &A(const T1 r, const T2 c) { return m_A[r][c]; } 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]; //nl_double m_A[storage_N][((storage_N + 7) / 8) * 8];
ATTR_ALIGN nl_double m_RHS[storage_N]; nl_double m_RHS[storage_N];
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
ATTR_ALIGN nl_double m_last_V[storage_N]; nl_double m_last_V[storage_N];
terms_t *m_rails_temp; terms_t *m_rails_temp;
private: 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; const unsigned m_dim;
nl_double m_lp_fact; nl_double m_lp_fact;

View File

@ -243,8 +243,8 @@ int matrix_solver_GCR_t<m_N, storage_N>::vsolve_non_dynamic(const bool newton_ra
{ {
const unsigned iN = this->N(); const unsigned iN = this->N();
ATTR_ALIGN nl_double RHS[storage_N]; nl_double RHS[storage_N];
ATTR_ALIGN nl_double new_V[storage_N]; nl_double new_V[storage_N];
for (unsigned i=0, e=mat.nz_num; i<e; i++) for (unsigned i=0, e=mat.nz_num; i<e; i++)
m_A[i] = 0.0; m_A[i] = 0.0;

View File

@ -125,8 +125,8 @@ int matrix_solver_GMRES_t<m_N, storage_N>::vsolve_non_dynamic(const bool newton_
*/ */
//nz_num = 0; //nz_num = 0;
ATTR_ALIGN nl_double RHS[storage_N]; nl_double RHS[storage_N];
ATTR_ALIGN nl_double new_V[storage_N]; nl_double new_V[storage_N];
for (unsigned i=0, e=mat.nz_num; i<e; i++) for (unsigned i=0, e=mat.nz_num; i<e; i++)
m_A[i] = 0.0; m_A[i] = 0.0;

View File

@ -90,19 +90,19 @@ protected:
template <typename T1, typename T2> template <typename T1, typename T2>
inline nl_ext_double &lAinv(const T1 &r, const T2 &c) { return m_lAinv[r][c]; } 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: private:
static const std::size_t m_pitch = ((( storage_N) + 7) / 8) * 8; static const std::size_t m_pitch = ((( storage_N) + 7) / 8) * 8;
ATTR_ALIGN nl_ext_double m_A[storage_N][m_pitch]; nl_ext_double m_A[storage_N][m_pitch];
ATTR_ALIGN nl_ext_double m_Ainv[storage_N][m_pitch]; nl_ext_double m_Ainv[storage_N][m_pitch];
ATTR_ALIGN nl_ext_double m_W[storage_N][m_pitch]; 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_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];
ATTR_ALIGN nl_ext_double m_lAinv[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; const unsigned m_dim;

View File

@ -70,10 +70,10 @@ int matrix_solver_SOR_t<m_N, storage_N>::vsolve_non_dynamic(const bool newton_ra
const nl_double ws = this->m_params.m_sor; const nl_double ws = this->m_params.m_sor;
ATTR_ALIGN nl_double w[storage_N]; nl_double w[storage_N];
ATTR_ALIGN nl_double one_m_w[storage_N]; nl_double one_m_w[storage_N];
ATTR_ALIGN nl_double RHS[storage_N]; nl_double RHS[storage_N];
ATTR_ALIGN nl_double new_V[storage_N]; nl_double new_V[storage_N];
for (unsigned k = 0; k < iN; k++) for (unsigned k = 0; k < iN; k++)
{ {

View File

@ -123,7 +123,7 @@ int matrix_solver_SOR_mat_t<m_N, storage_N>::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(); const unsigned iN = this->N();
matrix_solver_t::build_LE_A<matrix_solver_SOR_mat_t>(); matrix_solver_t::build_LE_A<matrix_solver_SOR_mat_t>();

View File

@ -95,26 +95,26 @@ protected:
template <typename T1, typename T2> template <typename T1, typename T2>
inline nl_ext_double &lA(const T1 &r, const T2 &c) { return m_lA[r][c]; } 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: private:
static const std::size_t m_pitch = ((( storage_N) + 7) / 8) * 8; static const std::size_t m_pitch = ((( storage_N) + 7) / 8) * 8;
ATTR_ALIGN nl_ext_double m_A[storage_N][m_pitch]; nl_ext_double m_A[storage_N][m_pitch];
ATTR_ALIGN nl_ext_double m_Ainv[storage_N][m_pitch]; nl_ext_double m_Ainv[storage_N][m_pitch];
ATTR_ALIGN nl_ext_double m_W[storage_N][m_pitch]; 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_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 */ /* temporary */
ATTR_ALIGN nl_double H[storage_N][m_pitch] ; nl_double H[storage_N][m_pitch] ;
unsigned rows[storage_N]; unsigned rows[storage_N];
unsigned cols[storage_N][m_pitch]; unsigned cols[storage_N][m_pitch];
unsigned colcount[storage_N]; unsigned colcount[storage_N];
unsigned m_cnt; unsigned m_cnt;
//ATTR_ALIGN nl_ext_double m_RHSx[storage_N]; //nl_ext_double m_RHSx[storage_N];
const unsigned m_dim; const unsigned m_dim;