Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 13:23:50 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

cpu/nec: use anonymous namespaces to avoid ODR violations with enums

Browse Source
This commit is contained in:
Vas Crabb 2020-08-11 16:57:47 +10:00
parent 461b8338a2
commit 2a342ec7c9
7 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/src/cpu.lua
View File

@ -1883,10 +1883,10 @@ if (CPUS["NEC"]~=null) then
MAME_DIR .. "src/devices/cpu/nec/nec80inst.hxx", MAME_DIR .. "src/devices/cpu/nec/nec80inst.hxx",
MAME_DIR .. "src/devices/cpu/nec/necmacro.h", MAME_DIR .. "src/devices/cpu/nec/necmacro.h",
MAME_DIR .. "src/devices/cpu/nec/necmodrm.h", MAME_DIR .. "src/devices/cpu/nec/necmodrm.h",
MAME_DIR .. "src/devices/cpu/nec/necpriv.h", MAME_DIR .. "src/devices/cpu/nec/necpriv.ipp",
MAME_DIR .. "src/devices/cpu/nec/v25instr.h", MAME_DIR .. "src/devices/cpu/nec/v25instr.h",
MAME_DIR .. "src/devices/cpu/nec/v25instr.hxx", MAME_DIR .. "src/devices/cpu/nec/v25instr.hxx",
MAME_DIR .. "src/devices/cpu/nec/v25priv.h", MAME_DIR .. "src/devices/cpu/nec/v25priv.ipp",
MAME_DIR .. "src/devices/cpu/nec/v25.cpp", MAME_DIR .. "src/devices/cpu/nec/v25.cpp",
MAME_DIR .. "src/devices/cpu/nec/v25.h", MAME_DIR .. "src/devices/cpu/nec/v25.h",
MAME_DIR .. "src/devices/cpu/nec/v25sfr.cpp", MAME_DIR .. "src/devices/cpu/nec/v25sfr.cpp",

3
src/devices/cpu/nec/nec.cpp
View File

@ -107,6 +107,7 @@
#include "emu.h" #include "emu.h"
#include "nec.h" #include "nec.h"
#include "necdasm.h" #include "necdasm.h"
#include "debugger.h" #include "debugger.h"
typedef uint8_t BOOLEAN; typedef uint8_t BOOLEAN;
@ -114,7 +115,7 @@ typedef uint8_t BYTE;
typedef uint16_t WORD; typedef uint16_t WORD;
typedef uint32_t DWORD; typedef uint32_t DWORD;
#include "necpriv.h" #include "necpriv.ipp"
DEFINE_DEVICE_TYPE(V20, v20_device, "v20", "NEC V20") DEFINE_DEVICE_TYPE(V20, v20_device, "v20", "NEC V20")
DEFINE_DEVICE_TYPE(V30, v30_device, "v30", "NEC V30") DEFINE_DEVICE_TYPE(V30, v30_device, "v30", "NEC V30")

5
src/devices/cpu/nec/necpriv.h → src/devices/cpu/nec/necpriv.ipp
View File

@ -1,5 +1,8 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Bryan McPhail // copyright-holders:Bryan McPhail
namespace {
/* Cpu types, steps of 8 to help the cycle count calculation */ /* Cpu types, steps of 8 to help the cycle count calculation */
#define V33_TYPE 0 #define V33_TYPE 0
#define V30_TYPE 8 #define V30_TYPE 8
@ -128,3 +131,5 @@ enum BREGS {
m_OverVal = (f) & 0x0800; \ m_OverVal = (f) & 0x0800; \
m_MF = (((f) & 0x8000) == 0x8000) || m_em; \ m_MF = (((f) & 0x8000) == 0x8000) || m_em; \
} }
} // anonymous namespace

8
src/devices/cpu/nec/v25.cpp
View File

@ -35,6 +35,9 @@
****************************************************************************/ ****************************************************************************/
#include "emu.h" #include "emu.h"
#include "v25.h"
#include "necdasm.h"
#include "debugger.h" #include "debugger.h"
typedef uint8_t BOOLEAN; typedef uint8_t BOOLEAN;
@ -42,9 +45,8 @@ typedef uint8_t BYTE;
typedef uint16_t WORD; typedef uint16_t WORD;
typedef uint32_t DWORD; typedef uint32_t DWORD;
#include "v25.h" #include "v25priv.ipp"
#include "v25priv.h"
#include "necdasm.h"
DEFINE_DEVICE_TYPE(V25, v25_device, "v25", "NEC V25") DEFINE_DEVICE_TYPE(V25, v25_device, "v25", "NEC V25")
DEFINE_DEVICE_TYPE(V35, v35_device, "v35", "NEC V35") DEFINE_DEVICE_TYPE(V35, v35_device, "v35", "NEC V35")

5
src/devices/cpu/nec/v25priv.h → src/devices/cpu/nec/v25priv.ipp
View File

@ -1,5 +1,8 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Bryan McPhail, Alex W. Jackson // copyright-holders:Bryan McPhail, Alex W. Jackson
namespace {
/* Cpu types, steps of 8 to help the cycle count calculation */ /* Cpu types, steps of 8 to help the cycle count calculation */
#define V33_TYPE 0 #define V33_TYPE 0
#define V30_TYPE 8 #define V30_TYPE 8
@ -186,3 +189,5 @@ enum BREGS {
/* RB only changes on BRKCS/RETRBI/TSKSW, so skip it */ \ /* RB only changes on BRKCS/RETRBI/TSKSW, so skip it */ \
m_MF = ((f) & 0x8000) == 0x8000; \ m_MF = ((f) & 0x8000) == 0x8000; \
} }
} // anonymous namespace

2
src/devices/cpu/nec/v25sfr.cpp
View File

@ -8,7 +8,7 @@
#include "emu.h" #include "emu.h"
#include "v25.h" #include "v25.h"
#include "v25priv.h" #include "v25priv.ipp"
void v25_common_device::ida_sfr_map(address_map &map) void v25_common_device::ida_sfr_map(address_map &map)
{ {

2
src/devices/cpu/nec/v5x.cpp
View File

@ -30,7 +30,7 @@
#include "emu.h" #include "emu.h"
#include "v5x.h" #include "v5x.h"
#include "necpriv.h" #include "necpriv.ipp"
#define VERBOSE 0 #define VERBOSE 0
#include "logmacro.h" #include "logmacro.h"