summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2015-05-25 02:15:13 +0200
committer couriersud <couriersud@arcor.de>2015-05-25 02:21:19 +0200
commitd298ab53fe61b8eef58f537e3d7ef9a9c5343b8e (patch)
treea675db76d789b191194011bcad99fbd5a753841c
parent12c9e541f33130c386bac3bd01bd451a1c0e2e33 (diff)
Fix nltool compile. After the next release the netlist folder structure
needs some redesign to better align with standalone compile. More header optimisation. (nw)
-rw-r--r--src/emu/netlist/devices/nld_truthtable.h3
-rw-r--r--src/emu/netlist/nl_base.h1
-rw-r--r--src/emu/netlist/nl_time.h1
-rw-r--r--src/emu/netlist/pconfig.h10
-rw-r--r--src/emu/netlist/plists.h1
-rw-r--r--src/emu/netlist/pstate.c1
-rw-r--r--src/emu/netlist/pstring.h3
-rw-r--r--src/tools/nltool.c9
8 files changed, 18 insertions, 11 deletions
diff --git a/src/emu/netlist/devices/nld_truthtable.h b/src/emu/netlist/devices/nld_truthtable.h
index 960bb20797d..2ba5082b086 100644
--- a/src/emu/netlist/devices/nld_truthtable.h
+++ b/src/emu/netlist/devices/nld_truthtable.h
@@ -23,7 +23,7 @@
static const char *m_desc[]; \
}
-
+#if 0
static inline UINT32 remove_first_bit(UINT32 v)
{
for (int i=0; i<32; i++)
@@ -31,6 +31,7 @@ static inline UINT32 remove_first_bit(UINT32 v)
return v & ~(1<<i);
return v;
}
+#endif
struct truthtable_desc_t
{
diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h
index 52df0f6693b..1eef0b71181 100644
--- a/src/emu/netlist/nl_base.h
+++ b/src/emu/netlist/nl_base.h
@@ -155,7 +155,6 @@
#ifndef NLBASE_H_
#define NLBASE_H_
-#include "nl_config.h"
#include "nl_lists.h"
#include "nl_time.h"
#include "nl_util.h"
diff --git a/src/emu/netlist/nl_time.h b/src/emu/netlist/nl_time.h
index 457f7622307..8e759f2cf1b 100644
--- a/src/emu/netlist/nl_time.h
+++ b/src/emu/netlist/nl_time.h
@@ -7,7 +7,6 @@
#ifndef NLTIME_H_
#define NLTIME_H_
-#include "nl_config.h"
#include "pstate.h"
//============================================================
diff --git a/src/emu/netlist/pconfig.h b/src/emu/netlist/pconfig.h
index 421748e8d90..0760bc4adfa 100644
--- a/src/emu/netlist/pconfig.h
+++ b/src/emu/netlist/pconfig.h
@@ -18,16 +18,24 @@
// Compiling without mame ?
+#include <algorithm>
+#include <cstdarg>
+
#if !(PSTANDALONE)
#include "osdcore.h"
+#undef ATTR_COLD
+#define ATTR_COLD
+
#else
#include <stdint.h>
/* not supported in GCC prior to 4.4.x */
/* ATTR_HOT and ATTR_COLD cause performance degration in 5.1 */
-#define ATTR_HOT
+//#define ATTR_HOT
#define ATTR_COLD
+#define ATTR_HOT __attribute__((hot))
+//#define ATTR_COLD __attribute__((cold))
#define RESTRICT
#define EXPECTED(x) (x)
diff --git a/src/emu/netlist/plists.h b/src/emu/netlist/plists.h
index 6313f6d93d3..3f422653367 100644
--- a/src/emu/netlist/plists.h
+++ b/src/emu/netlist/plists.h
@@ -10,7 +10,6 @@
#ifndef PLISTS_H_
#define PLISTS_H_
-#include "nl_config.h"
#include "palloc.h"
#include "pstring.h"
diff --git a/src/emu/netlist/pstate.c b/src/emu/netlist/pstate.c
index ee2c17d1ae9..84beaf7d622 100644
--- a/src/emu/netlist/pstate.c
+++ b/src/emu/netlist/pstate.c
@@ -29,7 +29,6 @@ ATTR_COLD void pstate_manager_t::save_state_ptr(const pstring &stname, const pst
"DT_FLOAT"
};
- NL_VERBOSE_OUT(("SAVE: <%s> %s(%d) %p\n", fullname.cstr(), ts[dt].cstr(), size, ptr));
pstate_entry_t *p = palloc(pstate_entry_t, stname, dt, owner, size, count, ptr, is_ptr);
m_save.add(p);
}
diff --git a/src/emu/netlist/pstring.h b/src/emu/netlist/pstring.h
index 1b1253b0000..c17251c575c 100644
--- a/src/emu/netlist/pstring.h
+++ b/src/emu/netlist/pstring.h
@@ -7,9 +7,6 @@
#ifndef _PSTRING_H_
#define _PSTRING_H_
-#include <algorithm>
-#include <cstdarg>
-
#include "pconfig.h"
// ----------------------------------------------------------------------------------------
diff --git a/src/tools/nltool.c b/src/tools/nltool.c
index 0b54bdb2cdb..a2e70ced243 100644
--- a/src/tools/nltool.c
+++ b/src/tools/nltool.c
@@ -10,7 +10,13 @@
#include <cstdio>
+#ifdef PSTANDALONE
#if (PSTANDALONE)
+#define PSTANDALONE_PROVIDED
+#endif
+#endif
+
+#ifdef PSTANDALONE_PROVIDED
#include <ctime>
@@ -27,9 +33,8 @@
inline osd_ticks_t osd_ticks_per_second() { return CLOCKS_PER_SEC; }
osd_ticks_t osd_ticks(void) { return clock(); }
-
-
#else
+
#include "netlist/poptions.h"
#include "netlist/pstring.h"
#include "netlist/plists.h"