summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-12-12 08:58:57 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-12-12 08:58:57 +0100
commit379581fb3690d92f7e3815534a479823aee8ddcc (patch)
tree77b4a080ba46ba58bfd8382926580cb2aad5a69d
parentafe2bbe6481acf518e384509586ada235e106c54 (diff)
macro removal INLINE -> static inline (nw)
-rw-r--r--3rdparty/softfloat/mamesf.h2
-rw-r--r--scripts/genie.lua21
-rw-r--r--src/devices/bus/gba/gba_slot.cpp4
-rw-r--r--src/devices/bus/isa/cga.cpp4
-rw-r--r--src/devices/bus/megadrive/svp.cpp4
-rw-r--r--src/devices/bus/ti99x/990_hd.cpp4
-rw-r--r--src/devices/cpu/8x300/8x300dasm.cpp4
-rw-r--r--src/devices/cpu/arm7/arm7drc.inc4
-rw-r--r--src/devices/cpu/asap/asapdasm.cpp2
-rw-r--r--src/devices/cpu/avr8/avr8.cpp2
-rw-r--r--src/devices/cpu/dsp32/dsp32dis.cpp8
-rw-r--r--src/devices/cpu/es5510/es5510.cpp2
-rw-r--r--src/devices/cpu/g65816/g65816cm.h2
-rw-r--r--src/devices/cpu/g65816/g65816ds.cpp10
-rw-r--r--src/devices/cpu/i386/i386dasm.cpp12
-rw-r--r--src/devices/cpu/i386/pentops.inc24
-rw-r--r--src/devices/cpu/i386/x87ops.inc14
-rw-r--r--src/devices/cpu/i860/i860dec.inc2
-rw-r--r--src/devices/cpu/jaguar/jagdasm.cpp2
-rw-r--r--src/devices/cpu/m37710/m37710cm.h2
-rw-r--r--src/devices/cpu/m37710/m7700ds.cpp10
-rw-r--r--src/devices/cpu/m68000/m68kcpu.h404
-rw-r--r--src/devices/cpu/m68000/m68kfpu.inc16
-rw-r--r--src/devices/cpu/m68000/m68kmmu.h12
-rw-r--r--src/devices/cpu/mips/mips3com.cpp4
-rw-r--r--src/devices/cpu/mips/mips3drc.cpp4
-rw-r--r--src/devices/cpu/mips/mips3dsm.cpp2
-rw-r--r--src/devices/cpu/mips/r3kdasm.cpp2
-rw-r--r--src/devices/cpu/nec/necdasm.cpp8
-rw-r--r--src/devices/cpu/pdp1/pdp1dasm.cpp2
-rw-r--r--src/devices/cpu/powerpc/ppccom.cpp16
-rw-r--r--src/devices/cpu/psx/dma.cpp2
-rw-r--r--src/devices/cpu/psx/gte.cpp6
-rw-r--r--src/devices/cpu/psx/irq.cpp2
-rw-r--r--src/devices/cpu/psx/mdec.cpp18
-rw-r--r--src/devices/cpu/psx/rcnt.cpp2
-rw-r--r--src/devices/cpu/psx/sio.cpp2
-rw-r--r--src/devices/cpu/rsp/rsp_dasm.cpp2
-rw-r--r--src/devices/cpu/rsp/rspdrc.cpp4
-rw-r--r--src/devices/cpu/sh4/sh4tmu.cpp2
-rw-r--r--src/devices/cpu/spc700/spc700.cpp2
-rw-r--r--src/devices/cpu/spc700/spc700ds.cpp4
-rw-r--r--src/devices/cpu/ssem/ssem.cpp2
-rw-r--r--src/devices/cpu/ssem/ssemdasm.cpp2
-rw-r--r--src/devices/cpu/tms32031/dis32031.cpp2
-rw-r--r--src/devices/cpu/tms9900/9900dasm.cpp2
-rw-r--r--src/devices/cpu/tms9900/99xxcore.h46
-rw-r--r--src/devices/machine/adc083x.cpp2
-rw-r--r--src/devices/machine/i2cmem.cpp2
-rw-r--r--src/devices/machine/mc68328.cpp2
-rw-r--r--src/devices/machine/mm58167.cpp2
-rw-r--r--src/devices/machine/rtc4543.cpp2
-rw-r--r--src/devices/machine/s3c2400.cpp2
-rw-r--r--src/devices/machine/s3c2410.cpp2
-rw-r--r--src/devices/machine/s3c2440.cpp2
-rw-r--r--src/devices/machine/s3c44b0.cpp2
-rw-r--r--src/devices/machine/timekpr.cpp4
-rw-r--r--src/devices/sound/ay8910.cpp6
-rw-r--r--src/devices/sound/c140.cpp2
-rw-r--r--src/devices/sound/disc_wav.inc2
-rw-r--r--src/devices/sound/fm.cpp58
-rw-r--r--src/devices/sound/fm2612.cpp56
-rw-r--r--src/devices/sound/fmopl.cpp38
-rw-r--r--src/devices/sound/k053260.cpp2
-rw-r--r--src/devices/sound/nes_apu.cpp2
-rw-r--r--src/devices/sound/sid.cpp2
-rw-r--r--src/devices/sound/sidenvel.cpp72
-rw-r--r--src/devices/sound/sidvoice.cpp10
-rw-r--r--src/devices/sound/sn76477.cpp4
-rw-r--r--src/devices/sound/sp0256.cpp10
-rw-r--r--src/devices/sound/spu.cpp8
-rw-r--r--src/devices/sound/ym2151.cpp20
-rw-r--r--src/devices/sound/ym2413.cpp32
-rw-r--r--src/devices/sound/ymdeltat.cpp4
-rw-r--r--src/devices/sound/ymf262.cpp36
-rw-r--r--src/devices/video/gf4500.cpp2
-rw-r--r--src/devices/video/polylgcy.cpp10
-rw-r--r--src/devices/video/psx.cpp4
-rw-r--r--src/devices/video/stvvdp1.cpp2
-rw-r--r--src/devices/video/stvvdp2.cpp2
-rw-r--r--src/devices/video/vooddefs.h58
-rw-r--r--src/devices/video/voodoo.cpp4
-rw-r--r--src/emu/debug/debugcmd.cpp8
-rw-r--r--src/emu/debug/dvmemory.cpp4
-rw-r--r--src/emu/debug/textbuf.cpp4
-rw-r--r--src/emu/debugger.h14
-rw-r--r--src/emu/output.cpp6
-rw-r--r--src/emu/output.h12
-rw-r--r--src/emu/rendutil.h22
-rw-r--r--src/emu/sound/filter.h2
-rw-r--r--src/emu/ui/ui.cpp2
-rw-r--r--src/emu/uiinput.h12
-rw-r--r--src/lib/formats/ace_tap.cpp6
-rw-r--r--src/lib/formats/cbm_tap.cpp2
-rw-r--r--src/lib/formats/fdi_dsk.cpp2
-rw-r--r--src/lib/formats/hect_tap.cpp6
-rw-r--r--src/lib/formats/imageutl.h8
-rw-r--r--src/lib/formats/kc_cas.cpp6
-rw-r--r--src/lib/formats/kim1_cas.cpp4
-rw-r--r--src/lib/formats/trs_cas.cpp2
-rw-r--r--src/lib/formats/tzx_cas.cpp8
-rw-r--r--src/lib/formats/vg5k_cas.cpp10
-rw-r--r--src/lib/util/aviio.cpp52
-rw-r--r--src/lib/util/cdrom.cpp8
-rw-r--r--src/lib/util/cdrom.h6
-rw-r--r--src/lib/util/corefile.cpp2
-rw-r--r--src/lib/util/jedparse.h4
-rw-r--r--src/lib/util/png.cpp16
-rw-r--r--src/lib/util/pool.cpp4
-rw-r--r--src/lib/util/unzip.cpp8
-rw-r--r--src/mame/audio/beezer.cpp2
-rw-r--r--src/mame/audio/exidy.cpp2
-rw-r--r--src/mame/audio/micro3d.cpp6
-rw-r--r--src/mame/audio/segasnd.cpp8
-rw-r--r--src/mame/audio/tx1.cpp2
-rw-r--r--src/mame/audio/vboy.cpp4
-rw-r--r--src/mame/drivers/39in1.cpp2
-rw-r--r--src/mame/drivers/atarisy4.cpp2
-rw-r--r--src/mame/drivers/cdi.cpp2
-rw-r--r--src/mame/drivers/cxhumax.cpp6
-rw-r--r--src/mame/drivers/ddenlovr.cpp4
-rw-r--r--src/mame/drivers/dm7000.cpp2
-rw-r--r--src/mame/drivers/gba.cpp4
-rw-r--r--src/mame/drivers/gp32.cpp2
-rw-r--r--src/mame/drivers/multfish.cpp8
-rw-r--r--src/mame/drivers/namcoic.cpp6
-rw-r--r--src/mame/drivers/namcos23.cpp2
-rw-r--r--src/mame/drivers/photon2.cpp4
-rw-r--r--src/mame/drivers/subsino2.cpp2
-rw-r--r--src/mame/drivers/taitotz.cpp12
-rw-r--r--src/mame/drivers/viper.cpp8
-rw-r--r--src/mame/drivers/zaurus.cpp2
-rw-r--r--src/mame/etc/jrcrypt.cpp4
-rw-r--r--src/mame/includes/model2.h2
-rw-r--r--src/mame/machine/appldriv.cpp2
-rw-r--r--src/mame/machine/cdi070.cpp2
-rw-r--r--src/mame/machine/cdicdic.cpp10
-rw-r--r--src/mame/machine/cdislave.cpp2
-rw-r--r--src/mame/machine/docg3.cpp2
-rw-r--r--src/mame/machine/fddebug.cpp20
-rw-r--r--src/mame/machine/gaelco3d.cpp4
-rw-r--r--src/mame/machine/micro3d.cpp4
-rw-r--r--src/mame/machine/midwayic.cpp2
-rw-r--r--src/mame/machine/n64.cpp2
-rw-r--r--src/mame/machine/psxcd.cpp2
-rw-r--r--src/mame/machine/sgi.cpp2
-rw-r--r--src/mame/machine/smartmed.cpp4
-rw-r--r--src/mame/machine/tx1.cpp6
-rw-r--r--src/mame/video/amiga.cpp12
-rw-r--r--src/mame/video/amigaaga.cpp12
-rw-r--r--src/mame/video/gba.cpp14
-rw-r--r--src/mame/video/hng64.cpp2
-rw-r--r--src/mame/video/k053936.cpp2
-rw-r--r--src/mame/video/konamigx.cpp4
-rw-r--r--src/mame/video/mcd212.cpp6
-rw-r--r--src/mame/video/midzeus.cpp32
-rw-r--r--src/mame/video/midzeus2.cpp18
-rw-r--r--src/mame/video/model2.cpp10
-rw-r--r--src/mame/video/model3.cpp2
-rw-r--r--src/mame/video/namcofl.cpp4
-rw-r--r--src/mame/video/namconb1.cpp4
-rw-r--r--src/mame/video/namcos2.cpp2
-rw-r--r--src/mame/video/newport.cpp2
-rw-r--r--src/mame/video/rdpfiltr.inc34
-rw-r--r--src/mame/video/tatsumi.cpp2
-rw-r--r--src/mame/video/victory.cpp2
-rw-r--r--src/mame/video/vrender0.cpp4
-rw-r--r--src/mame/video/wgp.cpp2
-rw-r--r--src/osd/eigccppc.h28
-rw-r--r--src/osd/eigccx86.h52
-rw-r--r--src/osd/eivc.h16
-rw-r--r--src/osd/eivcx86.h38
-rw-r--r--src/osd/eminline.h58
-rw-r--r--src/osd/modules/debugger/debugint.cpp8
-rw-r--r--src/osd/modules/render/d3d/d3d9intf.cpp2
-rw-r--r--src/osd/modules/render/draw13.cpp8
-rw-r--r--src/osd/modules/render/drawd3d.cpp18
-rw-r--r--src/osd/modules/render/drawdd.cpp2
-rw-r--r--src/osd/modules/render/drawogl.cpp16
-rw-r--r--src/osd/modules/sync/sync_ntc.cpp4
-rw-r--r--src/osd/modules/sync/sync_os2.cpp4
-rw-r--r--src/osd/osdcore.h2
-rw-r--r--src/osd/sdl/input.cpp4
-rw-r--r--src/osd/sdl/window.cpp8
-rw-r--r--src/osd/windows/input.cpp6
-rw-r--r--src/osd/windows/window.h4
-rw-r--r--src/osd/windows/winfile.cpp2
-rw-r--r--src/tools/imgtool/library.h8
-rw-r--r--src/tools/imgtool/modules/concept.cpp4
-rw-r--r--src/tools/imgtool/modules/mac.cpp16
-rw-r--r--src/tools/imgtool/modules/ti99.cpp34
-rw-r--r--src/tools/imgtool/modules/ti990hd.cpp8
-rw-r--r--src/tools/regrep.cpp4
193 files changed, 1041 insertions, 1062 deletions
diff --git a/3rdparty/softfloat/mamesf.h b/3rdparty/softfloat/mamesf.h
index cc6b9998a53..c66931698a3 100644
--- a/3rdparty/softfloat/mamesf.h
+++ b/3rdparty/softfloat/mamesf.h
@@ -64,4 +64,4 @@ typedef INT64 sbits64;
| a compiler does not support explicit inlining, this macro should be defined
| to be `static'.
*----------------------------------------------------------------------------*/
-// MAME defines INLINE
+#define INLINE static inline
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 088636a7e5e..5ca87cf7c16 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -554,24 +554,6 @@ if (_ACTION == nil) then return false end
configuration { "x64" }
defines { "PTR64=1" }
--- map the INLINE to something digestible by GCC
-configuration { "gmake" }
- buildoptions_cpp {
- "-DINLINE=\"static inline\"",
- }
- buildoptions_objc {
- "-DINLINE=\"static inline\"",
- }
-configuration { "xcode4*" }
- buildoptions {
- "-DINLINE=\"static inline\"",
- }
-
-configuration { "vs*" }
- defines {
- "INLINE=static inline",
- }
-
-- define MAME_DEBUG if we are a debugging build
configuration { "Debug" }
defines {
@@ -1002,7 +984,6 @@ end
"-Wno-tautological-compare",
"-Wno-dynamic-class-memaccess",
"-Wno-unused-value",
--- "-Wno-c++11-narrowing",
"-Wno-inline-new-delete",
"-Wno-constant-logical-operand",
"-Wno-deprecated-register",
@@ -1026,8 +1007,6 @@ end
end
buildoptions {
"-Wno-unused-result", -- needed for fgets,fread on linux
--- "-Wno-narrowing",
--- "-Wno-attributes",
-- array bounds checking seems to be buggy in 4.8.1 (try it on video/stvvdp1.c and video/model1.c without -Wno-array-bounds)
"-Wno-array-bounds",
}
diff --git a/src/devices/bus/gba/gba_slot.cpp b/src/devices/bus/gba/gba_slot.cpp
index fc8f09f30a0..4e7c9f62060 100644
--- a/src/devices/bus/gba/gba_slot.cpp
+++ b/src/devices/bus/gba/gba_slot.cpp
@@ -256,7 +256,7 @@ bool gba_cart_slot_device::call_softlist_load(software_list_device &swlist, cons
fullpath
-------------------------------------------------*/
-INLINE std::string gba_chip_string( UINT32 chip )
+static inline std::string gba_chip_string( UINT32 chip )
{
std::string str;
if (chip == 0) str += "NONE ";
@@ -273,7 +273,7 @@ INLINE std::string gba_chip_string( UINT32 chip )
}
-INLINE int gba_chip_has_conflict( UINT32 chip )
+static inline int gba_chip_has_conflict( UINT32 chip )
{
int count1 = 0, count2 = 0;
if (chip & GBA_CHIP_EEPROM) count1++;
diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp
index 8f99ddc0792..888318f65d7 100644
--- a/src/devices/bus/isa/cga.cpp
+++ b/src/devices/bus/isa/cga.cpp
@@ -1191,7 +1191,7 @@ WRITE8_MEMBER( isa8_cga_device::io_write )
// proc = cga_pgfx_4bpp;
//
-//INLINE void pgfx_plot_unit_4bpp(bitmap_ind16 &bitmap,
+//static inline void pgfx_plot_unit_4bpp(bitmap_ind16 &bitmap,
// int x, int y, int offs)
//{
// int color, values[2];
@@ -1259,7 +1259,7 @@ WRITE8_MEMBER( isa8_cga_device::io_write )
//
//
//
-//INLINE void pgfx_plot_unit_2bpp(bitmap_ind16 &bitmap,
+//static inline void pgfx_plot_unit_2bpp(bitmap_ind16 &bitmap,
// int x, int y, const UINT16 *palette, int offs)
//{
// int i;
diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp
index 51f6a1ea8de..9aa905b7a66 100644
--- a/src/devices/bus/megadrive/svp.cpp
+++ b/src/devices/bus/megadrive/svp.cpp
@@ -60,7 +60,7 @@ md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, const char *
// HELPERS
-INLINE int get_inc(int mode)
+static inline int get_inc(int mode)
{
int inc = (mode >> 11) & 7;
if (inc != 0) {
@@ -71,7 +71,7 @@ INLINE int get_inc(int mode)
return inc;
}
-INLINE void overwrite_write(UINT16 *dst, UINT16 d)
+static inline void overwrite_write(UINT16 *dst, UINT16 d)
{
if (d & 0xf000) { *dst &= ~0xf000; *dst |= d & 0xf000; }
if (d & 0x0f00) { *dst &= ~0x0f00; *dst |= d & 0x0f00; }
diff --git a/src/devices/bus/ti99x/990_hd.cpp b/src/devices/bus/ti99x/990_hd.cpp
index 99ad509d39f..b884f8be444 100644
--- a/src/devices/bus/ti99x/990_hd.cpp
+++ b/src/devices/bus/ti99x/990_hd.cpp
@@ -41,13 +41,13 @@ struct UINT32BE
UINT8 bytes[4];
};
-INLINE UINT32 get_UINT32BE(UINT32BE word)
+static inline UINT32 get_UINT32BE(UINT32BE word)
{
return (word.bytes[0] << 24) | (word.bytes[1] << 16) | (word.bytes[2] << 8) | word.bytes[3];
}
#ifdef UNUSED_FUNCTION
-INLINE void set_UINT32BE(UINT32BE *word, UINT32 data)
+static inline void set_UINT32BE(UINT32BE *word, UINT32 data)
{
word->bytes[0] = (data >> 24) & 0xff;
word->bytes[1] = (data >> 16) & 0xff;
diff --git a/src/devices/cpu/8x300/8x300dasm.cpp b/src/devices/cpu/8x300/8x300dasm.cpp
index e35b2b7cb41..eb65e735162 100644
--- a/src/devices/cpu/8x300/8x300dasm.cpp
+++ b/src/devices/cpu/8x300/8x300dasm.cpp
@@ -25,7 +25,7 @@ static const char *reg_names[32] =
};
// determines if right rotate or I/O field length is to be used
-INLINE bool is_rot(UINT16 opcode)
+static inline bool is_rot(UINT16 opcode)
{
if((opcode & 0x1000) || (opcode & 0x0010))
return false;
@@ -33,7 +33,7 @@ INLINE bool is_rot(UINT16 opcode)
return true;
}
-INLINE bool is_src_rot(UINT16 opcode)
+static inline bool is_src_rot(UINT16 opcode)
{
if((opcode & 0x1000))
return false;
diff --git a/src/devices/cpu/arm7/arm7drc.inc b/src/devices/cpu/arm7/arm7drc.inc
index 46c3aba570b..54ef46aa0fa 100644
--- a/src/devices/cpu/arm7/arm7drc.inc
+++ b/src/devices/cpu/arm7/arm7drc.inc
@@ -68,7 +68,7 @@
descriptor
-------------------------------------------------*/
-INLINE UINT32 epc(const opcode_desc *desc)
+static inline UINT32 epc(const opcode_desc *desc)
{
return desc->pc;
}
@@ -79,7 +79,7 @@ INLINE UINT32 epc(const opcode_desc *desc)
already allocated
-------------------------------------------------*/
-INLINE void alloc_handle(drcuml_state *drcuml, uml::code_handle **handleptr, const char *name)
+static inline void alloc_handle(drcuml_state *drcuml, uml::code_handle **handleptr, const char *name)
{
if (*handleptr == nullptr)
*handleptr = drcuml->handle_alloc(name);
diff --git a/src/devices/cpu/asap/asapdasm.cpp b/src/devices/cpu/asap/asapdasm.cpp
index eb16985da1b..676ba850228 100644
--- a/src/devices/cpu/asap/asapdasm.cpp
+++ b/src/devices/cpu/asap/asapdasm.cpp
@@ -35,7 +35,7 @@ static const char *const condition[16] =
CODE CODE
***************************************************************************/
-INLINE char *src2(UINT32 op, int scale)
+static inline char *src2(UINT32 op, int scale)
{
static char temp[20];
if ((op & 0xffe0) == 0xffe0)
diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp
index a1e755a29b8..d043e466876 100644
--- a/src/devices/cpu/avr8/avr8.cpp
+++ b/src/devices/cpu/avr8/avr8.cpp
@@ -66,7 +66,7 @@
#define ENABLE_VERBOSE_LOG (0)
#if ENABLE_VERBOSE_LOG
-INLINE void ATTR_PRINTF(3,4) verboselog(UINT16 pc, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(UINT16 pc, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/devices/cpu/dsp32/dsp32dis.cpp b/src/devices/cpu/dsp32/dsp32dis.cpp
index 25f43e30761..18c06f01e9d 100644
--- a/src/devices/cpu/dsp32/dsp32dis.cpp
+++ b/src/devices/cpu/dsp32/dsp32dis.cpp
@@ -85,7 +85,7 @@ static const char *const regnamee[] =
static char tempbuf[10][40];
-INLINE char *signed_16bit_unary(INT16 val)
+static inline char *signed_16bit_unary(INT16 val)
{
static char temp[10];
if (val < 0)
@@ -95,7 +95,7 @@ INLINE char *signed_16bit_unary(INT16 val)
return temp;
}
-INLINE char *signed_16bit_sep(INT16 val)
+static inline char *signed_16bit_sep(INT16 val)
{
static char temp[10];
if (val < 0)
@@ -105,7 +105,7 @@ INLINE char *signed_16bit_sep(INT16 val)
return temp;
}
-INLINE char *signed_16bit_sep_nospace(INT16 val)
+static inline char *signed_16bit_sep_nospace(INT16 val)
{
static char temp[10];
if (val < 0)
@@ -115,7 +115,7 @@ INLINE char *signed_16bit_sep_nospace(INT16 val)
return temp;
}
-INLINE char *unsigned_16bit_size(INT16 val, UINT8 size)
+static inline char *unsigned_16bit_size(INT16 val, UINT8 size)
{
static char temp[10];
if (size)
diff --git a/src/devices/cpu/es5510/es5510.cpp b/src/devices/cpu/es5510/es5510.cpp
index 16a1396f77a..17a73204f09 100644
--- a/src/devices/cpu/es5510/es5510.cpp
+++ b/src/devices/cpu/es5510/es5510.cpp
@@ -34,7 +34,7 @@ static inline INT64 SX64(INT64 x) { return (x & S64(0x0000800000000000)) ? x | S
#define VERBOSE_EXEC 0
#if VERBOSE
-INLINE void ATTR_PRINTF(1,2) log_to_stderr(const char *format, ...) {
+static inline void ATTR_PRINTF(1,2) log_to_stderr(const char *format, ...) {
va_list ap;
va_start(ap, format);
vfprintf(stderr, format, ap);
diff --git a/src/devices/cpu/g65816/g65816cm.h b/src/devices/cpu/g65816/g65816cm.h
index 7cfbcdf2cfb..649b2500653 100644
--- a/src/devices/cpu/g65816/g65816cm.h
+++ b/src/devices/cpu/g65816/g65816cm.h
@@ -46,7 +46,7 @@
#define MAKE_INT_8(A) (int8)((A)&0xff)
#else
#define int8 int
-INLINE int MAKE_INT_8(int A) {return (A & 0x80) ? A | ~0xff : A & 0xff;}
+static inline int MAKE_INT_8(int A) {return (A & 0x80) ? A | ~0xff : A & 0xff;}
#endif /* UCHAR_MAX == 0xff */
#define MAKE_UINT_8(A) ((A)&0xff)
diff --git a/src/devices/cpu/g65816/g65816ds.cpp b/src/devices/cpu/g65816/g65816ds.cpp
index 17af208a822..5965da2e3eb 100644
--- a/src/devices/cpu/g65816/g65816ds.cpp
+++ b/src/devices/cpu/g65816/g65816ds.cpp
@@ -141,26 +141,26 @@ static const g65816_opcode_struct g_opcodes[256] =
static const UINT8 *base_oprom;
static UINT32 base_pc;
-INLINE unsigned int read_8(unsigned int address)
+static inline unsigned int read_8(unsigned int address)
{
address = ADDRESS_65816(address);
return base_oprom[address - base_pc];
}
-INLINE unsigned int read_16(unsigned int address)
+static inline unsigned int read_16(unsigned int address)
{
unsigned int val = read_8(address);
return val | (read_8(address+1)<<8);
}
-INLINE unsigned int read_24(unsigned int address)
+static inline unsigned int read_24(unsigned int address)
{
unsigned int val = read_8(address);
val |= (read_8(address+1)<<8);
return val | (read_8(address+2)<<16);
}
-INLINE char* int_8_str(unsigned int val)
+static inline char* int_8_str(unsigned int val)
{
static char str[20];
@@ -174,7 +174,7 @@ INLINE char* int_8_str(unsigned int val)
return str;
}
-INLINE char* int_16_str(unsigned int val)
+static inline char* int_16_str(unsigned int val)
{
static char str[20];
diff --git a/src/devices/cpu/i386/i386dasm.cpp b/src/devices/cpu/i386/i386dasm.cpp
index 18e5557b4b5..780cda0ba1d 100644
--- a/src/devices/cpu/i386/i386dasm.cpp
+++ b/src/devices/cpu/i386/i386dasm.cpp
@@ -1993,7 +1993,7 @@ static UINT8 curmode;
#define MODRM_REG2 (modrm & 0x7)
#define MODRM_MOD ((modrm >> 6) & 0x3)
-INLINE UINT8 FETCH(void)
+static inline UINT8 FETCH(void)
{
if ((opcode_ptr - opcode_ptr_base) + 1 > max_length)
return 0xff;
@@ -2002,7 +2002,7 @@ INLINE UINT8 FETCH(void)
}
#if 0
-INLINE UINT16 FETCH16(void)
+static inline UINT16 FETCH16(void)
{
UINT16 d;
if ((opcode_ptr - opcode_ptr_base) + 2 > max_length)
@@ -2014,7 +2014,7 @@ INLINE UINT16 FETCH16(void)
}
#endif
-INLINE UINT32 FETCH32(void)
+static inline UINT32 FETCH32(void)
{
UINT32 d;
if ((opcode_ptr - opcode_ptr_base) + 4 > max_length)
@@ -2025,7 +2025,7 @@ INLINE UINT32 FETCH32(void)
return d;
}
-INLINE UINT8 FETCHD(void)
+static inline UINT8 FETCHD(void)
{
if ((opcode_ptr - opcode_ptr_base) + 1 > max_length)
return 0xff;
@@ -2033,7 +2033,7 @@ INLINE UINT8 FETCHD(void)
return *opcode_ptr++;
}
-INLINE UINT16 FETCHD16(void)
+static inline UINT16 FETCHD16(void)
{
UINT16 d;
if ((opcode_ptr - opcode_ptr_base) + 2 > max_length)
@@ -2044,7 +2044,7 @@ INLINE UINT16 FETCHD16(void)
return d;
}
-INLINE UINT32 FETCHD32(void)
+static inline UINT32 FETCHD32(void)
{
UINT32 d;
if ((opcode_ptr - opcode_ptr_base) + 4 > max_length)
diff --git a/src/devices/cpu/i386/pentops.inc b/src/devices/cpu/i386/pentops.inc
index ab89208314d..3b8eec56499 100644
--- a/src/devices/cpu/i386/pentops.inc
+++ b/src/devices/cpu/i386/pentops.inc
@@ -1200,7 +1200,7 @@ void i386_device::pentium_tzcnt_r32_rm32()
// TODO: actually implement TZCNT
}
-INLINE INT8 SaturatedSignedWordToSignedByte(INT16 word)
+static inline INT8 SaturatedSignedWordToSignedByte(INT16 word)
{
if (word > 127)
return 127;
@@ -1209,7 +1209,7 @@ INLINE INT8 SaturatedSignedWordToSignedByte(INT16 word)
return (INT8)word;
}
-INLINE UINT8 SaturatedSignedWordToUnsignedByte(INT16 word)
+static inline UINT8 SaturatedSignedWordToUnsignedByte(INT16 word)
{
if (word > 255)
return 255;
@@ -1218,7 +1218,7 @@ INLINE UINT8 SaturatedSignedWordToUnsignedByte(INT16 word)
return (UINT8)word;
}
-INLINE INT16 SaturatedSignedDwordToSignedWord(INT32 dword)
+static inline INT16 SaturatedSignedDwordToSignedWord(INT32 dword)
{
if (dword > 32767)
return 32767;
@@ -1227,7 +1227,7 @@ INLINE INT16 SaturatedSignedDwordToSignedWord(INT32 dword)
return (INT16)dword;
}
-INLINE UINT16 SaturatedSignedDwordToUnsignedWord(INT32 dword)
+static inline UINT16 SaturatedSignedDwordToUnsignedWord(INT32 dword)
{
if (dword > 65535)
return 65535;
@@ -3786,7 +3786,7 @@ void i386_device::sse_subps() // Opcode 0f 5c
CYCLES(1); // TODO: correct cycle count
}
-INLINE float sse_min_single(float src1, float src2)
+static inline float sse_min_single(float src1, float src2)
{
/*if ((src1 == 0) && (src2 == 0))
return src2;
@@ -3799,7 +3799,7 @@ INLINE float sse_min_single(float src1, float src2)
return src2;
}
-INLINE double sse_min_double(double src1, double src2)
+static inline double sse_min_double(double src1, double src2)
{
/*if ((src1 == 0) && (src2 == 0))
return src2;
@@ -3852,7 +3852,7 @@ void i386_device::sse_divps() // Opcode 0f 5e
CYCLES(1); // TODO: correct cycle count
}
-INLINE float sse_max_single(float src1, float src2)
+static inline float sse_max_single(float src1, float src2)
{
/*if ((src1 == 0) && (src2 == 0))
return src2;
@@ -3865,7 +3865,7 @@ INLINE float sse_max_single(float src1, float src2)
return src2;
}
-INLINE double sse_max_double(double src1, double src2)
+static inline double sse_max_double(double src1, double src2)
{
/*if ((src1 == 0) && (src2 == 0))
return src2;
@@ -4333,25 +4333,25 @@ void i386_device::sse_unpckhpd_r128_rm128() // Opcode 66 0f 15
CYCLES(1); // TODO: correct cycle count
}
-INLINE bool sse_issingleordered(float op1, float op2)
+static inline bool sse_issingleordered(float op1, float op2)
{
// TODO: true when at least one of the two source operands being compared is a NaN
return (op1 != op1) || (op1 != op2);
}
-INLINE bool sse_issingleunordered(float op1, float op2)
+static inline bool sse_issingleunordered(float op1, float op2)
{
// TODO: true when neither source operand is a NaN
return !((op1 != op1) || (op1 != op2));
}
-INLINE bool sse_isdoubleordered(double op1, double op2)
+static inline bool sse_isdoubleordered(double op1, double op2)
{
// TODO: true when at least one of the two source operands being compared is a NaN
return (op1 != op1) || (op1 != op2);
}
-INLINE bool sse_isdoubleunordered(double op1, double op2)
+static inline bool sse_isdoubleunordered(double op1, double op2)
{
// TODO: true when neither source operand is a NaN
return !((op1 != op1) || (op1 != op2));
diff --git a/src/devices/cpu/i386/x87ops.inc b/src/devices/cpu/i386/x87ops.inc
index 9306a7a5727..1cc44e7b92f 100644
--- a/src/devices/cpu/i386/x87ops.inc
+++ b/src/devices/cpu/i386/x87ops.inc
@@ -117,7 +117,7 @@ extern flag floatx80_is_nan( floatx80 a );
extern flag floatx80_is_signaling_nan(floatx80 a);
-INLINE flag floatx80_is_quiet_nan(floatx80 a)
+static inline flag floatx80_is_quiet_nan(floatx80 a)
{
bits64 aLow;
@@ -128,36 +128,36 @@ INLINE flag floatx80_is_quiet_nan(floatx80 a)
&& (a.low != aLow);
}
-INLINE int floatx80_is_zero(floatx80 fx)
+static inline int floatx80_is_zero(floatx80 fx)
{
return (((fx.high & 0x7fff) == 0) && ((fx.low << 1) == 0));
}
-INLINE int floatx80_is_inf(floatx80 fx)
+static inline int floatx80_is_inf(floatx80 fx)
{
return (((fx.high & 0x7fff) == 0x7fff) && ((fx.low << 1) == 0));
}
-INLINE int floatx80_is_denormal(floatx80 fx)
+static inline int floatx80_is_denormal(floatx80 fx)
{
return (((fx.high & 0x7fff) == 0) &&
((fx.low & U64(0x8000000000000000)) == 0) &&
((fx.low << 1) != 0));
}
-INLINE floatx80 floatx80_abs(floatx80 fx)
+static inline floatx80 floatx80_abs(floatx80 fx)
{
fx.high &= 0x7fff;
return fx;
}
-INLINE double fx80_to_double(floatx80 fx)
+static inline double fx80_to_double(floatx80 fx)
{
UINT64 d = floatx80_to_float64(fx);
return *(double*)&d;
}
-INLINE floatx80 double_to_fx80(double in)
+static inline floatx80 double_to_fx80(double in)
{
return float64_to_floatx80(*(UINT64*)&in);
}
diff --git a/src/devices/cpu/i860/i860dec.inc b/src/devices/cpu/i860/i860dec.inc
index 216d96a8a93..4600af7a0b8 100644
--- a/src/devices/cpu/i860/i860dec.inc
+++ b/src/devices/cpu/i860/i860dec.inc
@@ -896,7 +896,7 @@ void i860_cpu_device::dump_state (i860s *cpustate)
#endif
/* Sign extend N-bit number. */
-INLINE INT32 sign_ext (UINT32 x, int n)
+static inline INT32 sign_ext (UINT32 x, int n)
{
INT32 t;
t = x >> (n - 1);
diff --git a/src/devices/cpu/jaguar/jagdasm.cpp b/src/devices/cpu/jaguar/jagdasm.cpp
index e5e9cd70882..a12145c23c8 100644
--- a/src/devices/cpu/jaguar/jagdasm.cpp
+++ b/src/devices/cpu/jaguar/jagdasm.cpp
@@ -69,7 +69,7 @@ static const char *const condition[32] =
CODE CODE
***************************************************************************/
-INLINE char *signed_16bit(INT16 val)
+static inline char *signed_16bit(INT16 val)
{
static char temp[10];
if (val < 0)
diff --git a/src/devices/cpu/m37710/m37710cm.h b/src/devices/cpu/m37710/m37710cm.h
index aa691b2e9aa..5595230124c 100644
--- a/src/devices/cpu/m37710/m37710cm.h
+++ b/src/devices/cpu/m37710/m37710cm.h
@@ -41,7 +41,7 @@
#define MAKE_INT_8(A) (int8)((A)&0xff)
#else
#define int8 int
-INLINE int MAKE_INT_8(int A) {return (A & 0x80) ? A | ~0xff : A & 0xff;}
+static inline int MAKE_INT_8(int A) {return (A & 0x80) ? A | ~0xff : A & 0xff;}
#endif /* UCHAR_MAX == 0xff */
#define MAKE_UINT_8(A) ((A)&0xff)
diff --git a/src/devices/cpu/m37710/m7700ds.cpp b/src/devices/cpu/m37710/m7700ds.cpp
index f6b77932b1e..8ccf269dc46 100644
--- a/src/devices/cpu/m37710/m7700ds.cpp
+++ b/src/devices/cpu/m37710/m7700ds.cpp
@@ -321,25 +321,25 @@ static const m7700_opcode_struct g_opcodes_prefix89[256] =
{JSR, I, AXI }, {SBC, M, AX }, {INC, M, AX }, {SBC, M, ALX }
};
-INLINE unsigned int read_8(const UINT8 *oprom, unsigned int offset)
+static inline unsigned int read_8(const UINT8 *oprom, unsigned int offset)
{
return oprom[offset];
}
-INLINE unsigned int read_16(const UINT8 *oprom, unsigned int offset)
+static inline unsigned int read_16(const UINT8 *oprom, unsigned int offset)
{
unsigned int val = read_8(oprom, offset);
return val | (read_8(oprom, offset+1)<<8);
}
-INLINE unsigned int read_24(const UINT8 *oprom, unsigned int offset)
+static inline unsigned int read_24(const UINT8 *oprom, unsigned int offset)
{
unsigned int val = read_8(oprom, offset);
val |= (read_8(oprom, offset+1)<<8);
return val | (read_8(oprom, offset+2)<<16);
}
-INLINE char* int_8_str(unsigned int val)
+static inline char* int_8_str(unsigned int val)
{
static char str[20];
@@ -353,7 +353,7 @@ INLINE char* int_8_str(unsigned int val)
return str;
}
-INLINE char* int_16_str(unsigned int val)
+static inline char* int_16_str(unsigned int val)
{
static char str[20];
diff --git a/src/devices/cpu/m68000/m68kcpu.h b/src/devices/cpu/m68000/m68kcpu.h
index 2c30bf78a98..5cec889e002 100644
--- a/src/devices/cpu/m68000/m68kcpu.h
+++ b/src/devices/cpu/m68000/m68kcpu.h
@@ -496,119 +496,119 @@ extern const UINT8 m68ki_exception_cycle_table[][256];
extern const UINT8 m68ki_ea_idx_cycle_table[];
/* Read data immediately after the program counter */
-INLINE UINT32 m68ki_read_imm_16(m68000_base_device *m68k);
-INLINE UINT32 m68ki_read_imm_32(m68000_base_device *m68k);
+static inline UINT32 m68ki_read_imm_16(m68000_base_device *m68k);
+static inline UINT32 m68ki_read_imm_32(m68000_base_device *m68k);
/* Read data with specific function code */
-INLINE UINT32 m68ki_read_8_fc (m68000_base_device *m68k, UINT32 address, UINT32 fc);
-INLINE UINT32 m68ki_read_16_fc (m68000_base_device *m68k, UINT32 address, UINT32 fc);
-INLINE UINT32 m68ki_read_32_fc (m68000_base_device *m68k, UINT32 address, UINT32 fc);
+static inline UINT32 m68ki_read_8_fc (m68000_base_device *m68k, UINT32 address, UINT32 fc);
+static inline UINT32 m68ki_read_16_fc (m68000_base_device *m68k, UINT32 address, UINT32 fc);
+static inline UINT32 m68ki_read_32_fc (m68000_base_device *m68k, UINT32 address, UINT32 fc);
/* Write data with specific function code */
-INLINE void m68ki_write_8_fc (m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value);
-INLINE void m68ki_write_16_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value);
-INLINE void m68ki_write_32_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value);
-INLINE void m68ki_write_32_pd_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value);
+static inline void m68ki_write_8_fc (m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value);
+static inline void m68ki_write_16_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value);
+static inline void m68ki_write_32_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value);
+static inline void m68ki_write_32_pd_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value);
/* Indexed and PC-relative ea fetching */
-INLINE UINT32 m68ki_get_ea_pcdi(m68000_base_device *m68k);
-INLINE UINT32 m68ki_get_ea_pcix(m68000_base_device *m68k);
-INLINE UINT32 m68ki_get_ea_ix(m68000_base_device *m68k, UINT32 An);
+static inline UINT32 m68ki_get_ea_pcdi(m68000_base_device *m68k);
+static inline UINT32 m68ki_get_ea_pcix(m68000_base_device *m68k);
+static inline UINT32 m68ki_get_ea_ix(m68000_base_device *m68k, UINT32 An);
/* Operand fetching */
-INLINE UINT32 OPER_AY_AI_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_AI_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_AI_32(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_PI_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_PI_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_PI_32(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_PD_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_PD_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_PD_32(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_DI_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_DI_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_DI_32(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_IX_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_IX_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_AY_IX_32(m68000_base_device *m68k);
-
-INLINE UINT32 OPER_AX_AI_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_AI_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_AI_32(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_PI_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_PI_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_PI_32(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_PD_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_PD_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_PD_32(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_DI_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_DI_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_DI_32(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_IX_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_IX_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_AX_IX_32(m68000_base_device *m68k);
-
-INLINE UINT32 OPER_A7_PI_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_A7_PD_8(m68000_base_device *m68k);
-
-INLINE UINT32 OPER_AW_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_AW_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_AW_32(m68000_base_device *m68k);
-INLINE UINT32 OPER_AL_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_AL_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_AL_32(m68000_base_device *m68k);
-INLINE UINT32 OPER_PCDI_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_PCDI_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_PCDI_32(m68000_base_device *m68k);
-INLINE UINT32 OPER_PCIX_8(m68000_base_device *m68k);
-INLINE UINT32 OPER_PCIX_16(m68000_base_device *m68k);
-INLINE UINT32 OPER_PCIX_32(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_AI_8(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_AI_16(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_AI_32(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_PI_8(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_PI_16(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_PI_32(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_PD_8(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_PD_16(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_PD_32(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_DI_8(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_DI_16(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_DI_32(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_IX_8(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_IX_16(m68000_base_device *m68k);
+static inline UINT32 OPER_AY_IX_32(m68000_base_device *m68k);
+
+static inline UINT32 OPER_AX_AI_8(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_AI_16(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_AI_32(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_PI_8(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_PI_16(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_PI_32(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_PD_8(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_PD_16(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_PD_32(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_DI_8(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_DI_16(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_DI_32(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_IX_8(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_IX_16(m68000_base_device *m68k);
+static inline UINT32 OPER_AX_IX_32(m68000_base_device *m68k);
+
+static inline UINT32 OPER_A7_PI_8(m68000_base_device *m68k);
+static inline UINT32 OPER_A7_PD_8(m68000_base_device *m68k);
+
+static inline UINT32 OPER_AW_8(m68000_base_device *m68k);
+static inline UINT32 OPER_AW_16(m68000_base_device *m68k);
+static inline UINT32 OPER_AW_32(m68000_base_device *m68k);
+static inline UINT32 OPER_AL_8(m68000_base_device *m68k);
+static inline UINT32 OPER_AL_16(m68000_base_device *m68k);
+static inline UINT32 OPER_AL_32(m68000_base_device *m68k);
+static inline UINT32 OPER_PCDI_8(m68000_base_device *m68k);
+static inline UINT32 OPER_PCDI_16(m68000_base_device *m68k);
+static inline UINT32 OPER_PCDI_32(m68000_base_device *m68k);
+static inline UINT32 OPER_PCIX_8(m68000_base_device *m68k);
+static inline UINT32 OPER_PCIX_16(m68000_base_device *m68k);
+static inline UINT32 OPER_PCIX_32(m68000_base_device *m68k);
/* Stack operations */
-INLINE void m68ki_push_16(m68000_base_device *m68k, UINT32 value);
-INLINE void m68ki_push_32(m68000_base_device *m68k, UINT32 value);
-INLINE UINT32 m68ki_pull_16(m68000_base_device *m68k);
-INLINE UINT32 m68ki_pull_32(m68000_base_device *m68k);
+static inline void m68ki_push_16(m68000_base_device *m68k, UINT32 value);
+static inline void m68ki_push_32(m68000_base_device *m68k, UINT32 value);
+static inline UINT32 m68ki_pull_16(m68000_base_device *m68k);
+static inline UINT32 m68ki_pull_32(m68000_base_device *m68k);
/* Program flow operations */
-INLINE void m68ki_jump(m68000_base_device *m68k, UINT32 new_pc);
-INLINE void m68ki_jump_vector(m68000_base_device *m68k, UINT32 vector);
-INLINE void m68ki_branch_8(m68000_base_device *m68k, UINT32 offset);
-INLINE void m68ki_branch_16(m68000_base_device *m68k, UINT32 offset);
-INLINE void m68ki_branch_32(m68000_base_device *m68k, UINT32 offset);
+static inline void m68ki_jump(m68000_base_device *m68k, UINT32 new_pc);
+static inline void m68ki_jump_vector(m68000_base_device *m68k, UINT32 vector);
+static inline void m68ki_branch_8(m68000_base_device *m68k, UINT32 offset);
+static inline void m68ki_branch_16(m68000_base_device *m68k, UINT32 offset);
+static inline void m68ki_branch_32(m68000_base_device *m68k, UINT32 offset);
/* Status register operations. */
-INLINE void m68ki_set_s_flag(m68000_base_device *m68k, UINT32 value); /* Only bit 2 of value should be set (i.e. 4 or 0) */
-INLINE void m68ki_set_sm_flag(m68000_base_device *m68k, UINT32 value); /* only bits 1 and 2 of value should be set */
-INLINE void m68ki_set_ccr(m68000_base_device *m68k, UINT32 value); /* set the condition code register */
-INLINE void m68ki_set_sr(m68000_base_device *m68k, UINT32 value); /* set the status register */
-INLINE void m68ki_set_sr_noint(m68000_base_device *m68k, UINT32 value); /* set the status register */
+static inline void m68ki_set_s_flag(m68000_base_device *m68k, UINT32 value); /* Only bit 2 of value should be set (i.e. 4 or 0) */
+static inline void m68ki_set_sm_flag(m68000_base_device *m68k, UINT32 value); /* only bits 1 and 2 of value should be set */
+static inline void m68ki_set_ccr(m68000_base_device *m68k, UINT32 value); /* set the condition code register */
+static inline void m68ki_set_sr(m68000_base_device *m68k, UINT32 value); /* set the status register */
+static inline void m68ki_set_sr_noint(m68000_base_device *m68k, UINT32 value); /* set the status register */
/* Exception processing */
-INLINE UINT32 m68ki_init_exception(m68000_base_device *m68k); /* Initial exception processing */
-
-INLINE void m68ki_stack_frame_3word(m68000_base_device *m68k, UINT32 pc, UINT32 sr); /* Stack various frame types */
-INLINE void m68ki_stack_frame_buserr(m68000_base_device *m68k, UINT32 sr);
-
-INLINE void m68ki_stack_frame_0000(m68000_base_device *m68k, UINT32 pc, UINT32 sr, UINT32 vector);
-INLINE void m68ki_stack_frame_0001(m68000_base_device *m68k, UINT32 pc, UINT32 sr, UINT32 vector);
-INLINE void m68ki_stack_frame_0010(m68000_base_device *m68k, UINT32 sr, UINT32 vector);
-INLINE void m68ki_stack_frame_1000(m68000_base_device *m68k, UINT32 pc, UINT32 sr, UINT32 vector);
-INLINE void m68ki_stack_frame_1010(m68000_base_device *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address);
-INLINE void m68ki_stack_frame_1011(m68000_base_device *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address);
-INLINE void m68ki_stack_frame_0111(m68000_base_device *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address, bool in_mmu);
-
-INLINE void m68ki_exception_trap(m68000_base_device *m68k, UINT32 vector);
-INLINE void m68ki_exception_trapN(m68000_base_device *m68k, UINT32 vector);
-INLINE void m68ki_exception_trace(m68000_base_device *m68k);
-INLINE void m68ki_exception_privilege_violation(m68000_base_device *m68k);
-INLINE void m68ki_exception_1010(m68000_base_device *m68k);
-INLINE void m68ki_exception_1111(m68000_base_device *m68k);
-INLINE void m68ki_exception_illegal(m68000_base_device *m68k);
-INLINE void m68ki_exception_format_error(m68000_base_device *m68k);
-INLINE void m68ki_exception_address_error(m68000_base_device *m68k);
-
-INLINE void m68ki_check_interrupts(m68000_base_device *m68k); /* ASG: check for interrupts */
+static inline UINT32 m68ki_init_exception(m68000_base_device *m68k); /* Initial exception processing */
+
+static inline void m68ki_stack_frame_3word(m68000_base_device *m68k, UINT32 pc, UINT32 sr); /* Stack various frame types */
+static inline void m68ki_stack_frame_buserr(m68000_base_device *m68k, UINT32 sr);
+
+static inline void m68ki_stack_frame_0000(m68000_base_device *m68k, UINT32 pc, UINT32 sr, UINT32 vector);
+static inline void m68ki_stack_frame_0001(m68000_base_device *m68k, UINT32 pc, UINT32 sr, UINT32 vector);
+static inline void m68ki_stack_frame_0010(m68000_base_device *m68k, UINT32 sr, UINT32 vector);
+static inline void m68ki_stack_frame_1000(m68000_base_device *m68k, UINT32 pc, UINT32 sr, UINT32 vector);
+static inline void m68ki_stack_frame_1010(m68000_base_device *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address);
+static inline void m68ki_stack_frame_1011(m68000_base_device *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address);
+static inline void m68ki_stack_frame_0111(m68000_base_device *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address, bool in_mmu);
+
+static inline void m68ki_exception_trap(m68000_base_device *m68k, UINT32 vector);
+static inline void m68ki_exception_trapN(m68000_base_device *m68k, UINT32 vector);
+static inline void m68ki_exception_trace(m68000_base_device *m68k);
+static inline void m68ki_exception_privilege_violation(m68000_base_device *m68k);
+static inline void m68ki_exception_1010(m68000_base_device *m68k);
+static inline void m68ki_exception_1111(m68000_base_device *m68k);
+static inline void m68ki_exception_illegal(m68000_base_device *m68k);
+static inline void m68ki_exception_format_error(m68000_base_device *m68k);
+static inline void m68ki_exception_address_error(m68000_base_device *m68k);
+
+static inline void m68ki_check_interrupts(m68000_base_device *m68k); /* ASG: check for interrupts */
/* quick disassembly (used for logging) */
char* m68ki_disassemble_quick(unsigned int pc, unsigned int cpu_type);
@@ -619,12 +619,12 @@ char* m68ki_disassemble_quick(unsigned int pc, unsigned int cpu_type);
/* ======================================================================== */
-INLINE unsigned int m68k_read_pcrelative_8(m68000_base_device *m68k, unsigned int address)
+static inline unsigned int m68k_read_pcrelative_8(m68000_base_device *m68k, unsigned int address)
{
return ((m68k->readimm16(address&~1)>>(8*(1-(address & 1))))&0xff);
}
-INLINE unsigned int m68k_read_pcrelative_16(m68000_base_device *m68k, unsigned int address)
+static inline unsigned int m68k_read_pcrelative_16(m68000_base_device *m68k, unsigned int address)
{
if(address & 1)
return
@@ -636,7 +636,7 @@ INLINE unsigned int m68k_read_pcrelative_16(m68000_base_device *m68k, unsigned i
(m68k->readimm16(address ) );
}
-INLINE unsigned int m68k_read_pcrelative_32(m68000_base_device *m68k, unsigned int address)
+static inline unsigned int m68k_read_pcrelative_32(m68000_base_device *m68k, unsigned int address)
{
if(address & 1)
return
@@ -656,7 +656,7 @@ INLINE unsigned int m68k_read_pcrelative_32(m68000_base_device *m68k, unsigned i
* A real 68k first writes the high word to [address+2], and then writes the
* low word to [address].
*/
-INLINE void m68kx_write_memory_32_pd(m68000_base_device *m68k, unsigned int address, unsigned int value)
+static inline void m68kx_write_memory_32_pd(m68000_base_device *m68k, unsigned int address, unsigned int value)
{
m68k->/*memory.*/write16(address+2, value>>16);
m68k->/*memory.*/write16(address, value&0xffff);
@@ -666,7 +666,7 @@ INLINE void m68kx_write_memory_32_pd(m68000_base_device *m68k, unsigned int addr
/* ---------------------------- Read Immediate ---------------------------- */
// clear the instruction cache
-INLINE void m68ki_ic_clear(m68000_base_device *m68k)
+static inline void m68ki_ic_clear(m68000_base_device *m68k)
{
int i;
for (i=0; i< M68K_IC_SIZE; i++) {
@@ -676,7 +676,7 @@ INLINE void m68ki_ic_clear(m68000_base_device *m68k)
// read immediate word using the instruction cache
-INLINE UINT32 m68ki_ic_readimm16(m68000_base_device *m68k, UINT32 address)
+static inline UINT32 m68ki_ic_readimm16(m68000_base_device *m68k, UINT32 address)
{
if (m68k->cacr & M68K_CACR_EI)
{
@@ -725,7 +725,7 @@ INLINE UINT32 m68ki_ic_readimm16(m68000_base_device *m68k, UINT32 address)
/* Handles all immediate reads, does address error check, function code setting,
* and prefetching if they are enabled in m68kconf.h
*/
-INLINE UINT32 m68ki_read_imm_16(m68000_base_device *m68k)
+static inline UINT32 m68ki_read_imm_16(m68000_base_device *m68k)
{
UINT32 result;
@@ -752,7 +752,7 @@ INLINE UINT32 m68ki_read_imm_16(m68000_base_device *m68k)
return result;
}
-INLINE UINT32 m68ki_read_imm_32(m68000_base_device *m68k)
+static inline UINT32 m68ki_read_imm_32(m68000_base_device *m68k)
{
UINT32 temp_val;
@@ -789,13 +789,13 @@ INLINE UINT32 m68ki_read_imm_32(m68000_base_device *m68k)
* These functions will also check for address error and set the function
* code if they are enabled in m68kconf.h.
*/
-INLINE UINT32 m68ki_read_8_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc)
+static inline UINT32 m68ki_read_8_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc)
{
m68k->mmu_tmp_fc = fc;
m68k->mmu_tmp_rw = 1;
return m68k->/*memory.*/read8(address);
}
-INLINE UINT32 m68ki_read_16_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc)
+static inline UINT32 m68ki_read_16_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc)
{
if (CPU_TYPE_IS_010_LESS(m68k->cpu_type))
{
@@ -805,7 +805,7 @@ INLINE UINT32 m68ki_read_16_fc(m68000_base_device *m68k, UINT32 address, UINT32
m68k->mmu_tmp_rw = 1;
return m68k->/*memory.*/read16(address);
}
-INLINE UINT32 m68ki_read_32_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc)
+static inline UINT32 m68ki_read_32_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc)
{
if (CPU_TYPE_IS_010_LESS(m68k->cpu_type))
{
@@ -816,13 +816,13 @@ INLINE UINT32 m68ki_read_32_fc(m68000_base_device *m68k, UINT32 address, UINT32
return m68k->/*memory.*/read32(address);
}
-INLINE void m68ki_write_8_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value)
+static inline void m68ki_write_8_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value)
{
m68k->mmu_tmp_fc = fc;
m68k->mmu_tmp_rw = 0;
m68k->/*memory.*/write8(address, value);
}
-INLINE void m68ki_write_16_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value)
+static inline void m68ki_write_16_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value)
{
if (CPU_TYPE_IS_010_LESS(m68k->cpu_type))
{
@@ -832,7 +832,7 @@ INLINE void m68ki_write_16_fc(m68000_base_device *m68k, UINT32 address, UINT32 f
m68k->mmu_tmp_rw = 0;
m68k->/*memory.*/write16(address, value);
}
-INLINE void m68ki_write_32_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value)
+static inline void m68ki_write_32_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value)
{
if (CPU_TYPE_IS_010_LESS(m68k->cpu_type))
{
@@ -848,7 +848,7 @@ INLINE void m68ki_write_32_fc(m68000_base_device *m68k, UINT32 address, UINT32 f
* A real 68k first writes the high word to [address+2], and then writes the
* low word to [address].
*/
-INLINE void m68ki_write_32_pd_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value)
+static inline void m68ki_write_32_pd_fc(m68000_base_device *m68k, UINT32 address, UINT32 fc, UINT32 value)
{
if (CPU_TYPE_IS_010_LESS(m68k->cpu_type))
{
@@ -866,14 +866,14 @@ INLINE void m68ki_write_32_pd_fc(m68000_base_device *m68k, UINT32 address, UINT3
/* The program counter relative addressing modes cause operands to be
* retrieved from program space, not data space.
*/
-INLINE UINT32 m68ki_get_ea_pcdi(m68000_base_device *m68k)
+static inline UINT32 m68ki_get_ea_pcdi(m68000_base_device *m68k)
{
UINT32 old_pc = REG_PC(m68k);
return old_pc + MAKE_INT_16(m68ki_read_imm_16(m68k));
}
-INLINE UINT32 m68ki_get_ea_pcix(m68000_base_device *m68k)
+static inline UINT32 m68ki_get_ea_pcix(m68000_base_device *m68k)
{
return m68ki_get_ea_ix(m68k, REG_PC(m68k));
}
@@ -920,7 +920,7 @@ INLINE UINT32 m68ki_get_ea_pcix(m68000_base_device *m68k)
* 1 011 mem indir with long outer
* 1 100-111 reserved
*/
-INLINE UINT32 m68ki_get_ea_ix(m68000_base_device *m68k, UINT32 An)
+static inline UINT32 m68ki_get_ea_ix(m68000_base_device *m68k, UINT32 An)
{
/* An = base register */
UINT32 extension = m68ki_read_imm_16(m68k);
@@ -993,78 +993,78 @@ INLINE UINT32 m68ki_get_ea_ix(m68000_base_device *m68k, UINT32 An)
/* Fetch operands */
-INLINE UINT32 OPER_AY_AI_8(m68000_base_device *m68k) {UINT32 ea = EA_AY_AI_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_AY_AI_16(m68000_base_device *m68k) {UINT32 ea = EA_AY_AI_16(m68k); return m68ki_read_16(m68k, ea);}
-INLINE UINT32 OPER_AY_AI_32(m68000_base_device *m68k) {UINT32 ea = EA_AY_AI_32(m68k); return m68ki_read_32(m68k, ea);}
-INLINE UINT32 OPER_AY_PI_8(m68000_base_device *m68k) {UINT32 ea = EA_AY_PI_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_AY_PI_16(m68000_base_device *m68k) {UINT32 ea = EA_AY_PI_16(m68k); return m68ki_read_16(m68k, ea);}
-INLINE UINT32 OPER_AY_PI_32(m68000_base_device *m68k) {UINT32 ea = EA_AY_PI_32(m68k); return m68ki_read_32(m68k, ea);}
-INLINE UINT32 OPER_AY_PD_8(m68000_base_device *m68k) {UINT32 ea = EA_AY_PD_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_AY_PD_16(m68000_base_device *m68k) {UINT32 ea = EA_AY_PD_16(m68k); return m68ki_read_16(m68k, ea);}
-INLINE UINT32 OPER_AY_PD_32(m68000_base_device *m68k) {UINT32 ea = EA_AY_PD_32(m68k); return m68ki_read_32(m68k, ea);}
-INLINE UINT32 OPER_AY_DI_8(m68000_base_device *m68k) {UINT32 ea = EA_AY_DI_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_AY_DI_16(m68000_base_device *m68k) {UINT32 ea = EA_AY_DI_16(m68k); return m68ki_read_16(m68k, ea);}
-INLINE UINT32 OPER_AY_DI_32(m68000_base_device *m68k) {UINT32 ea = EA_AY_DI_32(m68k); return m68ki_read_32(m68k, ea);}
-INLINE UINT32 OPER_AY_IX_8(m68000_base_device *m68k) {UINT32 ea = EA_AY_IX_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_AY_IX_16(m68000_base_device *m68k) {UINT32 ea = EA_AY_IX_16(m68k); return m68ki_read_16(m68k, ea);}
-INLINE UINT32 OPER_AY_IX_32(m68000_base_device *m68k) {UINT32 ea = EA_AY_IX_32(m68k); return m68ki_read_32(m68k, ea);}
-
-INLINE UINT32 OPER_AX_AI_8(m68000_base_device *m68k) {UINT32 ea = EA_AX_AI_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_AX_AI_16(m68000_base_device *m68k) {UINT32 ea = EA_AX_AI_16(m68k); return m68ki_read_16(m68k, ea);}
-INLINE UINT32 OPER_AX_AI_32(m68000_base_device *m68k) {UINT32 ea = EA_AX_AI_32(m68k); return m68ki_read_32(m68k, ea);}
-INLINE UINT32 OPER_AX_PI_8(m68000_base_device *m68k) {UINT32 ea = EA_AX_PI_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_AX_PI_16(m68000_base_device *m68k) {UINT32 ea = EA_AX_PI_16(m68k); return m68ki_read_16(m68k, ea);}
-INLINE UINT32 OPER_AX_PI_32(m68000_base_device *m68k) {UINT32 ea = EA_AX_PI_32(m68k); return m68ki_read_32(m68k, ea);}
-INLINE UINT32 OPER_AX_PD_8(m68000_base_device *m68k) {UINT32 ea = EA_AX_PD_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_AX_PD_16(m68000_base_device *m68k) {UINT32 ea = EA_AX_PD_16(m68k); return m68ki_read_16(m68k, ea);}
-INLINE UINT32 OPER_AX_PD_32(m68000_base_device *m68k) {UINT32 ea = EA_AX_PD_32(m68k); return m68ki_read_32(m68k, ea);}
-INLINE UINT32 OPER_AX_DI_8(m68000_base_device *m68k) {UINT32 ea = EA_AX_DI_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_AX_DI_16(m68000_base_device *m68k) {UINT32 ea = EA_AX_DI_16(m68k); return m68ki_read_16(m68k, ea);}
-INLINE UINT32 OPER_AX_DI_32(m68000_base_device *m68k) {UINT32 ea = EA_AX_DI_32(m68k); return m68ki_read_32(m68k, ea);}
-INLINE UINT32 OPER_AX_IX_8(m68000_base_device *m68k) {UINT32 ea = EA_AX_IX_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_AX_IX_16(m68000_base_device *m68k) {UINT32 ea = EA_AX_IX_16(m68k); return m68ki_read_16(m68k, ea);}
-INLINE UINT32 OPER_AX_IX_32(m68000_base_device *m68k) {UINT32 ea = EA_AX_IX_32(m68k); return m68ki_read_32(m68k, ea);}
-
-INLINE UINT32 OPER_A7_PI_8(m68000_base_device *m68k) {UINT32 ea = EA_A7_PI_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_A7_PD_8(m68000_base_device *m68k) {UINT32 ea = EA_A7_PD_8(m68k); return m68ki_read_8(m68k, ea); }
-
-INLINE UINT32 OPER_AW_8(m68000_base_device *m68k) {UINT32 ea = EA_AW_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_AW_16(m68000_base_device *m68k) {UINT32 ea = EA_AW_16(m68k); return m68ki_read_16(m68k, ea);}
-INLINE UINT32 OPER_AW_32(m68000_base_device *m68k) {UINT32 ea = EA_AW_32(m68k); return m68ki_read_32(m68k, ea);}
-INLINE UINT32 OPER_AL_8(m68000_base_device *m68k) {UINT32 ea = EA_AL_8(m68k); return m68ki_read_8(m68k, ea); }
-INLINE UINT32 OPER_AL_16(m68000_base_device *m68k) {UINT32 ea = EA_AL_16(m68k); return m68ki_read_16(m68k, ea);}
-INLINE UINT32 OPER_AL_32(m68000_base_device *m68k) {UINT32 ea = EA_AL_32(m68k); return m68ki_read_32(m68k, ea);}
-INLINE UINT32 OPER_PCDI_8(m68000_base_device *m68k) {UINT32 ea = EA_PCDI_8(m68k); return m68ki_read_pcrel_8(m68k, ea); }
-INLINE UINT32 OPER_PCDI_16(m68000_base_device *m68k) {UINT32 ea = EA_PCDI_16(m68k); return m68ki_read_pcrel_16(m68k, ea);}
-INLINE UINT32 OPER_PCDI_32(m68000_base_device *m68k) {UINT32 ea = EA_PCDI_32(m68k); return m68ki_read_pcrel_32(m68k, ea);}
-INLINE UINT32 OPER_PCIX_8(m68000_base_device *m68k) {UINT32 ea = EA_PCIX_8(m68k); return m68ki_read_pcrel_8(m68k, ea); }
-INLINE UINT32 OPER_PCIX_16(m68000_base_device *m68k) {UINT32 ea = EA_PCIX_16(m68k); return m68ki_read_pcrel_16(m68k, ea);}
-INLINE UINT32 OPER_PCIX_32(m68000_base_device *m68k) {UINT32 ea = EA_PCIX_32(m68k); return m68ki_read_pcrel_32(m68k, ea);}
+static inline UINT32 OPER_AY_AI_8(m68000_base_device *m68k) {UINT32 ea = EA_AY_AI_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_AY_AI_16(m68000_base_device *m68k) {UINT32 ea = EA_AY_AI_16(m68k); return m68ki_read_16(m68k, ea);}
+static inline UINT32 OPER_AY_AI_32(m68000_base_device *m68k) {UINT32 ea = EA_AY_AI_32(m68k); return m68ki_read_32(m68k, ea);}
+static inline UINT32 OPER_AY_PI_8(m68000_base_device *m68k) {UINT32 ea = EA_AY_PI_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_AY_PI_16(m68000_base_device *m68k) {UINT32 ea = EA_AY_PI_16(m68k); return m68ki_read_16(m68k, ea);}
+static inline UINT32 OPER_AY_PI_32(m68000_base_device *m68k) {UINT32 ea = EA_AY_PI_32(m68k); return m68ki_read_32(m68k, ea);}
+static inline UINT32 OPER_AY_PD_8(m68000_base_device *m68k) {UINT32 ea = EA_AY_PD_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_AY_PD_16(m68000_base_device *m68k) {UINT32 ea = EA_AY_PD_16(m68k); return m68ki_read_16(m68k, ea);}
+static inline UINT32 OPER_AY_PD_32(m68000_base_device *m68k) {UINT32 ea = EA_AY_PD_32(m68k); return m68ki_read_32(m68k, ea);}
+static inline UINT32 OPER_AY_DI_8(m68000_base_device *m68k) {UINT32 ea = EA_AY_DI_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_AY_DI_16(m68000_base_device *m68k) {UINT32 ea = EA_AY_DI_16(m68k); return m68ki_read_16(m68k, ea);}
+static inline UINT32 OPER_AY_DI_32(m68000_base_device *m68k) {UINT32 ea = EA_AY_DI_32(m68k); return m68ki_read_32(m68k, ea);}
+static inline UINT32 OPER_AY_IX_8(m68000_base_device *m68k) {UINT32 ea = EA_AY_IX_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_AY_IX_16(m68000_base_device *m68k) {UINT32 ea = EA_AY_IX_16(m68k); return m68ki_read_16(m68k, ea);}
+static inline UINT32 OPER_AY_IX_32(m68000_base_device *m68k) {UINT32 ea = EA_AY_IX_32(m68k); return m68ki_read_32(m68k, ea);}
+
+static inline UINT32 OPER_AX_AI_8(m68000_base_device *m68k) {UINT32 ea = EA_AX_AI_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_AX_AI_16(m68000_base_device *m68k) {UINT32 ea = EA_AX_AI_16(m68k); return m68ki_read_16(m68k, ea);}
+static inline UINT32 OPER_AX_AI_32(m68000_base_device *m68k) {UINT32 ea = EA_AX_AI_32(m68k); return m68ki_read_32(m68k, ea);}
+static inline UINT32 OPER_AX_PI_8(m68000_base_device *m68k) {UINT32 ea = EA_AX_PI_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_AX_PI_16(m68000_base_device *m68k) {UINT32 ea = EA_AX_PI_16(m68k); return m68ki_read_16(m68k, ea);}
+static inline UINT32 OPER_AX_PI_32(m68000_base_device *m68k) {UINT32 ea = EA_AX_PI_32(m68k); return m68ki_read_32(m68k, ea);}
+static inline UINT32 OPER_AX_PD_8(m68000_base_device *m68k) {UINT32 ea = EA_AX_PD_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_AX_PD_16(m68000_base_device *m68k) {UINT32 ea = EA_AX_PD_16(m68k); return m68ki_read_16(m68k, ea);}
+static inline UINT32 OPER_AX_PD_32(m68000_base_device *m68k) {UINT32 ea = EA_AX_PD_32(m68k); return m68ki_read_32(m68k, ea);}
+static inline UINT32 OPER_AX_DI_8(m68000_base_device *m68k) {UINT32 ea = EA_AX_DI_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_AX_DI_16(m68000_base_device *m68k) {UINT32 ea = EA_AX_DI_16(m68k); return m68ki_read_16(m68k, ea);}
+static inline UINT32 OPER_AX_DI_32(m68000_base_device *m68k) {UINT32 ea = EA_AX_DI_32(m68k); return m68ki_read_32(m68k, ea);}
+static inline UINT32 OPER_AX_IX_8(m68000_base_device *m68k) {UINT32 ea = EA_AX_IX_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_AX_IX_16(m68000_base_device *m68k) {UINT32 ea = EA_AX_IX_16(m68k); return m68ki_read_16(m68k, ea);}
+static inline UINT32 OPER_AX_IX_32(m68000_base_device *m68k) {UINT32 ea = EA_AX_IX_32(m68k); return m68ki_read_32(m68k, ea);}
+
+static inline UINT32 OPER_A7_PI_8(m68000_base_device *m68k) {UINT32 ea = EA_A7_PI_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_A7_PD_8(m68000_base_device *m68k) {UINT32 ea = EA_A7_PD_8(m68k); return m68ki_read_8(m68k, ea); }
+
+static inline UINT32 OPER_AW_8(m68000_base_device *m68k) {UINT32 ea = EA_AW_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_AW_16(m68000_base_device *m68k) {UINT32 ea = EA_AW_16(m68k); return m68ki_read_16(m68k, ea);}
+static inline UINT32 OPER_AW_32(m68000_base_device *m68k) {UINT32 ea = EA_AW_32(m68k); return m68ki_read_32(m68k, ea);}
+static inline UINT32 OPER_AL_8(m68000_base_device *m68k) {UINT32 ea = EA_AL_8(m68k); return m68ki_read_8(m68k, ea); }
+static inline UINT32 OPER_AL_16(m68000_base_device *m68k) {UINT32 ea = EA_AL_16(m68k); return m68ki_read_16(m68k, ea);}
+static inline UINT32 OPER_AL_32(m68000_base_device *m68k) {UINT32 ea = EA_AL_32(m68k); return m68ki_read_32(m68k, ea);}
+static inline UINT32 OPER_PCDI_8(m68000_base_device *m68k) {UINT32 ea = EA_PCDI_8(m68k); return m68ki_read_pcrel_8(m68k, ea); }
+static inline UINT32 OPER_PCDI_16(m68000_base_device *m68k) {UINT32 ea = EA_PCDI_16(m68k); return m68ki_read_pcrel_16(m68k, ea);}
+static inline UINT32 OPER_PCDI_32(m68000_base_device *m68k) {UINT32 ea = EA_PCDI_32(m68k); return m68ki_read_pcrel_32(m68k, ea);}
+static inline UINT32 OPER_PCIX_8(m68000_base_device *m68k) {UINT32 ea = EA_PCIX_8(m68k); return m68ki_read_pcrel_8(m68k, ea); }
+static inline UINT32 OPER_PCIX_16(m68000_base_device *m68k) {UINT32 ea = EA_PCIX_16(m68k); return m68ki_read_pcrel_16(m68k, ea);}
+static inline UINT32 OPER_PCIX_32(m68000_base_device *m68k) {UINT32 ea = EA_PCIX_32(m68k); return m68ki_read_pcrel_32(m68k, ea);}
/* ---------------------------- Stack Functions --------------------------- */
/* Push/pull data from the stack */
-INLINE void m68ki_push_16(m68000_base_device *m68k, UINT32 value)
+static inline void m68ki_push_16(m68000_base_device *m68k, UINT32 value)
{
REG_SP(m68k) = MASK_OUT_ABOVE_32(REG_SP(m68k) - 2);
m68ki_write_16(m68k, REG_SP(m68k), value);
}
-INLINE void m68ki_push_32(m68000_base_device *m68k, UINT32 value)
+static inline void m68ki_push_32(m68000_base_device *m68k, UINT32 value)
{
REG_SP(m68k) = MASK_OUT_ABOVE_32(REG_SP(m68k) - 4);
m68ki_write_32(m68k, REG_SP(m68k), value);
}
-INLINE UINT32 m68ki_pull_16(m68000_base_device *m68k)
+static inline UINT32 m68ki_pull_16(m68000_base_device *m68k)
{
REG_SP(m68k) = MASK_OUT_ABOVE_32(REG_SP(m68k) + 2);
return m68ki_read_16(m68k, REG_SP(m68k)-2);
}
-INLINE UINT32 m68ki_pull_32(m68000_base_device *m68k)
+static inline UINT32 m68ki_pull_32(m68000_base_device *m68k)
{
REG_SP(m68k) = MASK_OUT_ABOVE_32(REG_SP(m68k) + 4);
return m68ki_read_32(m68k, REG_SP(m68k)-4);
@@ -1074,22 +1074,22 @@ INLINE UINT32 m68ki_pull_32(m68000_base_device *m68k)
/* Increment/decrement the stack as if doing a push/pull but
* don't do any memory access.
*/
-INLINE void m68ki_fake_push_16(m68000_base_device *m68k)
+static inline void m68ki_fake_push_16(m68000_base_device *m68k)
{
REG_SP(m68k) = MASK_OUT_ABOVE_32(REG_SP(m68k) - 2);
}
-INLINE void m68ki_fake_push_32(m68000_base_device *m68k)
+static inline void m68ki_fake_push_32(m68000_base_device *m68k)
{
REG_SP(m68k) = MASK_OUT_ABOVE_32(REG_SP(m68k) - 4);
}
-INLINE void m68ki_fake_pull_16(m68000_base_device *m68k)
+static inline void m68ki_fake_pull_16(m68000_base_device *m68k)
{
REG_SP(m68k) = MASK_OUT_ABOVE_32(REG_SP(m68k) + 2);
}
-INLINE void m68ki_fake_pull_32(m68000_base_device *m68k)
+static inline void m68ki_fake_pull_32(m68000_base_device *m68k)
{
REG_SP(m68k) = MASK_OUT_ABOVE_32(REG_SP(m68k) + 4);
}
@@ -1101,12 +1101,12 @@ INLINE void m68ki_fake_pull_32(m68000_base_device *m68k)
* These functions will also call the pc_changed callback if it was enabled
* in m68kconf.h.
*/
-INLINE void m68ki_jump(m68000_base_device *m68k, UINT32 new_pc)
+static inline void m68ki_jump(m68000_base_device *m68k, UINT32 new_pc)
{
REG_PC(m68k) = new_pc;
}
-INLINE void m68ki_jump_vector(m68000_base_device *m68k, UINT32 vector)
+static inline void m68ki_jump_vector(m68000_base_device *m68k, UINT32 vector)
{
REG_PC(m68k) = (vector<<2) + m68k->vbr;
REG_PC(m68k) = m68ki_read_data_32(m68k, REG_PC(m68k));
@@ -1118,17 +1118,17 @@ INLINE void m68ki_jump_vector(m68000_base_device *m68k, UINT32 vector)
* So far I've found no problems with not calling pc_changed for 8 or 16
* bit branches.
*/
-INLINE void m68ki_branch_8(m68000_base_device *m68k, UINT32 offset)
+static inline void m68ki_branch_8(m68000_base_device *m68k, UINT32 offset)
{
REG_PC(m68k) += MAKE_INT_8(offset);
}
-INLINE void m68ki_branch_16(m68000_base_device *m68k, UINT32 offset)
+static inline void m68ki_branch_16(m68000_base_device *m68k, UINT32 offset)
{
REG_PC(m68k) += MAKE_INT_16(offset);
}
-INLINE void m68ki_branch_32(m68000_base_device *m68k, UINT32 offset)
+static inline void m68ki_branch_32(m68000_base_device *m68k, UINT32 offset)
{
REG_PC(m68k) += offset;
}
@@ -1140,7 +1140,7 @@ INLINE void m68ki_branch_32(m68000_base_device *m68k, UINT32 offset)
/* Set the S flag and change the active stack pointer.
* Note that value MUST be 4 or 0.
*/
-INLINE void m68ki_set_s_flag(m68000_base_device *m68k, UINT32 value)
+static inline void m68ki_set_s_flag(m68000_base_device *m68k, UINT32 value)
{
/* Backup the old stack pointer */
REG_SP_BASE(m68k)[m68k->s_flag | ((m68k->s_flag>>1) & m68k->m_flag)] = REG_SP(m68k);
@@ -1153,7 +1153,7 @@ INLINE void m68ki_set_s_flag(m68000_base_device *m68k, UINT32 value)
/* Set the S and M flags and change the active stack pointer.
* Note that value MUST be 0, 2, 4, or 6 (bit2 = S, bit1 = M).
*/
-INLINE void m68ki_set_sm_flag(m68000_base_device *m68k, UINT32 value)
+static inline void m68ki_set_sm_flag(m68000_base_device *m68k, UINT32 value)
{
/* Backup the old stack pointer */
REG_SP_BASE(m68k)[m68k->s_flag | ((m68k->s_flag>>1) & m68k->m_flag)] = REG_SP(m68k);
@@ -1165,7 +1165,7 @@ INLINE void m68ki_set_sm_flag(m68000_base_device *m68k, UINT32 value)
}
/* Set the S and M flags. Don't touch the stack pointer. */
-INLINE void m68ki_set_sm_flag_nosp(m68000_base_device *m68k, UINT32 value)
+static inline void m68ki_set_sm_flag_nosp(m68000_base_device *m68k, UINT32 value)
{
/* Set the S and M flags */
m68k->s_flag = value & SFLAG_SET;
@@ -1174,7 +1174,7 @@ INLINE void m68ki_set_sm_flag_nosp(m68000_base_device *m68k, UINT32 value)
/* Set the condition code register */
-INLINE void m68ki_set_ccr(m68000_base_device *m68k, UINT32 value)
+static inline void m68ki_set_ccr(m68000_base_device *m68k, UINT32 value)
{
m68k->x_flag = BIT_4(value) << 4;
m68k->n_flag = BIT_3(value) << 4;
@@ -1184,7 +1184,7 @@ INLINE void m68ki_set_ccr(m68000_base_device *m68k, UINT32 value)
}
/* Set the status register but don't check for interrupts */
-INLINE void m68ki_set_sr_noint(m68000_base_device *m68k, UINT32 value)
+static inline void m68ki_set_sr_noint(m68000_base_device *m68k, UINT32 value)
{
/* Mask out the "unimplemented" bits */
value &= m68k->sr_mask;
@@ -1200,7 +1200,7 @@ INLINE void m68ki_set_sr_noint(m68000_base_device *m68k, UINT32 value)
/* Set the status register but don't check for interrupts nor
* change the stack pointer
*/
-INLINE void m68ki_set_sr_noint_nosp(m68000_base_device *m68k, UINT32 value)
+static inline void m68ki_set_sr_noint_nosp(m68000_base_device *m68k, UINT32 value)
{
/* Mask out the "unimplemented" bits */
value &= m68k->sr_mask;
@@ -1214,7 +1214,7 @@ INLINE void m68ki_set_sr_noint_nosp(m68000_base_device *m68k, UINT32 value)
}
/* Set the status register and check for interrupts */
-INLINE void m68ki_set_sr(m68000_base_device *m68k, UINT32 value)
+static inline void m68ki_set_sr(m68000_base_device *m68k, UINT32 value)
{
m68ki_set_sr_noint(m68k, value);
m68ki_check_interrupts(m68k);
@@ -1224,7 +1224,7 @@ INLINE void m68ki_set_sr(m68000_base_device *m68k, UINT32 value)
/* ------------------------- Exception Processing ------------------------- */
/* Initiate exception processing */
-INLINE UINT32 m68ki_init_exception(m68000_base_device *m68k)
+static inline UINT32 m68ki_init_exception(m68000_base_device *m68k)
{
/* Save the old status register */
UINT32 sr = m68ki_get_sr(m68k);
@@ -1239,7 +1239,7 @@ INLINE UINT32 m68ki_init_exception(m68000_base_device *m68k)
}
/* 3 word stack frame (68000 only) */
-INLINE void m68ki_stack_frame_3word(m68000_base_device *m68k, UINT32 pc, UINT32 sr)
+static inline void m68ki_stack_frame_3word(m68000_base_device *m68k, UINT32 pc, UINT32 sr)
{
m68ki_push_32(m68k, pc);
m68ki_push_16(m68k, sr);
@@ -1248,7 +1248,7 @@ INLINE void m68ki_stack_frame_3word(m68000_base_device *m68k, UINT32 pc, UINT32
/* Format 0 stack frame.
* This is the standard stack frame for 68010+.
*/
-INLINE void m68ki_stack_frame_0000(m68000_base_device *m68k, UINT32 pc, UINT32 sr, UINT32 vector)
+static inline void m68ki_stack_frame_0000(m68000_base_device *m68k, UINT32 pc, UINT32 sr, UINT32 vector)
{
/* Stack a 3-word frame if we are 68000 */
if(m68k->cpu_type == CPU_TYPE_000 || m68k->cpu_type == CPU_TYPE_008)
@@ -1264,7 +1264,7 @@ INLINE void m68ki_stack_frame_0000(m68000_base_device *m68k, UINT32 pc, UINT32 s
/* Format 1 stack frame (68020).
* For 68020, this is the 4 word throwaway frame.
*/
-INLINE void m68ki_stack_frame_0001(m68000_base_device *m68k, UINT32 pc, UINT32 sr, UINT32 vector)
+static inline void m68ki_stack_frame_0001(m68000_base_device *m68k, UINT32 pc, UINT32 sr, UINT32 vector)
{
m68ki_push_16(m68k, 0x1000 | (vector<<2));
m68ki_push_32(m68k, pc);
@@ -1274,7 +1274,7 @@ INLINE void m68ki_stack_frame_0001(m68000_base_device *m68k, UINT32 pc, UINT32 s
/* Format 2 stack frame.
* This is used only by 68020 for trap exceptions.
*/
-INLINE void m68ki_stack_frame_0010(m68000_base_device *m68k, UINT32 sr, UINT32 vector)
+static inline void m68ki_stack_frame_0010(m68000_base_device *m68k, UINT32 sr, UINT32 vector)
{
m68ki_push_32(m68k, REG_PPC(m68k));
m68ki_push_16(m68k, 0x2000 | (vector<<2));
@@ -1285,7 +1285,7 @@ INLINE void m68ki_stack_frame_0010(m68000_base_device *m68k, UINT32 sr, UINT32 v
/* Bus error stack frame (68000 only).
*/
-INLINE void m68ki_stack_frame_buserr(m68000_base_device *m68k, UINT32 sr)
+static inline void m68ki_stack_frame_buserr(m68000_base_device *m68k, UINT32 sr)
{
m68ki_push_32(m68k, REG_PC(m68k));
m68ki_push_16(m68k, sr);
@@ -1302,7 +1302,7 @@ INLINE void m68ki_stack_frame_buserr(m68000_base_device *m68k, UINT32 sr)
/* Format 8 stack frame (68010).
* 68010 only. This is the 29 word bus/address error frame.
*/
-INLINE void m68ki_stack_frame_1000(m68000_base_device *m68k, UINT32 pc, UINT32 sr, UINT32 vector)
+static inline void m68ki_stack_frame_1000(m68000_base_device *m68k, UINT32 pc, UINT32 sr, UINT32 vector)
{
/* VERSION
* NUMBER
@@ -1356,7 +1356,7 @@ INLINE void m68ki_stack_frame_1000(m68000_base_device *m68k, UINT32 pc, UINT32 s
* if the error happens at an instruction boundary.
* PC stacked is address of next instruction.
*/
-INLINE void m68ki_stack_frame_1010(m68000_base_device *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address)
+static inline void m68ki_stack_frame_1010(m68000_base_device *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address)
{
int orig_rw = m68k->mmu_tmp_buserror_rw; // this gets splatted by the following pushes, so save it now
int orig_fc = m68k->mmu_tmp_buserror_fc;
@@ -1408,7 +1408,7 @@ INLINE void m68ki_stack_frame_1010(m68000_base_device *m68k, UINT32 sr, UINT32 v
* if the error happens during instruction execution.
* PC stacked is address of instruction in progress.
*/
-INLINE void m68ki_stack_frame_1011(m68000_base_device *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address)
+static inline void m68ki_stack_frame_1011(m68000_base_device *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address)
{
int orig_rw = m68k->mmu_tmp_buserror_rw; // this gets splatted by the following pushes, so save it now
int orig_fc = m68k->mmu_tmp_buserror_fc;
@@ -1482,7 +1482,7 @@ INLINE void m68ki_stack_frame_1011(m68000_base_device *m68k, UINT32 sr, UINT32 v
* This is used by the 68040 for bus fault and mmu trap
* 30 words
*/
-INLINE void m68ki_stack_frame_0111(m68000_base_device *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address, bool in_mmu)
+static inline void m68ki_stack_frame_0111(m68000_base_device *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address, bool in_mmu)
{
int orig_rw = m68k->mmu_tmp_buserror_rw; // this gets splatted by the following pushes, so save it now
int orig_fc = m68k->mmu_tmp_buserror_fc;
@@ -1525,7 +1525,7 @@ INLINE void m68ki_stack_frame_0111(m68000_base_device *m68k, UINT32 sr, UINT32 v
/* Used for Group 2 exceptions.
* These stack a type 2 frame on the 020.
*/
-INLINE void m68ki_exception_trap(m68000_base_device *m68k, UINT32 vector)
+static inline void m68ki_exception_trap(m68000_base_device *m68k, UINT32 vector)
{
UINT32 sr = m68ki_init_exception(m68k);
@@ -1541,7 +1541,7 @@ INLINE void m68ki_exception_trap(m68000_base_device *m68k, UINT32 vector)
}
/* Trap#n stacks a 0 frame but behaves like group2 otherwise */
-INLINE void m68ki_exception_trapN(m68000_base_device *m68k, UINT32 vector)
+static inline void m68ki_exception_trapN(m68000_base_device *m68k, UINT32 vector)
{
UINT32 sr = m68ki_init_exception(m68k);
m68ki_stack_frame_0000(m68k, REG_PC(m68k), sr, vector);
@@ -1552,7 +1552,7 @@ INLINE void m68ki_exception_trapN(m68000_base_device *m68k, UINT32 vector)
}
/* Exception for trace mode */
-INLINE void m68ki_exception_trace(m68000_base_device *m68k)
+static inline void m68ki_exception_trace(m68000_base_device *m68k)
{
UINT32 sr = m68ki_init_exception(m68k);
@@ -1577,7 +1577,7 @@ INLINE void m68ki_exception_trace(m68000_base_device *m68k)
}
/* Exception for privilege violation */
-INLINE void m68ki_exception_privilege_violation(m68000_base_device *m68k)
+static inline void m68ki_exception_privilege_violation(m68000_base_device *m68k)
{
UINT32 sr = m68ki_init_exception(m68k);
@@ -1594,7 +1594,7 @@ INLINE void m68ki_exception_privilege_violation(m68000_base_device *m68k)
}
/* Exception for A-Line instructions */
-INLINE void m68ki_exception_1010(m68000_base_device *m68k)
+static inline void m68ki_exception_1010(m68000_base_device *m68k)
{
UINT32 sr;
@@ -1607,7 +1607,7 @@ INLINE void m68ki_exception_1010(m68000_base_device *m68k)
}
/* Exception for F-Line instructions */
-INLINE void m68ki_exception_1111(m68000_base_device *m68k)
+static inline void m68ki_exception_1111(m68000_base_device *m68k)
{
UINT32 sr;
@@ -1620,7 +1620,7 @@ INLINE void m68ki_exception_1111(m68000_base_device *m68k)
}
/* Exception for illegal instructions */
-INLINE void m68ki_exception_illegal(m68000_base_device *m68k)
+static inline void m68ki_exception_illegal(m68000_base_device *m68k)
{
UINT32 sr;
@@ -1639,7 +1639,7 @@ INLINE void m68ki_exception_illegal(m68000_base_device *m68k)
}
/* Exception for format errror in RTE */
-INLINE void m68ki_exception_format_error(m68000_base_device *m68k)
+static inline void m68ki_exception_format_error(m68000_base_device *m68k)
{
UINT32 sr = m68ki_init_exception(m68k);
m68ki_stack_frame_0000(m68k, REG_PC(m68k), sr, EXCEPTION_FORMAT_ERROR);
@@ -1650,7 +1650,7 @@ INLINE void m68ki_exception_format_error(m68000_base_device *m68k)
}
/* Exception for address error */
-INLINE void m68ki_exception_address_error(m68000_base_device *m68k)
+static inline void m68ki_exception_address_error(m68000_base_device *m68k)
{
UINT32 sr = m68ki_init_exception(m68k);
@@ -1678,7 +1678,7 @@ INLINE void m68ki_exception_address_error(m68000_base_device *m68k)
/* ASG: Check for interrupts */
-INLINE void m68ki_check_interrupts(m68000_base_device *m68k)
+static inline void m68ki_check_interrupts(m68000_base_device *m68k)
{
if(m68k->nmi_pending)
{
diff --git a/src/devices/cpu/m68000/m68kfpu.inc b/src/devices/cpu/m68000/m68kfpu.inc
index d922e774b2f..6493bc1f614 100644
--- a/src/devices/cpu/m68000/m68kfpu.inc
+++ b/src/devices/cpu/m68000/m68kfpu.inc
@@ -32,7 +32,7 @@ static const UINT32 pkmask3[18] =
0xfffff000, 0xffffff00, 0xfffffff0, 0xffffffff,
};
-INLINE double fx80_to_double(floatx80 fx)
+static inline double fx80_to_double(floatx80 fx)
{
UINT64 d;
double *foo;
@@ -44,7 +44,7 @@ INLINE double fx80_to_double(floatx80 fx)
return *foo;
}
-INLINE floatx80 double_to_fx80(double in)
+static inline floatx80 double_to_fx80(double in)
{
UINT64 *d;
@@ -53,7 +53,7 @@ INLINE floatx80 double_to_fx80(double in)
return float64_to_floatx80(*d);
}
-INLINE floatx80 load_extended_float80(m68000_base_device *m68k, UINT32 ea)
+static inline floatx80 load_extended_float80(m68000_base_device *m68k, UINT32 ea)
{
UINT32 d1,d2;
UINT16 d3;
@@ -69,7 +69,7 @@ INLINE floatx80 load_extended_float80(m68000_base_device *m68k, UINT32 ea)
return fp;
}
-INLINE void store_extended_float80(m68000_base_device *m68k, UINT32 ea, floatx80 fpr)
+static inline void store_extended_float80(m68000_base_device *m68k, UINT32 ea, floatx80 fpr)
{
m68ki_write_16(m68k, ea+0, fpr.high);
m68ki_write_16(m68k, ea+2, 0);
@@ -77,7 +77,7 @@ INLINE void store_extended_float80(m68000_base_device *m68k, UINT32 ea, floatx80
m68ki_write_32(m68k, ea+8, fpr.low&0xffffffff);
}
-INLINE floatx80 load_pack_float80(m68000_base_device *m68k, UINT32 ea)
+static inline floatx80 load_pack_float80(m68000_base_device *m68k, UINT32 ea)
{
UINT32 dw1, dw2, dw3;
floatx80 result;
@@ -128,7 +128,7 @@ INLINE floatx80 load_pack_float80(m68000_base_device *m68k, UINT32 ea)
return result;
}
-INLINE void store_pack_float80(m68000_base_device *m68k, UINT32 ea, int k, floatx80 fpr)
+static inline void store_pack_float80(m68000_base_device *m68k, UINT32 ea, int k, floatx80 fpr)
{
UINT32 dw1, dw2, dw3;
char str[128], *ch;
@@ -260,7 +260,7 @@ INLINE void store_pack_float80(m68000_base_device *m68k, UINT32 ea, int k, float
m68ki_write_32(m68k, ea+8, dw3);
}
-INLINE void SET_CONDITION_CODES(m68000_base_device *m68k, floatx80 reg)
+static inline void SET_CONDITION_CODES(m68000_base_device *m68k, floatx80 reg)
{
// UINT64 *regi;
@@ -293,7 +293,7 @@ INLINE void SET_CONDITION_CODES(m68000_base_device *m68k, floatx80 reg)
}
}
-INLINE int TEST_CONDITION(m68000_base_device *m68k, int condition)
+static inline int TEST_CONDITION(m68000_base_device *m68k, int condition)
{
int n = (REG_FPSR(m68k) & FPCC_N) != 0;
int z = (REG_FPSR(m68k) & FPCC_Z) != 0;
diff --git a/src/devices/cpu/m68000/m68kmmu.h b/src/devices/cpu/m68000/m68kmmu.h
index 342fc8ea981..7c3649c134b 100644
--- a/src/devices/cpu/m68000/m68kmmu.h
+++ b/src/devices/cpu/m68000/m68kmmu.h
@@ -176,7 +176,7 @@ void pmmu_atc_flush(m68000_base_device *m68k)
}
-INLINE UINT32 get_dt2_table_entry(m68000_base_device *m68k, UINT32 tptr, UINT8 ptest)
+static inline UINT32 get_dt2_table_entry(m68000_base_device *m68k, UINT32 tptr, UINT8 ptest)
{
UINT32 tbl_entry = m68k->program->read_dword(tptr);
UINT32 dt = tbl_entry & M68K_MMU_DF_DT;
@@ -198,7 +198,7 @@ INLINE UINT32 get_dt2_table_entry(m68000_base_device *m68k, UINT32 tptr, UINT8 p
return tbl_entry;
}
-INLINE UINT32 get_dt3_table_entry(m68000_base_device *m68k, UINT32 tptr, UINT8 fc, UINT8 ptest)
+static inline UINT32 get_dt3_table_entry(m68000_base_device *m68k, UINT32 tptr, UINT8 fc, UINT8 ptest)
{
UINT32 tbl_entry2 = m68k->program->read_dword(tptr);
UINT32 tbl_entry = m68k->program->read_dword(tptr + 4);
@@ -226,7 +226,7 @@ INLINE UINT32 get_dt3_table_entry(m68000_base_device *m68k, UINT32 tptr, UINT8 f
/*
pmmu_translate_addr_with_fc: perform 68851/68030-style PMMU address translation
*/
-/*INLINE*/ static UINT32 pmmu_translate_addr_with_fc(m68000_base_device *m68k, UINT32 addr_in, UINT8 fc, UINT8 ptest)
+/*static inline*/ static UINT32 pmmu_translate_addr_with_fc(m68000_base_device *m68k, UINT32 addr_in, UINT8 fc, UINT8 ptest)
{
UINT32 addr_out, tbl_entry = 0, tamode = 0, tbmode = 0, tcmode = 0;
UINT32 root_aptr, root_limit, tofs, ps, is, abits, bbits, cbits;
@@ -525,7 +525,7 @@ INLINE UINT32 get_dt3_table_entry(m68000_base_device *m68k, UINT32 tptr, UINT8 f
// FC bits: 2 = supervisor, 1 = program, 0 = data
// the 68040 is a subset of the 68851 and 68030 PMMUs - the page table sizes are fixed, there is no early termination, etc, etc.
-/*INLINE*/ static UINT32 pmmu_translate_addr_with_fc_040(m68000_base_device *m68k, UINT32 addr_in, UINT8 fc, UINT8 ptest)
+/*static inline*/ static UINT32 pmmu_translate_addr_with_fc_040(m68000_base_device *m68k, UINT32 addr_in, UINT8 fc, UINT8 ptest)
{
UINT32 addr_out, tt0, tt1;
@@ -809,7 +809,7 @@ INLINE UINT32 get_dt3_table_entry(m68000_base_device *m68k, UINT32 tptr, UINT8 f
/*
pmmu_translate_addr: perform 68851/68030-style PMMU address translation
*/
-/*INLINE*/ static UINT32 pmmu_translate_addr(m68000_base_device *m68k, UINT32 addr_in)
+/*static inline*/ static UINT32 pmmu_translate_addr(m68000_base_device *m68k, UINT32 addr_in)
{
UINT32 addr_out;
@@ -1111,7 +1111,7 @@ void m68881_mmu_ops(m68000_base_device *m68k)
/* Apple HMMU translation is much simpler */
-INLINE UINT32 hmmu_translate_addr(m68000_base_device *m68k, UINT32 addr_in)
+static inline UINT32 hmmu_translate_addr(m68000_base_device *m68k, UINT32 addr_in)
{
UINT32 addr_out;
diff --git a/src/devices/cpu/mips/mips3com.cpp b/src/devices/cpu/mips/mips3com.cpp
index 0409014eeba..bcd6f6f349a 100644
--- a/src/devices/cpu/mips/mips3com.cpp
+++ b/src/devices/cpu/mips/mips3com.cpp
@@ -29,7 +29,7 @@ static void tlb_entry_log_half(mips3_tlb_entry *entry, int tlbindex, int which);
TLB entry matches the provided ASID
-------------------------------------------------*/
-INLINE int tlb_entry_matches_asid(const mips3_tlb_entry *entry, UINT8 asid)
+static inline int tlb_entry_matches_asid(const mips3_tlb_entry *entry, UINT8 asid)
{
return (entry->entry_hi & 0xff) == asid;
}
@@ -40,7 +40,7 @@ INLINE int tlb_entry_matches_asid(const mips3_tlb_entry *entry, UINT8 asid)
TLB entry is global
-------------------------------------------------*/
-INLINE int tlb_entry_is_global(const mips3_tlb_entry *entry)
+static inline int tlb_entry_is_global(const mips3_tlb_entry *entry)
{
return (entry->entry_lo[0] & entry->entry_lo[1] & TLB_GLOBAL);
}
diff --git a/src/devices/cpu/mips/mips3drc.cpp b/src/devices/cpu/mips/mips3drc.cpp
index 3c7d3bbba2d..02d73de3b14 100644
--- a/src/devices/cpu/mips/mips3drc.cpp
+++ b/src/devices/cpu/mips/mips3drc.cpp
@@ -91,7 +91,7 @@ static const UINT8 fcc_shift[8] = { 23, 25, 26, 27, 28, 29, 30, 31 };
descriptor
-------------------------------------------------*/
-INLINE UINT32 epc(const opcode_desc *desc)
+static inline UINT32 epc(const opcode_desc *desc)
{
return (desc->flags & OPFLAG_IN_DELAY_SLOT) ? (desc->pc - 3) : desc->pc;
}
@@ -102,7 +102,7 @@ INLINE UINT32 epc(const opcode_desc *desc)
already allocated
-------------------------------------------------*/
-INLINE void alloc_handle(drcuml_state *drcuml, code_handle **handleptr, const char *name)
+static inline void alloc_handle(drcuml_state *drcuml, code_handle **handleptr, const char *name)
{
if (*handleptr == nullptr)
*handleptr = drcuml->handle_alloc(name);
diff --git a/src/devices/cpu/mips/mips3dsm.cpp b/src/devices/cpu/mips/mips3dsm.cpp
index d453a17f1c0..1b0d6e52286 100644
--- a/src/devices/cpu/mips/mips3dsm.cpp
+++ b/src/devices/cpu/mips/mips3dsm.cpp
@@ -101,7 +101,7 @@ static const char *const ccreg[4][32] =
CODE CODE
***************************************************************************/
-INLINE char *signed_16bit(INT16 val)
+static inline char *signed_16bit(INT16 val)
{
static char temp[10];
if (val < 0)
diff --git a/src/devices/cpu/mips/r3kdasm.cpp b/src/devices/cpu/mips/r3kdasm.cpp
index 78521a9679f..ed0da525a98 100644
--- a/src/devices/cpu/mips/r3kdasm.cpp
+++ b/src/devices/cpu/mips/r3kdasm.cpp
@@ -82,7 +82,7 @@ static const char *const ccreg[4][32] =
CODE CODE
***************************************************************************/
-INLINE char *signed_16bit(INT16 val)
+static inline char *signed_16bit(INT16 val)
{
static char temp[10];
if (val < 0)
diff --git a/src/devices/cpu/nec/necdasm.cpp b/src/devices/cpu/nec/necdasm.cpp
index 594bef384ed..cd326436fd4 100644
--- a/src/devices/cpu/nec/necdasm.cpp
+++ b/src/devices/cpu/nec/necdasm.cpp
@@ -875,7 +875,7 @@ static char modrm_string[256];
#define MAX_LENGTH 8
-INLINE UINT8 FETCH(void)
+static inline UINT8 FETCH(void)
{
if ((opcode_ptr - opcode_ptr_base) + 1 > MAX_LENGTH)
return 0xff;
@@ -884,7 +884,7 @@ INLINE UINT8 FETCH(void)
}
#if 0
-INLINE UINT16 FETCH16(void)
+static inline UINT16 FETCH16(void)
{
UINT16 d;
if ((opcode_ptr - opcode_ptr_base) + 2 > MAX_LENGTH)
@@ -896,7 +896,7 @@ INLINE UINT16 FETCH16(void)
}
#endif
-INLINE UINT8 FETCHD(void)
+static inline UINT8 FETCHD(void)
{
if ((opcode_ptr - opcode_ptr_base) + 1 > MAX_LENGTH)
return 0xff;
@@ -904,7 +904,7 @@ INLINE UINT8 FETCHD(void)
return *opcode_ptr++;
}
-INLINE UINT16 FETCHD16(void)
+static inline UINT16 FETCHD16(void)
{
UINT16 d;
if ((opcode_ptr - opcode_ptr_base) + 2 > MAX_LENGTH)
diff --git a/src/devices/cpu/pdp1/pdp1dasm.cpp b/src/devices/cpu/pdp1/pdp1dasm.cpp
index c8682ca1491..ec58c6e2e38 100644
--- a/src/devices/cpu/pdp1/pdp1dasm.cpp
+++ b/src/devices/cpu/pdp1/pdp1dasm.cpp
@@ -7,7 +7,7 @@
static int ib;
static int y;
-INLINE void ea (void)
+static inline void ea (void)
{
/* while (1)
{
diff --git a/src/devices/cpu/powerpc/ppccom.cpp b/src/devices/cpu/powerpc/ppccom.cpp
index bd95e60fc2a..6c8d4397206 100644
--- a/src/devices/cpu/powerpc/ppccom.cpp
+++ b/src/devices/cpu/powerpc/ppccom.cpp
@@ -306,7 +306,7 @@ ppc405gp_device::ppc405gp_device(const machine_config &mconfig, const char *tag,
of access and the protection bits
-------------------------------------------------*/
-INLINE int page_access_allowed(int transtype, UINT8 key, UINT8 protbits)
+static inline int page_access_allowed(int transtype, UINT8 key, UINT8 protbits)
{
if (key == 0)
return (transtype == TRANSLATE_WRITE) ? (protbits != 3) : TRUE;
@@ -450,7 +450,7 @@ inline void ppc_device::set_decrementer(UINT32 newdec)
is_nan_double - is a double value a NaN
-------------------------------------------------*/
-INLINE int is_nan_double(double x)
+static inline int is_nan_double(double x)
{
UINT64 xi = *(UINT64*)&x;
return( ((xi & DOUBLE_EXP) == DOUBLE_EXP) &&
@@ -464,7 +464,7 @@ INLINE int is_nan_double(double x)
quiet NaN
-------------------------------------------------*/
-INLINE int is_qnan_double(double x)
+static inline int is_qnan_double(double x)
{
UINT64 xi = *(UINT64*)&x;
return( ((xi & DOUBLE_EXP) == DOUBLE_EXP) &&
@@ -479,7 +479,7 @@ INLINE int is_qnan_double(double x)
signaling NaN
-------------------------------------------------*/
-INLINE int is_snan_double(double x)
+static inline int is_snan_double(double x)
{
UINT64 xi = *(UINT64*)&x;
return( ((xi & DOUBLE_EXP) == DOUBLE_EXP) &&
@@ -494,7 +494,7 @@ INLINE int is_snan_double(double x)
infinity
-------------------------------------------------*/
-INLINE int is_infinity_double(double x)
+static inline int is_infinity_double(double x)
{
UINT64 xi = *(UINT64*)&x;
return( ((xi & DOUBLE_EXP) == DOUBLE_EXP) &&
@@ -507,7 +507,7 @@ INLINE int is_infinity_double(double x)
normalized
-------------------------------------------------*/
-INLINE int is_normalized_double(double x)
+static inline int is_normalized_double(double x)
{
UINT64 exp;
UINT64 xi = *(UINT64*)&x;
@@ -522,7 +522,7 @@ INLINE int is_normalized_double(double x)
denormalized
-------------------------------------------------*/
-INLINE int is_denormalized_double(double x)
+static inline int is_denormalized_double(double x)
{
UINT64 xi = *(UINT64*)&x;
return( ((xi & DOUBLE_EXP) == 0) &&
@@ -534,7 +534,7 @@ INLINE int is_denormalized_double(double x)
sign_double - return sign of a double value
-------------------------------------------------*/
-INLINE int sign_double(double x)
+static inline int sign_double(double x)
{
UINT64 xi = *(UINT64*)&x;
return ((xi & DOUBLE_SIGN) != 0);
diff --git a/src/devices/cpu/psx/dma.cpp b/src/devices/cpu/psx/dma.cpp
index b77c6e9d8e5..f2f048c39ff 100644
--- a/src/devices/cpu/psx/dma.cpp
+++ b/src/devices/cpu/psx/dma.cpp
@@ -12,7 +12,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/devices/cpu/psx/gte.cpp b/src/devices/cpu/psx/gte.cpp
index 7b33804b289..fb3352737db 100644
--- a/src/devices/cpu/psx/gte.cpp
+++ b/src/devices/cpu/psx/gte.cpp
@@ -21,7 +21,7 @@ void ATTR_PRINTF(2,3) GTELOG( UINT32 pc, const char *a, ...)
logerror( "%08x: GTE: %s\n", pc, s_text );
}
#else
-INLINE void ATTR_PRINTF(2,3) GTELOG( UINT32 pc, const char *a, ...) {}
+static inline void ATTR_PRINTF(2,3) GTELOG( UINT32 pc, const char *a, ...) {}
#endif
@@ -278,7 +278,7 @@ void gte::setcp2cr( UINT32 pc, int reg, UINT32 value )
m_cp2cr[ reg ].d = value;
}
-INLINE INT64 gte_shift( INT64 a, int sf )
+static inline INT64 gte_shift( INT64 a, int sf )
{
if( sf > 0 )
{
@@ -307,7 +307,7 @@ INT32 gte::BOUNDS( int44 value, int max_flag, int min_flag )
return gte_shift( value.value(), m_sf );
}
-INLINE UINT32 gte_divide( UINT16 numerator, UINT16 denominator )
+static inline UINT32 gte_divide( UINT16 numerator, UINT16 denominator )
{
if( numerator < ( denominator * 2 ) )
{
diff --git a/src/devices/cpu/psx/irq.cpp b/src/devices/cpu/psx/irq.cpp
index a15b091d23f..4a2293d758c 100644
--- a/src/devices/cpu/psx/irq.cpp
+++ b/src/devices/cpu/psx/irq.cpp
@@ -14,7 +14,7 @@
#define PSX_IRQ_MASK ( 0x7fd )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/devices/cpu/psx/mdec.cpp b/src/devices/cpu/psx/mdec.cpp
index 0ad4ec3e2c3..3c0148525d5 100644
--- a/src/devices/cpu/psx/mdec.cpp
+++ b/src/devices/cpu/psx/mdec.cpp
@@ -15,7 +15,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -83,13 +83,13 @@ void psxmdec_device::device_start()
}
#ifdef UNUSED_FUNCTION
-INLINE void psxwriteword( UINT32 *p_n_psxram, UINT32 n_address, UINT16 n_data )
+static inline void psxwriteword( UINT32 *p_n_psxram, UINT32 n_address, UINT16 n_data )
{
*( (UINT16 *)( (UINT8 *)p_n_psxram + WORD_XOR_LE( n_address ) ) ) = n_data;
}
#endif
-INLINE UINT16 psxreadword( UINT32 *p_n_psxram, UINT32 n_address )
+static inline UINT16 psxreadword( UINT32 *p_n_psxram, UINT32 n_address )
{
return *( (UINT16 *)( (UINT8 *)p_n_psxram + WORD_XOR_LE( n_address ) ) );
}
@@ -161,12 +161,12 @@ void psxmdec_device::mdec_idct( INT32 *p_n_src, INT32 *p_n_dst )
}
}
-INLINE UINT16 mdec_unpack_run( UINT16 n_packed )
+static inline UINT16 mdec_unpack_run( UINT16 n_packed )
{
return n_packed >> 10;
}
-INLINE INT32 mdec_unpack_val( UINT16 n_packed )
+static inline INT32 mdec_unpack_val( UINT16 n_packed )
{
return ( ( (INT32)n_packed ) << 22 ) >> 22;
}
@@ -224,22 +224,22 @@ UINT32 psxmdec_device::mdec_unpack( UINT32 *p_n_psxram, UINT32 n_address )
return n_address;
}
-INLINE INT32 mdec_cr_to_r( INT32 n_cr )
+static inline INT32 mdec_cr_to_r( INT32 n_cr )
{
return ( 1435 * n_cr ) >> 10;
}
-INLINE INT32 mdec_cr_to_g( INT32 n_cr )
+static inline INT32 mdec_cr_to_g( INT32 n_cr )
{
return ( -731 * n_cr ) >> 10;
}
-INLINE INT32 mdec_cb_to_g( INT32 n_cb )
+static inline INT32 mdec_cb_to_g( INT32 n_cb )
{
return ( -351 * n_cb ) >> 10;
}
-INLINE INT32 mdec_cb_to_b( INT32 n_cb )
+static inline INT32 mdec_cb_to_b( INT32 n_cb )
{
return ( 1814 * n_cb ) >> 10;
}
diff --git a/src/devices/cpu/psx/rcnt.cpp b/src/devices/cpu/psx/rcnt.cpp
index fa7473e0453..f3e34a7cff8 100644
--- a/src/devices/cpu/psx/rcnt.cpp
+++ b/src/devices/cpu/psx/rcnt.cpp
@@ -11,7 +11,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp
index b801d3e7bc5..ba057dd01e1 100644
--- a/src/devices/cpu/psx/sio.cpp
+++ b/src/devices/cpu/psx/sio.cpp
@@ -11,7 +11,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/devices/cpu/rsp/rsp_dasm.cpp b/src/devices/cpu/rsp/rsp_dasm.cpp
index bf56b240652..d4ade625904 100644
--- a/src/devices/cpu/rsp/rsp_dasm.cpp
+++ b/src/devices/cpu/rsp/rsp_dasm.cpp
@@ -57,7 +57,7 @@ static const char *const element2[16] =
"00000000", "11111111", "22222222", "33333333", "44444444", "55555555", "66666666", "77777777"
};
-INLINE char *signed_imm16(UINT32 op)
+static inline char *signed_imm16(UINT32 op)
{
static char temp[10];
INT16 value = op & 0xffff;
diff --git a/src/devices/cpu/rsp/rspdrc.cpp b/src/devices/cpu/rsp/rspdrc.cpp
index b89d6ca1d7e..097a8c39507 100644
--- a/src/devices/cpu/rsp/rspdrc.cpp
+++ b/src/devices/cpu/rsp/rspdrc.cpp
@@ -64,7 +64,7 @@ extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op);
descriptor
-------------------------------------------------*/
-INLINE UINT32 epc(const opcode_desc *desc)
+static inline UINT32 epc(const opcode_desc *desc)
{
return ((desc->flags & OPFLAG_IN_DELAY_SLOT) ? (desc->pc - 3) : desc->pc) | 0x1000;
}
@@ -75,7 +75,7 @@ INLINE UINT32 epc(const opcode_desc *desc)
already allocated
-------------------------------------------------*/
-INLINE void alloc_handle(drcuml_state *drcuml, code_handle **handleptr, const char *name)
+static inline void alloc_handle(drcuml_state *drcuml, code_handle **handleptr, const char *name)
{
if (*handleptr == nullptr)
*handleptr = drcuml->handle_alloc(name);
diff --git a/src/devices/cpu/sh4/sh4tmu.cpp b/src/devices/cpu/sh4/sh4tmu.cpp
index 89b59ac42ee..46044de0f09 100644
--- a/src/devices/cpu/sh4/sh4tmu.cpp
+++ b/src/devices/cpu/sh4/sh4tmu.cpp
@@ -16,7 +16,7 @@ static const int tcnt_div[8] = { 4, 16, 64, 256, 1024, 1, 1, 1 };
a (constant+1) where 0 <= constant < 2^32
-------------------------------------------------*/
-INLINE attotime sh4_scale_up_mame_time(const attotime &_time1, UINT32 factor1)
+static inline attotime sh4_scale_up_mame_time(const attotime &_time1, UINT32 factor1)
{
return _time1 * factor1 + _time1;
}
diff --git a/src/devices/cpu/spc700/spc700.cpp b/src/devices/cpu/spc700/spc700.cpp
index a21ab8bc27f..968aad0f10c 100644
--- a/src/devices/cpu/spc700/spc700.cpp
+++ b/src/devices/cpu/spc700/spc700.cpp
@@ -80,7 +80,7 @@ Address Function Register R/W When Reset Remarks
#define MAKE_INT_8(A) (int8)((A)&0xff)
#else
#define int8 int
-INLINE int MAKE_INT_8(int A) {return (A & 0x80) ? A | ~0xff : A & 0xff;}
+static inline int MAKE_INT_8(int A) {return (A & 0x80) ? A | ~0xff : A & 0xff;}
#endif /* UCHAR_MAX == 0xff */
#define MAKE_UINT_8(A) ((A)&0xff)
diff --git a/src/devices/cpu/spc700/spc700ds.cpp b/src/devices/cpu/spc700/spc700ds.cpp
index ef5fbd4fe91..867ddd56210 100644
--- a/src/devices/cpu/spc700/spc700ds.cpp
+++ b/src/devices/cpu/spc700/spc700ds.cpp
@@ -323,13 +323,13 @@ static const spc700_opcode_struct g_opcodes[256] =
static unsigned int g_pc;
static const UINT8 *rombase;
-INLINE unsigned int read_8_immediate(void)
+static inline unsigned int read_8_immediate(void)
{
g_pc++;
return *rombase++;
}
-INLINE unsigned int read_16_immediate(void)
+static inline unsigned int read_16_immediate(void)
{
unsigned int result;
g_pc += 2;
diff --git a/src/devices/cpu/ssem/ssem.cpp b/src/devices/cpu/ssem/ssem.cpp
index 10ac5471e4d..0dfec9b9cfb 100644
--- a/src/devices/cpu/ssem/ssem.cpp
+++ b/src/devices/cpu/ssem/ssem.cpp
@@ -25,7 +25,7 @@ CPU_DISASSEMBLE( ssem );
// The de facto snapshot format for other SSEM simulators stores the data physically in that format as well.
// Therefore, in MESS, every 32-bit word has its bits reversed, too, and as a result the values must be
// un-reversed before being used.
-INLINE UINT32 reverse(UINT32 v)
+static inline UINT32 reverse(UINT32 v)
{
// Taken from http://www-graphics.stanford.edu/~seander/bithacks.html#ReverseParallel
// swap odd and even bits
diff --git a/src/devices/cpu/ssem/ssemdasm.cpp b/src/devices/cpu/ssem/ssemdasm.cpp
index 7b8a6a47a7b..a38ac00903a 100644
--- a/src/devices/cpu/ssem/ssemdasm.cpp
+++ b/src/devices/cpu/ssem/ssemdasm.cpp
@@ -19,7 +19,7 @@ static void ATTR_PRINTF(1,2) print(const char *fmt, ...)
va_end(vl);
}
-INLINE UINT32 reverse(UINT32 v)
+static inline UINT32 reverse(UINT32 v)
{
// Taken from http://www-graphics.stanford.edu/~seander/bithacks.html#ReverseParallel
// swap odd and even bits
diff --git a/src/devices/cpu/tms32031/dis32031.cpp b/src/devices/cpu/tms32031/dis32031.cpp
index bc2bd737318..4ab75192704 100644
--- a/src/devices/cpu/tms32031/dis32031.cpp
+++ b/src/devices/cpu/tms32031/dis32031.cpp
@@ -31,7 +31,7 @@
***************************************************************************/
#if 0
-INLINE char *signed_16bit(INT16 val)
+static inline char *signed_16bit(INT16 val)
{
static char temp[10];
if (val < 0)
diff --git a/src/devices/cpu/tms9900/9900dasm.cpp b/src/devices/cpu/tms9900/9900dasm.cpp
index 2e2883611c2..daa4d8cb540 100644
--- a/src/devices/cpu/tms9900/9900dasm.cpp
+++ b/src/devices/cpu/tms9900/9900dasm.cpp
@@ -314,7 +314,7 @@ static const enum opcodes ops_001c_002f_s0[20]=
static int PC;
-INLINE UINT16 readop_arg(const UINT8 *opram, unsigned pc)
+static inline UINT16 readop_arg(const UINT8 *opram, unsigned pc)
{
UINT16 result = opram[PC++ - pc] << 8;
return result | opram[PC++ - pc];
diff --git a/src/devices/cpu/tms9900/99xxcore.h b/src/devices/cpu/tms9900/99xxcore.h
index cb94fac286f..9bc68f30c26 100644
--- a/src/devices/cpu/tms9900/99xxcore.h
+++ b/src/devices/cpu/tms9900/99xxcore.h
@@ -283,7 +283,7 @@ Other references can be found on spies.com:
struct tms99xx_state;
-INLINE void execute(tms99xx_state *cpustate, UINT16 opcode);
+static inline void execute(tms99xx_state *cpustate, UINT16 opcode);
#if EXTERNAL_INSTRUCTION_DECODING
static void external_instruction_notify(tms99xx_state *cpustate, int ext_op_ID);
@@ -533,7 +533,7 @@ struct tms99xx_state
int extra_byte; /* buffer holding the unused byte in a word read */
};
-INLINE tms99xx_state *get_safe_token(device_t *device)
+static inline tms99xx_state *get_safe_token(device_t *device)
{
assert(device != NULL);
// assert(device->type() == TMS99XX_GET_INFO);
@@ -803,7 +803,7 @@ WRITE8_HANDLER(tms9995_internal2_w)
makes memory access slower, I have emulated this feature, because if I did otherwise,
there would be some implementation problems in some driver sooner or later.*/
- INLINE int readword(tms99xx_state *cpustate, int addr)
+ static inline int readword(tms99xx_state *cpustate, int addr)
{
int val;
@@ -1082,7 +1082,7 @@ WRITE8_HANDLER(tms9995_internal2_w)
#define READREG(reg) readword(cpustate, (cpustate->WP+(reg)) & 0xffff)
#define WRITEREG(reg, data) writeword(cpustate, (cpustate->WP+(reg)) & 0xffff, (data))
-INLINE UINT16 READREG_DEBUG(tms99xx_state *cpustate, int reg)
+static inline UINT16 READREG_DEBUG(tms99xx_state *cpustate, int reg)
{
int temp = cpustate->icount;
UINT16 result = READREG(reg);
@@ -1090,7 +1090,7 @@ INLINE UINT16 READREG_DEBUG(tms99xx_state *cpustate, int reg)
return result;
}
-INLINE void WRITEREG_DEBUG(tms99xx_state *cpustate, int reg, UINT16 data)
+static inline void WRITEREG_DEBUG(tms99xx_state *cpustate, int reg, UINT16 data)
{
int temp = cpustate->icount;
WRITEREG(reg, data);
@@ -1173,7 +1173,7 @@ INLINE void WRITEREG_DEBUG(tms99xx_state *cpustate, int reg, UINT16 data)
}
}
- INLINE void handle_error_interrupt(tms99xx_state *cpustate)
+ static inline void handle_error_interrupt(tms99xx_state *cpustate)
{
if (cpustate->error_interrupt_callback)
(*cpustate->error_interrupt_callback)(cpustate->device, cpustate->error_interrupt_register ? 1 : 0);
@@ -1339,12 +1339,12 @@ static const UINT16 inverted_right_shift_mask_table[17] =
0xFFFF
};
-INLINE UINT16 logical_right_shift(UINT16 val, int c)
+static inline UINT16 logical_right_shift(UINT16 val, int c)
{
return((val>>c) & right_shift_mask_table[c]);
}
-INLINE INT16 arithmetic_right_shift(INT16 val, int c)
+static inline INT16 arithmetic_right_shift(INT16 val, int c)
{
if (val < 0)
return((val>>c) | inverted_right_shift_mask_table[c]);
@@ -1359,7 +1359,7 @@ INLINE INT16 arithmetic_right_shift(INT16 val, int c)
/*
Set lae
*/
-INLINE void setst_lae(tms99xx_state *cpustate, INT16 val)
+static inline void setst_lae(tms99xx_state *cpustate, INT16 val)
{
cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ);
@@ -1375,7 +1375,7 @@ INLINE void setst_lae(tms99xx_state *cpustate, INT16 val)
/*
Set laep (BYTE)
*/
-INLINE void setst_byte_laep(tms99xx_state *cpustate, INT8 val)
+static inline void setst_byte_laep(tms99xx_state *cpustate, INT8 val)
{
cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ);
@@ -1392,7 +1392,7 @@ INLINE void setst_byte_laep(tms99xx_state *cpustate, INT8 val)
/*
For COC, CZC, and TB
*/
-INLINE void setst_e(tms99xx_state *cpustate, UINT16 val, UINT16 to)
+static inline void setst_e(tms99xx_state *cpustate, UINT16 val, UINT16 to)
{
if (val == to)
cpustate->STATUS |= ST_EQ;
@@ -1403,7 +1403,7 @@ INLINE void setst_e(tms99xx_state *cpustate, UINT16 val, UINT16 to)
/*
For CI, C, CB
*/
-INLINE void setst_c_lae(tms99xx_state *cpustate, UINT16 to, UINT16 val)
+static inline void setst_c_lae(tms99xx_state *cpustate, UINT16 to, UINT16 val)
{
cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ);
@@ -1421,7 +1421,7 @@ INLINE void setst_c_lae(tms99xx_state *cpustate, UINT16 to, UINT16 val)
/*
Set laeco for add
*/
-INLINE INT16 setst_add_laeco(tms99xx_state *cpustate, int a, int b)
+static inline INT16 setst_add_laeco(tms99xx_state *cpustate, int a, int b)
{
UINT32 res;
INT16 res2;
@@ -1457,7 +1457,7 @@ INLINE INT16 setst_add_laeco(tms99xx_state *cpustate, int a, int b)
/*
Set laeco for subtract
*/
-INLINE INT16 setst_sub_laeco(tms99xx_state *cpustate, int a, int b)
+static inline INT16 setst_sub_laeco(tms99xx_state *cpustate, int a, int b)
{
UINT32 res;
INT16 res2;
@@ -1493,7 +1493,7 @@ INLINE INT16 setst_sub_laeco(tms99xx_state *cpustate, int a, int b)
/*
Set laecop for add (BYTE)
*/
-INLINE INT8 setst_addbyte_laecop(tms99xx_state *cpustate, int a, int b)
+static inline INT8 setst_addbyte_laecop(tms99xx_state *cpustate, int a, int b)
{
unsigned int res;
INT8 res2;
@@ -1531,7 +1531,7 @@ INLINE INT8 setst_addbyte_laecop(tms99xx_state *cpustate, int a, int b)
/*
Set laecop for subtract (BYTE)
*/
-INLINE INT8 setst_subbyte_laecop(tms99xx_state *cpustate, int a, int b)
+static inline INT8 setst_subbyte_laecop(tms99xx_state *cpustate, int a, int b)
{
unsigned int res;
INT8 res2;
@@ -1570,7 +1570,7 @@ INLINE INT8 setst_subbyte_laecop(tms99xx_state *cpustate, int a, int b)
/*
For NEG
*/
-INLINE void setst_laeo(tms99xx_state *cpustate, INT16 val)
+static inline void setst_laeo(tms99xx_state *cpustate, INT16 val)
{
cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_OV);
@@ -1591,7 +1591,7 @@ INLINE void setst_laeo(tms99xx_state *cpustate, INT16 val)
/*
Meat of SRA
*/
-INLINE UINT16 setst_sra_laec(tms99xx_state *cpustate, INT16 a, UINT16 c)
+static inline UINT16 setst_sra_laec(tms99xx_state *cpustate, INT16 a, UINT16 c)
{
cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C);
@@ -1617,7 +1617,7 @@ INLINE UINT16 setst_sra_laec(tms99xx_state *cpustate, INT16 a, UINT16 c)
/*
Meat of SRL. Same algorithm as SRA, except that we fills in with 0s.
*/
-INLINE UINT16 setst_srl_laec(tms99xx_state *cpustate, UINT16 a,UINT16 c)
+static inline UINT16 setst_srl_laec(tms99xx_state *cpustate, UINT16 a,UINT16 c)
{
cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C);
@@ -1643,7 +1643,7 @@ INLINE UINT16 setst_srl_laec(tms99xx_state *cpustate, UINT16 a,UINT16 c)
//
// Meat of SRC
//
-INLINE UINT16 setst_src_laec(tms99xx_state *cpustate, UINT16 a,UINT16 c)
+static inline UINT16 setst_src_laec(tms99xx_state *cpustate, UINT16 a,UINT16 c)
{
cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C);
@@ -1668,7 +1668,7 @@ INLINE UINT16 setst_src_laec(tms99xx_state *cpustate, UINT16 a,UINT16 c)
//
// Meat of SLA
//
-INLINE UINT16 setst_sla_laeco(tms99xx_state *cpustate, UINT16 a, UINT16 c)
+static inline UINT16 setst_sla_laeco(tms99xx_state *cpustate, UINT16 a, UINT16 c)
{
cpustate->STATUS &= ~ (ST_LGT | ST_AGT | ST_EQ | ST_C | ST_OV);
@@ -1889,7 +1889,7 @@ static CPU_EXIT( tms99xx )
}
/* fetch : read one word at * PC, and increment PC. */
-INLINE UINT16 fetch(tms99xx_state *cpustate)
+static inline UINT16 fetch(tms99xx_state *cpustate)
{
UINT16 value = readword(cpustate, cpustate->PC);
cpustate->PC += 2;
@@ -4971,7 +4971,7 @@ static void h4000b(tms99xx_state *cpustate, UINT16 opcode)
}
-INLINE void execute(tms99xx_state *cpustate, UINT16 opcode)
+static inline void execute(tms99xx_state *cpustate, UINT16 opcode)
{
#if (! HAS_9995_OPCODES)
diff --git a/src/devices/machine/adc083x.cpp b/src/devices/machine/adc083x.cpp
index 40259e595f1..690c2d0e1fd 100644
--- a/src/devices/machine/adc083x.cpp
+++ b/src/devices/machine/adc083x.cpp
@@ -13,7 +13,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF( 3, 4 ) verboselog( int n_level, device_t &device, const char *s_fmt, ... )
+static inline void ATTR_PRINTF( 3, 4 ) verboselog( int n_level, device_t &device, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/devices/machine/i2cmem.cpp b/src/devices/machine/i2cmem.cpp
index 17da9d40e2e..d77e12ef4be 100644
--- a/src/devices/machine/i2cmem.cpp
+++ b/src/devices/machine/i2cmem.cpp
@@ -40,7 +40,7 @@ Up to 4096 bytes can be addressed.
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF( 3, 4 ) verboselog( device_t *device, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF( 3, 4 ) verboselog( device_t *device, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/devices/machine/mc68328.cpp b/src/devices/machine/mc68328.cpp
index 3e2101dddf2..4cd578d6a4c 100644
--- a/src/devices/machine/mc68328.cpp
+++ b/src/devices/machine/mc68328.cpp
@@ -15,7 +15,7 @@
#define VERBOSE_LEVEL (0)
-INLINE void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
{
if (VERBOSE_LEVEL >= n_level)
{
diff --git a/src/devices/machine/mm58167.cpp b/src/devices/machine/mm58167.cpp
index 74572770710..ed66df7603f 100644
--- a/src/devices/machine/mm58167.cpp
+++ b/src/devices/machine/mm58167.cpp
@@ -93,7 +93,7 @@ void mm58167_device::device_reset()
}
-INLINE UINT8 make_bcd(UINT8 data)
+static inline UINT8 make_bcd(UINT8 data)
{
return ((data / 10) << 4) | (data % 10);
}
diff --git a/src/devices/machine/rtc4543.cpp b/src/devices/machine/rtc4543.cpp
index 0d0211304cb..ac1eba33e79 100644
--- a/src/devices/machine/rtc4543.cpp
+++ b/src/devices/machine/rtc4543.cpp
@@ -88,7 +88,7 @@ void rtc4543_device::device_timer(emu_timer &timer, device_timer_id id, int para
}
-INLINE UINT8 make_bcd(UINT8 data)
+static inline UINT8 make_bcd(UINT8 data)
{
return ((data / 10) << 4) | (data % 10);
}
diff --git a/src/devices/machine/s3c2400.cpp b/src/devices/machine/s3c2400.cpp
index d1b185d453e..a1ef609a1ac 100644
--- a/src/devices/machine/s3c2400.cpp
+++ b/src/devices/machine/s3c2400.cpp
@@ -16,7 +16,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
{
if (VERBOSE_LEVEL >= n_level)
{
diff --git a/src/devices/machine/s3c2410.cpp b/src/devices/machine/s3c2410.cpp
index 8c2ba31049e..c89a67ef47b 100644
--- a/src/devices/machine/s3c2410.cpp
+++ b/src/devices/machine/s3c2410.cpp
@@ -16,7 +16,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
{
if (VERBOSE_LEVEL >= n_level)
{
diff --git a/src/devices/machine/s3c2440.cpp b/src/devices/machine/s3c2440.cpp
index 15795ef3448..7cc5e0a6247 100644
--- a/src/devices/machine/s3c2440.cpp
+++ b/src/devices/machine/s3c2440.cpp
@@ -16,7 +16,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
{
if (VERBOSE_LEVEL >= n_level)
{
diff --git a/src/devices/machine/s3c44b0.cpp b/src/devices/machine/s3c44b0.cpp
index 56e9ee32e3b..37402f900b0 100644
--- a/src/devices/machine/s3c44b0.cpp
+++ b/src/devices/machine/s3c44b0.cpp
@@ -17,7 +17,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
{
if (VERBOSE_LEVEL >= n_level)
{
diff --git a/src/devices/machine/timekpr.cpp b/src/devices/machine/timekpr.cpp
index 177cd5fef55..ccd849ef21d 100644
--- a/src/devices/machine/timekpr.cpp
+++ b/src/devices/machine/timekpr.cpp
@@ -61,12 +61,12 @@ const device_type MK48T08 = &device_creator<mk48t08_device>;
INLINE FUNCTIONS
***************************************************************************/
-INLINE UINT8 make_bcd(UINT8 data)
+static inline UINT8 make_bcd(UINT8 data)
{
return ( ( ( data / 10 ) % 10 ) << 4 ) + ( data % 10 );
}
-INLINE UINT8 from_bcd( UINT8 data )
+static inline UINT8 from_bcd( UINT8 data )
{
return ( ( ( data >> 4 ) & 15 ) * 10 ) + ( data & 15 );
}
diff --git a/src/devices/sound/ay8910.cpp b/src/devices/sound/ay8910.cpp
index ccef69d17d3..cb1e1c98bcb 100644
--- a/src/devices/sound/ay8910.cpp
+++ b/src/devices/sound/ay8910.cpp
@@ -431,7 +431,7 @@ static const ay8910_device::mosfet_param ay8910_mosfet_param =
*
*************************************/
-INLINE void build_3D_table(double rl, const ay8910_device::ay_ym_param *par, const ay8910_device::ay_ym_param *par_env, int normalize, double factor, int zero_is_off, INT32 *tab)
+static inline void build_3D_table(double rl, const ay8910_device::ay_ym_param *par, const ay8910_device::ay_ym_param *par_env, int normalize, double factor, int zero_is_off, INT32 *tab)
{
double min = 10.0, max = 0.0;
@@ -490,7 +490,7 @@ INLINE void build_3D_table(double rl, const ay8910_device::ay_ym_param *par, con
/* for (e=0;e<16;e++) printf("%d %d\n",e<<10, tab[e<<10]); */
}
-INLINE void build_single_table(double rl, const ay8910_device::ay_ym_param *par, int normalize, INT32 *tab, int zero_is_off)
+static inline void build_single_table(double rl, const ay8910_device::ay_ym_param *par, int normalize, INT32 *tab, int zero_is_off)
{
int j;
double rt;
@@ -529,7 +529,7 @@ INLINE void build_single_table(double rl, const ay8910_device::ay_ym_param *par,
}
-INLINE void build_mosfet_resistor_table(const ay8910_device::mosfet_param &par, const double rd, INT32 *tab)
+static inline void build_mosfet_resistor_table(const ay8910_device::mosfet_param &par, const double rd, INT32 *tab)
{
int j;
diff --git a/src/devices/sound/c140.cpp b/src/devices/sound/c140.cpp
index 2156efd27fc..6e5ff8321bf 100644
--- a/src/devices/sound/c140.cpp
+++ b/src/devices/sound/c140.cpp
@@ -74,7 +74,7 @@ const device_type C140 = &device_creator<c140_device>;
// LIVE DEVICE
//**************************************************************************
-INLINE int limit(INT32 in)
+static inline int limit(INT32 in)
{
if(in>0x7fff) return 0x7fff;
else if(in<-0x8000) return -0x8000;
diff --git a/src/devices/sound/disc_wav.inc b/src/devices/sound/disc_wav.inc
index 8d3b8d330a7..8087ea86627 100644
--- a/src/devices/sound/disc_wav.inc
+++ b/src/devices/sound/disc_wav.inc
@@ -218,7 +218,7 @@ DISCRETE_RESET(dss_counter)
#define DSS_LFSR_NOISE__FEED DISCRETE_INPUT(4)
#define DSS_LFSR_NOISE__BIAS DISCRETE_INPUT(5)
-INLINE int dss_lfsr_function(discrete_device *dev, int myfunc, int in0, int in1, int bitmask)
+static inline int dss_lfsr_function(discrete_device *dev, int myfunc, int in0, int in1, int bitmask)
{
int retval;
diff --git a/src/devices/sound/fm.cpp b/src/devices/sound/fm.cpp
index 4e21a4e5c7b..8aa9f157f91 100644
--- a/src/devices/sound/fm.cpp
+++ b/src/devices/sound/fm.cpp
@@ -694,7 +694,7 @@ struct FM_OPN
/* status set and IRQ handling */
-INLINE void FM_STATUS_SET(FM_ST *ST,int flag)
+static inline void FM_STATUS_SET(FM_ST *ST,int flag)
{
/* set status flag */
ST->status |= flag;
@@ -707,7 +707,7 @@ INLINE void FM_STATUS_SET(FM_ST *ST,int flag)
}
/* status reset and IRQ handling */
-INLINE void FM_STATUS_RESET(FM_ST *ST,int flag)
+static inline void FM_STATUS_RESET(FM_ST *ST,int flag)
{
/* reset status flag */
ST->status &=~flag;
@@ -720,7 +720,7 @@ INLINE void FM_STATUS_RESET(FM_ST *ST,int flag)
}
/* IRQ mask set */
-INLINE void FM_IRQMASK_SET(FM_ST *ST,int flag)
+static inline void FM_IRQMASK_SET(FM_ST *ST,int flag)
{
ST->irqmask = flag;
/* IRQ handling check */
@@ -729,7 +729,7 @@ INLINE void FM_IRQMASK_SET(FM_ST *ST,int flag)
}
/* OPN Mode Register Write */
-INLINE void set_timers( FM_ST *ST, void *n, int v )
+static inline void set_timers( FM_ST *ST, void *n, int v )
{
/* b7 = CSM MODE */
/* b6 = 3 slot mode */
@@ -787,7 +787,7 @@ INLINE void set_timers( FM_ST *ST, void *n, int v )
/* Timer A Overflow */
-INLINE void TimerAOver(FM_ST *ST)
+static inline void TimerAOver(FM_ST *ST)
{
/* set status (if enabled) */
if(ST->mode & 0x04) FM_STATUS_SET(ST,0x01);
@@ -796,7 +796,7 @@ INLINE void TimerAOver(FM_ST *ST)
if (ST->timer_handler) (ST->timer_handler)(ST->param,0,ST->TAC * ST->timer_prescaler,ST->clock);
}
/* Timer B Overflow */
-INLINE void TimerBOver(FM_ST *ST)
+static inline void TimerBOver(FM_ST *ST)
{
/* set status (if enabled) */
if(ST->mode & 0x08) FM_STATUS_SET(ST,0x02);
@@ -838,7 +838,7 @@ INLINE void TimerBOver(FM_ST *ST)
#if FM_BUSY_FLAG_SUPPORT
#define FM_BUSY_CLEAR(ST) ((ST)->busy_expiry_time = UNDEFINED_TIME)
-INLINE UINT8 FM_STATUS_FLAG(FM_ST *ST)
+static inline UINT8 FM_STATUS_FLAG(FM_ST *ST)
{
if( COMPARE_TIMES(ST->busy_expiry_time, UNDEFINED_TIME) != 0 )
{
@@ -849,7 +849,7 @@ INLINE UINT8 FM_STATUS_FLAG(FM_ST *ST)
}
return ST->status;
}
-INLINE void FM_BUSY_SET(FM_ST *ST,int busyclock )
+static inline void FM_BUSY_SET(FM_ST *ST,int busyclock )
{
TIME_TYPE expiry_period = MULTIPLY_TIME_BY_INT(attotime::from_hz(ST->clock), busyclock * ST->timer_prescaler);
ST->busy_expiry_time = ADD_TIMES(FM_GET_TIME_NOW(&ST->device->machine()), expiry_period);
@@ -863,7 +863,7 @@ INLINE void FM_BUSY_SET(FM_ST *ST,int busyclock )
-INLINE void FM_KEYON(UINT8 type, FM_CH *CH , int s )
+static inline void FM_KEYON(UINT8 type, FM_CH *CH , int s )
{
FM_SLOT *SLOT = &CH->SLOT[s];
if( !SLOT->key )
@@ -875,7 +875,7 @@ INLINE void FM_KEYON(UINT8 type, FM_CH *CH , int s )
}
}
-INLINE void FM_KEYOFF(FM_CH *CH , int s )
+static inline void FM_KEYOFF(FM_CH *CH , int s )
{
FM_SLOT *SLOT = &CH->SLOT[s];
if( SLOT->key )
@@ -975,7 +975,7 @@ static void setup_connection( FM_OPN *OPN, FM_CH *CH, int ch )
}
/* set detune & multiple */
-INLINE void set_det_mul(FM_ST *ST,FM_CH *CH,FM_SLOT *SLOT,int v)
+static inline void set_det_mul(FM_ST *ST,FM_CH *CH,FM_SLOT *SLOT,int v)
{
SLOT->mul = (v&0x0f)? (v&0x0f)*2 : 1;
SLOT->DT = ST->dt_tab[(v>>4)&7];
@@ -983,13 +983,13 @@ INLINE void set_det_mul(FM_ST *ST,FM_CH *CH,FM_SLOT *SLOT,int v)
}
/* set total level */
-INLINE void set_tl(FM_CH *CH,FM_SLOT *SLOT , int v)
+static inline void set_tl(FM_CH *CH,FM_SLOT *SLOT , int v)
{
SLOT->tl = (v&0x7f)<<(ENV_BITS-7); /* 7bit TL */
}
/* set attack rate & key scale */
-INLINE void set_ar_ksr(UINT8 type, FM_CH *CH,FM_SLOT *SLOT,int v)
+static inline void set_ar_ksr(UINT8 type, FM_CH *CH,FM_SLOT *SLOT,int v)
{
UINT8 old_KSR = SLOT->KSR;
@@ -1015,7 +1015,7 @@ INLINE void set_ar_ksr(UINT8 type, FM_CH *CH,FM_SLOT *SLOT,int v)
}
/* set decay rate */
-INLINE void set_dr(UINT8 type, FM_SLOT *SLOT,int v)
+static inline void set_dr(UINT8 type, FM_SLOT *SLOT,int v)
{
SLOT->d1r = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
@@ -1024,7 +1024,7 @@ INLINE void set_dr(UINT8 type, FM_SLOT *SLOT,int v)
}
/* set sustain rate */
-INLINE void set_sr(UINT8 type, FM_SLOT *SLOT,int v)
+static inline void set_sr(UINT8 type, FM_SLOT *SLOT,int v)
{
SLOT->d2r = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
@@ -1033,7 +1033,7 @@ INLINE void set_sr(UINT8 type, FM_SLOT *SLOT,int v)
}
/* set release rate */
-INLINE void set_sl_rr(UINT8 type, FM_SLOT *SLOT,int v)
+static inline void set_sl_rr(UINT8 type, FM_SLOT *SLOT,int v)
{
SLOT->sl = sl_table[ v>>4 ];
@@ -1045,7 +1045,7 @@ INLINE void set_sl_rr(UINT8 type, FM_SLOT *SLOT,int v)
-INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
+static inline signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
{
UINT32 p;
@@ -1056,7 +1056,7 @@ INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
return tl_tab[p];
}
-INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm)
+static inline signed int op_calc1(UINT32 phase, unsigned int env, signed int pm)
{
UINT32 p;
@@ -1068,7 +1068,7 @@ INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm)
}
/* advance LFO to next sample */
-INLINE void advance_lfo(FM_OPN *OPN)
+static inline void advance_lfo(FM_OPN *OPN)
{
UINT8 pos;
@@ -1108,7 +1108,7 @@ INLINE void advance_lfo(FM_OPN *OPN)
}
}
-/* changed from INLINE to static here to work around gcc 4.2.1 codegen bug */
+/* changed from static inline to static here to work around gcc 4.2.1 codegen bug */
static void advance_eg_channel(FM_OPN *OPN, FM_SLOT *SLOT)
{
unsigned int out;
@@ -1259,7 +1259,7 @@ static void advance_eg_channel(FM_OPN *OPN, FM_SLOT *SLOT)
#define volume_calc(OP) ((OP)->vol_out + (AM & (OP)->AMmask))
-INLINE void update_phase_lfo_slot(FM_OPN *OPN, FM_SLOT *SLOT, INT32 pms, UINT32 block_fnum)
+static inline void update_phase_lfo_slot(FM_OPN *OPN, FM_SLOT *SLOT, INT32 pms, UINT32 block_fnum)
{
UINT32 fnum_lfo = ((block_fnum & 0x7f0) >> 4) * 32 * 8;
INT32 lfo_fn_table_index_offset = lfo_pm_table[ fnum_lfo + pms + OPN->LFO_PM ];
@@ -1293,7 +1293,7 @@ INLINE void update_phase_lfo_slot(FM_OPN *OPN, FM_SLOT *SLOT, INT32 pms, UINT32
}
}
-INLINE void update_phase_lfo_channel(FM_OPN *OPN, FM_CH *CH)
+static inline void update_phase_lfo_channel(FM_OPN *OPN, FM_CH *CH)
{
UINT32 block_fnum = CH->block_fnum;
@@ -1344,7 +1344,7 @@ INLINE void update_phase_lfo_channel(FM_OPN *OPN, FM_CH *CH)
}
}
-INLINE void chan_calc(FM_OPN *OPN, FM_CH *CH, int chnum)
+static inline void chan_calc(FM_OPN *OPN, FM_CH *CH, int chnum)
{
unsigned int eg_out;
@@ -1420,7 +1420,7 @@ INLINE void chan_calc(FM_OPN *OPN, FM_CH *CH, int chnum)
}
/* update phase increment and envelope generator */
-INLINE void refresh_fc_eg_slot(FM_OPN *OPN, FM_SLOT *SLOT , int fc , int kc )
+static inline void refresh_fc_eg_slot(FM_OPN *OPN, FM_SLOT *SLOT , int fc , int kc )
{
int ksr = kc >> SLOT->KSR;
@@ -1459,7 +1459,7 @@ INLINE void refresh_fc_eg_slot(FM_OPN *OPN, FM_SLOT *SLOT , int fc , int kc )
}
/* update phase increment counters */
-/* Changed from INLINE to static to work around gcc 4.2.1 codegen bug */
+/* Changed from static inline to static to work around gcc 4.2.1 codegen bug */
static void refresh_fc_eg_chan(FM_OPN *OPN, FM_CH *CH )
{
if( CH->SLOT[SLOT1].Incr==-1)
@@ -1653,7 +1653,7 @@ static void FMCloseTable( void )
/* CSM Key Controll */
-INLINE void CSMKeyControll(UINT8 type, FM_CH *CH)
+static inline void CSMKeyControll(UINT8 type, FM_CH *CH)
{
/* all key on then off (only for operators which were OFF!) */
if (!CH->SLOT[SLOT1].key)
@@ -2471,7 +2471,7 @@ static void Init_ADPCMATable(void)
}
/* ADPCM A (Non control type) : calculate one channel output */
-INLINE void ADPCMA_calc_chan( YM2610 *F2610, ADPCM_CH *ch )
+static inline void ADPCMA_calc_chan( YM2610 *F2610, ADPCM_CH *ch )
{
UINT32 step;
UINT8 data;
@@ -2691,7 +2691,7 @@ static const unsigned int YM2608_ADPCM_ROM_addr[2*6] = {
/* flag enable control 0x110 */
-INLINE void YM2608IRQFlagWrite(FM_OPN *OPN, YM2608 *F2608, int v)
+static inline void YM2608IRQFlagWrite(FM_OPN *OPN, YM2608 *F2608, int v)
{
if( v & 0x80 )
{ /* Reset IRQ flag */
@@ -2705,7 +2705,7 @@ INLINE void YM2608IRQFlagWrite(FM_OPN *OPN, YM2608 *F2608, int v)
}
/* compatible mode & IRQ enable control 0x29 */
-INLINE void YM2608IRQMaskWrite(FM_OPN *OPN, YM2608 *F2608, int v)
+static inline void YM2608IRQMaskWrite(FM_OPN *OPN, YM2608 *F2608, int v)
{
/* SCH,xx,xxx,EN_ZERO,EN_BRDY,EN_EOS,EN_TB,EN_TA */
diff --git a/src/devices/sound/fm2612.cpp b/src/devices/sound/fm2612.cpp
index 2154e393735..086198a9ec4 100644
--- a/src/devices/sound/fm2612.cpp
+++ b/src/devices/sound/fm2612.cpp
@@ -714,7 +714,7 @@ struct YM2612
/* status set and IRQ handling */
-INLINE void FM_STATUS_SET(fm2612_FM_ST *ST,int flag)
+static inline void FM_STATUS_SET(fm2612_FM_ST *ST,int flag)
{
/* set status flag */
ST->status |= flag;
@@ -727,7 +727,7 @@ INLINE void FM_STATUS_SET(fm2612_FM_ST *ST,int flag)
}
/* status reset and IRQ handling */
-INLINE void FM_STATUS_RESET(fm2612_FM_ST *ST,int flag)
+static inline void FM_STATUS_RESET(fm2612_FM_ST *ST,int flag)
{
/* reset status flag */
ST->status &=~flag;
@@ -740,7 +740,7 @@ INLINE void FM_STATUS_RESET(fm2612_FM_ST *ST,int flag)
}
/* IRQ mask set */
-INLINE void FM_IRQMASK_SET(fm2612_FM_ST *ST,int flag)
+static inline void FM_IRQMASK_SET(fm2612_FM_ST *ST,int flag)
{
ST->irqmask = flag;
/* IRQ handling check */
@@ -748,7 +748,7 @@ INLINE void FM_IRQMASK_SET(fm2612_FM_ST *ST,int flag)
FM_STATUS_RESET(ST,0);
}
-INLINE void FM_KEYON(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH , int s )
+static inline void FM_KEYON(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH , int s )
{
fm2612_FM_SLOT *SLOT = &CH->SLOT[s];
@@ -783,7 +783,7 @@ INLINE void FM_KEYON(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH , int s )
SLOT->key = 1;
}
-INLINE void FM_KEYOFF(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH , int s )
+static inline void FM_KEYOFF(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH , int s )
{
fm2612_FM_SLOT *SLOT = &CH->SLOT[s];
@@ -816,7 +816,7 @@ INLINE void FM_KEYOFF(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH , int s )
SLOT->key = 0;
}
-INLINE void FM_KEYON_CSM(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH , int s )
+static inline void FM_KEYON_CSM(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH , int s )
{
fm2612_FM_SLOT *SLOT = &CH->SLOT[s];
@@ -849,7 +849,7 @@ INLINE void FM_KEYON_CSM(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH , int s )
}
}
-INLINE void FM_KEYOFF_CSM(fm2612_FM_CH *CH , int s )
+static inline void FM_KEYOFF_CSM(fm2612_FM_CH *CH , int s )
{
fm2612_FM_SLOT *SLOT = &CH->SLOT[s];
if (!SLOT->key)
@@ -880,7 +880,7 @@ INLINE void FM_KEYOFF_CSM(fm2612_FM_CH *CH , int s )
}
/* OPN Mode Register Write */
-INLINE void set_timers(fm2612_FM_OPN *OPN, fm2612_FM_ST *ST, void *n, int v)
+static inline void set_timers(fm2612_FM_OPN *OPN, fm2612_FM_ST *ST, void *n, int v)
{
/* b7 = CSM MODE */
/* b6 = 3 slot mode */
@@ -954,7 +954,7 @@ INLINE void set_timers(fm2612_FM_OPN *OPN, fm2612_FM_ST *ST, void *n, int v)
/* Timer A Overflow */
-INLINE void TimerAOver(fm2612_FM_ST *ST)
+static inline void TimerAOver(fm2612_FM_ST *ST)
{
/* set status (if enabled) */
if(ST->mode & 0x04) FM_STATUS_SET(ST,0x01);
@@ -963,7 +963,7 @@ INLINE void TimerAOver(fm2612_FM_ST *ST)
if (ST->timer_handler) (ST->timer_handler)(ST->param,0,ST->TAC * ST->timer_prescaler,ST->clock);
}
/* Timer B Overflow */
-INLINE void TimerBOver(fm2612_FM_ST *ST)
+static inline void TimerBOver(fm2612_FM_ST *ST)
{
/* set status (if enabled) */
if(ST->mode & 0x08) FM_STATUS_SET(ST,0x02);
@@ -1005,7 +1005,7 @@ INLINE void TimerBOver(fm2612_FM_ST *ST)
#if FM_BUSY_FLAG_SUPPORT
#define FM_BUSY_CLEAR(ST) ((ST)->busy_expiry_time = UNDEFINED_TIME)
-INLINE UINT8 FM_STATUS_FLAG(fm2612_FM_ST *ST)
+static inline UINT8 FM_STATUS_FLAG(fm2612_FM_ST *ST)
{
if( COMPARE_TIMES(ST->busy_expiry_time, UNDEFINED_TIME) != 0 )
{
@@ -1017,7 +1017,7 @@ INLINE UINT8 FM_STATUS_FLAG(fm2612_FM_ST *ST)
return ST->status;
}
#if 0
-INLINE void FM_BUSY_SET(fm2612_FM_ST *ST,int busyclock )
+static inline void FM_BUSY_SET(fm2612_FM_ST *ST,int busyclock )
{
TIME_TYPE expiry_period = MULTIPLY_TIME_BY_INT(attotime::from_hz(ST->clock), busyclock * ST->timer_prescaler);
ST->busy_expiry_time = ADD_TIMES(FM_GET_TIME_NOW(&ST->device->machine()), expiry_period);
@@ -1119,7 +1119,7 @@ static void setup_connection(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH, int ch)
}
/* set detune & multiple */
-INLINE void set_det_mul(fm2612_FM_ST *ST,fm2612_FM_CH *CH,fm2612_FM_SLOT *SLOT,int v)
+static inline void set_det_mul(fm2612_FM_ST *ST,fm2612_FM_CH *CH,fm2612_FM_SLOT *SLOT,int v)
{
SLOT->mul = (v&0x0f)? (v&0x0f)*2 : 1;
SLOT->DT = ST->dt_tab[(v>>4)&7];
@@ -1127,7 +1127,7 @@ INLINE void set_det_mul(fm2612_FM_ST *ST,fm2612_FM_CH *CH,fm2612_FM_SLOT *SLOT,i
}
/* set total level */
-INLINE void set_tl(fm2612_FM_CH *CH,fm2612_FM_SLOT *SLOT , int v)
+static inline void set_tl(fm2612_FM_CH *CH,fm2612_FM_SLOT *SLOT , int v)
{
SLOT->tl = (v&0x7f)<<(ENV_BITS-7); /* 7bit TL */
@@ -1139,7 +1139,7 @@ INLINE void set_tl(fm2612_FM_CH *CH,fm2612_FM_SLOT *SLOT , int v)
}
/* set attack rate & key scale */
-INLINE void set_ar_ksr(UINT8 type, fm2612_FM_CH *CH,fm2612_FM_SLOT *SLOT,int v)
+static inline void set_ar_ksr(UINT8 type, fm2612_FM_CH *CH,fm2612_FM_SLOT *SLOT,int v)
{
UINT8 old_KSR = SLOT->KSR;
@@ -1168,7 +1168,7 @@ INLINE void set_ar_ksr(UINT8 type, fm2612_FM_CH *CH,fm2612_FM_SLOT *SLOT,int v)
}
/* set decay rate */
-INLINE void set_dr(UINT8 type, fm2612_FM_SLOT *SLOT,int v)
+static inline void set_dr(UINT8 type, fm2612_FM_SLOT *SLOT,int v)
{
SLOT->d1r = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
@@ -1177,7 +1177,7 @@ INLINE void set_dr(UINT8 type, fm2612_FM_SLOT *SLOT,int v)
}
/* set sustain rate */
-INLINE void set_sr(UINT8 type, fm2612_FM_SLOT *SLOT,int v)
+static inline void set_sr(UINT8 type, fm2612_FM_SLOT *SLOT,int v)
{
SLOT->d2r = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
@@ -1186,7 +1186,7 @@ INLINE void set_sr(UINT8 type, fm2612_FM_SLOT *SLOT,int v)
}
/* set release rate */
-INLINE void set_sl_rr(UINT8 type, fm2612_FM_SLOT *SLOT,int v)
+static inline void set_sl_rr(UINT8 type, fm2612_FM_SLOT *SLOT,int v)
{
SLOT->sl = sl_table[ v>>4 ];
@@ -1201,7 +1201,7 @@ INLINE void set_sl_rr(UINT8 type, fm2612_FM_SLOT *SLOT,int v)
}
/* advance LFO to next sample */
-INLINE void advance_lfo(fm2612_FM_OPN *OPN)
+static inline void advance_lfo(fm2612_FM_OPN *OPN)
{
if (OPN->lfo_timer_overflow) /* LFO enabled ? */
{
@@ -1229,7 +1229,7 @@ INLINE void advance_lfo(fm2612_FM_OPN *OPN)
}
}
-/* changed from INLINE to static here to work around gcc 4.2.1 codegen bug */
+/* changed from static inline to static here to work around gcc 4.2.1 codegen bug */
static void advance_eg_channel(fm2612_FM_OPN *OPN, fm2612_FM_SLOT *SLOT)
{
unsigned int out;
@@ -1442,7 +1442,7 @@ static void update_ssg_eg_channel(fm2612_FM_SLOT *SLOT)
}
-INLINE void update_phase_lfo_slot(fm2612_FM_OPN *OPN, fm2612_FM_SLOT *SLOT, INT32 pms, UINT32 block_fnum)
+static inline void update_phase_lfo_slot(fm2612_FM_OPN *OPN, fm2612_FM_SLOT *SLOT, INT32 pms, UINT32 block_fnum)
{
UINT32 fnum_lfo = ((block_fnum & 0x7f0) >> 4) * 32 * 8;
INT32 lfo_fn_table_index_offset = lfo_pm_table[ fnum_lfo + pms + OPN->LFO_PM ];
@@ -1472,7 +1472,7 @@ INLINE void update_phase_lfo_slot(fm2612_FM_OPN *OPN, fm2612_FM_SLOT *SLOT, INT3
}
}
-INLINE void update_phase_lfo_channel(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH)
+static inline void update_phase_lfo_channel(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH)
{
UINT32 block_fnum = CH->block_fnum;
@@ -1519,7 +1519,7 @@ INLINE void update_phase_lfo_channel(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH)
}
/* update phase increment and envelope generator */
-INLINE void refresh_fc_eg_slot(fm2612_FM_OPN *OPN, fm2612_FM_SLOT *SLOT , int fc , int kc )
+static inline void refresh_fc_eg_slot(fm2612_FM_OPN *OPN, fm2612_FM_SLOT *SLOT , int fc , int kc )
{
int ksr = kc >> SLOT->KSR;
@@ -1558,7 +1558,7 @@ INLINE void refresh_fc_eg_slot(fm2612_FM_OPN *OPN, fm2612_FM_SLOT *SLOT , int fc
}
/* update phase increment counters */
-/* Changed from INLINE to static to work around gcc 4.2.1 codegen bug */
+/* Changed from static inline to static to work around gcc 4.2.1 codegen bug */
static void refresh_fc_eg_chan(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH )
{
if( CH->SLOT[SLOT1].Incr==-1)
@@ -1574,7 +1574,7 @@ static void refresh_fc_eg_chan(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH )
#define volume_calc(OP) ((OP)->vol_out + (AM & (OP)->AMmask))
-INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
+static inline signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
{
UINT32 p;
@@ -1585,7 +1585,7 @@ INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
return tl_tab[p];
}
-INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm)
+static inline signed int op_calc1(UINT32 phase, unsigned int env, signed int pm)
{
UINT32 p;
@@ -1596,7 +1596,7 @@ INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm)
return tl_tab[p];
}
-INLINE void chan_calc(YM2612 *F2612, fm2612_FM_OPN *OPN, fm2612_FM_CH *CH)
+static inline void chan_calc(YM2612 *F2612, fm2612_FM_OPN *OPN, fm2612_FM_CH *CH)
{
UINT32 AM = OPN->LFO_AM >> CH->ams;
unsigned int eg_out = volume_calc(&CH->SLOT[SLOT1]);
@@ -1679,7 +1679,7 @@ static void FMCloseTable( void )
/* CSM Key Controll */
-INLINE void CSMKeyControll(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH)
+static inline void CSMKeyControll(fm2612_FM_OPN *OPN, fm2612_FM_CH *CH)
{
/* all key ON (verified by Nemesis on real hardware) */
FM_KEYON_CSM(OPN,CH,SLOT1);
diff --git a/src/devices/sound/fmopl.cpp b/src/devices/sound/fmopl.cpp
index adec411d20b..d8592ea3afb 100644
--- a/src/devices/sound/fmopl.cpp
+++ b/src/devices/sound/fmopl.cpp
@@ -129,7 +129,7 @@ Revision History:
/*#define SAVE_SAMPLE*/
#ifdef SAVE_SAMPLE
-INLINE signed int acc_calc(signed int value)
+static inline signed int acc_calc(signed int value)
{
if (value>=0)
{
@@ -651,7 +651,7 @@ static int num_lock = 0;
-INLINE int limit( int val, int max, int min ) {
+static inline int limit( int val, int max, int min ) {
if ( val > max )
val = max;
else if ( val < min )
@@ -662,7 +662,7 @@ INLINE int limit( int val, int max, int min ) {
/* status set and IRQ handling */
-INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag)
+static inline void OPL_STATUS_SET(FM_OPL *OPL,int flag)
{
/* set status flag */
OPL->status |= flag;
@@ -678,7 +678,7 @@ INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag)
}
/* status reset and IRQ handling */
-INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag)
+static inline void OPL_STATUS_RESET(FM_OPL *OPL,int flag)
{
/* reset status flag */
OPL->status &=~flag;
@@ -694,7 +694,7 @@ INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag)
}
/* IRQ mask set */
-INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag)
+static inline void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag)
{
OPL->statusmask = flag;
/* IRQ handling check */
@@ -704,7 +704,7 @@ INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag)
/* advance LFO to next sample */
-INLINE void advance_lfo(FM_OPL *OPL)
+static inline void advance_lfo(FM_OPL *OPL)
{
UINT8 tmp;
@@ -725,7 +725,7 @@ INLINE void advance_lfo(FM_OPL *OPL)
}
/* advance to next sample */
-INLINE void advance(FM_OPL *OPL)
+static inline void advance(FM_OPL *OPL)
{
OPL_CH *CH;
OPL_SLOT *op;
@@ -888,7 +888,7 @@ INLINE void advance(FM_OPL *OPL)
}
-INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+static inline signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
{
UINT32 p;
@@ -899,7 +899,7 @@ INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigne
return tl_tab[p];
}
-INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+static inline signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
{
UINT32 p;
@@ -914,7 +914,7 @@ INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsign
#define volume_calc(OP) ((OP)->TLL + ((UINT32)(OP)->volume) + (OPL->LFO_AM & (OP)->AMmask))
/* calculate output */
-INLINE void OPL_CALC_CH( FM_OPL *OPL, OPL_CH *CH )
+static inline void OPL_CALC_CH( FM_OPL *OPL, OPL_CH *CH )
{
OPL_SLOT *SLOT;
unsigned int env;
@@ -980,7 +980,7 @@ number number BLK/FNUM2 FNUM Drum Hat Drum Tom Cymbal
/* calculate rhythm */
-INLINE void OPL_CALC_RH( FM_OPL *OPL, OPL_CH *CH, unsigned int noise )
+static inline void OPL_CALC_RH( FM_OPL *OPL, OPL_CH *CH, unsigned int noise )
{
OPL_SLOT *SLOT;
signed int out;
@@ -1324,7 +1324,7 @@ static void OPL_initalize(FM_OPL *OPL)
}
-INLINE void FM_KEYON(OPL_SLOT *SLOT, UINT32 key_set)
+static inline void FM_KEYON(OPL_SLOT *SLOT, UINT32 key_set)
{
if( !SLOT->key )
{
@@ -1336,7 +1336,7 @@ INLINE void FM_KEYON(OPL_SLOT *SLOT, UINT32 key_set)
SLOT->key |= key_set;
}
-INLINE void FM_KEYOFF(OPL_SLOT *SLOT, UINT32 key_clr)
+static inline void FM_KEYOFF(OPL_SLOT *SLOT, UINT32 key_clr)
{
if( SLOT->key )
{
@@ -1352,7 +1352,7 @@ INLINE void FM_KEYOFF(OPL_SLOT *SLOT, UINT32 key_clr)
}
/* update phase increment counter of operator (also update the EG rates if necessary) */
-INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT)
+static inline void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT)
{
int ksr;
@@ -1383,7 +1383,7 @@ INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT)
}
/* set multi,am,vib,EG-TYP,KSR,mul */
-INLINE void set_mul(FM_OPL *OPL,int slot,int v)
+static inline void set_mul(FM_OPL *OPL,int slot,int v)
{
OPL_CH *CH = &OPL->P_CH[slot/2];
OPL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -1397,7 +1397,7 @@ INLINE void set_mul(FM_OPL *OPL,int slot,int v)
}
/* set ksl & tl */
-INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v)
+static inline void set_ksl_tl(FM_OPL *OPL,int slot,int v)
{
OPL_CH *CH = &OPL->P_CH[slot/2];
OPL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -1409,7 +1409,7 @@ INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v)
}
/* set attack rate & decay rate */
-INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v)
+static inline void set_ar_dr(FM_OPL *OPL,int slot,int v)
{
OPL_CH *CH = &OPL->P_CH[slot/2];
OPL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -1433,7 +1433,7 @@ INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v)
}
/* set sustain level & release rate */
-INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v)
+static inline void set_sl_rr(FM_OPL *OPL,int slot,int v)
{
OPL_CH *CH = &OPL->P_CH[slot/2];
OPL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -2112,7 +2112,7 @@ static unsigned char OPLRead(FM_OPL *OPL,int a)
}
/* CSM Key Controll */
-INLINE void CSMKeyControll(OPL_CH *CH)
+static inline void CSMKeyControll(OPL_CH *CH)
{
FM_KEYON (&CH->SLOT[SLOT1], 4);
FM_KEYON (&CH->SLOT[SLOT2], 4);
diff --git a/src/devices/sound/k053260.cpp b/src/devices/sound/k053260.cpp
index 434d352635c..134598a1f7c 100644
--- a/src/devices/sound/k053260.cpp
+++ b/src/devices/sound/k053260.cpp
@@ -247,7 +247,7 @@ WRITE8_MEMBER( k053260_device::write )
}
-INLINE int limit( int val, int max, int min )
+static inline int limit( int val, int max, int min )
{
if ( val > max )
val = max;
diff --git a/src/devices/sound/nes_apu.cpp b/src/devices/sound/nes_apu.cpp
index 0c42deb0fca..3792311c77e 100644
--- a/src/devices/sound/nes_apu.cpp
+++ b/src/devices/sound/nes_apu.cpp
@@ -427,7 +427,7 @@ int8 nesapu_device::apu_noise(noise_t *chan)
}
/* RESET DPCM PARAMETERS */
-INLINE void apu_dpcmreset(dpcm_t *chan)
+static inline void apu_dpcmreset(dpcm_t *chan)
{
chan->address = 0xC000 + (uint16) (chan->regs[2] << 6);
chan->length = (uint16) (chan->regs[3] << 4) + 1;
diff --git a/src/devices/sound/sid.cpp b/src/devices/sound/sid.cpp
index 375095e7401..d040702eeae 100644
--- a/src/devices/sound/sid.cpp
+++ b/src/devices/sound/sid.cpp
@@ -55,7 +55,7 @@ static void MixerInit(int threeVoiceAmplify)
}
-INLINE void syncEm(SID6581_t *This)
+static inline void syncEm(SID6581_t *This)
{
int sync1 = (This->optr1.modulator->cycleLenCount <= 0);
int sync2 = (This->optr2.modulator->cycleLenCount <= 0);
diff --git a/src/devices/sound/sidenvel.cpp b/src/devices/sound/sidenvel.cpp
index 9b375c37b1f..2fa17166638 100644
--- a/src/devices/sound/sidenvel.cpp
+++ b/src/devices/sound/sidenvel.cpp
@@ -195,24 +195,24 @@ void enveEmuResetOperator(sidOperator* pVoice)
pVoice->enveShortAttackCount = 0;
}
-INLINE UINT16 enveEmuStartAttack(sidOperator*);
-INLINE UINT16 enveEmuStartDecay(sidOperator*);
-INLINE UINT16 enveEmuStartRelease(sidOperator*);
-INLINE UINT16 enveEmuAlterAttack(sidOperator*);
-INLINE UINT16 enveEmuAlterDecay(sidOperator*);
-INLINE UINT16 enveEmuAlterSustain(sidOperator*);
-INLINE UINT16 enveEmuAlterSustainDecay(sidOperator*);
-INLINE UINT16 enveEmuAlterRelease(sidOperator*);
-INLINE UINT16 enveEmuAttack(sidOperator*);
-INLINE UINT16 enveEmuDecay(sidOperator*);
-INLINE UINT16 enveEmuSustain(sidOperator*);
-INLINE UINT16 enveEmuSustainDecay(sidOperator*);
-INLINE UINT16 enveEmuRelease(sidOperator*);
-INLINE UINT16 enveEmuMute(sidOperator*);
-
-INLINE UINT16 enveEmuStartShortAttack(sidOperator*);
-INLINE UINT16 enveEmuAlterShortAttack(sidOperator*);
-INLINE UINT16 enveEmuShortAttack(sidOperator*);
+static inline UINT16 enveEmuStartAttack(sidOperator*);
+static inline UINT16 enveEmuStartDecay(sidOperator*);
+static inline UINT16 enveEmuStartRelease(sidOperator*);
+static inline UINT16 enveEmuAlterAttack(sidOperator*);
+static inline UINT16 enveEmuAlterDecay(sidOperator*);
+static inline UINT16 enveEmuAlterSustain(sidOperator*);
+static inline UINT16 enveEmuAlterSustainDecay(sidOperator*);
+static inline UINT16 enveEmuAlterRelease(sidOperator*);
+static inline UINT16 enveEmuAttack(sidOperator*);
+static inline UINT16 enveEmuDecay(sidOperator*);
+static inline UINT16 enveEmuSustain(sidOperator*);
+static inline UINT16 enveEmuSustainDecay(sidOperator*);
+static inline UINT16 enveEmuRelease(sidOperator*);
+static inline UINT16 enveEmuMute(sidOperator*);
+
+static inline UINT16 enveEmuStartShortAttack(sidOperator*);
+static inline UINT16 enveEmuAlterShortAttack(sidOperator*);
+static inline UINT16 enveEmuShortAttack(sidOperator*);
const ptr2sidUwordFunc enveModeTable[] =
@@ -240,7 +240,7 @@ const ptr2sidUwordFunc enveModeTable[] =
/* */
/* ADSRctrl is (index*2) to enveModeTable[], because of KEY-bit. */
-INLINE void enveEmuEnveAdvance(sidOperator* pVoice)
+static inline void enveEmuEnveAdvance(sidOperator* pVoice)
{
#ifdef SID_FPUENVE
pVoice->fenveStep += pVoice->fenveStepAdd;
@@ -258,7 +258,7 @@ INLINE void enveEmuEnveAdvance(sidOperator* pVoice)
/* */
/* Only used in the beginning. */
-INLINE UINT16 enveEmuMute(sidOperator* pVoice)
+static inline UINT16 enveEmuMute(sidOperator* pVoice)
{
return 0;
}
@@ -267,7 +267,7 @@ INLINE UINT16 enveEmuMute(sidOperator* pVoice)
/* Release */
/* */
-INLINE UINT16 enveEmuRelease(sidOperator* pVoice)
+static inline UINT16 enveEmuRelease(sidOperator* pVoice)
{
#ifdef SID_FPUENVE
pVoice->enveStep = (UINT16)pVoice->fenveStep;
@@ -293,7 +293,7 @@ INLINE UINT16 enveEmuRelease(sidOperator* pVoice)
}
}
-INLINE UINT16 enveEmuAlterRelease(sidOperator* pVoice)
+static inline UINT16 enveEmuAlterRelease(sidOperator* pVoice)
{
UINT8 release = pVoice->SIDSR & 0x0F;
#ifdef SID_FPUENVE
@@ -308,7 +308,7 @@ INLINE UINT16 enveEmuAlterRelease(sidOperator* pVoice)
return enveEmuRelease(pVoice);
}
-INLINE UINT16 enveEmuStartRelease(sidOperator* pVoice)
+static inline UINT16 enveEmuStartRelease(sidOperator* pVoice)
{
pVoice->ADSRctrl = ENVE_RELEASE;
#ifdef SID_FPUENVE
@@ -327,12 +327,12 @@ INLINE UINT16 enveEmuStartRelease(sidOperator* pVoice)
/* Sustain */
/* */
-INLINE UINT16 enveEmuSustain(sidOperator* pVoice)
+static inline UINT16 enveEmuSustain(sidOperator* pVoice)
{
return masterAmplModTable[pVoice->sid->masterVolumeAmplIndex+pVoice->enveVol];
}
-INLINE UINT16 enveEmuSustainDecay(sidOperator* pVoice)
+static inline UINT16 enveEmuSustainDecay(sidOperator* pVoice)
{
#ifdef SID_FPUENVE
pVoice->enveStep = (UINT16)pVoice->fenveStep;
@@ -368,7 +368,7 @@ INLINE UINT16 enveEmuSustainDecay(sidOperator* pVoice)
}
/* This is the same as enveEmuStartSustainDecay(). */
-INLINE UINT16 enveEmuAlterSustainDecay(sidOperator* pVoice)
+static inline UINT16 enveEmuAlterSustainDecay(sidOperator* pVoice)
{
UINT8 decay = pVoice->SIDAD & 0x0F ;
#ifdef SID_FPUENVE
@@ -384,7 +384,7 @@ INLINE UINT16 enveEmuAlterSustainDecay(sidOperator* pVoice)
}
/* This is the same as enveEmuStartSustain(). */
-INLINE UINT16 enveEmuAlterSustain(sidOperator* pVoice)
+static inline UINT16 enveEmuAlterSustain(sidOperator* pVoice)
{
if ( pVoice->enveVol > pVoice->enveSusVol )
{
@@ -404,7 +404,7 @@ INLINE UINT16 enveEmuAlterSustain(sidOperator* pVoice)
/* Decay */
/* */
-INLINE UINT16 enveEmuDecay(sidOperator* pVoice)
+static inline UINT16 enveEmuDecay(sidOperator* pVoice)
{
#ifdef SID_FPUENVE
pVoice->enveStep = (UINT16)pVoice->fenveStep;
@@ -439,7 +439,7 @@ INLINE UINT16 enveEmuDecay(sidOperator* pVoice)
}
}
-INLINE UINT16 enveEmuAlterDecay(sidOperator* pVoice)
+static inline UINT16 enveEmuAlterDecay(sidOperator* pVoice)
{
UINT8 decay = pVoice->SIDAD & 0x0F ;
#ifdef SID_FPUENVE
@@ -454,7 +454,7 @@ INLINE UINT16 enveEmuAlterDecay(sidOperator* pVoice)
return enveEmuDecay(pVoice);
}
-INLINE UINT16 enveEmuStartDecay(sidOperator* pVoice)
+static inline UINT16 enveEmuStartDecay(sidOperator* pVoice)
{
pVoice->ADSRctrl = ENVE_DECAY;
#ifdef SID_FPUENVE
@@ -471,7 +471,7 @@ INLINE UINT16 enveEmuStartDecay(sidOperator* pVoice)
/* Attack */
/* */
-INLINE UINT16 enveEmuAttack(sidOperator* pVoice)
+static inline UINT16 enveEmuAttack(sidOperator* pVoice)
{
#ifdef SID_FPUENVE
pVoice->enveStep = (UINT16)pVoice->fenveStep;
@@ -494,7 +494,7 @@ INLINE UINT16 enveEmuAttack(sidOperator* pVoice)
}
}
-INLINE UINT16 enveEmuAlterAttack(sidOperator* pVoice)
+static inline UINT16 enveEmuAlterAttack(sidOperator* pVoice)
{
UINT8 attack = pVoice->SIDAD >> 4;
#ifdef SID_FPUENVE
@@ -509,7 +509,7 @@ INLINE UINT16 enveEmuAlterAttack(sidOperator* pVoice)
return enveEmuAttack(pVoice);
}
-INLINE UINT16 enveEmuStartAttack(sidOperator* pVoice)
+static inline UINT16 enveEmuStartAttack(sidOperator* pVoice)
{
pVoice->ADSRctrl = ENVE_ATTACK;
#ifdef SID_FPUENVE
@@ -531,7 +531,7 @@ INLINE UINT16 enveEmuStartAttack(sidOperator* pVoice)
/*#include <iostream.h> */
/*#include <iomanip.h> */
-INLINE UINT16 enveEmuShortAttack(sidOperator* pVoice)
+static inline UINT16 enveEmuShortAttack(sidOperator* pVoice)
{
#ifdef SID_FPUENVE
pVoice->enveStep = (UINT16)pVoice->fenveStep;
@@ -556,7 +556,7 @@ INLINE UINT16 enveEmuShortAttack(sidOperator* pVoice)
return masterAmplModTable[ pVoice->sid->masterVolumeAmplIndex + pVoice->enveVol ];
}
-INLINE UINT16 enveEmuAlterShortAttack(sidOperator* pVoice)
+static inline UINT16 enveEmuAlterShortAttack(sidOperator* pVoice)
{
UINT8 attack = pVoice->SIDAD >> 4;
#ifdef SID_FPUENVE
@@ -571,7 +571,7 @@ INLINE UINT16 enveEmuAlterShortAttack(sidOperator* pVoice)
return enveEmuShortAttack(pVoice);
}
-INLINE UINT16 enveEmuStartShortAttack(sidOperator* pVoice)
+static inline UINT16 enveEmuStartShortAttack(sidOperator* pVoice)
{
pVoice->ADSRctrl = ENVE_SHORTATTACK;
#ifdef SID_FPUENVE
diff --git a/src/devices/sound/sidvoice.cpp b/src/devices/sound/sidvoice.cpp
index 5f183307443..3104f69d680 100644
--- a/src/devices/sound/sidvoice.cpp
+++ b/src/devices/sound/sidvoice.cpp
@@ -48,7 +48,7 @@ void sidInitMixerEngine(running_machine &machine)
}
-INLINE void waveAdvance(sidOperator* pVoice)
+static inline void waveAdvance(sidOperator* pVoice)
{
#if defined(DIRECT_FIXPOINT)
pVoice->waveStep.l += pVoice->waveStepAdd.l;
@@ -62,7 +62,7 @@ INLINE void waveAdvance(sidOperator* pVoice)
#endif
}
-INLINE void noiseAdvance(sidOperator* pVoice)
+static inline void noiseAdvance(sidOperator* pVoice)
{
pVoice->noiseStep += pVoice->noiseStepAdd;
if (pVoice->noiseStep >= (1L<<20))
@@ -90,7 +90,7 @@ INLINE void noiseAdvance(sidOperator* pVoice)
}
}
-INLINE void noiseAdvanceHp(sidOperator* pVoice)
+static inline void noiseAdvanceHp(sidOperator* pVoice)
{
UINT32 tmp = pVoice->noiseStepAdd;
while (tmp >= (1L<<20))
@@ -274,7 +274,7 @@ static void sidMode74(sidOperator* pVoice) {
/* */
/* */
-INLINE void waveCalcCycleLen(sidOperator* pVoice)
+static inline void waveCalcCycleLen(sidOperator* pVoice)
{
#if defined(DIRECT_FIXPOINT)
pVoice->cycleAddLen.w[HI] = 0;
@@ -326,7 +326,7 @@ INLINE void waveCalcCycleLen(sidOperator* pVoice)
} /* see above (opening bracket) */
}
-INLINE void waveCalcFilter(sidOperator* pVoice)
+static inline void waveCalcFilter(sidOperator* pVoice)
{
if ( pVoice->filtEnabled )
{
diff --git a/src/devices/sound/sn76477.cpp b/src/devices/sound/sn76477.cpp
index af53b7bc7ab..bc89db04447 100644
--- a/src/devices/sound/sn76477.cpp
+++ b/src/devices/sound/sn76477.cpp
@@ -265,13 +265,13 @@ void sn76477_device::device_stop()
#undef max
#undef min
-INLINE double max(double a, double b)
+static inline double max(double a, double b)
{
return (a > b) ? a : b;
}
-INLINE double min(double a, double b)
+static inline double min(double a, double b)
{
return (a < b) ? a : b;
}
diff --git a/src/devices/sound/sp0256.cpp b/src/devices/sound/sp0256.cpp
index 31071bb247e..1ba54669ab2 100644
--- a/src/devices/sound/sp0256.cpp
+++ b/src/devices/sound/sp0256.cpp
@@ -215,7 +215,7 @@ void sp0256_device::device_reset()
/* ======================================================================== */
/* LIMIT -- Limiter function for digital sample output. */
/* ======================================================================== */
-INLINE INT16 limit(INT16 s)
+static inline INT16 limit(INT16 s)
{
#ifdef HIGH_QUALITY /* Higher quality than the original, but who cares? */
if (s > 8191) return 8191;
@@ -230,7 +230,7 @@ INLINE INT16 limit(INT16 s)
/* ======================================================================== */
/* LPC12_UPDATE -- Update the 12-pole filter, outputting samples. */
/* ======================================================================== */
-INLINE int lpc12_update(struct lpc12_t *f, int num_samp, INT16 *out, UINT32 *optr)
+static inline int lpc12_update(struct lpc12_t *f, int num_samp, INT16 *out, UINT32 *optr)
{
int i, j;
INT16 samp;
@@ -360,7 +360,7 @@ static const int stage_map[6] = { 0, 1, 2, 3, 4, 5 };
/* ======================================================================== */
/* LPC12_REGDEC -- Decode the register set in the filter bank. */
/* ======================================================================== */
-INLINE void lpc12_regdec(struct lpc12_t *f)
+static inline void lpc12_regdec(struct lpc12_t *f)
{
int i;
@@ -722,7 +722,7 @@ static const INT16 sp0256_df_idx[16 * 8] =
/* ======================================================================== */
/* BITREV32 -- Bit-reverse a 32-bit number. */
/* ======================================================================== */
-INLINE UINT32 bitrev32(UINT32 val)
+static inline UINT32 bitrev32(UINT32 val)
{
val = ((val & 0xFFFF0000) >> 16) | ((val & 0x0000FFFF) << 16);
val = ((val & 0xFF00FF00) >> 8) | ((val & 0x00FF00FF) << 8);
@@ -736,7 +736,7 @@ INLINE UINT32 bitrev32(UINT32 val)
/* ======================================================================== */
/* BITREV8 -- Bit-reverse a 8-bit number. */
/* ======================================================================== */
-INLINE UINT8 bitrev8(UINT8 val)
+static inline UINT8 bitrev8(UINT8 val)
{
val = ((val & 0xF0) >> 4) | ((val & 0x0F) << 4);
val = ((val & 0xCC) >> 2) | ((val & 0x33) << 2);
diff --git a/src/devices/sound/spu.cpp b/src/devices/sound/spu.cpp
index 31d04be95d6..50276f3c486 100644
--- a/src/devices/sound/spu.cpp
+++ b/src/devices/sound/spu.cpp
@@ -39,22 +39,22 @@ const device_type SPU = &device_creator<spu_device>;
//
//
//
-INLINE unsigned int min(unsigned int a, unsigned int b)
+static inline unsigned int min(unsigned int a, unsigned int b)
{
return (a > b) ? b : a;
}
-INLINE unsigned int max(unsigned int a, unsigned int b)
+static inline unsigned int max(unsigned int a, unsigned int b)
{
return (a > b) ? a : b;
}
-INLINE double mindb(double a, double b)
+static inline double mindb(double a, double b)
{
return (a > b) ? b : a;
}
-INLINE double maxdb(double a, double b)
+static inline double maxdb(double a, double b)
{
return (a > b) ? a : b;
}
diff --git a/src/devices/sound/ym2151.cpp b/src/devices/sound/ym2151.cpp
index 5569fc6e9e1..9f5f63120ec 100644
--- a/src/devices/sound/ym2151.cpp
+++ b/src/devices/sound/ym2151.cpp
@@ -753,7 +753,7 @@ static void init_chip_tables(YM2151 *chip)
} \
}
-INLINE void envelope_KONKOFF(YM2151 *PSG, YM2151Operator * op, int v)
+static inline void envelope_KONKOFF(YM2151 *PSG, YM2151Operator * op, int v)
{
if (v&0x08) /* M1 */
KEY_ON (op+0, 1)
@@ -857,7 +857,7 @@ static TIMER_CALLBACK( timer_callback_chip_busy )
-INLINE void set_connect(YM2151 *PSG, YM2151Operator *om1, int cha, int v)
+static inline void set_connect(YM2151 *PSG, YM2151Operator *om1, int cha, int v)
{
YM2151Operator *om2 = om1+1;
YM2151Operator *oc1 = om1+2;
@@ -949,7 +949,7 @@ INLINE void set_connect(YM2151 *PSG, YM2151Operator *om1, int cha, int v)
}
-INLINE void refresh_EG(YM2151Operator * op)
+static inline void refresh_EG(YM2151Operator * op)
{
UINT32 kc;
UINT32 v;
@@ -1650,7 +1650,7 @@ void ym2151_reset_chip(void *_chip)
-INLINE signed int op_calc(YM2151Operator * OP, unsigned int env, signed int pm)
+static inline signed int op_calc(YM2151Operator * OP, unsigned int env, signed int pm)
{
UINT32 p;
@@ -1663,7 +1663,7 @@ INLINE signed int op_calc(YM2151Operator * OP, unsigned int env, signed int pm)
return tl_tab[p];
}
-INLINE signed int op_calc1(YM2151Operator * OP, unsigned int env, signed int pm)
+static inline signed int op_calc1(YM2151Operator * OP, unsigned int env, signed int pm)
{
UINT32 p;
INT32 i;
@@ -1687,7 +1687,7 @@ INLINE signed int op_calc1(YM2151Operator * OP, unsigned int env, signed int pm)
#define volume_calc(OP) ((OP)->tl + ((UINT32)(OP)->volume) + (AM & (OP)->AMmask))
-INLINE void chan_calc(YM2151 *PSG, unsigned int chan)
+static inline void chan_calc(YM2151 *PSG, unsigned int chan)
{
YM2151Operator *op;
unsigned int env;
@@ -1737,7 +1737,7 @@ INLINE void chan_calc(YM2151 *PSG, unsigned int chan)
op->mem_value = PSG->mem;
}
-INLINE void chan7_calc(YM2151 *PSG)
+static inline void chan7_calc(YM2151 *PSG)
{
YM2151Operator *op;
unsigned int env;
@@ -2007,7 +2007,7 @@ rate 11 1 |
--
*/
-INLINE void advance_eg(YM2151 *PSG)
+static inline void advance_eg(YM2151 *PSG)
{
YM2151Operator *op;
unsigned int i;
@@ -2091,7 +2091,7 @@ INLINE void advance_eg(YM2151 *PSG)
}
-INLINE void advance(YM2151 *PSG)
+static inline void advance(YM2151 *PSG)
{
YM2151Operator *op;
unsigned int i;
@@ -2275,7 +2275,7 @@ INLINE void advance(YM2151 *PSG)
}
#if 0
-INLINE signed int acc_calc(signed int value)
+static inline signed int acc_calc(signed int value)
{
if (value>=0)
{
diff --git a/src/devices/sound/ym2413.cpp b/src/devices/sound/ym2413.cpp
index fcab80555df..7573bfa4323 100644
--- a/src/devices/sound/ym2413.cpp
+++ b/src/devices/sound/ym2413.cpp
@@ -98,7 +98,7 @@ to do:
//#define SAVE_SAMPLE
#ifdef SAVE_SAMPLE
-INLINE signed int acc_calc(signed int value)
+static inline signed int acc_calc(signed int value)
{
if (value>=0)
{
@@ -628,7 +628,7 @@ static int num_lock = 0;
#define SLOT8_2 (&chip->P_CH[8].SLOT[SLOT2])
-INLINE int limit( int val, int max, int min )
+static inline int limit( int val, int max, int min )
{
if ( val > max )
val = max;
@@ -640,7 +640,7 @@ INLINE int limit( int val, int max, int min )
/* advance LFO to next sample */
-INLINE void advance_lfo(YM2413 *chip)
+static inline void advance_lfo(YM2413 *chip)
{
/* LFO */
chip->lfo_am_cnt += chip->lfo_am_inc;
@@ -654,7 +654,7 @@ INLINE void advance_lfo(YM2413 *chip)
}
/* advance to next sample */
-INLINE void advance(YM2413 *chip)
+static inline void advance(YM2413 *chip)
{
OPLL_CH *CH;
OPLL_SLOT *op;
@@ -883,7 +883,7 @@ INLINE void advance(YM2413 *chip)
}
-INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+static inline signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
{
UINT32 p;
@@ -894,7 +894,7 @@ INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigne
return tl_tab[p];
}
-INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+static inline signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
{
UINT32 p;
INT32 i;
@@ -916,7 +916,7 @@ INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsign
#define volume_calc(OP) ((OP)->TLL + ((UINT32)(OP)->volume) + (chip->LFO_AM & (OP)->AMmask))
/* calculate output */
-INLINE void chan_calc( YM2413 *chip, OPLL_CH *CH )
+static inline void chan_calc( YM2413 *chip, OPLL_CH *CH )
{
OPLL_SLOT *SLOT;
unsigned int env;
@@ -993,7 +993,7 @@ number number BLK/FNUM2 FNUM Drum Hat Drum Tom Cymbal
/* calculate rhythm */
-INLINE void rhythm_calc( YM2413 *chip, OPLL_CH *CH, unsigned int noise )
+static inline void rhythm_calc( YM2413 *chip, OPLL_CH *CH, unsigned int noise )
{
OPLL_SLOT *SLOT;
signed int out;
@@ -1392,7 +1392,7 @@ static void OPLL_initalize(YM2413 *chip, device_t *device)
/*logerror("YM2413init eg_timer_add=%8x eg_timer_overflow=%8x\n", chip->eg_timer_add, chip->eg_timer_overflow);*/
}
-INLINE void KEY_ON(OPLL_SLOT *SLOT, UINT32 key_set)
+static inline void KEY_ON(OPLL_SLOT *SLOT, UINT32 key_set)
{
if( !SLOT->key )
{
@@ -1403,7 +1403,7 @@ INLINE void KEY_ON(OPLL_SLOT *SLOT, UINT32 key_set)
SLOT->key |= key_set;
}
-INLINE void KEY_OFF(OPLL_SLOT *SLOT, UINT32 key_clr)
+static inline void KEY_OFF(OPLL_SLOT *SLOT, UINT32 key_clr)
{
if( SLOT->key )
{
@@ -1419,7 +1419,7 @@ INLINE void KEY_OFF(OPLL_SLOT *SLOT, UINT32 key_clr)
}
/* update phase increment counter of operator (also update the EG rates if necessary) */
-INLINE void CALC_FCSLOT(OPLL_CH *CH,OPLL_SLOT *SLOT)
+static inline void CALC_FCSLOT(OPLL_CH *CH,OPLL_SLOT *SLOT)
{
int ksr;
UINT32 SLOT_rs;
@@ -1465,7 +1465,7 @@ INLINE void CALC_FCSLOT(OPLL_CH *CH,OPLL_SLOT *SLOT)
}
/* set multi,am,vib,EG-TYP,KSR,mul */
-INLINE void set_mul(YM2413 *chip,int slot,int v)
+static inline void set_mul(YM2413 *chip,int slot,int v)
{
OPLL_CH *CH = &chip->P_CH[slot/2];
OPLL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -1479,7 +1479,7 @@ INLINE void set_mul(YM2413 *chip,int slot,int v)
}
/* set ksl, tl */
-INLINE void set_ksl_tl(YM2413 *chip,int chan,int v)
+static inline void set_ksl_tl(YM2413 *chip,int chan,int v)
{
OPLL_CH *CH = &chip->P_CH[chan];
/* modulator */
@@ -1491,7 +1491,7 @@ INLINE void set_ksl_tl(YM2413 *chip,int chan,int v)
}
/* set ksl , waveforms, feedback */
-INLINE void set_ksl_wave_fb(YM2413 *chip,int chan,int v)
+static inline void set_ksl_wave_fb(YM2413 *chip,int chan,int v)
{
OPLL_CH *CH = &chip->P_CH[chan];
/* modulator */
@@ -1509,7 +1509,7 @@ INLINE void set_ksl_wave_fb(YM2413 *chip,int chan,int v)
}
/* set attack rate & decay rate */
-INLINE void set_ar_dr(YM2413 *chip,int slot,int v)
+static inline void set_ar_dr(YM2413 *chip,int slot,int v)
{
OPLL_CH *CH = &chip->P_CH[slot/2];
OPLL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -1533,7 +1533,7 @@ INLINE void set_ar_dr(YM2413 *chip,int slot,int v)
}
/* set sustain level & release rate */
-INLINE void set_sl_rr(YM2413 *chip,int slot,int v)
+static inline void set_sl_rr(YM2413 *chip,int slot,int v)
{
OPLL_CH *CH = &chip->P_CH[slot/2];
OPLL_SLOT *SLOT = &CH->SLOT[slot&1];
diff --git a/src/devices/sound/ymdeltat.cpp b/src/devices/sound/ymdeltat.cpp
index 3e592ea7ce2..d6668c7a8a5 100644
--- a/src/devices/sound/ymdeltat.cpp
+++ b/src/devices/sound/ymdeltat.cpp
@@ -476,7 +476,7 @@ void YM_DELTAT_savestate(device_t *device,YM_DELTAT *DELTAT)
else if ( val < min ) val = min; \
}
-INLINE void YM_DELTAT_synthesis_from_external_memory(YM_DELTAT *DELTAT)
+static inline void YM_DELTAT_synthesis_from_external_memory(YM_DELTAT *DELTAT)
{
UINT32 step;
int data;
@@ -557,7 +557,7 @@ INLINE void YM_DELTAT_synthesis_from_external_memory(YM_DELTAT *DELTAT)
-INLINE void YM_DELTAT_synthesis_from_CPU_memory(YM_DELTAT *DELTAT)
+static inline void YM_DELTAT_synthesis_from_CPU_memory(YM_DELTAT *DELTAT)
{
UINT32 step;
int data;
diff --git a/src/devices/sound/ymf262.cpp b/src/devices/sound/ymf262.cpp
index 366624ac5c4..84f0c22466d 100644
--- a/src/devices/sound/ymf262.cpp
+++ b/src/devices/sound/ymf262.cpp
@@ -609,7 +609,7 @@ static int num_lock = 0;
-INLINE int limit( int val, int max, int min ) {
+static inline int limit( int val, int max, int min ) {
if ( val > max )
val = max;
else if ( val < min )
@@ -620,7 +620,7 @@ INLINE int limit( int val, int max, int min ) {
/* status set and IRQ handling */
-INLINE void OPL3_STATUS_SET(OPL3 *chip,int flag)
+static inline void OPL3_STATUS_SET(OPL3 *chip,int flag)
{
/* set status flag masking out disabled IRQs */
chip->status |= (flag & chip->statusmask);
@@ -636,7 +636,7 @@ INLINE void OPL3_STATUS_SET(OPL3 *chip,int flag)
}
/* status reset and IRQ handling */
-INLINE void OPL3_STATUS_RESET(OPL3 *chip,int flag)
+static inline void OPL3_STATUS_RESET(OPL3 *chip,int flag)
{
/* reset status flag */
chip->status &= ~flag;
@@ -652,7 +652,7 @@ INLINE void OPL3_STATUS_RESET(OPL3 *chip,int flag)
}
/* IRQ mask set */
-INLINE void OPL3_STATUSMASK_SET(OPL3 *chip,int flag)
+static inline void OPL3_STATUSMASK_SET(OPL3 *chip,int flag)
{
chip->statusmask = flag;
/* IRQ handling check */
@@ -662,7 +662,7 @@ INLINE void OPL3_STATUSMASK_SET(OPL3 *chip,int flag)
/* advance LFO to next sample */
-INLINE void advance_lfo(OPL3 *chip)
+static inline void advance_lfo(OPL3 *chip)
{
UINT8 tmp;
@@ -683,7 +683,7 @@ INLINE void advance_lfo(OPL3 *chip)
}
/* advance to next sample */
-INLINE void advance(OPL3 *chip)
+static inline void advance(OPL3 *chip)
{
OPL3_CH *CH;
OPL3_SLOT *op;
@@ -851,7 +851,7 @@ INLINE void advance(OPL3 *chip)
}
-INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+static inline signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
{
UINT32 p;
@@ -862,7 +862,7 @@ INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigne
return tl_tab[p];
}
-INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+static inline signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
{
UINT32 p;
@@ -878,7 +878,7 @@ INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsign
/* calculate output of a standard 2 operator channel
(or 1st part of a 4-op channel) */
-INLINE void chan_calc( OPL3 *chip, OPL3_CH *CH )
+static inline void chan_calc( OPL3 *chip, OPL3_CH *CH )
{
OPL3_SLOT *SLOT;
unsigned int env;
@@ -913,7 +913,7 @@ INLINE void chan_calc( OPL3 *chip, OPL3_CH *CH )
}
/* calculate output of a 2nd part of 4-op channel */
-INLINE void chan_calc_ext( OPL3 *chip, OPL3_CH *CH )
+static inline void chan_calc_ext( OPL3 *chip, OPL3_CH *CH )
{
OPL3_SLOT *SLOT;
unsigned int env;
@@ -971,7 +971,7 @@ number number BLK/FNUM2 FNUM Drum Hat Drum Tom Cymbal
/* calculate rhythm */
-INLINE void chan_calc_rhythm( OPL3 *chip, OPL3_CH *CH, unsigned int noise )
+static inline void chan_calc_rhythm( OPL3 *chip, OPL3_CH *CH, unsigned int noise )
{
OPL3_SLOT *SLOT;
signed int *chanout = chip->chanout;
@@ -1370,7 +1370,7 @@ static void OPL3_initalize(OPL3 *chip)
}
-INLINE void FM_KEYON(OPL3_SLOT *SLOT, UINT32 key_set)
+static inline void FM_KEYON(OPL3_SLOT *SLOT, UINT32 key_set)
{
if( !SLOT->key )
{
@@ -1382,7 +1382,7 @@ INLINE void FM_KEYON(OPL3_SLOT *SLOT, UINT32 key_set)
SLOT->key |= key_set;
}
-INLINE void FM_KEYOFF(OPL3_SLOT *SLOT, UINT32 key_clr)
+static inline void FM_KEYOFF(OPL3_SLOT *SLOT, UINT32 key_clr)
{
if( SLOT->key )
{
@@ -1398,7 +1398,7 @@ INLINE void FM_KEYOFF(OPL3_SLOT *SLOT, UINT32 key_clr)
}
/* update phase increment counter of operator (also update the EG rates if necessary) */
-INLINE void CALC_FCSLOT(OPL3_CH *CH,OPL3_SLOT *SLOT)
+static inline void CALC_FCSLOT(OPL3_CH *CH,OPL3_SLOT *SLOT)
{
int ksr;
@@ -1433,7 +1433,7 @@ INLINE void CALC_FCSLOT(OPL3_CH *CH,OPL3_SLOT *SLOT)
}
/* set multi,am,vib,EG-TYP,KSR,mul */
-INLINE void set_mul(OPL3 *chip,int slot,int v)
+static inline void set_mul(OPL3 *chip,int slot,int v)
{
OPL3_CH *CH = &chip->P_CH[slot/2];
OPL3_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -1499,7 +1499,7 @@ INLINE void set_mul(OPL3 *chip,int slot,int v)
}
/* set ksl & tl */
-INLINE void set_ksl_tl(OPL3 *chip,int slot,int v)
+static inline void set_ksl_tl(OPL3 *chip,int slot,int v)
{
OPL3_CH *CH = &chip->P_CH[slot/2];
OPL3_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -1563,7 +1563,7 @@ INLINE void set_ksl_tl(OPL3 *chip,int slot,int v)
}
/* set attack rate & decay rate */
-INLINE void set_ar_dr(OPL3 *chip,int slot,int v)
+static inline void set_ar_dr(OPL3 *chip,int slot,int v)
{
OPL3_CH *CH = &chip->P_CH[slot/2];
OPL3_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -1590,7 +1590,7 @@ INLINE void set_ar_dr(OPL3 *chip,int slot,int v)
}
/* set sustain level & release rate */
-INLINE void set_sl_rr(OPL3 *chip,int slot,int v)
+static inline void set_sl_rr(OPL3 *chip,int slot,int v)
{
OPL3_CH *CH = &chip->P_CH[slot/2];
OPL3_SLOT *SLOT = &CH->SLOT[slot&1];
diff --git a/src/devices/video/gf4500.cpp b/src/devices/video/gf4500.cpp
index 06cb8cd9030..f3061597002 100644
--- a/src/devices/video/gf4500.cpp
+++ b/src/devices/video/gf4500.cpp
@@ -13,7 +13,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
{
if (VERBOSE_LEVEL >= n_level)
{
diff --git a/src/devices/video/polylgcy.cpp b/src/devices/video/polylgcy.cpp
index d88a68c86d1..b18c6941515 100644
--- a/src/devices/video/polylgcy.cpp
+++ b/src/devices/video/polylgcy.cpp
@@ -210,7 +210,7 @@ static void poly_state_presave(legacy_poly_manager *poly);
down
-------------------------------------------------*/
-INLINE INT32 round_coordinate(float value)
+static inline INT32 round_coordinate(float value)
{
INT32 result = floor(value);
return result + (value - (float)result > 0.5f);
@@ -222,7 +222,7 @@ INLINE INT32 round_coordinate(float value)
a simple tri_extent to a full poly_extent
-------------------------------------------------*/
-INLINE void convert_tri_extent_to_poly_extent(poly_extent *dstextent, const tri_extent *srcextent, const polygon_info *polygon, INT32 y)
+static inline void convert_tri_extent_to_poly_extent(poly_extent *dstextent, const tri_extent *srcextent, const polygon_info *polygon, INT32 y)
{
/* copy start/stop always */
dstextent->startx = srcextent->startx;
@@ -242,7 +242,7 @@ INLINE void convert_tri_extent_to_poly_extent(poly_extent *dstextent, const tri_
a vertex based on p[0] crossing the clipval
-------------------------------------------------*/
-INLINE void interpolate_vertex(poly_vertex *outv, const poly_vertex *v1, const poly_vertex *v2, int paramcount, float clipval)
+static inline void interpolate_vertex(poly_vertex *outv, const poly_vertex *v1, const poly_vertex *v2, int paramcount, float clipval)
{
float frac = (clipval - v1->p[0]) / (v2->p[0] - v1->p[0]);
int paramnum;
@@ -260,7 +260,7 @@ INLINE void interpolate_vertex(poly_vertex *outv, const poly_vertex *v1, const p
another
-------------------------------------------------*/
-INLINE void copy_vertex(poly_vertex *outv, const poly_vertex *v, int paramcount)
+static inline void copy_vertex(poly_vertex *outv, const poly_vertex *v, int paramcount)
{
int paramnum;
@@ -276,7 +276,7 @@ INLINE void copy_vertex(poly_vertex *outv, const poly_vertex *v, int paramcount)
object, blocking if we run out
-------------------------------------------------*/
-INLINE polygon_info *allocate_polygon(legacy_poly_manager *poly, int miny, int maxy)
+static inline polygon_info *allocate_polygon(legacy_poly_manager *poly, int miny, int maxy)
{
/* wait for a work item if we have to */
if (poly->polygon_next + 1 > poly->polygon_count)
diff --git a/src/devices/video/psx.cpp b/src/devices/video/psx.cpp
index 4c6efbdf355..9268c6dc575 100644
--- a/src/devices/video/psx.cpp
+++ b/src/devices/video/psx.cpp
@@ -101,7 +101,7 @@ static const UINT16 m_p_n_prevpointlist3[] = { 2, 0, 1 };
#define TEXTURE_V( a ) ( a.b.h )
#define TEXTURE_U( a ) ( a.b.l )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -1282,7 +1282,7 @@ void psxgpu_device::decode_tpage( UINT32 tpage )
a.sw.l = SINT11( COORD_X( a ) ); \
a.sw.h = SINT11( COORD_Y( a ) );
-INLINE int CullVertex( int a, int b )
+static inline int CullVertex( int a, int b )
{
int d = a - b;
if( d < -1023 || d > 1023 )
diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp
index 126089d40b5..e467bb4a68c 100644
--- a/src/devices/video/stvvdp1.cpp
+++ b/src/devices/video/stvvdp1.cpp
@@ -533,7 +533,7 @@ UINT8 saturn_state::stv_read_gouraud_table( void )
}
}
-INLINE INT32 _shading( INT32 color, INT32 correction )
+static inline INT32 _shading( INT32 color, INT32 correction )
{
correction = (correction >> 16) & 0x1f;
color += (correction - 16);
diff --git a/src/devices/video/stvvdp2.cpp b/src/devices/video/stvvdp2.cpp
index 5308b2afd6b..07b718741c2 100644
--- a/src/devices/video/stvvdp2.cpp
+++ b/src/devices/video/stvvdp2.cpp
@@ -2318,7 +2318,7 @@ UINT8 saturn_state::stv_vdp2_check_vram_cycle_pattern_registers( UINT8 access_co
return access_command_ok == 3 ? 1 : 0;
}
-INLINE UINT32 stv_add_blend(UINT32 a, UINT32 b)
+static inline UINT32 stv_add_blend(UINT32 a, UINT32 b)
{
rgb_t rb = (a & 0xff00ff) + (b & 0xff00ff);
rgb_t g = (a & 0x00ff00) + (b & 0x00ff00);
diff --git a/src/devices/video/vooddefs.h b/src/devices/video/vooddefs.h
index f98aece2110..bf14947df16 100644
--- a/src/devices/video/vooddefs.h
+++ b/src/devices/video/vooddefs.h
@@ -1745,13 +1745,13 @@ struct voodoo_state
*
*************************************/
-INLINE void fifo_reset(fifo_state *f)
+static inline void fifo_reset(fifo_state *f)
{
f->in = f->out = 0;
}
-INLINE void fifo_add(fifo_state *f, UINT32 data)
+static inline void fifo_add(fifo_state *f, UINT32 data)
{
INT32 next_in;
@@ -1769,7 +1769,7 @@ INLINE void fifo_add(fifo_state *f, UINT32 data)
}
-INLINE UINT32 fifo_remove(fifo_state *f)
+static inline UINT32 fifo_remove(fifo_state *f)
{
UINT32 data = 0xffffffff;
@@ -1791,25 +1791,25 @@ INLINE UINT32 fifo_remove(fifo_state *f)
}
-INLINE UINT32 fifo_peek(fifo_state *f)
+static inline UINT32 fifo_peek(fifo_state *f)
{
return f->base[f->out];
}
-INLINE int fifo_empty(fifo_state *f)
+static inline int fifo_empty(fifo_state *f)
{
return (f->in == f->out);
}
-INLINE int fifo_full(fifo_state *f)
+static inline int fifo_full(fifo_state *f)
{
return (f->in + 1 == f->out || (f->in == f->size - 1 && f->out == 0));
}
-INLINE INT32 fifo_items(fifo_state *f)
+static inline INT32 fifo_items(fifo_state *f)
{
INT32 items = f->in - f->out;
if (items < 0)
@@ -1818,7 +1818,7 @@ INLINE INT32 fifo_items(fifo_state *f)
}
-INLINE INT32 fifo_space(fifo_state *f)
+static inline INT32 fifo_space(fifo_state *f)
{
INT32 items = f->in - f->out;
if (items < 0)
@@ -1847,7 +1847,7 @@ INLINE INT32 fifo_space(fifo_state *f)
*
*************************************/
-INLINE INT32 fast_reciplog(INT64 value, INT32 *log2)
+static inline INT32 fast_reciplog(INT64 value, INT32 *log2)
{
extern UINT32 voodoo_reciplog[];
UINT32 temp, recip, rlog;
@@ -1925,7 +1925,7 @@ INLINE INT32 fast_reciplog(INT64 value, INT32 *log2)
*
*************************************/
-INLINE INT32 float_to_int32(UINT32 data, int fixedbits)
+static inline INT32 float_to_int32(UINT32 data, int fixedbits)
{
int exponent = ((data >> 23) & 0xff) - 127 - 23 + fixedbits;
INT32 result = (data & 0x7fffff) | 0x800000;
@@ -1949,7 +1949,7 @@ INLINE INT32 float_to_int32(UINT32 data, int fixedbits)
}
-INLINE INT64 float_to_int64(UINT32 data, int fixedbits)
+static inline INT64 float_to_int64(UINT32 data, int fixedbits)
{
int exponent = ((data >> 23) & 0xff) - 127 - 23 + fixedbits;
INT64 result = (data & 0x7fffff) | 0x800000;
@@ -1980,7 +1980,7 @@ INLINE INT64 float_to_int64(UINT32 data, int fixedbits)
*
*************************************/
-INLINE UINT32 normalize_color_path(UINT32 eff_color_path)
+static inline UINT32 normalize_color_path(UINT32 eff_color_path)
{
/* ignore the subpixel adjust and texture enable flags */
eff_color_path &= ~((1 << 26) | (1 << 27));
@@ -1989,7 +1989,7 @@ INLINE UINT32 normalize_color_path(UINT32 eff_color_path)
}
-INLINE UINT32 normalize_alpha_mode(UINT32 eff_alpha_mode)
+static inline UINT32 normalize_alpha_mode(UINT32 eff_alpha_mode)
{
/* always ignore alpha ref value */
eff_alpha_mode &= ~(0xff << 24);
@@ -2006,7 +2006,7 @@ INLINE UINT32 normalize_alpha_mode(UINT32 eff_alpha_mode)
}
-INLINE UINT32 normalize_fog_mode(UINT32 eff_fog_mode)
+static inline UINT32 normalize_fog_mode(UINT32 eff_fog_mode)
{
/* if not doing fogging, ignore all the other fog bits */
if (!FOGMODE_ENABLE_FOG(eff_fog_mode))
@@ -2016,7 +2016,7 @@ INLINE UINT32 normalize_fog_mode(UINT32 eff_fog_mode)
}
-INLINE UINT32 normalize_fbz_mode(UINT32 eff_fbz_mode)
+static inline UINT32 normalize_fbz_mode(UINT32 eff_fbz_mode)
{
/* ignore the draw buffer */
eff_fbz_mode &= ~(3 << 14);
@@ -2025,7 +2025,7 @@ INLINE UINT32 normalize_fbz_mode(UINT32 eff_fbz_mode)
}
-INLINE UINT32 normalize_tex_mode(UINT32 eff_tex_mode)
+static inline UINT32 normalize_tex_mode(UINT32 eff_tex_mode)
{
/* ignore the NCC table and seq_8_downld flags */
eff_tex_mode &= ~((1 << 5) | (1 << 31));
@@ -2042,7 +2042,7 @@ INLINE UINT32 normalize_tex_mode(UINT32 eff_tex_mode)
}
-INLINE UINT32 compute_raster_hash(const raster_info *info)
+static inline UINT32 compute_raster_hash(const raster_info *info)
{
UINT32 hash;
@@ -2199,7 +2199,7 @@ do
} \
while (0)
-INLINE rgbaint_t ATTR_FORCE_INLINE clampARGB(const rgbaint_t &iterargb, UINT32 FBZCP)
+static inline rgbaint_t ATTR_FORCE_INLINE clampARGB(const rgbaint_t &iterargb, UINT32 FBZCP)
{
rgbaint_t result(iterargb);
//rgbaint_t colorint((INT32) (itera>>12), (INT32) (iterr>>12), (INT32) (iterg>>12), (INT32) (iterb>>12));
@@ -2346,7 +2346,7 @@ do
} \
while (0)
-INLINE bool ATTR_FORCE_INLINE chromaKeyTest(voodoo_state *v, stats_block *stats, UINT32 fbzModeReg, rgbaint_t rgbaIntColor)
+static inline bool ATTR_FORCE_INLINE chromaKeyTest(voodoo_state *v, stats_block *stats, UINT32 fbzModeReg, rgbaint_t rgbaIntColor)
{
if (FBZMODE_ENABLE_CHROMAKEY(fbzModeReg))
{
@@ -2435,7 +2435,7 @@ do
} \
while (0)
-INLINE bool alphaMaskTest(stats_block *stats, UINT32 fbzModeReg, UINT8 alpha)
+static inline bool alphaMaskTest(stats_block *stats, UINT32 fbzModeReg, UINT8 alpha)
{
if (FBZMODE_ENABLE_ALPHA_MASK(fbzModeReg))
{
@@ -2521,7 +2521,7 @@ do
} \
while (0)
-INLINE bool ATTR_FORCE_INLINE alphaTest(voodoo_state *v, stats_block *stats, UINT32 alphaModeReg, UINT8 alpha)
+static inline bool ATTR_FORCE_INLINE alphaTest(voodoo_state *v, stats_block *stats, UINT32 alphaModeReg, UINT8 alpha)
{
if (ALPHAMODE_ALPHATEST(alphaModeReg))
{
@@ -2750,7 +2750,7 @@ do
} \
while (0)
-INLINE void ATTR_FORCE_INLINE alphaBlend(UINT32 FBZMODE, UINT32 ALPHAMODE, INT32 x, const UINT8 *dither, int dpix, UINT16 *depth, rgbaint_t &preFog, rgbaint_t &srcColor)
+static inline void ATTR_FORCE_INLINE alphaBlend(UINT32 FBZMODE, UINT32 ALPHAMODE, INT32 x, const UINT8 *dither, int dpix, UINT16 *depth, rgbaint_t &preFog, rgbaint_t &srcColor)
{
if (ALPHAMODE_ALPHABLEND(ALPHAMODE))
{
@@ -3068,7 +3068,7 @@ do
} \
while (0)
-INLINE void ATTR_FORCE_INLINE applyFogging(voodoo_state *v, UINT32 fogModeReg, UINT32 fbzCpReg, INT32 x, const UINT8 *dither4, INT32 fogDepth,
+static inline void ATTR_FORCE_INLINE applyFogging(voodoo_state *v, UINT32 fogModeReg, UINT32 fbzCpReg, INT32 x, const UINT8 *dither4, INT32 fogDepth,
rgbaint_t &color, INT32 iterz, INT64 iterw, UINT8 itera)
{
if (FOGMODE_ENABLE_FOG(fogModeReg))
@@ -3711,7 +3711,7 @@ do
} \
while (0)
-INLINE bool ATTR_FORCE_INLINE depthTest(UINT16 zaColorReg, stats_block *stats, INT32 destDepth, UINT32 fbzModeReg, INT32 biasdepth)
+static inline bool ATTR_FORCE_INLINE depthTest(UINT16 zaColorReg, stats_block *stats, INT32 destDepth, UINT32 fbzModeReg, INT32 biasdepth)
{
/* handle depth buffer testing */
if (FBZMODE_ENABLE_DEPTHBUF(fbzModeReg))
@@ -4163,7 +4163,7 @@ do
} \
while (0)
-INLINE bool ATTR_FORCE_INLINE combineColor(voodoo_state *VV, stats_block *STATS, UINT32 FBZCOLORPATH, UINT32 FBZMODE, UINT32 ALPHAMODE,
+static inline bool ATTR_FORCE_INLINE combineColor(voodoo_state *VV, stats_block *STATS, UINT32 FBZCOLORPATH, UINT32 FBZMODE, UINT32 ALPHAMODE,
rgbaint_t TEXELARGB, INT32 ITERZ, INT64 ITERW, rgbaint_t &srcColor)
{
rgbaint_t c_other;
@@ -4722,7 +4722,7 @@ static void raster_##name(void *destbase, INT32 y, const poly_extent *extent, co
// The return value is coded as a 24.8 value.
// The maximum error using a 4 bit lookup from the mantissa is 0.0875, which is less than 1/2 lsb (0.125) for 2 bits of fraction.
// ******************************************************************************************************************************
-INLINE INT32 ATTR_FORCE_INLINE new_log2(double &value)
+static inline INT32 ATTR_FORCE_INLINE new_log2(double &value)
{
static const INT32 new_log2_table[16] = {0, 22, 44, 63, 82, 100, 118, 134, 150, 165, 179, 193, 207, 220, 232, 244};
UINT64 ival = *((UINT64 *)&value);
@@ -4738,7 +4738,7 @@ INLINE INT32 ATTR_FORCE_INLINE new_log2(double &value)
// Computes A/C and B/C and returns log2 of 1/C
// A, B and C are 16.32 values. The results are 24.8.
-INLINE void ATTR_FORCE_INLINE multi_reciplog(INT64 valueA, INT64 valueB, INT64 valueC, INT32 &log, INT32 &resA, INT32 &resB)
+static inline void ATTR_FORCE_INLINE multi_reciplog(INT64 valueA, INT64 valueB, INT64 valueC, INT32 &log, INT32 &resA, INT32 &resB)
{
double recip = double(1ULL<<(47-39))/valueC;
double resAD = valueA * recip;
@@ -4750,7 +4750,7 @@ INLINE void ATTR_FORCE_INLINE multi_reciplog(INT64 valueA, INT64 valueB, INT64 v
}
-INLINE rgbaint_t ATTR_FORCE_INLINE genTexture(tmu_state *TT, INT32 x, const UINT8 *dither4, const UINT32 TEXMODE, rgb_t *LOOKUP, INT32 LODBASE, INT64 ITERS, INT64 ITERT, INT64 ITERW, INT32 &lod)
+static inline rgbaint_t ATTR_FORCE_INLINE genTexture(tmu_state *TT, INT32 x, const UINT8 *dither4, const UINT32 TEXMODE, rgb_t *LOOKUP, INT32 LODBASE, INT64 ITERS, INT64 ITERT, INT64 ITERW, INT32 &lod)
{
rgbaint_t result;
INT32 s, t, ilod;
@@ -4941,7 +4941,7 @@ INLINE rgbaint_t ATTR_FORCE_INLINE genTexture(tmu_state *TT, INT32 x, const UINT
return result;
}
-INLINE rgbaint_t ATTR_FORCE_INLINE combineTexture(tmu_state *TT, const UINT32 TEXMODE, rgbaint_t c_local, rgbaint_t c_other, INT32 lod)
+static inline rgbaint_t ATTR_FORCE_INLINE combineTexture(tmu_state *TT, const UINT32 TEXMODE, rgbaint_t c_local, rgbaint_t c_other, INT32 lod)
{
INT32 a_other = c_other.get_a();
INT32 a_local = c_local.get_a();
diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp
index 277d3c9a287..72d94e994d4 100644
--- a/src/devices/video/voodoo.cpp
+++ b/src/devices/video/voodoo.cpp
@@ -285,7 +285,7 @@ static const raster_info predef_raster_table[] =
in device is, in fact, a voodoo device
-------------------------------------------------*/
-INLINE voodoo_state *get_safe_token(device_t *device)
+static inline voodoo_state *get_safe_token(device_t *device)
{
assert(device != nullptr);
assert((device->type() == VOODOO_1) || (device->type() == VOODOO_2) || (device->type() == VOODOO_BANSHEE) || (device->type() == VOODOO_3));
@@ -1426,7 +1426,7 @@ static void recompute_texture_params(tmu_state *t)
}
-INLINE INT32 prepare_tmu(tmu_state *t)
+static inline INT32 prepare_tmu(tmu_state *t)
{
INT64 texdx, texdy;
INT32 lodbase;
diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp
index 08eec1307bd..328079095c9 100644
--- a/src/emu/debug/debugcmd.cpp
+++ b/src/emu/debug/debugcmd.cpp
@@ -168,7 +168,7 @@ static void execute_dumpkbd(running_machine &machine, int ref, int params, const
given address is valid for cheating
-------------------------------------------------*/
-INLINE int cheat_address_is_valid(address_space &space, offs_t address)
+static inline int cheat_address_is_valid(address_space &space, offs_t address)
{
return debug_cpu_translate(space, TRANSLATE_READ, &address) && (space.get_write_ptr(address) != nullptr);
}
@@ -179,7 +179,7 @@ INLINE int cheat_address_is_valid(address_space &space, offs_t address)
the current cheat width, if signed
-------------------------------------------------*/
-INLINE UINT64 cheat_sign_extend(const cheat_system *cheatsys, UINT64 value)
+static inline UINT64 cheat_sign_extend(const cheat_system *cheatsys, UINT64 value)
{
if (cheatsys->signed_cheat)
{
@@ -196,7 +196,7 @@ INLINE UINT64 cheat_sign_extend(const cheat_system *cheatsys, UINT64 value)
cheat_byte_swap - swap a value
-------------------------------------------------*/
-INLINE UINT64 cheat_byte_swap(const cheat_system *cheatsys, UINT64 value)
+static inline UINT64 cheat_byte_swap(const cheat_system *cheatsys, UINT64 value)
{
if (cheatsys->swapped_cheat)
{
@@ -217,7 +217,7 @@ INLINE UINT64 cheat_byte_swap(const cheat_system *cheatsys, UINT64 value)
and swapping if necessary
-------------------------------------------------*/
-INLINE UINT64 cheat_read_extended(const cheat_system *cheatsys, address_space &space, offs_t address)
+static inline UINT64 cheat_read_extended(const cheat_system *cheatsys, address_space &space, offs_t address)
{
return cheat_sign_extend(cheatsys, cheat_byte_swap(cheatsys, debug_read_memory(space, address, cheatsys->width, TRUE)));
}
diff --git a/src/emu/debug/dvmemory.cpp b/src/emu/debug/dvmemory.cpp
index 1bff6cc81b1..2327d7284cc 100644
--- a/src/emu/debug/dvmemory.cpp
+++ b/src/emu/debug/dvmemory.cpp
@@ -211,7 +211,7 @@ void debug_view_memory::view_notify(debug_view_notification type)
// whose 32 bit representation is value
//-------------------------------------------------
-INLINE float uint32_to_float(UINT32 value)
+static inline float uint32_to_float(UINT32 value)
{
union {
float f;
@@ -227,7 +227,7 @@ INLINE float uint32_to_float(UINT32 value)
// whose 64 bit representation is value
//-------------------------------------------------
-INLINE float uint64_to_double(UINT64 value)
+static inline float uint64_to_double(UINT64 value)
{
union {
double f;
diff --git a/src/emu/debug/textbuf.cpp b/src/emu/debug/textbuf.cpp
index cd96be9cd5a..e7daf96571a 100644
--- a/src/emu/debug/textbuf.cpp
+++ b/src/emu/debug/textbuf.cpp
@@ -50,7 +50,7 @@ struct text_buffer
currently held in the buffer
-------------------------------------------------*/
-INLINE INT32 buffer_used(text_buffer *text)
+static inline INT32 buffer_used(text_buffer *text)
{
INT32 used = text->bufend - text->bufstart;
if (used < 0)
@@ -64,7 +64,7 @@ INLINE INT32 buffer_used(text_buffer *text)
available in the buffer
-------------------------------------------------*/
-INLINE INT32 buffer_space(text_buffer *text)
+static inline INT32 buffer_space(text_buffer *text)
{
return text->bufsize - buffer_used(text);
}
diff --git a/src/emu/debugger.h b/src/emu/debugger.h
index fe59fc6df52..bde3ad7572b 100644
--- a/src/emu/debugger.h
+++ b/src/emu/debugger.h
@@ -41,7 +41,7 @@ void debugger_flush_all_traces_on_abnormal_exit(void);
this once per instruction from CPU cores
-------------------------------------------------*/
-INLINE void debugger_instruction_hook(device_t *device, offs_t curpc)
+static inline void debugger_instruction_hook(device_t *device, offs_t curpc)
{
#ifndef MAME_DEBUG_FAST
if ((device->machine().debug_flags & DEBUG_FLAG_CALL_HOOK) != 0)
@@ -55,7 +55,7 @@ INLINE void debugger_instruction_hook(device_t *device, offs_t curpc)
anytime an exception is generated
-------------------------------------------------*/
-INLINE void debugger_exception_hook(device_t *device, int exception)
+static inline void debugger_exception_hook(device_t *device, int exception)
{
if ((device->machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
device->debug()->exception_hook(exception);
@@ -73,7 +73,7 @@ INLINE void debugger_exception_hook(device_t *device, int exception)
execution for the given CPU
-------------------------------------------------*/
-INLINE void debugger_start_cpu_hook(device_t *device, const attotime &endtime)
+static inline void debugger_start_cpu_hook(device_t *device, const attotime &endtime)
{
if ((device->machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
device->debug()->start_hook(endtime);
@@ -86,7 +86,7 @@ INLINE void debugger_start_cpu_hook(device_t *device, const attotime &endtime)
for the given CPU
-------------------------------------------------*/
-INLINE void debugger_stop_cpu_hook(device_t *device)
+static inline void debugger_stop_cpu_hook(device_t *device)
{
if ((device->machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
device->debug()->stop_hook();
@@ -99,7 +99,7 @@ INLINE void debugger_stop_cpu_hook(device_t *device)
acknowledged
-------------------------------------------------*/
-INLINE void debugger_interrupt_hook(device_t *device, int irqline)
+static inline void debugger_interrupt_hook(device_t *device, int irqline)
{
if ((device->machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
device->debug()->interrupt_hook(irqline);
@@ -116,7 +116,7 @@ INLINE void debugger_interrupt_hook(device_t *device, int irqline)
next opportunity
-------------------------------------------------*/
-INLINE void debugger_break(running_machine &machine)
+static inline void debugger_break(running_machine &machine)
{
if ((machine.debug_flags & DEBUG_FLAG_ENABLED) != 0)
debug_cpu_get_visible_cpu(machine)->debug()->halt_on_next_instruction("Internal breakpoint\n");
@@ -129,7 +129,7 @@ INLINE void debugger_break(running_machine &machine)
halted within the instruction hook
-------------------------------------------------*/
-INLINE int debugger_within_instruction_hook(running_machine &machine)
+static inline int debugger_within_instruction_hook(running_machine &machine)
{
if ((machine.debug_flags & DEBUG_FLAG_ENABLED) != 0)
return debug_cpu_within_instruction_hook(machine);
diff --git a/src/emu/output.cpp b/src/emu/output.cpp
index e2e919dfaa3..3977c0e809b 100644
--- a/src/emu/output.cpp
+++ b/src/emu/output.cpp
@@ -78,7 +78,7 @@ static void output_exit(running_machine &machine);
get_hash - return the hash of an output value
-------------------------------------------------*/
-INLINE UINT32 get_hash(const char *string)
+static inline UINT32 get_hash(const char *string)
{
return core_crc32(0, (UINT8 *)string, (UINT32)strlen(string));
}
@@ -88,7 +88,7 @@ INLINE UINT32 get_hash(const char *string)
find_item - find an item based on a string
-------------------------------------------------*/
-INLINE output_item *find_item(const char *string)
+static inline output_item *find_item(const char *string)
{
UINT32 hash = get_hash(string);
output_item *item;
@@ -106,7 +106,7 @@ INLINE output_item *find_item(const char *string)
create_new_item - create a new item
-------------------------------------------------*/
-INLINE output_item *create_new_item(const char *outname, INT32 value)
+static inline output_item *create_new_item(const char *outname, INT32 value)
{
auto item = global_alloc(output_item);
UINT32 hash = get_hash(outname);
diff --git a/src/emu/output.h b/src/emu/output.h
index 9ab4fd86b12..95f8e40d821 100644
--- a/src/emu/output.h
+++ b/src/emu/output.h
@@ -62,33 +62,33 @@ const char *output_id_to_name(UINT32 id);
INLINES
***************************************************************************/
-INLINE void output_set_led_value(int index, int value)
+static inline void output_set_led_value(int index, int value)
{
output_set_indexed_value("led", index, value ? 1 : 0);
}
-INLINE void output_set_lamp_value(int index, int value)
+static inline void output_set_lamp_value(int index, int value)
{
output_set_indexed_value("lamp", index, value);
}
-INLINE void output_set_digit_value(int index, int value)
+static inline void output_set_digit_value(int index, int value)
{
output_set_indexed_value("digit", index, value);
}
-INLINE INT32 output_get_led_value(int index)
+static inline INT32 output_get_led_value(int index)
{
return output_get_indexed_value("led", index);
}
-INLINE INT32 output_get_lamp_value(int index)
+static inline INT32 output_get_lamp_value(int index)
{
return output_get_indexed_value("lamp", index);
}
-INLINE INT32 output_get_digit_value(int index)
+static inline INT32 output_get_digit_value(int index)
{
return output_get_indexed_value("digit", index);
}
diff --git a/src/emu/rendutil.h b/src/emu/rendutil.h
index 22c75d42ce6..d992d35d88c 100644
--- a/src/emu/rendutil.h
+++ b/src/emu/rendutil.h
@@ -38,7 +38,7 @@ bool render_load_png(bitmap_argb32 &bitmap, emu_file &file, const char *dirname,
round-to-nearest
-------------------------------------------------*/
-INLINE float render_round_nearest(float f)
+static inline float render_round_nearest(float f)
{
return floor(f + 0.5f);
}
@@ -49,7 +49,7 @@ INLINE float render_round_nearest(float f)
bounds
-------------------------------------------------*/
-INLINE void set_render_bounds_xy(render_bounds *bounds, float x0, float y0, float x1, float y1)
+static inline void set_render_bounds_xy(render_bounds *bounds, float x0, float y0, float x1, float y1)
{
bounds->x0 = x0;
bounds->y0 = y0;
@@ -63,7 +63,7 @@ INLINE void set_render_bounds_xy(render_bounds *bounds, float x0, float y0, floa
bounds
-------------------------------------------------*/
-INLINE void set_render_bounds_wh(render_bounds *bounds, float x0, float y0, float width, float height)
+static inline void set_render_bounds_wh(render_bounds *bounds, float x0, float y0, float width, float height)
{
bounds->x0 = x0;
bounds->y0 = y0;
@@ -77,7 +77,7 @@ INLINE void set_render_bounds_wh(render_bounds *bounds, float x0, float y0, floa
of two render_bounds
-------------------------------------------------*/
-INLINE void sect_render_bounds(render_bounds *dest, const render_bounds *src)
+static inline void sect_render_bounds(render_bounds *dest, const render_bounds *src)
{
dest->x0 = (dest->x0 > src->x0) ? dest->x0 : src->x0;
dest->x1 = (dest->x1 < src->x1) ? dest->x1 : src->x1;
@@ -91,7 +91,7 @@ INLINE void sect_render_bounds(render_bounds *dest, const render_bounds *src)
render_bounds
-------------------------------------------------*/
-INLINE void union_render_bounds(render_bounds *dest, const render_bounds *src)
+static inline void union_render_bounds(render_bounds *dest, const render_bounds *src)
{
dest->x0 = (dest->x0 < src->x0) ? dest->x0 : src->x0;
dest->x1 = (dest->x1 > src->x1) ? dest->x1 : src->x1;
@@ -104,7 +104,7 @@ INLINE void union_render_bounds(render_bounds *dest, const render_bounds *src)
set_render_color - cleaner way to set a color
-------------------------------------------------*/
-INLINE void set_render_color(render_color *color, float a, float r, float g, float b)
+static inline void set_render_color(render_color *color, float a, float r, float g, float b)
{
color->a = a;
color->r = r;
@@ -118,7 +118,7 @@ INLINE void set_render_color(render_color *color, float a, float r, float g, flo
flip flags
-------------------------------------------------*/
-INLINE int orientation_swap_flips(int orientation)
+static inline int orientation_swap_flips(int orientation)
{
return (orientation & ORIENTATION_SWAP_XY) |
((orientation & ORIENTATION_FLIP_X) ? ORIENTATION_FLIP_Y : 0) |
@@ -131,7 +131,7 @@ INLINE int orientation_swap_flips(int orientation)
that will undo another orientation
-------------------------------------------------*/
-INLINE int orientation_reverse(int orientation)
+static inline int orientation_reverse(int orientation)
{
/* if not swapping X/Y, then just apply the same transform to reverse */
if (!(orientation & ORIENTATION_SWAP_XY))
@@ -148,7 +148,7 @@ INLINE int orientation_reverse(int orientation)
after applying two subsequent orientations
-------------------------------------------------*/
-INLINE int orientation_add(int orientation1, int orientation2)
+static inline int orientation_add(int orientation1, int orientation2)
{
/* if the 2nd transform doesn't swap, just XOR together */
if (!(orientation2 & ORIENTATION_SWAP_XY))
@@ -166,7 +166,7 @@ INLINE int orientation_add(int orientation1, int orientation2)
a single RGB component
-------------------------------------------------*/
-INLINE float apply_brightness_contrast_gamma_fp(float srcval, float brightness, float contrast, float gamma)
+static inline float apply_brightness_contrast_gamma_fp(float srcval, float brightness, float contrast, float gamma)
{
/* first apply gamma */
srcval = pow(srcval, 1.0f / gamma);
@@ -189,7 +189,7 @@ INLINE float apply_brightness_contrast_gamma_fp(float srcval, float brightness,
a single RGB component
-------------------------------------------------*/
-INLINE UINT8 apply_brightness_contrast_gamma(UINT8 src, float brightness, float contrast, float gamma)
+static inline UINT8 apply_brightness_contrast_gamma(UINT8 src, float brightness, float contrast, float gamma)
{
float srcval = (float)src * (1.0f / 255.0f);
float result = apply_brightness_contrast_gamma_fp(srcval, brightness, contrast, gamma);
diff --git a/src/emu/sound/filter.h b/src/emu/sound/filter.h
index 5e671e85545..7e7398a2686 100644
--- a/src/emu/sound/filter.h
+++ b/src/emu/sound/filter.h
@@ -44,7 +44,7 @@ void filter_state_free(filter_state* s);
void filter_state_reset(filter* f, filter_state* s);
/* Insert a value in the filter state */
-INLINE void filter_insert(filter* f, filter_state* s, filter_real x) {
+static inline void filter_insert(filter* f, filter_state* s, filter_real x) {
/* next state */
++s->prev_mac;
if (s->prev_mac >= f->order)
diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp
index 02522bc896a..3a016b25b10 100644
--- a/src/emu/ui/ui.cpp
+++ b/src/emu/ui/ui.cpp
@@ -143,7 +143,7 @@ static INT32 slider_crossoffset(running_machine &machine, void *arg, std::string
// character a possible line break?
//-------------------------------------------------
-INLINE int is_breakable_char(unicode_char ch)
+static inline int is_breakable_char(unicode_char ch)
{
// regular spaces and hyphens are breakable
if (ch == ' ' || ch == '-')
diff --git a/src/emu/uiinput.h b/src/emu/uiinput.h
index d5f85e2ff02..3b7a63d420d 100644
--- a/src/emu/uiinput.h
+++ b/src/emu/uiinput.h
@@ -93,7 +93,7 @@ bool ui_input_pressed_repeat(running_machine &machine, int code, int speed);
move event to the specified render_target
-------------------------------------------------*/
-INLINE void ui_input_push_mouse_move_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
+static inline void ui_input_push_mouse_move_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
{
ui_event event = { UI_EVENT_NONE };
event.event_type = UI_EVENT_MOUSE_MOVE;
@@ -109,7 +109,7 @@ INLINE void ui_input_push_mouse_move_event(running_machine &machine, render_targ
mouse leave event to the specified render_target
-------------------------------------------------*/
-INLINE void ui_input_push_mouse_leave_event(running_machine &machine, render_target *target)
+static inline void ui_input_push_mouse_leave_event(running_machine &machine, render_target *target)
{
ui_event event = { UI_EVENT_NONE };
event.event_type = UI_EVENT_MOUSE_LEAVE;
@@ -123,7 +123,7 @@ INLINE void ui_input_push_mouse_leave_event(running_machine &machine, render_tar
down event to the specified render_target
-------------------------------------------------*/
-INLINE void ui_input_push_mouse_down_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
+static inline void ui_input_push_mouse_down_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
{
ui_event event = { UI_EVENT_NONE };
event.event_type = UI_EVENT_MOUSE_DOWN;
@@ -139,7 +139,7 @@ INLINE void ui_input_push_mouse_down_event(running_machine &machine, render_targ
down event to the specified render_target
-------------------------------------------------*/
-INLINE void ui_input_push_mouse_up_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
+static inline void ui_input_push_mouse_up_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
{
ui_event event = { UI_EVENT_NONE };
event.event_type = UI_EVENT_MOUSE_UP;
@@ -156,7 +156,7 @@ INLINE void ui_input_push_mouse_up_event(running_machine &machine, render_target
render_target
-------------------------------------------------*/
-INLINE void ui_input_push_mouse_double_click_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
+static inline void ui_input_push_mouse_double_click_event(running_machine &machine, render_target *target, INT32 x, INT32 y)
{
ui_event event = { UI_EVENT_NONE };
event.event_type = UI_EVENT_MOUSE_DOUBLE_CLICK;
@@ -172,7 +172,7 @@ INLINE void ui_input_push_mouse_double_click_event(running_machine &machine, ren
to the specified render_target
-------------------------------------------------*/
-INLINE void ui_input_push_char_event(running_machine &machine, render_target *target, unicode_char ch)
+static inline void ui_input_push_char_event(running_machine &machine, render_target *target, unicode_char ch)
{
ui_event event = { UI_EVENT_NONE };
event.event_type = UI_EVENT_CHAR;
diff --git a/src/lib/formats/ace_tap.cpp b/src/lib/formats/ace_tap.cpp
index 10265ad5460..e247b0803d6 100644
--- a/src/lib/formats/ace_tap.cpp
+++ b/src/lib/formats/ace_tap.cpp
@@ -26,7 +26,7 @@ static int cas_size;
/*******************************************************************
Generate one high-low cycle of sample data
********************************************************************/
-INLINE int ace_tap_cycle(INT16 *buffer, int sample_pos, int high, int low)
+static inline int ace_tap_cycle(INT16 *buffer, int sample_pos, int high, int low)
{
int i = 0;
@@ -48,7 +48,7 @@ INLINE int ace_tap_cycle(INT16 *buffer, int sample_pos, int high, int low)
}
-INLINE int ace_tap_silence(INT16 *buffer, int sample_pos, int samples)
+static inline int ace_tap_silence(INT16 *buffer, int sample_pos, int samples)
{
int i = 0;
@@ -64,7 +64,7 @@ INLINE int ace_tap_silence(INT16 *buffer, int sample_pos, int samples)
}
-INLINE int ace_tap_byte(INT16 *buffer, int sample_pos, UINT8 data)
+static inline int ace_tap_byte(INT16 *buffer, int sample_pos, UINT8 data)
{
int i, samples;
diff --git a/src/lib/formats/cbm_tap.cpp b/src/lib/formats/cbm_tap.cpp
index 5c3033f9dad..1293d3c531d 100644
--- a/src/lib/formats/cbm_tap.cpp
+++ b/src/lib/formats/cbm_tap.cpp
@@ -135,7 +135,7 @@ static int len;
/* This in fact gives the number of samples for half of the pulse */
-INLINE int tap_data_to_samplecount(int data, int frequency)
+static inline int tap_data_to_samplecount(int data, int frequency)
{
// return (int) (0.5 * (0.5 + (((double)CBM_WAV_FREQUENCY / frequency) * (double)data))); // MESS TZX formula
return (int) (0.5 * (((double)CBM_WAV_FREQUENCY / frequency) * (double)((data) + 0.5))); // tap2wav formula
diff --git a/src/lib/formats/fdi_dsk.cpp b/src/lib/formats/fdi_dsk.cpp
index 05d3d7807b7..b766671ecb8 100644
--- a/src/lib/formats/fdi_dsk.cpp
+++ b/src/lib/formats/fdi_dsk.cpp
@@ -131,7 +131,7 @@ struct fdi_pulse_track_header
INLINE FUNCTIONS
***************************************************************************/
-INLINE struct fdidsk_tag *get_tag(floppy_image_legacy *floppy)
+static inline struct fdidsk_tag *get_tag(floppy_image_legacy *floppy)
{
return (fdidsk_tag *)floppy_tag(floppy);
}
diff --git a/src/lib/formats/hect_tap.cpp b/src/lib/formats/hect_tap.cpp
index 7b2120ddae1..ba79afe1180 100644
--- a/src/lib/formats/hect_tap.cpp
+++ b/src/lib/formats/hect_tap.cpp
@@ -40,7 +40,7 @@ enum
/*******************************************************************
Generate one high-low cycle of sample data
********************************************************************/
-INLINE int hector_tap_cycle(INT16 *buffer, int sample_pos, int high, int low)
+static inline int hector_tap_cycle(INT16 *buffer, int sample_pos, int high, int low)
{
int i = 0;
@@ -62,7 +62,7 @@ INLINE int hector_tap_cycle(INT16 *buffer, int sample_pos, int high, int low)
}
-INLINE int hector_tap_byte(INT16 *buffer, int sample_pos, UINT8 data)
+static inline int hector_tap_byte(INT16 *buffer, int sample_pos, UINT8 data)
{
/* Writing an entire byte */
int i, samples;
@@ -81,7 +81,7 @@ INLINE int hector_tap_byte(INT16 *buffer, int sample_pos, UINT8 data)
}
-INLINE int hector_tap_synchro(INT16 *buffer, int sample_pos, int nb_synchro)
+static inline int hector_tap_synchro(INT16 *buffer, int sample_pos, int nb_synchro)
{
/* Writing an entire byte */
int i, samples;
diff --git a/src/lib/formats/imageutl.h b/src/lib/formats/imageutl.h
index 8b51adebabf..a2369e8284a 100644
--- a/src/lib/formats/imageutl.h
+++ b/src/lib/formats/imageutl.h
@@ -25,7 +25,7 @@ unsigned short ccitt_crc16_one( unsigned short crc, const unsigned char data );
* Alignment-friendly integer placement
* ----------------------------------------------------------------------- */
-INLINE void place_integer_be(void *ptr, size_t offset, size_t size, UINT64 value)
+static inline void place_integer_be(void *ptr, size_t offset, size_t size, UINT64 value)
{
UINT8 *byte_ptr = ((UINT8 *) ptr) + offset;
UINT16 val16;
@@ -56,7 +56,7 @@ INLINE void place_integer_be(void *ptr, size_t offset, size_t size, UINT64 value
}
}
-INLINE UINT64 pick_integer_be(const void *ptr, size_t offset, size_t size)
+static inline UINT64 pick_integer_be(const void *ptr, size_t offset, size_t size)
{
UINT64 result = 0;
const UINT8 *byte_ptr = ((const UINT8 *) ptr) + offset;
@@ -93,7 +93,7 @@ INLINE UINT64 pick_integer_be(const void *ptr, size_t offset, size_t size)
return result;
}
-INLINE void place_integer_le(void *ptr, size_t offset, size_t size, UINT64 value)
+static inline void place_integer_le(void *ptr, size_t offset, size_t size, UINT64 value)
{
UINT8 *byte_ptr = ((UINT8 *) ptr) + offset;
UINT16 val16;
@@ -124,7 +124,7 @@ INLINE void place_integer_le(void *ptr, size_t offset, size_t size, UINT64 value
}
}
-INLINE UINT64 pick_integer_le(const void *ptr, size_t offset, size_t size)
+static inline UINT64 pick_integer_le(const void *ptr, size_t offset, size_t size)
{
UINT64 result = 0;
const UINT8 *byte_ptr = ((const UINT8 *) ptr) + offset;
diff --git a/src/lib/formats/kc_cas.cpp b/src/lib/formats/kc_cas.cpp
index 40e261aed7f..3e3d36e3f8b 100644
--- a/src/lib/formats/kc_cas.cpp
+++ b/src/lib/formats/kc_cas.cpp
@@ -43,7 +43,7 @@ static int kc_image_size;
/*******************************************************************
Generate one high-low cycle of sample data
********************************************************************/
-INLINE int kc_cas_cycle(INT16 *buffer, int sample_pos, int len)
+static inline int kc_cas_cycle(INT16 *buffer, int sample_pos, int len)
{
int num_samples = KC_WAV_FREQUENCY / (len * 2);
@@ -63,7 +63,7 @@ INLINE int kc_cas_cycle(INT16 *buffer, int sample_pos, int len)
/*******************************************************************
Generate n samples of silence
********************************************************************/
-INLINE int kc_cas_silence(INT16 *buffer, int sample_pos, int len)
+static inline int kc_cas_silence(INT16 *buffer, int sample_pos, int len)
{
int i = 0;
@@ -78,7 +78,7 @@ INLINE int kc_cas_silence(INT16 *buffer, int sample_pos, int len)
/*******************************************************************
Generate samples for 1 byte
********************************************************************/
-INLINE int kc_cas_byte(INT16 *buffer, int sample_pos, UINT8 data)
+static inline int kc_cas_byte(INT16 *buffer, int sample_pos, UINT8 data)
{
int samples = 0;
diff --git a/src/lib/formats/kim1_cas.cpp b/src/lib/formats/kim1_cas.cpp
index db4c4a95a0b..ed9a1a36a0e 100644
--- a/src/lib/formats/kim1_cas.cpp
+++ b/src/lib/formats/kim1_cas.cpp
@@ -11,7 +11,7 @@
static int cas_size;
-INLINE int kim1_output_signal( INT16 *buffer, int sample_pos, int high )
+static inline int kim1_output_signal( INT16 *buffer, int sample_pos, int high )
{
int sample_count, i, j;
@@ -62,7 +62,7 @@ INLINE int kim1_output_signal( INT16 *buffer, int sample_pos, int high )
}
-INLINE int kim1_output_byte( INT16 *buffer, int sample_pos, UINT8 byte )
+static inline int kim1_output_byte( INT16 *buffer, int sample_pos, UINT8 byte )
{
int i;
int sample_count = 0;
diff --git a/src/lib/formats/trs_cas.cpp b/src/lib/formats/trs_cas.cpp
index 5e205348768..ec8bea116a7 100644
--- a/src/lib/formats/trs_cas.cpp
+++ b/src/lib/formats/trs_cas.cpp
@@ -21,7 +21,7 @@ static int cas_size;
/*******************************************************************
Generate one high-low cycle of sample data
********************************************************************/
-INLINE int trs80l2_cas_cycle(INT16 *buffer, int sample_pos, int silence, int high, int low)
+static inline int trs80l2_cas_cycle(INT16 *buffer, int sample_pos, int silence, int high, int low)
{
int i = 0;
diff --git a/src/lib/formats/tzx_cas.cpp b/src/lib/formats/tzx_cas.cpp
index 498de384e53..d78fee1595f 100644
--- a/src/lib/formats/tzx_cas.cpp
+++ b/src/lib/formats/tzx_cas.cpp
@@ -207,12 +207,12 @@ static void tzx_cas_get_blocks( const UINT8 *casdata, int caslen )
}
}
-INLINE int millisec_to_samplecount( int millisec )
+static inline int millisec_to_samplecount( int millisec )
{
return (int) (millisec * ((double)TZX_WAV_FREQUENCY / 1000.0));
}
-INLINE int tcycles_to_samplecount( int tcycles )
+static inline int tcycles_to_samplecount( int tcycles )
{
return (int) ((0.5 + (((double)TZX_WAV_FREQUENCY / 3500000) * (double)tcycles)) * (double) t_scale);
}
@@ -335,7 +335,7 @@ static int tzx_handle_direct(INT16 **buffer, const UINT8 *bytes, int pause, int
}
-INLINE int tzx_handle_symbol(INT16 **buffer, const UINT8 *symtable, UINT8 symbol, int maxp)
+static inline int tzx_handle_symbol(INT16 **buffer, const UINT8 *symtable, UINT8 symbol, int maxp)
{
int size = 0;
const UINT8 *cursymb = symtable + (2 * maxp + 1)*symbol;
@@ -395,7 +395,7 @@ INLINE int tzx_handle_symbol(INT16 **buffer, const UINT8 *symtable, UINT8 symbol
return size;
}
-INLINE int stream_get_bit(const UINT8 *bytes, UINT8 &stream_bit, UINT32 &stream_byte)
+static inline int stream_get_bit(const UINT8 *bytes, UINT8 &stream_bit, UINT32 &stream_byte)
{
// get bit here
UINT8 retbit = 0;
diff --git a/src/lib/formats/vg5k_cas.cpp b/src/lib/formats/vg5k_cas.cpp
index 6c10112ab30..2933f77f8c0 100644
--- a/src/lib/formats/vg5k_cas.cpp
+++ b/src/lib/formats/vg5k_cas.cpp
@@ -20,7 +20,7 @@ static int k7_size;
/*******************************************************************
Generate one high-low cycle of sample data
********************************************************************/
-INLINE int vg5k_cas_cycle(INT16 *buffer, int sample_pos, int len)
+static inline int vg5k_cas_cycle(INT16 *buffer, int sample_pos, int len)
{
int i = 0;
@@ -45,7 +45,7 @@ INLINE int vg5k_cas_cycle(INT16 *buffer, int sample_pos, int len)
/*******************************************************************
Generate n samples of silence
********************************************************************/
-INLINE int vg5k_cas_silence(INT16 *buffer, int sample_pos, int len)
+static inline int vg5k_cas_silence(INT16 *buffer, int sample_pos, int len)
{
int i = 0;
@@ -60,7 +60,7 @@ INLINE int vg5k_cas_silence(INT16 *buffer, int sample_pos, int len)
/*******************************************************************
Generate the end-byte samples
********************************************************************/
-INLINE int vg5k_cas_eob(INT16 *buffer, int sample_pos)
+static inline int vg5k_cas_eob(INT16 *buffer, int sample_pos)
{
int i, samples = 0;
@@ -73,7 +73,7 @@ INLINE int vg5k_cas_eob(INT16 *buffer, int sample_pos)
}
-INLINE int vg5k_cas_byte(INT16 *buffer, int sample_pos, UINT8 data)
+static inline int vg5k_cas_byte(INT16 *buffer, int sample_pos, UINT8 data)
{
/* Writing an entire byte */
int i, samples;
@@ -100,7 +100,7 @@ INLINE int vg5k_cas_byte(INT16 *buffer, int sample_pos, UINT8 data)
/*******************************************************************
Generate n sample of synchro
********************************************************************/
-INLINE int vg5k_k7_synchro(INT16 *buffer, int sample_pos, int len)
+static inline int vg5k_k7_synchro(INT16 *buffer, int sample_pos, int len)
{
int i, samples = 0;
diff --git a/src/lib/util/aviio.cpp b/src/lib/util/aviio.cpp
index 95d96ca6422..90918c06673 100644
--- a/src/lib/util/aviio.cpp
+++ b/src/lib/util/aviio.cpp
@@ -471,7 +471,7 @@ static void printf_chunk_recursive(avi_file *file, avi_chunk *chunk, int indent)
-------------------------------------------------*/
/**
- * @fn INLINE UINT16 fetch_16bits(const UINT8 *data)
+ * @fn static inline UINT16 fetch_16bits(const UINT8 *data)
*
* @brief Fetches the 16bits.
*
@@ -480,7 +480,7 @@ static void printf_chunk_recursive(avi_file *file, avi_chunk *chunk, int indent)
* @return The 16bits.
*/
-INLINE UINT16 fetch_16bits(const UINT8 *data)
+static inline UINT16 fetch_16bits(const UINT8 *data)
{
return data[0] | (data[1] << 8);
}
@@ -492,7 +492,7 @@ INLINE UINT16 fetch_16bits(const UINT8 *data)
-------------------------------------------------*/
/**
- * @fn INLINE UINT32 fetch_32bits(const UINT8 *data)
+ * @fn static inline UINT32 fetch_32bits(const UINT8 *data)
*
* @brief Fetches the 32bits.
*
@@ -501,7 +501,7 @@ INLINE UINT16 fetch_16bits(const UINT8 *data)
* @return The 32bits.
*/
-INLINE UINT32 fetch_32bits(const UINT8 *data)
+static inline UINT32 fetch_32bits(const UINT8 *data)
{
return data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
}
@@ -513,7 +513,7 @@ INLINE UINT32 fetch_32bits(const UINT8 *data)
-------------------------------------------------*/
/**
- * @fn INLINE UINT64 fetch_64bits(const UINT8 *data)
+ * @fn static inline UINT64 fetch_64bits(const UINT8 *data)
*
* @brief Fetches the 64bits.
*
@@ -522,7 +522,7 @@ INLINE UINT32 fetch_32bits(const UINT8 *data)
* @return The 64bits.
*/
-INLINE UINT64 fetch_64bits(const UINT8 *data)
+static inline UINT64 fetch_64bits(const UINT8 *data)
{
return (UINT64)data[0] | ((UINT64)data[1] << 8) |
((UINT64)data[2] << 16) | ((UINT64)data[3] << 24) |
@@ -537,7 +537,7 @@ INLINE UINT64 fetch_64bits(const UINT8 *data)
-------------------------------------------------*/
/**
- * @fn INLINE void put_16bits(UINT8 *data, UINT16 value)
+ * @fn static inline void put_16bits(UINT8 *data, UINT16 value)
*
* @brief Puts the 16bits.
*
@@ -545,7 +545,7 @@ INLINE UINT64 fetch_64bits(const UINT8 *data)
* @param value The value.
*/
-INLINE void put_16bits(UINT8 *data, UINT16 value)
+static inline void put_16bits(UINT8 *data, UINT16 value)
{
data[0] = value >> 0;
data[1] = value >> 8;
@@ -558,7 +558,7 @@ INLINE void put_16bits(UINT8 *data, UINT16 value)
-------------------------------------------------*/
/**
- * @fn INLINE void put_32bits(UINT8 *data, UINT32 value)
+ * @fn static inline void put_32bits(UINT8 *data, UINT32 value)
*
* @brief Puts the 32bits.
*
@@ -566,7 +566,7 @@ INLINE void put_16bits(UINT8 *data, UINT16 value)
* @param value The value.
*/
-INLINE void put_32bits(UINT8 *data, UINT32 value)
+static inline void put_32bits(UINT8 *data, UINT32 value)
{
data[0] = value >> 0;
data[1] = value >> 8;
@@ -581,7 +581,7 @@ INLINE void put_32bits(UINT8 *data, UINT32 value)
-------------------------------------------------*/
/**
- * @fn INLINE void put_64bits(UINT8 *data, UINT64 value)
+ * @fn static inline void put_64bits(UINT8 *data, UINT64 value)
*
* @brief Puts the 64bits.
*
@@ -589,7 +589,7 @@ INLINE void put_32bits(UINT8 *data, UINT32 value)
* @param value The value.
*/
-INLINE void put_64bits(UINT8 *data, UINT64 value)
+static inline void put_64bits(UINT8 *data, UINT64 value)
{
data[0] = value >> 0;
data[1] = value >> 8;
@@ -608,7 +608,7 @@ INLINE void put_64bits(UINT8 *data, UINT64 value)
-------------------------------------------------*/
/**
- * @fn INLINE avi_stream *get_video_stream(avi_file *file)
+ * @fn static inline avi_stream *get_video_stream(avi_file *file)
*
* @brief Gets video stream.
*
@@ -617,7 +617,7 @@ INLINE void put_64bits(UINT8 *data, UINT64 value)
* @return null if it fails, else the video stream.
*/
-INLINE avi_stream *get_video_stream(avi_file *file)
+static inline avi_stream *get_video_stream(avi_file *file)
{
int streamnum;
@@ -636,7 +636,7 @@ INLINE avi_stream *get_video_stream(avi_file *file)
-------------------------------------------------*/
/**
- * @fn INLINE avi_stream *get_audio_stream(avi_file *file, int channel, int *offset)
+ * @fn static inline avi_stream *get_audio_stream(avi_file *file, int channel, int *offset)
*
* @brief Gets audio stream.
*
@@ -647,7 +647,7 @@ INLINE avi_stream *get_video_stream(avi_file *file)
* @return null if it fails, else the audio stream.
*/
-INLINE avi_stream *get_audio_stream(avi_file *file, int channel, int *offset)
+static inline avi_stream *get_audio_stream(avi_file *file, int channel, int *offset)
{
int streamnum;
@@ -674,7 +674,7 @@ INLINE avi_stream *get_audio_stream(avi_file *file, int channel, int *offset)
-------------------------------------------------*/
/**
- * @fn INLINE avi_error set_stream_chunk_info(avi_stream *stream, UINT32 index, UINT64 offset, UINT32 length)
+ * @fn static inline avi_error set_stream_chunk_info(avi_stream *stream, UINT32 index, UINT64 offset, UINT32 length)
*
* @brief Sets stream chunk information.
*
@@ -686,7 +686,7 @@ INLINE avi_stream *get_audio_stream(avi_file *file, int channel, int *offset)
* @return An avi_error.
*/
-INLINE avi_error set_stream_chunk_info(avi_stream *stream, UINT32 index, UINT64 offset, UINT32 length)
+static inline avi_error set_stream_chunk_info(avi_stream *stream, UINT32 index, UINT64 offset, UINT32 length)
{
/* if we need to allocate more, allocate more */
if (index >= stream->chunksalloc)
@@ -720,7 +720,7 @@ INLINE avi_error set_stream_chunk_info(avi_stream *stream, UINT32 index, UINT64
-------------------------------------------------*/
/**
- * @fn INLINE UINT32 compute_idx1_size(avi_file *file)
+ * @fn static inline UINT32 compute_idx1_size(avi_file *file)
*
* @brief Calculates the index 1 size.
*
@@ -729,7 +729,7 @@ INLINE avi_error set_stream_chunk_info(avi_stream *stream, UINT32 index, UINT64
* @return The calculated index 1 size.
*/
-INLINE UINT32 compute_idx1_size(avi_file *file)
+static inline UINT32 compute_idx1_size(avi_file *file)
{
int chunks = 0;
int strnum;
@@ -748,7 +748,7 @@ INLINE UINT32 compute_idx1_size(avi_file *file)
-------------------------------------------------*/
/**
- * @fn INLINE UINT32 get_chunkid_for_stream(avi_file *file, avi_stream *stream)
+ * @fn static inline UINT32 get_chunkid_for_stream(avi_file *file, avi_stream *stream)
*
* @brief Gets chunkid for stream.
*
@@ -758,7 +758,7 @@ INLINE UINT32 compute_idx1_size(avi_file *file)
* @return The chunkid for stream.
*/
-INLINE UINT32 get_chunkid_for_stream(avi_file *file, avi_stream *stream)
+static inline UINT32 get_chunkid_for_stream(avi_file *file, avi_stream *stream)
{
UINT32 chunkid;
@@ -778,7 +778,7 @@ INLINE UINT32 get_chunkid_for_stream(avi_file *file, avi_stream *stream)
-------------------------------------------------*/
/**
- * @fn INLINE UINT32 framenum_to_samplenum(avi_file *file, UINT32 framenum)
+ * @fn static inline UINT32 framenum_to_samplenum(avi_file *file, UINT32 framenum)
*
* @brief Framenum to samplenum.
*
@@ -788,7 +788,7 @@ INLINE UINT32 get_chunkid_for_stream(avi_file *file, avi_stream *stream)
* @return An UINT32.
*/
-INLINE UINT32 framenum_to_samplenum(avi_file *file, UINT32 framenum)
+static inline UINT32 framenum_to_samplenum(avi_file *file, UINT32 framenum)
{
return ((UINT64)file->info.audio_samplerate * (UINT64)framenum * (UINT64)file->info.video_sampletime + file->info.video_timescale - 1) / (UINT64)file->info.video_timescale;
}
@@ -801,7 +801,7 @@ INLINE UINT32 framenum_to_samplenum(avi_file *file, UINT32 framenum)
-------------------------------------------------*/
/**
- * @fn INLINE avi_error expand_tempbuffer(avi_file *file, UINT32 length)
+ * @fn static inline avi_error expand_tempbuffer(avi_file *file, UINT32 length)
*
* @brief Expand tempbuffer.
*
@@ -811,7 +811,7 @@ INLINE UINT32 framenum_to_samplenum(avi_file *file, UINT32 framenum)
* @return An avi_error.
*/
-INLINE avi_error expand_tempbuffer(avi_file *file, UINT32 length)
+static inline avi_error expand_tempbuffer(avi_file *file, UINT32 length)
{
/* expand the tempbuffer to hold the data if necessary */
if (length > file->tempbuffersize)
diff --git a/src/lib/util/cdrom.cpp b/src/lib/util/cdrom.cpp
index 917cb355839..a9a60ef97bd 100644
--- a/src/lib/util/cdrom.cpp
+++ b/src/lib/util/cdrom.cpp
@@ -130,7 +130,7 @@ struct cdrom_file
-------------------------------------------------*/
/**
- * @fn INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &tracknum)
+ * @fn static inline UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &tracknum)
*
* @brief Physical to chd lba.
*
@@ -141,7 +141,7 @@ struct cdrom_file
* @return An UINT32.
*/
-INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &tracknum)
+static inline UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &tracknum)
{
UINT32 chdlba;
int track;
@@ -164,7 +164,7 @@ INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &trac
-------------------------------------------------*/
/**
- * @fn INLINE UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &tracknum)
+ * @fn static inline UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &tracknum)
*
* @brief Logical to chd lba.
*
@@ -175,7 +175,7 @@ INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &trac
* @return An UINT32.
*/
-INLINE UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &tracknum)
+static inline UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &tracknum)
{
UINT32 chdlba, physlba;
int track;
diff --git a/src/lib/util/cdrom.h b/src/lib/util/cdrom.h
index c0115701e35..c495a405513 100644
--- a/src/lib/util/cdrom.h
+++ b/src/lib/util/cdrom.h
@@ -145,12 +145,12 @@ void ecc_clear(UINT8 *sector);
INLINE FUNCTIONS
***************************************************************************/
-INLINE UINT32 msf_to_lba(UINT32 msf)
+static inline UINT32 msf_to_lba(UINT32 msf)
{
return ( ((msf&0x00ff0000)>>16) * 60 * 75) + (((msf&0x0000ff00)>>8) * 75) + ((msf&0x000000ff)>>0);
}
-INLINE UINT32 lba_to_msf(UINT32 lba)
+static inline UINT32 lba_to_msf(UINT32 lba)
{
UINT8 m, s, f;
@@ -167,7 +167,7 @@ INLINE UINT32 lba_to_msf(UINT32 lba)
// segacd needs it like this.. investigate
// Angelo also says PCE tracks often start playing at the
// wrong address.. related?
-INLINE UINT32 lba_to_msf_alt(int lba)
+static inline UINT32 lba_to_msf_alt(int lba)
{
UINT32 ret = 0;
diff --git a/src/lib/util/corefile.cpp b/src/lib/util/corefile.cpp
index b7e389a35f7..a2242c133c6 100644
--- a/src/lib/util/corefile.cpp
+++ b/src/lib/util/corefile.cpp
@@ -104,7 +104,7 @@ static file_error osd_or_zlib_write(core_file *file, const void *buffer, UINT64
works for most platforms
-------------------------------------------------*/
-INLINE int is_directory_separator(char c)
+static inline int is_directory_separator(char c)
{
return (c == '\\' || c == '/' || c == ':');
}
diff --git a/src/lib/util/jedparse.h b/src/lib/util/jedparse.h
index 1615f25af34..0f23462b995 100644
--- a/src/lib/util/jedparse.h
+++ b/src/lib/util/jedparse.h
@@ -63,7 +63,7 @@ size_t jedbin_output(const jed_data *data, void *result, size_t length);
INLINE FUNCTIONS
***************************************************************************/
-INLINE int jed_get_fuse(const jed_data *data, UINT32 fusenum)
+static inline int jed_get_fuse(const jed_data *data, UINT32 fusenum)
{
if (fusenum < JED_MAX_FUSES)
return (data->fusemap[fusenum / 8] >> (fusenum % 8)) & 1;
@@ -72,7 +72,7 @@ INLINE int jed_get_fuse(const jed_data *data, UINT32 fusenum)
}
-INLINE void jed_set_fuse(jed_data *data, UINT32 fusenum, UINT8 value)
+static inline void jed_set_fuse(jed_data *data, UINT32 fusenum, UINT8 value)
{
if (fusenum < JED_MAX_FUSES)
{
diff --git a/src/lib/util/png.cpp b/src/lib/util/png.cpp
index 6e57d949f47..a6b269593ef 100644
--- a/src/lib/util/png.cpp
+++ b/src/lib/util/png.cpp
@@ -53,51 +53,51 @@ static const int samples[] = { 1, 0, 3, 1, 2, 0, 4 };
INLINE FUNCTIONS
***************************************************************************/
-INLINE UINT8 fetch_8bit(UINT8 *v)
+static inline UINT8 fetch_8bit(UINT8 *v)
{
return *v;
}
#ifdef UNUSED_FUNCTION
-INLINE UINT16 fetch_16bit(UINT8 *v)
+static inline UINT16 fetch_16bit(UINT8 *v)
{
return BIG_ENDIANIZE_INT16(*(UINT16 *)v);
}
#endif
-INLINE UINT32 fetch_32bit(UINT8 *v)
+static inline UINT32 fetch_32bit(UINT8 *v)
{
return BIG_ENDIANIZE_INT32(*(UINT32 *)v);
}
-INLINE void put_8bit(UINT8 *v, UINT8 data)
+static inline void put_8bit(UINT8 *v, UINT8 data)
{
*v = data;
}
#ifdef UNUSED_FUNCTION
-INLINE void put_16bit(UINT8 *v, UINT16 data)
+static inline void put_16bit(UINT8 *v, UINT16 data)
{
*(UINT16 *)v = BIG_ENDIANIZE_INT16(data);
}
#endif
-INLINE void put_32bit(UINT8 *v, UINT32 data)
+static inline void put_32bit(UINT8 *v, UINT32 data)
{
*(UINT32 *)v = BIG_ENDIANIZE_INT32(data);
}
-INLINE int compute_bpp(const png_info *pnginfo)
+static inline int compute_bpp(const png_info *pnginfo)
{
return samples[pnginfo->color_type] * pnginfo->bit_depth / 8;
}
-INLINE int compute_rowbytes(const png_info *pnginfo)
+static inline int compute_rowbytes(const png_info *pnginfo)
{
return (pnginfo->width * samples[pnginfo->color_type] * pnginfo->bit_depth + 7) / 8;
}
diff --git a/src/lib/util/pool.cpp b/src/lib/util/pool.cpp
index e004f236b76..9712d8b6e00 100644
--- a/src/lib/util/pool.cpp
+++ b/src/lib/util/pool.cpp
@@ -100,7 +100,7 @@ static void report_failure(object_pool *pool, const char *format, ...) ATTR_PRIN
object
-------------------------------------------------*/
-INLINE int hash_object(void *object)
+static inline int hash_object(void *object)
{
return ((size_t)object >> 4) % POOL_HASH_SIZE;
}
@@ -111,7 +111,7 @@ INLINE int hash_object(void *object)
a given object type
-------------------------------------------------*/
-INLINE objtype_entry *get_object_type(object_pool *pool, object_type type)
+static inline objtype_entry *get_object_type(object_pool *pool, object_type type)
{
objtype_entry *entry;
diff --git a/src/lib/util/unzip.cpp b/src/lib/util/unzip.cpp
index a8f3ca434e2..876d8ae90c5 100644
--- a/src/lib/util/unzip.cpp
+++ b/src/lib/util/unzip.cpp
@@ -99,7 +99,7 @@
***************************************************************************/
/**
- * @fn INLINE UINT16 read_word(UINT8 *buf)
+ * @fn static inline UINT16 read_word(UINT8 *buf)
*
* @brief Reads a word.
*
@@ -108,13 +108,13 @@
* @return The word.
*/
-INLINE UINT16 read_word(UINT8 *buf)
+static inline UINT16 read_word(UINT8 *buf)
{
return (buf[1] << 8) | buf[0];
}
/**
- * @fn INLINE UINT32 read_dword(UINT8 *buf)
+ * @fn static inline UINT32 read_dword(UINT8 *buf)
*
* @brief Reads a double word.
*
@@ -123,7 +123,7 @@ INLINE UINT16 read_word(UINT8 *buf)
* @return The double word.
*/
-INLINE UINT32 read_dword(UINT8 *buf)
+static inline UINT32 read_dword(UINT8 *buf)
{
return (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
}
diff --git a/src/mame/audio/beezer.cpp b/src/mame/audio/beezer.cpp
index f026b480f1b..3a295208073 100644
--- a/src/mame/audio/beezer.cpp
+++ b/src/mame/audio/beezer.cpp
@@ -192,7 +192,7 @@ void beezer_sound_device::device_reset()
*
*************************************/
// need to set int_flag properly here
-INLINE void sh6840_apply_clock(struct sh6840_timer_channel_beez *t, int clocks)
+static inline void sh6840_apply_clock(struct sh6840_timer_channel_beez *t, int clocks)
{
/* dual 8-bit case */
if (t->cr & 0x04)
diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp
index 16de53a8dd3..c8bbaaf25ba 100644
--- a/src/mame/audio/exidy.cpp
+++ b/src/mame/audio/exidy.cpp
@@ -55,7 +55,7 @@ WRITE_LINE_MEMBER( exidy_sound_device::update_irq_state )
*
*************************************/
-INLINE void sh6840_apply_clock(struct sh6840_timer_channel *t, int clocks)
+static inline void sh6840_apply_clock(struct sh6840_timer_channel *t, int clocks)
{
/* dual 8-bit case */
if (t->cr & 0x04)
diff --git a/src/mame/audio/micro3d.cpp b/src/mame/audio/micro3d.cpp
index 0a53160f017..4e7cea003e9 100644
--- a/src/mame/audio/micro3d.cpp
+++ b/src/mame/audio/micro3d.cpp
@@ -22,20 +22,20 @@
*************************************/
/* Borrowed from segasnd.c */
-INLINE void configure_filter(m3d_filter_state *state, double r, double c)
+static inline void configure_filter(m3d_filter_state *state, double r, double c)
{
state->capval = 0;
state->exponent = 1.0 - exp(-1.0 / (r * c * 2000000/8));
}
#if 0
-INLINE double step_rc_filter(m3d_filter_state *state, double input)
+static inline double step_rc_filter(m3d_filter_state *state, double input)
{
state->capval += (input - state->capval) * state->exponent;
return state->capval;
}
-INLINE double step_cr_filter(m3d_filter_state *state, double input)
+static inline double step_cr_filter(m3d_filter_state *state, double input)
{
double result = (input - state->capval);
state->capval += (input - state->capval) * state->exponent;
diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp
index 72d58d8fa51..abc5df498d4 100644
--- a/src/mame/audio/segasnd.cpp
+++ b/src/mame/audio/segasnd.cpp
@@ -37,21 +37,21 @@
INLINE FUNCTIONS
***************************************************************************/
-INLINE void configure_filter(g80_filter_state *state, double r, double c)
+static inline void configure_filter(g80_filter_state *state, double r, double c)
{
state->capval = 0;
state->exponent = 1.0 - exp(-1.0 / (r * c * SAMPLE_RATE));
}
-INLINE double step_rc_filter(g80_filter_state *state, double input)
+static inline double step_rc_filter(g80_filter_state *state, double input)
{
state->capval += (input - state->capval) * state->exponent;
return state->capval;
}
-INLINE double step_cr_filter(g80_filter_state *state, double input)
+static inline double step_cr_filter(g80_filter_state *state, double input)
{
double result = (input - state->capval);
state->capval += (input - state->capval) * state->exponent;
@@ -503,7 +503,7 @@ READ8_MEMBER( usb_sound_device::t1_r )
*
*************************************/
-INLINE void clock_channel(timer8253_channel *ch)
+static inline void clock_channel(timer8253_channel *ch)
{
UINT8 lastgate = ch->lastgate;
diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp
index e9983ad1cc9..b4dac235258 100644
--- a/src/mame/audio/tx1.cpp
+++ b/src/mame/audio/tx1.cpp
@@ -231,7 +231,7 @@ WRITE8_MEMBER( tx1_sound_device::ay8910_b_w )
***************************************************************************/
-INLINE void update_engine(int eng[4])
+static inline void update_engine(int eng[4])
{
int p0 = eng[0];
int p1 = eng[1];
diff --git a/src/mame/audio/vboy.cpp b/src/mame/audio/vboy.cpp
index eb9947e9806..f6b77630522 100644
--- a/src/mame/audio/vboy.cpp
+++ b/src/mame/audio/vboy.cpp
@@ -184,8 +184,8 @@ static const INT8 outLvlTbl[16][16] = {
{ 0, 2, 4, 6, 8, 10, 12, 14, 16, 17, 19, 21, 23, 25, 27, 29}
};
-INLINE UINT8 mgetb(register UINT8 *ptr) { return *ptr; }
-INLINE void mputb(UINT8 *ptr, INT8 data) { *ptr = data; }
+static inline UINT8 mgetb(register UINT8 *ptr) { return *ptr; }
+static inline void mputb(UINT8 *ptr, INT8 data) { *ptr = data; }
//**************************************************************************
// LIVE DEVICE
diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp
index e10e1fd8690..fcbd59370f4 100644
--- a/src/mame/drivers/39in1.cpp
+++ b/src/mame/drivers/39in1.cpp
@@ -103,7 +103,7 @@ public:
#define VERBOSE_LEVEL ( 3 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char* s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char* s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/drivers/atarisy4.cpp b/src/mame/drivers/atarisy4.cpp
index 44986485ecd..d03be4447b5 100644
--- a/src/mame/drivers/atarisy4.cpp
+++ b/src/mame/drivers/atarisy4.cpp
@@ -222,7 +222,7 @@ UINT32 atarisy4_state::screen_update_atarisy4(screen_device &screen, bitmap_rgb3
return 0;
}
-INLINE UINT32 xy_to_screen_addr(UINT32 x, UINT32 y)
+static inline UINT32 xy_to_screen_addr(UINT32 x, UINT32 y)
{
// UINT32 offset = ((gpu.mcr >> 4) & 3) << 9;
UINT32 offset = 0;
diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp
index 9e01800ef5a..8b1e60376aa 100644
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@@ -38,7 +38,7 @@ TODO:
#include "softlist.h"
#if ENABLE_VERBOSE_LOG
-INLINE void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp
index e7a2104d0fa..d1ed5d1b5e0 100644
--- a/src/mame/drivers/cxhumax.cpp
+++ b/src/mame/drivers/cxhumax.cpp
@@ -17,7 +17,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
{
if (VERBOSE_LEVEL >= n_level)
{
@@ -835,12 +835,12 @@ void cxhumax_state::video_start()
The document also contains the constants below as floats.
--------------------------------------------------------------------------*/
-INLINE UINT8 clamp16_shift8(UINT32 x)
+static inline UINT8 clamp16_shift8(UINT32 x)
{
return (((INT32) x < 0) ? 0 : (x > 65535 ? 255: x >> 8));
}
-INLINE UINT32 ycc_to_rgb(UINT32 ycc)
+static inline UINT32 ycc_to_rgb(UINT32 ycc)
{
/* original equations:
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index a3b46e98f49..519ed10af03 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -686,7 +686,7 @@ void ddenlovr_state::do_plot( int x, int y, int pen )
}
-INLINE int fetch_bit( UINT8 *src_data, int src_len, int *bit_addr )
+static inline int fetch_bit( UINT8 *src_data, int src_len, int *bit_addr )
{
const int baddrmask = 0x7ffffff;
@@ -705,7 +705,7 @@ INLINE int fetch_bit( UINT8 *src_data, int src_len, int *bit_addr )
return (src_data[baddr / 8] >> (7 - (baddr & 7))) & 1;
}
-INLINE int fetch_word( UINT8 *src_data, int src_len, int *bit_addr, int word_len )
+static inline int fetch_word( UINT8 *src_data, int src_len, int *bit_addr, int word_len )
{
int res = 0;
diff --git a/src/mame/drivers/dm7000.cpp b/src/mame/drivers/dm7000.cpp
index 20c5e0bd787..24a6fe48f2c 100644
--- a/src/mame/drivers/dm7000.cpp
+++ b/src/mame/drivers/dm7000.cpp
@@ -43,7 +43,7 @@
#define VERBOSE_LEVEL ( 9 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
{
if (VERBOSE_LEVEL >= n_level)
{
diff --git a/src/mame/drivers/gba.cpp b/src/mame/drivers/gba.cpp
index 3f8ae3f392a..abaea79d40d 100644
--- a/src/mame/drivers/gba.cpp
+++ b/src/mame/drivers/gba.cpp
@@ -22,7 +22,7 @@
#define VERBOSE_LEVEL (0)
-INLINE void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -1838,7 +1838,7 @@ WRITE32_MEMBER(gba_state::gba_io_w)
}
}
-INLINE UINT32 COMBINE_DATA32_16(UINT32 prev, UINT32 data, UINT32 mem_mask)
+static inline UINT32 COMBINE_DATA32_16(UINT32 prev, UINT32 data, UINT32 mem_mask)
{
COMBINE_DATA(&prev);
switch(mem_mask)
diff --git a/src/mame/drivers/gp32.cpp b/src/mame/drivers/gp32.cpp
index 4627ddab5e6..4512c3db20f 100644
--- a/src/mame/drivers/gp32.cpp
+++ b/src/mame/drivers/gp32.cpp
@@ -25,7 +25,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
{
if (VERBOSE_LEVEL >= n_level)
{
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index 539a4dfdd20..e0a46ede44c 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -480,7 +480,7 @@ A12 <-> A13
}
}
-INLINE void rom_decodel(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
+static inline void rom_decodel(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
{
UINT32 i, jscr;
@@ -491,7 +491,7 @@ INLINE void rom_decodel(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor
}
memcpy(romptr,tmprom,igrosoft_gamble_ROM_SIZE);
}
-INLINE void rom_decodeh(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
+static inline void rom_decodeh(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
{
UINT32 i, jscr;
@@ -519,7 +519,7 @@ static void lottery_decode(running_machine &machine, UINT8 xor12, UINT8 xor34, U
rom_decodeh(&igrosoft_gamble_gfx[0x380000], &temprom[0], xor78, xor_addr);
}
-INLINE void roment_decodel(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
+static inline void roment_decodel(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
{
UINT32 i, jscr;
@@ -530,7 +530,7 @@ INLINE void roment_decodel(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32
}
memcpy(romptr,tmprom,igrosoft_gamble_ROM_SIZE);
}
-INLINE void roment_decodeh(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
+static inline void roment_decodeh(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor_add)
{
UINT32 i, jscr;
diff --git a/src/mame/drivers/namcoic.cpp b/src/mame/drivers/namcoic.cpp
index 1cc553b93eb..8790639cfe7 100644
--- a/src/mame/drivers/namcoic.cpp
+++ b/src/mame/drivers/namcoic.cpp
@@ -561,7 +561,7 @@ READ16_MEMBER( namcos2_shared_state::c355_obj_position_r )
return m_c355_obj_position[offset];
}
-INLINE UINT8
+static inline UINT8
nth_byte16( const UINT16 *pSource, int which )
{
UINT16 data = pSource[which/2];
@@ -579,7 +579,7 @@ nth_byte16( const UINT16 *pSource, int which )
* read from 32-bit aligned memory as if it were an array of 16 bit words.
*/
#ifdef UNUSED_FUNCTION
-INLINE UINT16
+static inline UINT16
nth_word32( const UINT32 *pSource, int which )
{
UINT32 data = pSource[which/2];
@@ -598,7 +598,7 @@ nth_word32( const UINT32 *pSource, int which )
* read from 32-bit aligned memory as if it were an array of bytes.
*/
#ifdef UNUSED_FUNCTION
-INLINE UINT8
+static inline UINT8
nth_byte32( const UINT32 *pSource, int which )
{
UINT32 data = pSource[which/4];
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index 66106e4bafd..0bda3aa8cb0 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -1655,7 +1655,7 @@ float namcos23_state::f24_to_f32(UINT32 v)
return *(float *)&r;
}
-INLINE UINT8 light(UINT8 c, float l)
+static inline UINT8 light(UINT8 c, float l)
{
if(l < 1)
l = l*c;
diff --git a/src/mame/drivers/photon2.cpp b/src/mame/drivers/photon2.cpp
index c3aa6438a0e..f0683c72413 100644
--- a/src/mame/drivers/photon2.cpp
+++ b/src/mame/drivers/photon2.cpp
@@ -113,7 +113,7 @@ void photon2_state::video_start()
#if 0
/* return the color to be used inverting FLASHing colors if necessary */
-INLINE unsigned char get_display_color (unsigned char color, int invert)
+static inline unsigned char get_display_color (unsigned char color, int invert)
{
if (invert && (color & 0x80))
return (color & 0xc0) + ((color & 0x38) >> 3) + ((color & 0x07) << 3);
@@ -138,7 +138,7 @@ void photon2_state::screen_eof_spectrum(screen_device &screen, bool state)
}
}
-INLINE void spectrum_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color)
+static inline void spectrum_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color)
{
bitmap.pix16(y, x) = (UINT16)color;
}
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index 137f034337c..99c9cf97a09 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -223,7 +223,7 @@ WRITE8_MEMBER(subsino2_state::ss9601_byte_lo2_w)
}
-INLINE void ss9601_videoram_w(layer_t *l, vram_t vram, address_space &space, offs_t offset, UINT8 data)
+static inline void ss9601_videoram_w(layer_t *l, vram_t vram, address_space &space, offs_t offset, UINT8 data)
{
l->videorams[vram][offset] = data;
diff --git a/src/mame/drivers/taitotz.cpp b/src/mame/drivers/taitotz.cpp
index 6c472379b17..5f83ed30285 100644
--- a/src/mame/drivers/taitotz.cpp
+++ b/src/mame/drivers/taitotz.cpp
@@ -760,14 +760,14 @@ static const float dot3_tex_table[32] =
0.266666f, 0.300000f, 0.333333f, 0.366666f, 0.400000f, 0.433333f, 0.466666f, 0.500000f,
};
-INLINE float dot_product_vec3(VECTOR3 a, VECTOR3 b)
+static inline float dot_product_vec3(VECTOR3 a, VECTOR3 b)
{
return (a[0] * b[0]) + (a[1] * b[1]) + (a[2] * b[2]);
}
// Fast inverse square-root
// Adapted from http://en.wikipedia.org/wiki/Fast_inverse_square_root
-INLINE float finvsqrt(float number)
+static inline float finvsqrt(float number)
{
UINT32 i;
float x2, y;
@@ -783,7 +783,7 @@ INLINE float finvsqrt(float number)
}
#if 0
-INLINE void normalize_vec3(VECTOR3 *v)
+static inline void normalize_vec3(VECTOR3 *v)
{
float l = finvsqrt(*v[0] * *v[0] + *v[1] * *v[1] + *v[2] * *v[2]);
*v[0] *= l;
@@ -792,7 +792,7 @@ INLINE void normalize_vec3(VECTOR3 *v)
}
#endif
-INLINE float clamp_pos(float v)
+static inline float clamp_pos(float v)
{
if (v < 0.0f)
return 0.0f;
@@ -800,7 +800,7 @@ INLINE float clamp_pos(float v)
return v;
}
-INLINE UINT32 generate_texel_address(int iu, int iv)
+static inline UINT32 generate_texel_address(int iu, int iv)
{
// generate texel address from U and V
UINT32 addr = 0;
@@ -1074,7 +1074,7 @@ void taitotz_renderer::draw_scanline(INT32 scanline, const extent_t &extent, con
}
}
-INLINE int is_point_inside(float x, float y, float z, PLANE cp)
+static inline int is_point_inside(float x, float y, float z, PLANE cp)
{
float s = (x * cp.x) + (y * cp.y) + (z * cp.z) + cp.d;
if (s >= 0.0f)
diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp
index 1cc8a78eaaa..9fee0bf3ff1 100644
--- a/src/mame/drivers/viper.cpp
+++ b/src/mame/drivers/viper.cpp
@@ -440,7 +440,7 @@ UINT32 viper_state::screen_update_viper(screen_device &screen, bitmap_rgb32 &bit
UINT32 m_mpc8240_regs[256/4];
-INLINE UINT64 read64le_with_32le_device_handler(read32_delegate handler, address_space &space, offs_t offset, UINT64 mem_mask)
+static inline UINT64 read64le_with_32le_device_handler(read32_delegate handler, address_space &space, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if (ACCESSING_BITS_0_31)
@@ -451,7 +451,7 @@ INLINE UINT64 read64le_with_32le_device_handler(read32_delegate handler, address
}
-INLINE void write64le_with_32le_device_handler(write32_delegate handler, address_space &space, offs_t offset, UINT64 data, UINT64 mem_mask)
+static inline void write64le_with_32le_device_handler(write32_delegate handler, address_space &space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if (ACCESSING_BITS_0_31)
handler(space, offset * 2 + 0, data >> 0, mem_mask >> 0);
@@ -459,7 +459,7 @@ INLINE void write64le_with_32le_device_handler(write32_delegate handler, address
handler(space, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
-INLINE UINT64 read64be_with_32le_device_handler(read32_delegate handler, address_space &space, offs_t offset, UINT64 mem_mask)
+static inline UINT64 read64be_with_32le_device_handler(read32_delegate handler, address_space &space, offs_t offset, UINT64 mem_mask)
{
UINT64 result;
mem_mask = FLIPENDIAN_INT64(mem_mask);
@@ -468,7 +468,7 @@ INLINE UINT64 read64be_with_32le_device_handler(read32_delegate handler, address
}
-INLINE void write64be_with_32le_device_handler(write32_delegate handler, address_space &space, offs_t offset, UINT64 data, UINT64 mem_mask)
+static inline void write64be_with_32le_device_handler(write32_delegate handler, address_space &space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
data = FLIPENDIAN_INT64(data);
mem_mask = FLIPENDIAN_INT64(mem_mask);
diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp
index 971b821fb82..cf19f15c8ff 100644
--- a/src/mame/drivers/zaurus.cpp
+++ b/src/mame/drivers/zaurus.cpp
@@ -1452,7 +1452,7 @@ protected:
#define VERBOSE_LEVEL ( 5 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char* s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char* s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/etc/jrcrypt.cpp b/src/mame/etc/jrcrypt.cpp
index b1244151243..e973df30753 100644
--- a/src/mame/etc/jrcrypt.cpp
+++ b/src/mame/etc/jrcrypt.cpp
@@ -147,11 +147,11 @@ unsigned jrpacman_decode_roms(int address)
return RAM[address]; // this should never happen!
}
#else
-INLINE WordBit(word theWord, int theBit)
+static inline WordBit(word theWord, int theBit)
{
return (theWord >> theBit)&1;
}
-INLINE ByteBit(byte theByte, int theBit)
+static inline ByteBit(byte theByte, int theBit)
{
return (theByte >> theBit)&1;
}
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index 64d7a7f6c03..e71cf24f55f 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -257,7 +257,7 @@ struct m2_poly_extra_data
};
-INLINE UINT16 get_texel( UINT32 base_x, UINT32 base_y, int x, int y, UINT32 *sheet )
+static inline UINT16 get_texel( UINT32 base_x, UINT32 base_y, int x, int y, UINT32 *sheet )
{
UINT32 baseoffs = ((base_y/2)*512)+(base_x/2);
UINT32 texeloffs = ((y/2)*512)+(x/2);
diff --git a/src/mame/machine/appldriv.cpp b/src/mame/machine/appldriv.cpp
index 1257b720e23..139da446140 100644
--- a/src/mame/machine/appldriv.cpp
+++ b/src/mame/machine/appldriv.cpp
@@ -19,7 +19,7 @@
#define PARENT_FLOPPY_2 "^floppy2"
#define PARENT_FLOPPY_3 "^floppy3"
-INLINE apple525_floppy_image_device *get_device(device_t *device)
+static inline apple525_floppy_image_device *get_device(device_t *device)
{
assert(device != nullptr);
assert(device->type() == FLOPPY_APPLE);
diff --git a/src/mame/machine/cdi070.cpp b/src/mame/machine/cdi070.cpp
index cc8f377d76a..892b625f2db 100644
--- a/src/mame/machine/cdi070.cpp
+++ b/src/mame/machine/cdi070.cpp
@@ -30,7 +30,7 @@ TODO:
const device_type MACHINE_CDI68070 = &device_creator<cdi68070_device>;
#if ENABLE_VERBOSE_LOG
-INLINE void ATTR_PRINTF(1,2) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(1,2) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/machine/cdicdic.cpp b/src/mame/machine/cdicdic.cpp
index 75d10ddb125..a6fbd02da27 100644
--- a/src/mame/machine/cdicdic.cpp
+++ b/src/mame/machine/cdicdic.cpp
@@ -33,7 +33,7 @@ TODO:
const device_type MACHINE_CDICDIC = &device_creator<cdicdic_device>;
#if ENABLE_VERBOSE_LOG
-INLINE void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -99,7 +99,7 @@ const INT32 cdicdic_device::s_cdic_adpcm_filter_coef[5][2] =
// INLINES
//**************************************************************************
-INLINE int CDIC_IS_VALID_SAMPLE_BUF(UINT16 *cdram, UINT16 addr)
+static inline int CDIC_IS_VALID_SAMPLE_BUF(UINT16 *cdram, UINT16 addr)
{
UINT8 *cdram8 = ((UINT8*)cdram) + addr + 8;
if(cdram8[2] != 0xff)
@@ -109,7 +109,7 @@ INLINE int CDIC_IS_VALID_SAMPLE_BUF(UINT16 *cdram, UINT16 addr)
return 0;
}
-INLINE double CDIC_SAMPLE_BUF_FREQ(UINT16 *cdram, UINT16 addr)
+static inline double CDIC_SAMPLE_BUF_FREQ(UINT16 *cdram, UINT16 addr)
{
UINT8 *cdram8 = ((UINT8*)cdram) + addr + 8;
switch(cdram8[2] & 0x3f)
@@ -129,7 +129,7 @@ INLINE double CDIC_SAMPLE_BUF_FREQ(UINT16 *cdram, UINT16 addr)
}
}
-INLINE int CDIC_SAMPLE_BUF_SIZE(UINT16 *cdram, UINT16 addr)
+static inline int CDIC_SAMPLE_BUF_SIZE(UINT16 *cdram, UINT16 addr)
{
UINT8 *cdram8 = ((UINT8*)cdram) + addr + 8;
switch(cdram8[2] & 0x3f)
@@ -151,7 +151,7 @@ INLINE int CDIC_SAMPLE_BUF_SIZE(UINT16 *cdram, UINT16 addr)
}
}
-INLINE INT16 clamp(INT16 in)
+static inline INT16 clamp(INT16 in)
{
return in;
}
diff --git a/src/mame/machine/cdislave.cpp b/src/mame/machine/cdislave.cpp
index ac9d4fe706f..e02b32f6221 100644
--- a/src/mame/machine/cdislave.cpp
+++ b/src/mame/machine/cdislave.cpp
@@ -32,7 +32,7 @@ const device_type MACHINE_CDISLAVE = &device_creator<cdislave_device>;
#if ENABLE_VERBOSE_LOG
-INLINE void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/machine/docg3.cpp b/src/mame/machine/docg3.cpp
index fbd3cb02515..9ec4ef16b35 100644
--- a/src/mame/machine/docg3.cpp
+++ b/src/mame/machine/docg3.cpp
@@ -13,7 +13,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/machine/fddebug.cpp b/src/mame/machine/fddebug.cpp
index 0a78590cb5c..61e019280db 100644
--- a/src/mame/machine/fddebug.cpp
+++ b/src/mame/machine/fddebug.cpp
@@ -309,7 +309,7 @@ static int validate_opcode(address_space &space, UINT32 pc, const UINT8 *opdata,
used to decrypt it
-----------------------------------------------*/
-INLINE int addr_to_keyaddr(offs_t address)
+static inline int addr_to_keyaddr(offs_t address)
{
/* for address xx0000-xx0006 (but only if >= 000008), use key xx2000-xx2006 */
if ((address & 0x0ffc) == 0 && address >= 4)
@@ -325,7 +325,7 @@ INLINE int addr_to_keyaddr(offs_t address)
always be 1
-----------------------------------------------*/
-INLINE UINT8 mask_for_keyaddr(offs_t address)
+static inline UINT8 mask_for_keyaddr(offs_t address)
{
/* the first half of the key always has bit 0x80 set; the second half 0x40 */
/* however, the values at 0000-0003 and 1000-1003 don't follow this rule */
@@ -343,7 +343,7 @@ INLINE UINT8 mask_for_keyaddr(offs_t address)
the specified number of steps
-----------------------------------------------*/
-INLINE UINT32 advance_seed(UINT32 seed, int count)
+static inline UINT32 advance_seed(UINT32 seed, int count)
{
/* iterate over the seed for 'count' reps */
while (count--)
@@ -360,7 +360,7 @@ INLINE UINT32 advance_seed(UINT32 seed, int count)
from a seed and apply the given mask
-----------------------------------------------*/
-INLINE UINT8 key_value_from_seed(UINT32 seed, UINT8 mask)
+static inline UINT8 key_value_from_seed(UINT32 seed, UINT8 mask)
{
/* put bits 16-21 of the seed in the low 6 bits and OR with the mask */
return ((~seed >> 16) & 0x3f) | mask;
@@ -373,7 +373,7 @@ INLINE UINT8 key_value_from_seed(UINT32 seed, UINT8 mask)
given seed
-----------------------------------------------*/
-INLINE void generate_key_bytes(UINT8 *dest, UINT32 keyoffs, UINT32 count, UINT32 seed)
+static inline void generate_key_bytes(UINT8 *dest, UINT32 keyoffs, UINT32 count, UINT32 seed)
{
int bytenum;
@@ -395,7 +395,7 @@ INLINE void generate_key_bytes(UINT8 *dest, UINT32 keyoffs, UINT32 count, UINT32
an opcode based on the opcode
-----------------------------------------------*/
-INLINE UINT8 get_opcode_length(UINT16 opcode)
+static inline UINT8 get_opcode_length(UINT16 opcode)
{
/* return the length from the table */
return optable[opcode].flags >> 28;
@@ -407,7 +407,7 @@ INLINE UINT8 get_opcode_length(UINT16 opcode)
constraint
-----------------------------------------------*/
-INLINE void set_constraint(fd1094_constraint *constraint, UINT32 pc, UINT16 state, UINT16 value, UINT16 mask)
+static inline void set_constraint(fd1094_constraint *constraint, UINT32 pc, UINT16 state, UINT16 value, UINT16 mask)
{
constraint->pc = pc;
constraint->state = state;
@@ -420,7 +420,7 @@ INLINE void set_constraint(fd1094_constraint *constraint, UINT32 pc, UINT16 stat
for a given address
-----------------------------------------------*/
-INLINE void print_possibilities(running_machine &machine)
+static inline void print_possibilities(running_machine &machine)
{
int i;
@@ -435,7 +435,7 @@ INLINE void print_possibilities(running_machine &machine)
0=no, 1=yes, 2=unlikely
-----------------------------------------------*/
-INLINE int pc_is_valid(address_space &space, UINT32 pc, UINT32 flags)
+static inline int pc_is_valid(address_space &space, UINT32 pc, UINT32 flags)
{
/* if we're odd or out of range, fail */
if ((pc & 1) == 1)
@@ -453,7 +453,7 @@ INLINE int pc_is_valid(address_space &space, UINT32 pc, UINT32 flags)
valid? 0=no, 1=yes, 2=unlikely
-----------------------------------------------*/
-INLINE int addr_is_valid(address_space &space, UINT32 addr, UINT32 flags)
+static inline int addr_is_valid(address_space &space, UINT32 addr, UINT32 flags)
{
/* if this a JMP, the address is a PC */
if (flags & OF_JMP)
diff --git a/src/mame/machine/gaelco3d.cpp b/src/mame/machine/gaelco3d.cpp
index a8fe3f32590..d4f9c58383a 100644
--- a/src/mame/machine/gaelco3d.cpp
+++ b/src/mame/machine/gaelco3d.cpp
@@ -158,13 +158,13 @@ static void *osd_sharedmem_ptr(osd_shared_mem *os_shmem)
INLINE FUNCTIONS
***************************************************************************/
-INLINE void shmem_lock(shmem_t *shmem)
+static inline void shmem_lock(shmem_t *shmem)
{
while (atomic_exchange32(&shmem->lock,1) == 0)
;
}
-INLINE void shmem_unlock(shmem_t *shmem)
+static inline void shmem_unlock(shmem_t *shmem)
{
atomic_exchange32(&shmem->lock,0);
}
diff --git a/src/mame/machine/micro3d.cpp b/src/mame/machine/micro3d.cpp
index 4c207dfe28f..f51d73dafb8 100644
--- a/src/mame/machine/micro3d.cpp
+++ b/src/mame/machine/micro3d.cpp
@@ -214,7 +214,7 @@ READ32_MEMBER(micro3d_state::micro3d_scc_r)
*
*************************************/
-INLINE INT64 dot_product(micro3d_vtx *v1, micro3d_vtx *v2)
+static inline INT64 dot_product(micro3d_vtx *v1, micro3d_vtx *v2)
{
INT64 result = ((INT64)v1->x * (INT64)v2->x) +
((INT64)v1->y * (INT64)v2->y) +
@@ -222,7 +222,7 @@ INLINE INT64 dot_product(micro3d_vtx *v1, micro3d_vtx *v2)
return result;
}
-INLINE INT64 normalised_multiply(INT32 a, INT32 b)
+static inline INT64 normalised_multiply(INT32 a, INT32 b)
{
INT64 result;
diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp
index 783eb12ed3e..2d848da5d0f 100644
--- a/src/mame/machine/midwayic.cpp
+++ b/src/mame/machine/midwayic.cpp
@@ -202,7 +202,7 @@ WRITE8_MEMBER(midway_serial_pic_device::write)
*
*************************************/
-INLINE UINT8 make_bcd(UINT8 data)
+static inline UINT8 make_bcd(UINT8 data)
{
return ((data / 10) << 4) | (data % 10);
}
diff --git a/src/mame/machine/n64.cpp b/src/mame/machine/n64.cpp
index 91ce7e482e4..4918f1a1613 100644
--- a/src/mame/machine/n64.cpp
+++ b/src/mame/machine/n64.cpp
@@ -1739,7 +1739,7 @@ UINT8 n64_periphs::calc_mempak_crc(UINT8 *buffer, int length)
return crc;
}
-INLINE UINT8 convert_to_bcd(int val)
+static inline UINT8 convert_to_bcd(int val)
{
return ((val / 10) << 4) | (val % 10);
}
diff --git a/src/mame/machine/psxcd.cpp b/src/mame/machine/psxcd.cpp
index 552ad78b3e4..069e9f224f1 100644
--- a/src/mame/machine/psxcd.cpp
+++ b/src/mame/machine/psxcd.cpp
@@ -6,7 +6,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/machine/sgi.cpp b/src/mame/machine/sgi.cpp
index fe2259b5219..d9b6e8b8887 100644
--- a/src/mame/machine/sgi.cpp
+++ b/src/mame/machine/sgi.cpp
@@ -14,7 +14,7 @@
#define VERBOSE_LEVEL ( 2 )
#if 0
-INLINE void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/machine/smartmed.cpp b/src/mame/machine/smartmed.cpp
index b3147c49316..f8295a4110d 100644
--- a/src/mame/machine/smartmed.cpp
+++ b/src/mame/machine/smartmed.cpp
@@ -30,13 +30,13 @@ struct UINT32BE
UINT8 bytes[4];
};
-INLINE UINT32 get_UINT32BE(UINT32BE word)
+static inline UINT32 get_UINT32BE(UINT32BE word)
{
return (word.bytes[0] << 24) | (word.bytes[1] << 16) | (word.bytes[2] << 8) | word.bytes[3];
}
#ifdef UNUSED_FUNCTION
-INLINE void set_UINT32BE(UINT32BE *word, UINT32 data)
+static inline void set_UINT32BE(UINT32BE *word, UINT32 data)
{
word->bytes[0] = (data >> 24) & 0xff;
word->bytes[1] = (data >> 16) & 0xff;
diff --git a/src/mame/machine/tx1.cpp b/src/mame/machine/tx1.cpp
index 93862c8c935..76658ae9231 100644
--- a/src/mame/machine/tx1.cpp
+++ b/src/mame/machine/tx1.cpp
@@ -20,7 +20,7 @@
#define ROL16(val, shift) ( ((UINT16)val << shift) | ((UINT16)val >> (16 - shift)) )
#define SWAP16(val) ( (((UINT16)val << 8) & 0xff00) | ((UINT16)val >> 8) )
-INLINE UINT8 reverse_nibble(UINT8 nibble)
+static inline UINT8 reverse_nibble(UINT8 nibble)
{
return (nibble & 1) << 3 |
(nibble & 2) << 1 |
@@ -402,7 +402,7 @@ enum
#define TX1_SET_INS0_BIT do { if (!(ins & 0x4) && math.i0ff) ins |= math.i0ff; } while(0)
-INLINE UINT16 get_tx1_datarom_addr(math_t &math)
+static inline UINT16 get_tx1_datarom_addr(math_t &math)
{
UINT16 addr;
@@ -960,7 +960,7 @@ enum
#define BB_SET_INS0_BIT do { if (!(ins & 0x4) && math.i0ff) ins |= math.i0ff;} while(0)
-INLINE UINT16 get_bb_datarom_addr(math_t &math)
+static inline UINT16 get_bb_datarom_addr(math_t &math)
{
UINT16 addr;
diff --git a/src/mame/video/amiga.cpp b/src/mame/video/amiga.cpp
index 79651098c66..d049cc2e165 100644
--- a/src/mame/video/amiga.cpp
+++ b/src/mame/video/amiga.cpp
@@ -381,7 +381,7 @@ void amiga_sprite_enable_comparitor(running_machine &machine, int which, int ena
*
*************************************/
-INLINE void fetch_sprite_data(amiga_state *state, int scanline, int sprite)
+static inline void fetch_sprite_data(amiga_state *state, int scanline, int sprite)
{
CUSTOM_REG(REG_SPR0DATA + 4 * sprite) = state->chip_ram_r(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 0);
CUSTOM_REG(REG_SPR0DATB + 4 * sprite) = state->chip_ram_r(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 2);
@@ -457,7 +457,7 @@ static void update_sprite_dma(amiga_state *state, int scanline)
*
*************************************/
-INLINE UINT32 interleave_sprite_data(UINT16 lobits, UINT16 hibits)
+static inline UINT32 interleave_sprite_data(UINT16 lobits, UINT16 hibits)
{
return (amiga_expand_byte[lobits & 0xff] << 0) | (amiga_expand_byte[lobits >> 8] << 16) |
(amiga_expand_byte[hibits & 0xff] << 1) | (amiga_expand_byte[hibits >> 8] << 17);
@@ -557,7 +557,7 @@ static int get_sprite_pixel(amiga_state *state, int x)
*
*************************************/
-INLINE UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs)
+static inline UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs)
{
UINT8 pix = (CUSTOM_REG(REG_BPL1DAT) >> obitoffs) & 1;
if (planes >= 3)
@@ -570,7 +570,7 @@ INLINE UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs
}
-INLINE UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoffs)
+static inline UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoffs)
{
UINT8 pix = 0;
if (planes >= 2)
@@ -586,7 +586,7 @@ INLINE UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoff
return pix;
}
-INLINE void fetch_bitplane_data(amiga_state *state, int plane)
+static inline void fetch_bitplane_data(amiga_state *state, int plane)
{
CUSTOM_REG(REG_BPL1DAT + plane) = state->chip_ram_r(CUSTOM_REG_LONG(REG_BPL1PTH + plane * 2));
CUSTOM_REG_LONG(REG_BPL1PTH + plane * 2) += 2;
@@ -599,7 +599,7 @@ INLINE void fetch_bitplane_data(amiga_state *state, int plane)
*
*************************************/
-INLINE int update_ham(amiga_state *state, int newpix)
+static inline int update_ham(amiga_state *state, int newpix)
{
switch (newpix >> 4)
{
diff --git a/src/mame/video/amigaaga.cpp b/src/mame/video/amigaaga.cpp
index 6af424998e0..88dac2caf91 100644
--- a/src/mame/video/amigaaga.cpp
+++ b/src/mame/video/amigaaga.cpp
@@ -89,7 +89,7 @@ VIDEO_START_MEMBER(amiga_state,amiga_aga)
*
*************************************/
-INLINE void fetch_sprite_data(amiga_state *state, int scanline, int sprite)
+static inline void fetch_sprite_data(amiga_state *state, int scanline, int sprite)
{
switch((CUSTOM_REG(REG_FMODE) >> 2) & 0x03)
{
@@ -217,7 +217,7 @@ static void update_sprite_dma(amiga_state *state, int scanline)
*
*************************************/
-INLINE UINT32 interleave_sprite_data(UINT16 lobits, UINT16 hibits)
+static inline UINT32 interleave_sprite_data(UINT16 lobits, UINT16 hibits)
{
return (amiga_expand_byte[lobits & 0xff] << 0) | (amiga_expand_byte[lobits >> 8] << 16) |
(amiga_expand_byte[hibits & 0xff] << 1) | (amiga_expand_byte[hibits >> 8] << 17);
@@ -332,7 +332,7 @@ static int get_sprite_pixel(amiga_state *state, int x)
*
*************************************/
-INLINE UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs)
+static inline UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs)
{
UINT64 *aga_bpldat = state->m_aga_bpldat;
UINT8 pix = (aga_bpldat[0] >> obitoffs) & 1;
@@ -350,7 +350,7 @@ INLINE UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs
}
-INLINE UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoffs)
+static inline UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoffs)
{
UINT8 pix = 0;
if (planes >= 2)
@@ -371,7 +371,7 @@ INLINE UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoff
return pix;
}
-INLINE void fetch_bitplane_data(amiga_state *state, int plane)
+static inline void fetch_bitplane_data(amiga_state *state, int plane)
{
UINT64 *aga_bpldat = state->m_aga_bpldat;
@@ -409,7 +409,7 @@ INLINE void fetch_bitplane_data(amiga_state *state, int plane)
*
*************************************/
-INLINE rgb_t update_ham(amiga_state *state, int newpix)
+static inline rgb_t update_ham(amiga_state *state, int newpix)
{
switch (newpix & 0x03)
{
diff --git a/src/mame/video/gba.cpp b/src/mame/video/gba.cpp
index e0883eafee1..17b8d926938 100644
--- a/src/mame/video/gba.cpp
+++ b/src/mame/video/gba.cpp
@@ -15,7 +15,7 @@
#define VERBOSE_LEVEL (0)
-INLINE void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -34,9 +34,9 @@ static const int coeff[32] = {
};
/* Utility functions */
-INLINE UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb);
-INLINE UINT32 increase_brightness(UINT32 color, int coeff_);
-INLINE UINT32 decrease_brightness(UINT32 color, int coeff_);
+static inline UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb);
+static inline UINT32 increase_brightness(UINT32 color, int coeff_);
+static inline UINT32 decrease_brightness(UINT32 color, int coeff_);
#define GBA_MODE0 0
#define GBA_MODE1 1
@@ -1776,7 +1776,7 @@ inline int gba_state::is_in_window(int x, int window)
return 0;
}
-INLINE UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb)
+static inline UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb)
{
if(color0 < 0x80000000)
{
@@ -1799,7 +1799,7 @@ INLINE UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb)
return color0;
}
-INLINE UINT32 increase_brightness(UINT32 color, int coeff_)
+static inline UINT32 increase_brightness(UINT32 color, int coeff_)
{
int r = (color >> 0) & 0x1f;
int g = (color >> 5) & 0x1f;
@@ -1816,7 +1816,7 @@ INLINE UINT32 increase_brightness(UINT32 color, int coeff_)
return (color & 0xffff0000) | (b << 10) | (g << 5) | r;
}
-INLINE UINT32 decrease_brightness(UINT32 color, int coeff_)
+static inline UINT32 decrease_brightness(UINT32 color, int coeff_)
{
int r = (color >> 0) & 0x1f;
int g = (color >> 5) & 0x1f;
diff --git a/src/mame/video/hng64.cpp b/src/mame/video/hng64.cpp
index ac7084687b6..015c8ae0fac 100644
--- a/src/mame/video/hng64.cpp
+++ b/src/mame/video/hng64.cpp
@@ -220,7 +220,7 @@ static void hng64_configure_blit_parameters(blit_parameters *blit, tilemap_t *tm
}
}
-INLINE UINT32 alpha_additive_r32(UINT32 d, UINT32 s, UINT8 level)
+static inline UINT32 alpha_additive_r32(UINT32 d, UINT32 s, UINT8 level)
{
UINT32 add;
add = (s & 0x00ff0000) + (d & 0x00ff0000);
diff --git a/src/mame/video/k053936.cpp b/src/mame/video/k053936.cpp
index b7ce3aa158f..f29039970dc 100644
--- a/src/mame/video/k053936.cpp
+++ b/src/mame/video/k053936.cpp
@@ -433,7 +433,7 @@ void K053936GP_set_cliprect(int chip, int minx, int maxx, int miny, int maxy)
cliprect.set(minx, maxx, miny, maxy);
}
-INLINE void K053936GP_copyroz32clip( running_machine &machine,
+static inline void K053936GP_copyroz32clip( running_machine &machine,
bitmap_rgb32 &dst_bitmap, bitmap_ind16 &src_bitmap,
const rectangle &dst_cliprect, const rectangle &src_cliprect,
UINT32 _startx,UINT32 _starty,int _incxx,int _incxy,int _incyx,int _incyy,
diff --git a/src/mame/video/konamigx.cpp b/src/mame/video/konamigx.cpp
index a1720ccca1a..ab0b87a06fa 100644
--- a/src/mame/video/konamigx.cpp
+++ b/src/mame/video/konamigx.cpp
@@ -14,7 +14,7 @@
#define VERBOSE 0
-INLINE void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data);
+static inline void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data);
void konamigx_state::konamigx_precache_registers(void)
@@ -1559,7 +1559,7 @@ UINT32 konamigx_state::screen_update_konamigx_right(screen_device &screen, bitma
return 0;
}
-INLINE void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data)
+static inline void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data)
{
palette.set_pen_color(color, pal5bit(data >> rshift), pal5bit(data >> gshift), pal5bit(data >> bshift));
}
diff --git a/src/mame/video/mcd212.cpp b/src/mame/video/mcd212.cpp
index aec55056c8f..d7912615bbf 100644
--- a/src/mame/video/mcd212.cpp
+++ b/src/mame/video/mcd212.cpp
@@ -30,7 +30,7 @@ TODO:
const device_type MACHINE_MCD212 = &device_creator<mcd212_device>;
#if ENABLE_VERBOSE_LOG
-INLINE void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
+static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...)
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -729,7 +729,7 @@ void mcd212_device::process_dca(int channel)
m_channel[channel].dca = addr * 2;
}
-INLINE UINT8 MCD212_LIM(INT32 in)
+static inline UINT8 MCD212_LIM(INT32 in)
{
if(in < 0)
{
@@ -742,7 +742,7 @@ INLINE UINT8 MCD212_LIM(INT32 in)
return (UINT8)in;
}
-INLINE UINT8 BYTE_TO_CLUT(int channel, int icm, UINT8 byte)
+static inline UINT8 BYTE_TO_CLUT(int channel, int icm, UINT8 byte)
{
switch(icm)
{
diff --git a/src/mame/video/midzeus.cpp b/src/mame/video/midzeus.cpp
index d0f7330a8d4..7cf60e4f6a5 100644
--- a/src/mame/video/midzeus.cpp
+++ b/src/mame/video/midzeus.cpp
@@ -114,10 +114,10 @@ static int is_mk4b;
*
*************************************/
-INLINE UINT8 get_texel_4bit(const void *base, int y, int x, int width);
-INLINE UINT8 get_texel_alt_4bit(const void *base, int y, int x, int width);
-INLINE UINT8 get_texel_8bit(const void *base, int y, int x, int width);
-INLINE UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width);
+static inline UINT8 get_texel_4bit(const void *base, int y, int x, int width);
+static inline UINT8 get_texel_alt_4bit(const void *base, int y, int x, int width);
+static inline UINT8 get_texel_8bit(const void *base, int y, int x, int width);
+static inline UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width);
/*************************************
@@ -160,25 +160,25 @@ INLINE UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width);
*
*************************************/
-INLINE void *waveram0_ptr_from_block_addr(UINT32 addr)
+static inline void *waveram0_ptr_from_block_addr(UINT32 addr)
{
UINT32 blocknum = (addr % WAVERAM0_WIDTH) + ((addr >> 12) % WAVERAM0_HEIGHT) * WAVERAM0_WIDTH;
return WAVERAM_BLOCK0(blocknum);
}
-INLINE void *waveram0_ptr_from_expanded_addr(UINT32 addr)
+static inline void *waveram0_ptr_from_expanded_addr(UINT32 addr)
{
UINT32 blocknum = (addr % WAVERAM0_WIDTH) + ((addr >> 16) % WAVERAM0_HEIGHT) * WAVERAM0_WIDTH;
return WAVERAM_BLOCK0(blocknum);
}
-INLINE void *waveram1_ptr_from_expanded_addr(UINT32 addr)
+static inline void *waveram1_ptr_from_expanded_addr(UINT32 addr)
{
UINT32 blocknum = (addr % WAVERAM1_WIDTH) + ((addr >> 16) % WAVERAM1_HEIGHT) * WAVERAM1_WIDTH;
return WAVERAM_BLOCK1(blocknum);
}
-INLINE void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
+static inline void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
{
UINT32 blocknum = (((addr & ~1) * width) / 8) % (WAVERAM0_WIDTH * WAVERAM0_HEIGHT);
return WAVERAM_BLOCK0(blocknum);
@@ -192,7 +192,7 @@ INLINE void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
*
*************************************/
-INLINE void waveram_plot_depth(int y, int x, UINT16 color, UINT16 depth)
+static inline void waveram_plot_depth(int y, int x, UINT16 color, UINT16 depth)
{
if (zeus_cliprect.contains(x, y))
{
@@ -202,13 +202,13 @@ INLINE void waveram_plot_depth(int y, int x, UINT16 color, UINT16 depth)
}
#ifdef UNUSED_FUNCTION
-INLINE void waveram_plot(int y, int x, UINT16 color)
+static inline void waveram_plot(int y, int x, UINT16 color)
{
if (zeus_cliprect.contains(x, y))
WAVERAM_WRITEPIX(zeus_renderbase, y, x, color);
}
-INLINE void waveram_plot_check_depth(int y, int x, UINT16 color, UINT16 depth)
+static inline void waveram_plot_check_depth(int y, int x, UINT16 color, UINT16 depth)
{
if (zeus_cliprect.contains(x, y))
{
@@ -221,7 +221,7 @@ INLINE void waveram_plot_check_depth(int y, int x, UINT16 color, UINT16 depth)
}
}
-INLINE void waveram_plot_check_depth_nowrite(int y, int x, UINT16 color, UINT16 depth)
+static inline void waveram_plot_check_depth_nowrite(int y, int x, UINT16 color, UINT16 depth)
{
if (zeus_cliprect.contains(x, y))
{
@@ -240,26 +240,26 @@ INLINE void waveram_plot_check_depth_nowrite(int y, int x, UINT16 color, UINT16
*************************************/
// 4x2 block size
-INLINE UINT8 get_texel_4bit(const void *base, int y, int x, int width)
+static inline UINT8 get_texel_4bit(const void *base, int y, int x, int width)
{
UINT32 byteoffs = (y / 2) * (width * 2) + ((x / 8) << 3) + ((y & 1) << 2) + ((x / 2) & 3);
return (WAVERAM_READ8(base, byteoffs) >> (4 * (x & 1))) & 0x0f;
}
-INLINE UINT8 get_texel_8bit(const void *base, int y, int x, int width)
+static inline UINT8 get_texel_8bit(const void *base, int y, int x, int width)
{
UINT32 byteoffs = (y / 2) * (width * 2) + ((x / 4) << 3) + ((y & 1) << 2) + (x & 3);
return WAVERAM_READ8(base, byteoffs);
}
// 2x2 block size
-INLINE UINT8 get_texel_alt_4bit(const void *base, int y, int x, int width)
+static inline UINT8 get_texel_alt_4bit(const void *base, int y, int x, int width)
{
UINT32 byteoffs = (y / 4) * (width * 4) + ((x / 4) << 3) + ((y & 3) << 1) + ((x / 2) & 1);
return (WAVERAM_READ8(base, byteoffs) >> (4 * (x & 1))) & 0x0f;
}
-INLINE UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width)
+static inline UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width)
{
UINT32 byteoffs = (y / 4) * (width * 4) + ((x / 2) << 3) + ((y & 3) << 1) + (x & 1);
return WAVERAM_READ8(base, byteoffs);
diff --git a/src/mame/video/midzeus2.cpp b/src/mame/video/midzeus2.cpp
index 4b1c3d65689..670af222960 100644
--- a/src/mame/video/midzeus2.cpp
+++ b/src/mame/video/midzeus2.cpp
@@ -165,20 +165,20 @@ static int subregwrite_count[0x100];
*
*************************************/
-INLINE void *waveram0_ptr_from_expanded_addr(UINT32 addr)
+static inline void *waveram0_ptr_from_expanded_addr(UINT32 addr)
{
UINT32 blocknum = (addr % WAVERAM0_WIDTH) + ((addr >> 16) % WAVERAM0_HEIGHT) * WAVERAM0_WIDTH;
return WAVERAM_BLOCK0(blocknum);
}
-INLINE void *waveram1_ptr_from_expanded_addr(UINT32 addr)
+static inline void *waveram1_ptr_from_expanded_addr(UINT32 addr)
{
UINT32 blocknum = (addr % WAVERAM1_WIDTH) + ((addr >> 16) % WAVERAM1_HEIGHT) * WAVERAM1_WIDTH;
return WAVERAM_BLOCK1(blocknum);
}
#ifdef UNUSED_FUNCTION
-INLINE void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
+static inline void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
{
UINT32 blocknum = ((addr & ~1) * width) / 8;
return WAVERAM_BLOCK0(blocknum);
@@ -193,14 +193,14 @@ INLINE void *waveram0_ptr_from_texture_addr(UINT32 addr, int width)
*************************************/
#ifdef UNUSED_FUNCTION
-INLINE void waveram_plot(int y, int x, UINT32 color)
+static inline void waveram_plot(int y, int x, UINT32 color)
{
if (zeus_cliprect.contains(x, y))
WAVERAM_WRITEPIX(zeus_renderbase, y, x, color);
}
#endif
-INLINE void waveram_plot_depth(int y, int x, UINT32 color, UINT16 depth)
+static inline void waveram_plot_depth(int y, int x, UINT32 color, UINT16 depth)
{
if (zeus_cliprect.contains(x, y))
{
@@ -210,7 +210,7 @@ INLINE void waveram_plot_depth(int y, int x, UINT32 color, UINT16 depth)
}
#ifdef UNUSED_FUNCTION
-INLINE void waveram_plot_check_depth(int y, int x, UINT32 color, UINT16 depth)
+static inline void waveram_plot_check_depth(int y, int x, UINT32 color, UINT16 depth)
{
if (zeus_cliprect.contains(x, y))
{
@@ -225,7 +225,7 @@ INLINE void waveram_plot_check_depth(int y, int x, UINT32 color, UINT16 depth)
#endif
#ifdef UNUSED_FUNCTION
-INLINE void waveram_plot_check_depth_nowrite(int y, int x, UINT32 color, UINT16 depth)
+static inline void waveram_plot_check_depth_nowrite(int y, int x, UINT32 color, UINT16 depth)
{
if (zeus_cliprect.contains(x, y))
{
@@ -243,7 +243,7 @@ INLINE void waveram_plot_check_depth_nowrite(int y, int x, UINT32 color, UINT16
*
*************************************/
-INLINE UINT8 get_texel_8bit(const void *base, int y, int x, int width)
+static inline UINT8 get_texel_8bit(const void *base, int y, int x, int width)
{
UINT32 byteoffs = (y / 2) * (width * 2) + ((x / 4) << 3) + ((y & 1) << 2) + (x & 3);
return WAVERAM_READ8(base, byteoffs);
@@ -251,7 +251,7 @@ INLINE UINT8 get_texel_8bit(const void *base, int y, int x, int width)
#ifdef UNUSED_FUNCTION
-INLINE UINT8 get_texel_4bit(const void *base, int y, int x, int width)
+static inline UINT8 get_texel_4bit(const void *base, int y, int x, int width)
{
UINT32 byteoffs = (y / 2) * (width * 2) + ((x / 8) << 3) + ((y & 1) << 2) + ((x / 2) & 3);
return (WAVERAM_READ8(base, byteoffs) >> (4 * (x & 1))) & 0x0f;
diff --git a/src/mame/video/model2.cpp b/src/mame/video/model2.cpp
index 93d41b28552..8915d2ee5c1 100644
--- a/src/mame/video/model2.cpp
+++ b/src/mame/video/model2.cpp
@@ -105,7 +105,7 @@
*
*******************************************/
-INLINE void transform_point( poly_vertex *point, float *matrix )
+static inline void transform_point( poly_vertex *point, float *matrix )
{
float tx = (point->x * matrix[0]) + (point->y * matrix[3]) + (point->pz * matrix[6]) + (matrix[9]);
float ty = (point->x * matrix[1]) + (point->y * matrix[4]) + (point->pz * matrix[7]) + (matrix[10]);
@@ -116,7 +116,7 @@ INLINE void transform_point( poly_vertex *point, float *matrix )
point->pz = tz;
}
-INLINE void transform_vector( poly_vertex *vector, float *matrix )
+static inline void transform_vector( poly_vertex *vector, float *matrix )
{
float tx = (vector->x * matrix[0]) + (vector->y * matrix[3]) + (vector->pz * matrix[6]);
float ty = (vector->x * matrix[1]) + (vector->y * matrix[4]) + (vector->pz * matrix[7]);
@@ -127,7 +127,7 @@ INLINE void transform_vector( poly_vertex *vector, float *matrix )
vector->pz = tz;
}
-INLINE void normalize_vector( poly_vertex *vector )
+static inline void normalize_vector( poly_vertex *vector )
{
float n = sqrt( (vector->x * vector->x) + (vector->y * vector->y) + (vector->pz * vector->pz) );
@@ -140,12 +140,12 @@ INLINE void normalize_vector( poly_vertex *vector )
}
}
-INLINE float dot_product( poly_vertex *v1, poly_vertex *v2 )
+static inline float dot_product( poly_vertex *v1, poly_vertex *v2 )
{
return (v1->x * v2->x) + (v1->y * v2->y) + (v1->pz * v2->pz);
}
-INLINE void vector_cross3( poly_vertex *dst, poly_vertex *v0, poly_vertex *v1, poly_vertex *v2 )
+static inline void vector_cross3( poly_vertex *dst, poly_vertex *v0, poly_vertex *v1, poly_vertex *v2 )
{
poly_vertex p1, p2;
diff --git a/src/mame/video/model3.cpp b/src/mame/video/model3.cpp
index 4cea4a5a2e7..9e1e60be5d8 100644
--- a/src/mame/video/model3.cpp
+++ b/src/mame/video/model3.cpp
@@ -1312,7 +1312,7 @@ WRITE64_MEMBER(model3_state::real3d_cmd_w)
/*****************************************************************************/
/* matrix and vector operations */
-INLINE float dot_product3(VECTOR3 a, VECTOR3 b)
+static inline float dot_product3(VECTOR3 a, VECTOR3 b)
{
return (a[0] * b[0]) + (a[1] * b[1]) + (a[2] * b[2]);
}
diff --git a/src/mame/video/namcofl.cpp b/src/mame/video/namcofl.cpp
index d15d63ac7eb..cf2f73805c6 100644
--- a/src/mame/video/namcofl.cpp
+++ b/src/mame/video/namcofl.cpp
@@ -11,7 +11,7 @@
* read from 32-bit aligned memory as if it were an array of 16 bit words.
*/
#ifdef UNUSED_FUNCTION
-INLINE UINT16
+static inline UINT16
nth_word32( const UINT32 *source, int which )
{
source += which/2;
@@ -31,7 +31,7 @@ nth_word32( const UINT32 *source, int which )
* read from 32-bit aligned memory as if it were an array of bytes.
*/
#ifdef UNUSED_FUNCTION
-INLINE UINT8
+static inline UINT8
nth_byte32( const UINT32 *pSource, int which )
{
UINT32 data = pSource[which/4];
diff --git a/src/mame/video/namconb1.cpp b/src/mame/video/namconb1.cpp
index cc38da66c8a..007ee859ad5 100644
--- a/src/mame/video/namconb1.cpp
+++ b/src/mame/video/namconb1.cpp
@@ -10,7 +10,7 @@
/* nth_word32 is a general-purpose utility function, which allows us to
* read from 32-bit aligned memory as if it were an array of 16 bit words.
*/
-INLINE UINT16
+static inline UINT16
nth_word32( const UINT32 *source, int which )
{
source += which/2;
@@ -27,7 +27,7 @@ nth_word32( const UINT32 *source, int which )
/* nth_byte32 is a general-purpose utility function, which allows us to
* read from 32-bit aligned memory as if it were an array of bytes.
*/
-INLINE UINT8
+static inline UINT8
nth_byte32( const UINT32 *pSource, int which )
{
UINT32 data = pSource[which/4];
diff --git a/src/mame/video/namcos2.cpp b/src/mame/video/namcos2.cpp
index 96ab3a18de1..d45dd94278d 100644
--- a/src/mame/video/namcos2.cpp
+++ b/src/mame/video/namcos2.cpp
@@ -64,7 +64,7 @@ struct roz_param
int wrap;
};
-INLINE void
+static inline void
draw_roz_helper_block(const struct roz_param *rozInfo, int destx, int desty,
int srcx, int srcy, int width, int height,
bitmap_ind16 &destbitmap, bitmap_ind8 &flagsbitmap,
diff --git a/src/mame/video/newport.cpp b/src/mame/video/newport.cpp
index 8d331fbb60f..52aff54c3ce 100644
--- a/src/mame/video/newport.cpp
+++ b/src/mame/video/newport.cpp
@@ -32,7 +32,7 @@
#define VERBOSE_LEVEL ( 0 )
#if 0
-INLINE void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ... )
+static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
diff --git a/src/mame/video/rdpfiltr.inc b/src/mame/video/rdpfiltr.inc
index 31f10f4858a..019a928a727 100644
--- a/src/mame/video/rdpfiltr.inc
+++ b/src/mame/video/rdpfiltr.inc
@@ -1,16 +1,16 @@
// license:BSD-3-Clause
// copyright-holders:Ryan Holtz
#if 0
-INLINE void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres);
-INLINE void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index);
-INLINE void restore_filter16(INT32* r, INT32* g, INT32* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres);
-INLINE void divot_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuffer);
-INLINE void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuff, UINT32 hres);
-INLINE void restore_two(color_t* filtered, color_t* neighbour);
-INLINE void video_max(UINT32* Pixels, UINT8* max, UINT32* enb);
-INLINE UINT32 ge_two(UINT32 enb);
-
-INLINE void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres)
+static inline void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres);
+static inline void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index);
+static inline void restore_filter16(INT32* r, INT32* g, INT32* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres);
+static inline void divot_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuffer);
+static inline void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuff, UINT32 hres);
+static inline void restore_two(color_t* filtered, color_t* neighbour);
+static inline void video_max(UINT32* Pixels, UINT8* max, UINT32* enb);
+static inline UINT32 ge_two(UINT32 enb);
+
+static inline void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres)
{
color_t penumax, penumin, max, min;
UINT16 pix = *vbuff;
@@ -210,7 +210,7 @@ INLINE void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UI
}
// This needs to be fixed for endianness.
-INLINE void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index)
+static inline void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index)
{
UINT8 leftr, leftg, leftb, rightr, rightg, rightb;
UINT16 leftpix, rightpix;
@@ -256,7 +256,7 @@ INLINE void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 f
}
}
-INLINE void divot_filter16_buffer(int* r, int* g, int* b, color_t* vibuffer)
+static inline void divot_filter16_buffer(int* r, int* g, int* b, color_t* vibuffer)
{
color_t leftpix = vibuffer[-1];
color_t rightpix = vibuffer[1];
@@ -303,7 +303,7 @@ INLINE void divot_filter16_buffer(int* r, int* g, int* b, color_t* vibuffer)
}
// Fix me.
-INLINE void restore_filter16(int* r, int* g, int* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres)
+static inline void restore_filter16(int* r, int* g, int* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres)
{
INT32 leftuppix = -hres - 1;
INT32 leftdownpix = hres - 1;
@@ -430,7 +430,7 @@ INLINE void restore_filter16(int* r, int* g, int* b, UINT16* fbuff, UINT32 fbuff
}
}
-INLINE void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuff, UINT32 hres)
+static inline void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuff, UINT32 hres)
{
color_t filtered;
color_t leftuppix, leftdownpix, leftpix;
@@ -474,7 +474,7 @@ INLINE void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuf
}
// This is wrong, only the 5 upper bits are compared.
-INLINE void restore_two(color_t* filtered, color_t* neighbour)
+static inline void restore_two(color_t* filtered, color_t* neighbour)
{
if (neighbour->i.r > filtered->i.r)
{
@@ -502,7 +502,7 @@ INLINE void restore_two(color_t* filtered, color_t* neighbour)
}
}
-INLINE void video_max(UINT32* Pixels, UINT8* max, UINT32* enb)
+static inline void video_max(UINT32* Pixels, UINT8* max, UINT32* enb)
{
int i;
int pos = 0;
@@ -526,7 +526,7 @@ INLINE void video_max(UINT32* Pixels, UINT8* max, UINT32* enb)
*max = Pixels[pos];
}
-INLINE UINT32 ge_two(UINT32 enb)
+static inline UINT32 ge_two(UINT32 enb)
{
if(enb & 1)
{
diff --git a/src/mame/video/tatsumi.cpp b/src/mame/video/tatsumi.cpp
index 34656f1b9b1..3e150303609 100644
--- a/src/mame/video/tatsumi.cpp
+++ b/src/mame/video/tatsumi.cpp
@@ -169,7 +169,7 @@ VIDEO_START_MEMBER(tatsumi_state,bigfight)
/********************************************************************/
template<class _BitmapClass>
-INLINE void roundupt_drawgfxzoomrotate(tatsumi_state *state,
+static inline void roundupt_drawgfxzoomrotate(tatsumi_state *state,
_BitmapClass &dest_bmp, const rectangle &clip, gfx_element *gfx,
UINT32 code,UINT32 color,int flipx,int flipy,UINT32 ssx,UINT32 ssy,
int scalex, int scaley, int rotate, int write_priority_only )
diff --git a/src/mame/video/victory.cpp b/src/mame/video/victory.cpp
index a265f3d3815..99ce602429b 100644
--- a/src/mame/video/victory.cpp
+++ b/src/mame/video/victory.cpp
@@ -510,7 +510,7 @@ Registers:
*
*************************************/
-INLINE void count_states(struct micro_t &micro, int states)
+static inline void count_states(struct micro_t &micro, int states)
{
attotime state_time = MICRO_STATE_CLOCK_PERIOD * states;
diff --git a/src/mame/video/vrender0.cpp b/src/mame/video/vrender0.cpp
index 1b968053882..7b2af322548 100644
--- a/src/mame/video/vrender0.cpp
+++ b/src/mame/video/vrender0.cpp
@@ -116,7 +116,7 @@ no color in the palette will have this value
#define RGB32(r,g,b) ((r << 16) | (g << 8) | (b << 0))
#define RGB16(r,g,b) ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3)
-INLINE UINT16 RGB32TO16(UINT32 rgb)
+static inline UINT16 RGB32TO16(UINT32 rgb)
{
return (((rgb >> (16 + 3)) & 0x1f) << 11) | (((rgb >> (8 + 2)) & 0x3f) << 5) | (((rgb >> (3)) & 0x1f) << 0);
}
@@ -125,7 +125,7 @@ INLINE UINT16 RGB32TO16(UINT32 rgb)
#define EXTRACTG8(Src) (((Src >> 5) << 2) & 0xff)
#define EXTRACTB8(Src) (((Src >> 0) << 3) & 0xff)
-INLINE UINT16 Shade(UINT16 Src, UINT32 Shade)
+static inline UINT16 Shade(UINT16 Src, UINT32 Shade)
{
UINT32 scr = (EXTRACTR8(Src) * ((Shade >> 16) & 0xff)) >> 8;
UINT32 scg = (EXTRACTG8(Src) * ((Shade >> 8) & 0xff)) >> 8;
diff --git a/src/mame/video/wgp.cpp b/src/mame/video/wgp.cpp
index 9cd1ef49871..9a7c78b1140 100644
--- a/src/mame/video/wgp.cpp
+++ b/src/mame/video/wgp.cpp
@@ -477,7 +477,7 @@ void wgp_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const
CUSTOM DRAW
*********************************************************/
-INLINE void bryan2_drawscanline( bitmap_ind16 &bitmap, int x, int y, int length,
+static inline void bryan2_drawscanline( bitmap_ind16 &bitmap, int x, int y, int length,
const UINT16 *src, int transparent, UINT32 orient, bitmap_ind8 &priority, int pri )
{
UINT16 *dsti = &bitmap.pix16(y, x);
diff --git a/src/osd/eigccppc.h b/src/osd/eigccppc.h
index 846a0aac55b..dacf6b5efc3 100644
--- a/src/osd/eigccppc.h
+++ b/src/osd/eigccppc.h
@@ -41,7 +41,7 @@
-------------------------------------------------*/
#define mul_32x32_hi _mul_32x32_hi
-INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline INT32 ATTR_CONST ATTR_FORCE_INLINE
_mul_32x32_hi(INT32 val1, INT32 val2)
{
INT32 result;
@@ -64,7 +64,7 @@ _mul_32x32_hi(INT32 val1, INT32 val2)
-------------------------------------------------*/
#define mulu_32x32_hi _mulu_32x32_hi
-INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline UINT32 ATTR_CONST ATTR_FORCE_INLINE
_mulu_32x32_hi(UINT32 val1, UINT32 val2)
{
UINT32 result;
@@ -89,7 +89,7 @@ _mulu_32x32_hi(UINT32 val1, UINT32 val2)
#if !defined(__ppc64__) && !defined(__PPC64__) && !defined(_ARCH_PPC64)
#define mul_32x32_shift _mul_32x32_shift
-INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline INT32 ATTR_CONST ATTR_FORCE_INLINE
_mul_32x32_shift(INT32 val1, INT32 val2, UINT8 shift)
{
INT32 result;
@@ -123,7 +123,7 @@ _mul_32x32_shift(INT32 val1, INT32 val2, UINT8 shift)
#if !defined(__ppc64__) && !defined(__PPC64__) && !defined(_ARCH_PPC64)
#define mulu_32x32_shift _mulu_32x32_shift
-INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline UINT32 ATTR_CONST ATTR_FORCE_INLINE
_mulu_32x32_shift(UINT32 val1, UINT32 val2, UINT8 shift)
{
UINT32 result;
@@ -222,7 +222,7 @@ _mulu_32x32_shift(UINT32 val1, UINT32 val2, UINT8 shift)
-------------------------------------------------*/
#define recip_approx _recip_approx
-INLINE float ATTR_CONST ATTR_FORCE_INLINE
+static inline float ATTR_CONST ATTR_FORCE_INLINE
_recip_approx(float value)
{
float result;
@@ -248,7 +248,7 @@ _recip_approx(float value)
-------------------------------------------------*/
#define count_leading_zeros _count_leading_zeros
-INLINE UINT8 ATTR_CONST ATTR_FORCE_INLINE
+static inline UINT8 ATTR_CONST ATTR_FORCE_INLINE
_count_leading_zeros(UINT32 value)
{
UINT32 result;
@@ -269,7 +269,7 @@ _count_leading_zeros(UINT32 value)
-------------------------------------------------*/
#define count_leading_ones _count_leading_ones
-INLINE UINT8 ATTR_CONST ATTR_FORCE_INLINE
+static inline UINT8 ATTR_CONST ATTR_FORCE_INLINE
_count_leading_ones(UINT32 value)
{
UINT32 result;
@@ -298,7 +298,7 @@ _count_leading_ones(UINT32 value)
-------------------------------------------------*/
#define compare_exchange32 _compare_exchange32
-INLINE INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
_compare_exchange32(INT32 volatile *ptr, INT32 compare, INT32 exchange)
{
INT32 result;
@@ -332,7 +332,7 @@ _compare_exchange32(INT32 volatile *ptr, INT32 compare, INT32 exchange)
#if defined(__ppc64__) || defined(__PPC64__)
#define compare_exchange64 _compare_exchange64
-INLINE INT64 ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT64 ATTR_NONNULL(1) ATTR_FORCE_INLINE
_compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
{
INT64 result;
@@ -365,7 +365,7 @@ _compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
-------------------------------------------------*/
#define atomic_exchange32 _atomic_exchange32
-INLINE INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
_atomic_exchange32(INT32 volatile *ptr, INT32 exchange)
{
INT32 result;
@@ -393,7 +393,7 @@ _atomic_exchange32(INT32 volatile *ptr, INT32 exchange)
-------------------------------------------------*/
#define atomic_add32 _atomic_add32
-INLINE INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
_atomic_add32(INT32 volatile *ptr, INT32 delta)
{
INT32 result;
@@ -422,7 +422,7 @@ _atomic_add32(INT32 volatile *ptr, INT32 delta)
-------------------------------------------------*/
#define atomic_increment32 _atomic_increment32
-INLINE INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
_atomic_increment32(INT32 volatile *ptr)
{
INT32 result;
@@ -450,7 +450,7 @@ _atomic_increment32(INT32 volatile *ptr)
-------------------------------------------------*/
#define atomic_decrement32 _atomic_decrement32
-INLINE INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
_atomic_decrement32(INT32 volatile *ptr)
{
INT32 result;
@@ -484,7 +484,7 @@ _atomic_decrement32(INT32 volatile *ptr)
-------------------------------------------------*/
#define get_profile_ticks _get_profile_ticks
-INLINE INT64 ATTR_UNUSED ATTR_FORCE_INLINE _get_profile_ticks(void)
+static inline INT64 ATTR_UNUSED ATTR_FORCE_INLINE _get_profile_ticks(void)
{
// fix me - should use the time base
return osd_ticks();
diff --git a/src/osd/eigccx86.h b/src/osd/eigccx86.h
index a33df410994..2be2164a165 100644
--- a/src/osd/eigccx86.h
+++ b/src/osd/eigccx86.h
@@ -41,7 +41,7 @@ union _x86_union
#ifndef __x86_64__
#define mul_32x32 _mul_32x32
-INLINE INT64 ATTR_CONST ATTR_FORCE_INLINE
+static inline INT64 ATTR_CONST ATTR_FORCE_INLINE
_mul_32x32(INT32 a, INT32 b)
{
INT64 result;
@@ -67,7 +67,7 @@ _mul_32x32(INT32 a, INT32 b)
#ifndef __x86_64__
#define mulu_32x32 _mulu_32x32
-INLINE UINT64 ATTR_CONST ATTR_FORCE_INLINE
+static inline UINT64 ATTR_CONST ATTR_FORCE_INLINE
_mulu_32x32(UINT32 a, UINT32 b)
{
UINT64 result;
@@ -92,7 +92,7 @@ _mulu_32x32(UINT32 a, UINT32 b)
-------------------------------------------------*/
#define mul_32x32_hi _mul_32x32_hi
-INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline INT32 ATTR_CONST ATTR_FORCE_INLINE
_mul_32x32_hi(INT32 a, INT32 b)
{
INT32 result, temp;
@@ -117,7 +117,7 @@ _mul_32x32_hi(INT32 a, INT32 b)
-------------------------------------------------*/
#define mulu_32x32_hi _mulu_32x32_hi
-INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline UINT32 ATTR_CONST ATTR_FORCE_INLINE
_mulu_32x32_hi(UINT32 a, UINT32 b)
{
UINT32 result, temp;
@@ -144,7 +144,7 @@ _mulu_32x32_hi(UINT32 a, UINT32 b)
#ifndef __x86_64__
#define mul_32x32_shift _mul_32x32_shift
-INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline INT32 ATTR_CONST ATTR_FORCE_INLINE
_mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)
{
INT32 result;
@@ -174,7 +174,7 @@ _mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)
#ifndef __x86_64__
#define mulu_32x32_shift _mulu_32x32_shift
-INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline UINT32 ATTR_CONST ATTR_FORCE_INLINE
_mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
{
UINT32 result;
@@ -202,7 +202,7 @@ _mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
#ifndef __x86_64__
#define div_64x32 _div_64x32
-INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline INT32 ATTR_CONST ATTR_FORCE_INLINE
_div_64x32(INT64 a, INT32 b)
{
INT32 result, temp;
@@ -229,7 +229,7 @@ _div_64x32(INT64 a, INT32 b)
#ifndef __x86_64__
#define divu_64x32 _divu_64x32
-INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline UINT32 ATTR_CONST ATTR_FORCE_INLINE
_divu_64x32(UINT64 a, UINT32 b)
{
UINT32 result, temp;
@@ -257,7 +257,7 @@ _divu_64x32(UINT64 a, UINT32 b)
#ifndef __x86_64__
#define div_64x32_rem _div_64x32_rem
-INLINE INT32 ATTR_FORCE_INLINE
+static inline INT32 ATTR_FORCE_INLINE
_div_64x32_rem(INT64 dividend, INT32 divisor, INT32 *remainder)
{
INT32 quotient;
@@ -285,7 +285,7 @@ _div_64x32_rem(INT64 dividend, INT32 divisor, INT32 *remainder)
#ifndef __x86_64__
#define divu_64x32_rem _divu_64x32_rem
-INLINE UINT32 ATTR_FORCE_INLINE
+static inline UINT32 ATTR_FORCE_INLINE
_divu_64x32_rem(UINT64 dividend, UINT32 divisor, UINT32 *remainder)
{
UINT32 quotient;
@@ -304,7 +304,7 @@ _divu_64x32_rem(UINT64 dividend, UINT32 divisor, UINT32 *remainder)
}
#else
#define divu_64x32_rem _divu_64x32_rem
-INLINE UINT32 ATTR_FORCE_INLINE
+static inline UINT32 ATTR_FORCE_INLINE
_divu_64x32_rem(UINT64 dividend, UINT32 divisor, UINT32 *remainder)
{
UINT32 quotient;
@@ -336,7 +336,7 @@ _divu_64x32_rem(UINT64 dividend, UINT32 divisor, UINT32 *remainder)
#ifndef __x86_64__
#define div_32x32_shift _div_32x32_shift
-INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline INT32 ATTR_CONST ATTR_FORCE_INLINE
_div_32x32_shift(INT32 a, INT32 b, UINT8 shift)
{
INT32 result;
@@ -368,7 +368,7 @@ _div_32x32_shift(INT32 a, INT32 b, UINT8 shift)
#ifndef __x86_64__
#define divu_32x32_shift _divu_32x32_shift
-INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline UINT32 ATTR_CONST ATTR_FORCE_INLINE
_divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
{
INT32 result;
@@ -399,7 +399,7 @@ _divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
#ifndef __x86_64__
#define mod_64x32 _mod_64x32
-INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline INT32 ATTR_CONST ATTR_FORCE_INLINE
_mod_64x32(INT64 a, INT32 b)
{
INT32 result, temp;
@@ -426,7 +426,7 @@ _mod_64x32(INT64 a, INT32 b)
#ifndef __x86_64__
#define modu_64x32 _modu_64x32
-INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
+static inline UINT32 ATTR_CONST ATTR_FORCE_INLINE
_modu_64x32(UINT64 a, UINT32 b)
{
UINT32 result, temp;
@@ -453,7 +453,7 @@ _modu_64x32(UINT64 a, UINT32 b)
#ifdef __SSE2__
#define recip_approx _recip_approx
-INLINE float ATTR_CONST
+static inline float ATTR_CONST
_recip_approx(float value)
{
__m128 value_xmm = _mm_set_ss(value);
@@ -476,7 +476,7 @@ _recip_approx(float value)
-------------------------------------------------*/
#define count_leading_zeros _count_leading_zeros
-INLINE UINT8 ATTR_CONST ATTR_FORCE_INLINE
+static inline UINT8 ATTR_CONST ATTR_FORCE_INLINE
_count_leading_zeros(UINT32 value)
{
UINT32 result;
@@ -501,7 +501,7 @@ _count_leading_zeros(UINT32 value)
-------------------------------------------------*/
#define count_leading_ones _count_leading_ones
-INLINE UINT8 ATTR_CONST ATTR_FORCE_INLINE
+static inline UINT8 ATTR_CONST ATTR_FORCE_INLINE
_count_leading_ones(UINT32 value)
{
UINT32 result;
@@ -535,7 +535,7 @@ _count_leading_ones(UINT32 value)
-------------------------------------------------*/
#define compare_exchange32 _compare_exchange32
-INLINE INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
_compare_exchange32(INT32 volatile *ptr, INT32 compare, INT32 exchange)
{
INT32 result;
@@ -562,7 +562,7 @@ _compare_exchange32(INT32 volatile *ptr, INT32 compare, INT32 exchange)
#ifdef __x86_64__
#define compare_exchange64 _compare_exchange64
-INLINE INT64 ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT64 ATTR_NONNULL(1) ATTR_FORCE_INLINE
_compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
{
INT64 result;
@@ -588,7 +588,7 @@ _compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
-------------------------------------------------*/
#define atomic_exchange32 _atomic_exchange32
-INLINE INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
_atomic_exchange32(INT32 volatile *ptr, INT32 exchange)
{
INT32 result;
@@ -611,7 +611,7 @@ _atomic_exchange32(INT32 volatile *ptr, INT32 exchange)
-------------------------------------------------*/
#define atomic_add32 _atomic_add32
-INLINE INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
_atomic_add32(INT32 volatile *ptr, INT32 delta)
{
INT32 result = delta;
@@ -635,7 +635,7 @@ _atomic_add32(INT32 volatile *ptr, INT32 delta)
-------------------------------------------------*/
#define atomic_increment32 _atomic_increment32
-INLINE INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
_atomic_increment32(INT32 volatile *ptr)
{
INT32 result = 1;
@@ -659,7 +659,7 @@ _atomic_increment32(INT32 volatile *ptr)
-------------------------------------------------*/
#define atomic_decrement32 _atomic_decrement32
-INLINE INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT32 ATTR_NONNULL(1) ATTR_FORCE_INLINE
_atomic_decrement32(INT32 volatile *ptr)
{
INT32 result = -1;
@@ -691,7 +691,7 @@ _atomic_decrement32(INT32 volatile *ptr)
#define get_profile_ticks _get_profile_ticks
#ifndef __x86_64__
-INLINE UINT64 ATTR_UNUSED ATTR_FORCE_INLINE _get_profile_ticks(void)
+static inline UINT64 ATTR_UNUSED ATTR_FORCE_INLINE _get_profile_ticks(void)
{
UINT64 result;
__asm__ __volatile__ (
@@ -701,7 +701,7 @@ INLINE UINT64 ATTR_UNUSED ATTR_FORCE_INLINE _get_profile_ticks(void)
return result;
}
#else
-INLINE UINT64 ATTR_UNUSED ATTR_FORCE_INLINE _get_profile_ticks(void)
+static inline UINT64 ATTR_UNUSED ATTR_FORCE_INLINE _get_profile_ticks(void)
{
_x86_union r;
__asm__ __volatile__ (
diff --git a/src/osd/eivc.h b/src/osd/eivc.h
index 93927b1712b..3794e7ff169 100644
--- a/src/osd/eivc.h
+++ b/src/osd/eivc.h
@@ -49,7 +49,7 @@ extern "C" unsigned char _BitScanReverse(unsigned long *Index, unsigned long Mas
#ifndef count_leading_zeros
#define count_leading_zeros _count_leading_zeros
-INLINE UINT8 _count_leading_zeros(UINT32 value)
+static inline UINT8 _count_leading_zeros(UINT32 value)
{
UINT32 index;
return _BitScanReverse((unsigned long *)&index, value) ? (index ^ 31) : 32;
@@ -64,7 +64,7 @@ INLINE UINT8 _count_leading_zeros(UINT32 value)
#ifndef count_leading_ones
#define count_leading_ones _count_leading_ones
-INLINE UINT8 _count_leading_ones(UINT32 value)
+static inline UINT8 _count_leading_ones(UINT32 value)
{
UINT32 index;
return _BitScanReverse((unsigned long *)&index, ~value) ? (index ^ 31) : 32;
@@ -86,7 +86,7 @@ INLINE UINT8 _count_leading_ones(UINT32 value)
#ifndef compare_exchange32
#define compare_exchange32 _compare_exchange32
-INLINE INT32 _compare_exchange32(INT32 volatile *ptr, INT32 compare, INT32 exchange)
+static inline INT32 _compare_exchange32(INT32 volatile *ptr, INT32 compare, INT32 exchange)
{
return _InterlockedCompareExchange((volatile long *)ptr, exchange, compare);
}
@@ -103,7 +103,7 @@ INLINE INT32 _compare_exchange32(INT32 volatile *ptr, INT32 compare, INT32 excha
#ifdef PTR64
#ifndef compare_exchange64
#define compare_exchange64 _compare_exchange64
-INLINE INT64 _compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
+static inline INT64 _compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
{
return _InterlockedCompareExchange64(ptr, exchange, compare);
}
@@ -119,7 +119,7 @@ INLINE INT64 _compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 excha
#ifndef atomic_exchange32
#define atomic_exchange32 _atomic_exchange32
-INLINE INT32 _atomic_exchange32(INT32 volatile *ptr, INT32 exchange)
+static inline INT32 _atomic_exchange32(INT32 volatile *ptr, INT32 exchange)
{
return _InterlockedExchange((volatile long *)ptr, exchange);
}
@@ -134,7 +134,7 @@ INLINE INT32 _atomic_exchange32(INT32 volatile *ptr, INT32 exchange)
#ifndef atomic_add32
#define atomic_add32 _atomic_add32
-INLINE INT32 _atomic_add32(INT32 volatile *ptr, INT32 delta)
+static inline INT32 _atomic_add32(INT32 volatile *ptr, INT32 delta)
{
return _InterlockedExchangeAdd((volatile long *)ptr, delta) + delta;
}
@@ -149,7 +149,7 @@ INLINE INT32 _atomic_add32(INT32 volatile *ptr, INT32 delta)
#ifndef atomic_increment32
#define atomic_increment32 _atomic_increment32
-INLINE INT32 _atomic_increment32(INT32 volatile *ptr)
+static inline INT32 _atomic_increment32(INT32 volatile *ptr)
{
return _InterlockedIncrement((volatile long *)ptr);
}
@@ -164,7 +164,7 @@ INLINE INT32 _atomic_increment32(INT32 volatile *ptr)
#ifndef atomic_decrement32
#define atomic_decrement32 _atomic_decrement32
-INLINE INT32 _atomic_decrement32(INT32 volatile *ptr)
+static inline INT32 _atomic_decrement32(INT32 volatile *ptr)
{
return _InterlockedDecrement((volatile long *)ptr);
}
diff --git a/src/osd/eivcx86.h b/src/osd/eivcx86.h
index b834bc2aa25..b6139f70c26 100644
--- a/src/osd/eivcx86.h
+++ b/src/osd/eivcx86.h
@@ -28,7 +28,7 @@
#ifndef PTR64
#define mul_32x32 _mul_32x32
-INLINE INT64 _mul_32x32(INT32 a, INT32 b)
+static inline INT64 _mul_32x32(INT32 a, INT32 b)
{
// in theory this should work, but it is untested
__asm
@@ -49,7 +49,7 @@ INLINE INT64 _mul_32x32(INT32 a, INT32 b)
#ifndef PTR64
#define mulu_32x32 _mulu_32x32
-INLINE UINT64 _mulu_32x32(UINT32 a, UINT32 b)
+static inline UINT64 _mulu_32x32(UINT32 a, UINT32 b)
{
// in theory this should work, but it is untested
__asm
@@ -70,7 +70,7 @@ INLINE UINT64 _mulu_32x32(UINT32 a, UINT32 b)
#ifndef PTR64
#define mul_32x32_hi _mul_32x32_hi
-INLINE INT32 _mul_32x32_hi(INT32 a, INT32 b)
+static inline INT32 _mul_32x32_hi(INT32 a, INT32 b)
{
INT32 result;
@@ -94,7 +94,7 @@ INLINE INT32 _mul_32x32_hi(INT32 a, INT32 b)
#ifndef PTR64
#define mulu_32x32_hi _mulu_32x32_hi
-INLINE UINT32 _mulu_32x32_hi(UINT32 a, UINT32 b)
+static inline UINT32 _mulu_32x32_hi(UINT32 a, UINT32 b)
{
INT32 result;
@@ -119,7 +119,7 @@ INLINE UINT32 _mulu_32x32_hi(UINT32 a, UINT32 b)
#ifndef PTR64
#define mul_32x32_shift _mul_32x32_shift
-INLINE INT32 _mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)
+static inline INT32 _mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)
{
INT32 result;
@@ -146,7 +146,7 @@ INLINE INT32 _mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)
#ifndef PTR64
#define mulu_32x32_shift _mulu_32x32_shift
-INLINE UINT32 _mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
+static inline UINT32 _mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
{
INT32 result;
@@ -171,7 +171,7 @@ INLINE UINT32 _mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
#ifndef PTR64
#define div_64x32 _div_64x32
-INLINE INT32 _div_64x32(INT64 a, INT32 b)
+static inline INT32 _div_64x32(INT64 a, INT32 b)
{
INT32 result;
INT32 alow = a;
@@ -197,7 +197,7 @@ INLINE INT32 _div_64x32(INT64 a, INT32 b)
#ifndef PTR64
#define divu_64x32 _divu_64x32
-INLINE UINT32 _divu_64x32(UINT64 a, UINT32 b)
+static inline UINT32 _divu_64x32(UINT64 a, UINT32 b)
{
UINT32 result;
UINT32 alow = a;
@@ -224,7 +224,7 @@ INLINE UINT32 _divu_64x32(UINT64 a, UINT32 b)
#ifndef PTR64
#define div_64x32_rem _div_64x32_rem
-INLINE INT32 _div_64x32_rem(INT64 a, INT32 b, INT32 *remainder)
+static inline INT32 _div_64x32_rem(INT64 a, INT32 b, INT32 *remainder)
{
INT32 result;
INT32 alow = a;
@@ -254,7 +254,7 @@ INLINE INT32 _div_64x32_rem(INT64 a, INT32 b, INT32 *remainder)
#ifndef PTR64
#define divu_64x32_rem _divu_64x32_rem
-INLINE UINT32 _divu_64x32_rem(UINT64 a, UINT32 b, UINT32 *remainder)
+static inline UINT32 _divu_64x32_rem(UINT64 a, UINT32 b, UINT32 *remainder)
{
UINT32 result;
UINT32 alow = a;
@@ -284,7 +284,7 @@ INLINE UINT32 _divu_64x32_rem(UINT64 a, UINT32 b, UINT32 *remainder)
#ifndef PTR64
#define div_32x32_shift _div_32x32_shift
-INLINE INT32 _div_32x32_shift(INT32 a, INT32 b, UINT8 shift)
+static inline INT32 _div_32x32_shift(INT32 a, INT32 b, UINT8 shift)
{
INT32 result;
@@ -312,7 +312,7 @@ INLINE INT32 _div_32x32_shift(INT32 a, INT32 b, UINT8 shift)
#ifndef PTR64
#define divu_32x32_shift _divu_32x32_shift
-INLINE UINT32 _divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
+static inline UINT32 _divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
{
UINT32 result;
@@ -339,7 +339,7 @@ INLINE UINT32 _divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
#ifndef PTR64
#define mod_64x32 _mod_64x32
-INLINE INT32 _mod_64x32(INT64 a, INT32 b)
+static inline INT32 _mod_64x32(INT64 a, INT32 b)
{
INT32 result;
INT32 alow = a;
@@ -365,7 +365,7 @@ INLINE INT32 _mod_64x32(INT64 a, INT32 b)
#ifndef PTR64
#define modu_64x32 _modu_64x32
-INLINE UINT32 _modu_64x32(UINT64 a, UINT32 b)
+static inline UINT32 _modu_64x32(UINT64 a, UINT32 b)
{
UINT32 result;
UINT32 alow = a;
@@ -391,7 +391,7 @@ INLINE UINT32 _modu_64x32(UINT64 a, UINT32 b)
#ifdef PTR64
#define recip_approx _recip_approx
-INLINE float _recip_approx(float z)
+static inline float _recip_approx(float z)
{
__m128 mz = _mm_set_ss(z);
__m128 mooz = _mm_rcp_ss(mz);
@@ -414,7 +414,7 @@ INLINE float _recip_approx(float z)
#ifndef PTR64
#define count_leading_zeros _count_leading_zeros
-INLINE UINT8 _count_leading_zeros(UINT32 value)
+static inline UINT8 _count_leading_zeros(UINT32 value)
{
INT32 result;
@@ -440,7 +440,7 @@ INLINE UINT8 _count_leading_zeros(UINT32 value)
#ifndef PTR64
#define count_leading_ones _count_leading_ones
-INLINE UINT8 _count_leading_ones(UINT32 value)
+static inline UINT8 _count_leading_ones(UINT32 value)
{
INT32 result;
@@ -477,14 +477,14 @@ INLINE UINT8 _count_leading_ones(UINT32 value)
#ifdef PTR64
-INLINE osd_ticks_t _get_profile_ticks(void)
+static inline osd_ticks_t _get_profile_ticks(void)
{
return __rdtsc();
}
#else
-INLINE osd_ticks_t _get_profile_ticks(void)
+static inline osd_ticks_t _get_profile_ticks(void)
{
UINT64 result;
UINT64 *presult = &result;
diff --git a/src/osd/eminline.h b/src/osd/eminline.h
index 79b154d9ba8..80b31437f2a 100644
--- a/src/osd/eminline.h
+++ b/src/osd/eminline.h
@@ -19,7 +19,7 @@
#if defined(__i386__) || defined(__x86_64__)
-INLINE void ATTR_FORCE_INLINE
+static inline void ATTR_FORCE_INLINE
osd_yield_processor(void)
{
__asm__ __volatile__ ( " rep ; nop ;" );
@@ -32,7 +32,7 @@ osd_yield_processor(void)
// osd_exchange64
//============================================================
-INLINE INT64 ATTR_UNUSED ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT64 ATTR_UNUSED ATTR_NONNULL(1) ATTR_FORCE_INLINE
_osd_exchange64(INT64 volatile *ptr, INT64 exchange)
{
INT64 ret;
@@ -52,7 +52,7 @@ _osd_exchange64(INT64 volatile *ptr, INT64 exchange)
#elif defined(__ppc__) || defined (__PPC__) || defined(__ppc64__) || defined(__PPC64__)
-INLINE void ATTR_FORCE_INLINE
+static inline void ATTR_FORCE_INLINE
osd_yield_processor(void)
{
__asm__ __volatile__ ( " nop \n nop \n" );
@@ -66,7 +66,7 @@ osd_yield_processor(void)
// osd_exchange64
//============================================================
-INLINE INT64 ATTR_UNUSED ATTR_NONNULL(1) ATTR_FORCE_INLINE
+static inline INT64 ATTR_UNUSED ATTR_NONNULL(1) ATTR_FORCE_INLINE
_osd_exchange64(INT64 volatile *ptr, INT64 exchange)
{
INT64 ret;
@@ -152,7 +152,7 @@ INT64 win_compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
-------------------------------------------------*/
#ifndef mul_32x32
-INLINE INT64 mul_32x32(INT32 a, INT32 b)
+static inline INT64 mul_32x32(INT32 a, INT32 b)
{
return (INT64)a * (INT64)b;
}
@@ -166,7 +166,7 @@ INLINE INT64 mul_32x32(INT32 a, INT32 b)
-------------------------------------------------*/
#ifndef mulu_32x32
-INLINE UINT64 mulu_32x32(UINT32 a, UINT32 b)
+static inline UINT64 mulu_32x32(UINT32 a, UINT32 b)
{
return (UINT64)a * (UINT64)b;
}
@@ -180,7 +180,7 @@ INLINE UINT64 mulu_32x32(UINT32 a, UINT32 b)
-------------------------------------------------*/
#ifndef mul_32x32_hi
-INLINE INT32 mul_32x32_hi(INT32 a, INT32 b)
+static inline INT32 mul_32x32_hi(INT32 a, INT32 b)
{
return (UINT32)(((INT64)a * (INT64)b) >> 32);
}
@@ -194,7 +194,7 @@ INLINE INT32 mul_32x32_hi(INT32 a, INT32 b)
-------------------------------------------------*/
#ifndef mulu_32x32_hi
-INLINE UINT32 mulu_32x32_hi(UINT32 a, UINT32 b)
+static inline UINT32 mulu_32x32_hi(UINT32 a, UINT32 b)
{
return (UINT32)(((UINT64)a * (UINT64)b) >> 32);
}
@@ -209,7 +209,7 @@ INLINE UINT32 mulu_32x32_hi(UINT32 a, UINT32 b)
-------------------------------------------------*/
#ifndef mul_32x32_shift
-INLINE INT32 mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)
+static inline INT32 mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)
{
return (INT32)(((INT64)a * (INT64)b) >> shift);
}
@@ -224,7 +224,7 @@ INLINE INT32 mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)
-------------------------------------------------*/
#ifndef mulu_32x32_shift
-INLINE UINT32 mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
+static inline UINT32 mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
{
return (UINT32)(((UINT64)a * (UINT64)b) >> shift);
}
@@ -237,7 +237,7 @@ INLINE UINT32 mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
-------------------------------------------------*/
#ifndef div_64x32
-INLINE INT32 div_64x32(INT64 a, INT32 b)
+static inline INT32 div_64x32(INT64 a, INT32 b)
{
return a / (INT64)b;
}
@@ -250,7 +250,7 @@ INLINE INT32 div_64x32(INT64 a, INT32 b)
-------------------------------------------------*/
#ifndef divu_64x32
-INLINE UINT32 divu_64x32(UINT64 a, UINT32 b)
+static inline UINT32 divu_64x32(UINT64 a, UINT32 b)
{
return a / (UINT64)b;
}
@@ -264,7 +264,7 @@ INLINE UINT32 divu_64x32(UINT64 a, UINT32 b)
-------------------------------------------------*/
#ifndef div_64x32_rem
-INLINE INT32 div_64x32_rem(INT64 a, INT32 b, INT32 *remainder)
+static inline INT32 div_64x32_rem(INT64 a, INT32 b, INT32 *remainder)
{
INT32 res = div_64x32(a, b);
*remainder = a - ((INT64)b * res);
@@ -280,7 +280,7 @@ INLINE INT32 div_64x32_rem(INT64 a, INT32 b, INT32 *remainder)
-------------------------------------------------*/
#ifndef divu_64x32_rem
-INLINE UINT32 divu_64x32_rem(UINT64 a, UINT32 b, UINT32 *remainder)
+static inline UINT32 divu_64x32_rem(UINT64 a, UINT32 b, UINT32 *remainder)
{
UINT32 res = divu_64x32(a, b);
*remainder = a - ((UINT64)b * res);
@@ -296,7 +296,7 @@ INLINE UINT32 divu_64x32_rem(UINT64 a, UINT32 b, UINT32 *remainder)
-------------------------------------------------*/
#ifndef div_32x32_shift
-INLINE INT32 div_32x32_shift(INT32 a, INT32 b, UINT8 shift)
+static inline INT32 div_32x32_shift(INT32 a, INT32 b, UINT8 shift)
{
return ((INT64)a << shift) / (INT64)b;
}
@@ -310,7 +310,7 @@ INLINE INT32 div_32x32_shift(INT32 a, INT32 b, UINT8 shift)
-------------------------------------------------*/
#ifndef divu_32x32_shift
-INLINE UINT32 divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
+static inline UINT32 divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
{
return ((UINT64)a << shift) / (UINT64)b;
}
@@ -323,7 +323,7 @@ INLINE UINT32 divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
-------------------------------------------------*/
#ifndef mod_64x32
-INLINE INT32 mod_64x32(INT64 a, INT32 b)
+static inline INT32 mod_64x32(INT64 a, INT32 b)
{
return a - (b * div_64x32(a, b));
}
@@ -336,7 +336,7 @@ INLINE INT32 mod_64x32(INT64 a, INT32 b)
-------------------------------------------------*/
#ifndef modu_64x32
-INLINE UINT32 modu_64x32(UINT64 a, UINT32 b)
+static inline UINT32 modu_64x32(UINT64 a, UINT32 b)
{
return a - (b * divu_64x32(a, b));
}
@@ -349,7 +349,7 @@ INLINE UINT32 modu_64x32(UINT64 a, UINT32 b)
-------------------------------------------------*/
#ifndef recip_approx
-INLINE float recip_approx(float value)
+static inline float recip_approx(float value)
{
return 1.0f / value;
}
@@ -367,7 +367,7 @@ INLINE float recip_approx(float value)
-------------------------------------------------*/
#ifndef count_leading_zeros
-INLINE UINT8 count_leading_zeros(UINT32 val)
+static inline UINT8 count_leading_zeros(UINT32 val)
{
UINT8 count;
for (count = 0; (INT32)val >= 0; count++) val <<= 1;
@@ -382,7 +382,7 @@ INLINE UINT8 count_leading_zeros(UINT32 val)
-------------------------------------------------*/
#ifndef count_leading_ones
-INLINE UINT8 count_leading_ones(UINT32 val)
+static inline UINT8 count_leading_ones(UINT32 val)
{
UINT8 count;
for (count = 0; (INT32)val < 0; count++) val <<= 1;
@@ -409,7 +409,7 @@ INLINE UINT8 count_leading_ones(UINT32 val)
-------------------------------------------------*/
#ifndef compare_exchange32
-INLINE INT32 compare_exchange32(INT32 volatile *ptr, INT32 compare, INT32 exchange)
+static inline INT32 compare_exchange32(INT32 volatile *ptr, INT32 compare, INT32 exchange)
{
INT32 oldval = *ptr;
if (*ptr == compare)
@@ -433,7 +433,7 @@ INLINE INT32 compare_exchange32(INT32 volatile *ptr, INT32 compare, INT32 exchan
#ifdef PTR64
#ifndef compare_exchange64
-INLINE INT64 compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
+static inline INT64 compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
{
INT64 oldval = *ptr;
if (*ptr == compare)
@@ -452,7 +452,7 @@ INLINE INT64 compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchan
-------------------------------------------------*/
#ifndef compare_exchange_ptr
-INLINE void *compare_exchange_ptr(void * volatile *ptr, void *compare, void *exchange)
+static inline void *compare_exchange_ptr(void * volatile *ptr, void *compare, void *exchange)
{
#ifdef PTR64
INT64 result;
@@ -478,7 +478,7 @@ INLINE void *compare_exchange_ptr(void * volatile *ptr, void *compare, void *exc
-------------------------------------------------*/
#ifndef atomic_exchange32
-INLINE INT32 atomic_exchange32(INT32 volatile *ptr, INT32 exchange)
+static inline INT32 atomic_exchange32(INT32 volatile *ptr, INT32 exchange)
{
INT32 oldval = *ptr;
*ptr = exchange;
@@ -499,7 +499,7 @@ INLINE INT32 atomic_exchange32(INT32 volatile *ptr, INT32 exchange)
-------------------------------------------------*/
#ifndef atomic_add32
-INLINE INT32 atomic_add32(INT32 volatile *ptr, INT32 delta)
+static inline INT32 atomic_add32(INT32 volatile *ptr, INT32 delta)
{
return (*ptr += delta);
}
@@ -518,7 +518,7 @@ INLINE INT32 atomic_add32(INT32 volatile *ptr, INT32 delta)
-------------------------------------------------*/
#ifndef atomic_increment32
-INLINE INT32 atomic_increment32(INT32 volatile *ptr)
+static inline INT32 atomic_increment32(INT32 volatile *ptr)
{
return atomic_add32(ptr, 1);
}
@@ -537,7 +537,7 @@ INLINE INT32 atomic_increment32(INT32 volatile *ptr)
-------------------------------------------------*/
#ifndef atomic_decrement32
-INLINE INT32 atomic_decrement32(INT32 volatile *ptr)
+static inline INT32 atomic_decrement32(INT32 volatile *ptr)
{
return atomic_add32(ptr, -1);
}
@@ -557,7 +557,7 @@ INLINE INT32 atomic_decrement32(INT32 volatile *ptr)
-------------------------------------------------*/
#ifndef get_profile_ticks
-INLINE INT64 get_profile_ticks(void)
+static inline INT64 get_profile_ticks(void)
{
return osd_ticks();
}
diff --git a/src/osd/modules/debugger/debugint.cpp b/src/osd/modules/debugger/debugint.cpp
index 9688a17c8e3..246a19a88a6 100644
--- a/src/osd/modules/debugger/debugint.cpp
+++ b/src/osd/modules/debugger/debugint.cpp
@@ -238,17 +238,17 @@ public:
INLINE FUNCTIONS
***************************************************************************/
-INLINE int dview_is_state(DView *dv, int state)
+static inline int dview_is_state(DView *dv, int state)
{
return ((dv->state & state) ? TRUE : FALSE);
}
-INLINE int dview_is_state_all(DView *dv, int state)
+static inline int dview_is_state_all(DView *dv, int state)
{
return ((dv->state & state) == state ? TRUE : FALSE);
}
-INLINE void dview_set_state(DView *dv, int state, int onoff)
+static inline void dview_set_state(DView *dv, int state, int onoff)
{
if (onoff)
dv->state |= state;
@@ -682,7 +682,7 @@ static int dview_on_mouse(DView *dv, int mx, int my, bool button)
}
-INLINE void map_attr_to_fg_bg(unsigned char attr, rgb_t *fg, rgb_t *bg)
+static inline void map_attr_to_fg_bg(unsigned char attr, rgb_t *fg, rgb_t *bg)
{
*bg = rgb_t(0xff,0xff,0xff,0xff);
*fg = rgb_t(0xff,0x00,0x00,0x00);
diff --git a/src/osd/modules/render/d3d/d3d9intf.cpp b/src/osd/modules/render/d3d/d3d9intf.cpp
index cb8eb741f65..e4f5e08db3b 100644
--- a/src/osd/modules/render/d3d/d3d9intf.cpp
+++ b/src/osd/modules/render/d3d/d3d9intf.cpp
@@ -39,7 +39,7 @@ static void set_interfaces(base *d3dptr);
// INLINES
//============================================================
-INLINE void convert_present_params(const present_parameters *params, D3DPRESENT_PARAMETERS *d3d9params)
+static inline void convert_present_params(const present_parameters *params, D3DPRESENT_PARAMETERS *d3d9params)
{
memset(d3d9params, 0, sizeof(*d3d9params));
d3d9params->BackBufferWidth = params->BackBufferWidth;
diff --git a/src/osd/modules/render/draw13.cpp b/src/osd/modules/render/draw13.cpp
index f1f75fe57bf..f357d567e71 100644
--- a/src/osd/modules/render/draw13.cpp
+++ b/src/osd/modules/render/draw13.cpp
@@ -354,17 +354,17 @@ static bool blit_info_initialized = false;
//============================================================
-INLINE float round_nearest(float f)
+static inline float round_nearest(float f)
{
return floor(f + 0.5f);
}
-INLINE HashT texture_compute_hash(const render_texinfo &texture, const UINT32 flags)
+static inline HashT texture_compute_hash(const render_texinfo &texture, const UINT32 flags)
{
return (HashT)texture.base ^ (flags & (PRIMFLAG_BLENDMODE_MASK | PRIMFLAG_TEXFORMAT_MASK));
}
-INLINE SDL_BlendMode map_blendmode(const int blendmode)
+static inline SDL_BlendMode map_blendmode(const int blendmode)
{
switch (blendmode)
{
@@ -382,7 +382,7 @@ INLINE SDL_BlendMode map_blendmode(const int blendmode)
return SDL_BLENDMODE_NONE;
}
-INLINE void set_coloralphamode(SDL_Texture *texture_id, const render_color *color)
+static inline void set_coloralphamode(SDL_Texture *texture_id, const render_color *color)
{
UINT32 sr = (UINT32)(255.0f * color->r);
UINT32 sg = (UINT32)(255.0f * color->g);
diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp
index 04fdadbcbbc..ee99588ebdf 100644
--- a/src/osd/modules/render/drawd3d.cpp
+++ b/src/osd/modules/render/drawd3d.cpp
@@ -92,7 +92,7 @@ static const line_aa_step line_aa_4step[] =
// INLINES
//============================================================
-INLINE BOOL GetClientRectExceptMenu(HWND hWnd, PRECT pRect, BOOL fullscreen)
+static inline BOOL GetClientRectExceptMenu(HWND hWnd, PRECT pRect, BOOL fullscreen)
{
static HMENU last_menu;
static RECT last_rect;
@@ -119,7 +119,7 @@ INLINE BOOL GetClientRectExceptMenu(HWND hWnd, PRECT pRect, BOOL fullscreen)
}
-INLINE UINT32 ycc_to_rgb(UINT8 y, UINT8 cb, UINT8 cr)
+static inline UINT32 ycc_to_rgb(UINT8 y, UINT8 cb, UINT8 cr)
{
/* original equations:
@@ -2199,7 +2199,7 @@ void texture_info::compute_size(int texwidth, int texheight)
// copyline_palette16
//============================================================
-INLINE void copyline_palette16(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix)
+static inline void copyline_palette16(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix)
{
int x;
@@ -2217,7 +2217,7 @@ INLINE void copyline_palette16(UINT32 *dst, const UINT16 *src, int width, const
// copyline_palettea16
//============================================================
-INLINE void copyline_palettea16(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix)
+static inline void copyline_palettea16(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix)
{
int x;
@@ -2235,7 +2235,7 @@ INLINE void copyline_palettea16(UINT32 *dst, const UINT16 *src, int width, const
// copyline_rgb32
//============================================================
-INLINE void copyline_rgb32(UINT32 *dst, const UINT32 *src, int width, const rgb_t *palette, int xborderpix)
+static inline void copyline_rgb32(UINT32 *dst, const UINT32 *src, int width, const rgb_t *palette, int xborderpix)
{
int x;
@@ -2278,7 +2278,7 @@ INLINE void copyline_rgb32(UINT32 *dst, const UINT32 *src, int width, const rgb_
// copyline_argb32
//============================================================
-INLINE void copyline_argb32(UINT32 *dst, const UINT32 *src, int width, const rgb_t *palette, int xborderpix)
+static inline void copyline_argb32(UINT32 *dst, const UINT32 *src, int width, const rgb_t *palette, int xborderpix)
{
int x;
@@ -2321,7 +2321,7 @@ INLINE void copyline_argb32(UINT32 *dst, const UINT32 *src, int width, const rgb
// copyline_yuy16_to_yuy2
//============================================================
-INLINE void copyline_yuy16_to_yuy2(UINT16 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix)
+static inline void copyline_yuy16_to_yuy2(UINT16 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix)
{
int x;
@@ -2386,7 +2386,7 @@ INLINE void copyline_yuy16_to_yuy2(UINT16 *dst, const UINT16 *src, int width, co
// copyline_yuy16_to_uyvy
//============================================================
-INLINE void copyline_yuy16_to_uyvy(UINT16 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix)
+static inline void copyline_yuy16_to_uyvy(UINT16 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix)
{
int x;
@@ -2449,7 +2449,7 @@ INLINE void copyline_yuy16_to_uyvy(UINT16 *dst, const UINT16 *src, int width, co
// copyline_yuy16_to_argb
//============================================================
-INLINE void copyline_yuy16_to_argb(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix)
+static inline void copyline_yuy16_to_argb(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix)
{
int x;
diff --git a/src/osd/modules/render/drawdd.cpp b/src/osd/modules/render/drawdd.cpp
index 8ba2df0df91..fb82dff3c1f 100644
--- a/src/osd/modules/render/drawdd.cpp
+++ b/src/osd/modules/render/drawdd.cpp
@@ -171,7 +171,7 @@ inline void renderer_dd::update_outer_rects()
}
-INLINE int better_mode(int width0, int height0, int width1, int height1, float desired_aspect)
+static inline int better_mode(int width0, int height0, int width1, int height1, float desired_aspect)
{
float aspect0 = (float)width0 / (float)height0;
float aspect1 = (float)width1 / (float)height1;
diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp
index caaa4d6ea74..4a2744e4068 100644
--- a/src/osd/modules/render/drawogl.cpp
+++ b/src/osd/modules/render/drawogl.cpp
@@ -655,7 +655,7 @@ static const line_aa_step line_aa_4step[] =
// INLINES
//============================================================
-INLINE HashT texture_compute_hash(const render_texinfo *texture, UINT32 flags)
+static inline HashT texture_compute_hash(const render_texinfo *texture, UINT32 flags)
{
HashT h = (HashT)texture->base ^ (flags & (PRIMFLAG_BLENDMODE_MASK | PRIMFLAG_TEXFORMAT_MASK));
//printf("hash %d\n", (int) h % HASH_SIZE);
@@ -1998,7 +1998,7 @@ void sdl_info_ogl::texture_compute_type_subroutine(const render_texinfo *texsour
}
}
-INLINE int get_valid_pow2_value(int v, int needPow2)
+static inline int get_valid_pow2_value(int v, int needPow2)
{
return (needPow2)?gl_round_to_pow2(v):v;
}
@@ -2569,7 +2569,7 @@ ogl_texture_info *sdl_info_ogl::texture_create(const render_texinfo *texsource,
// copyline_palette16
//============================================================
-INLINE void copyline_palette16(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix, int xprescale)
+static inline void copyline_palette16(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix, int xprescale)
{
int x;
@@ -2592,7 +2592,7 @@ INLINE void copyline_palette16(UINT32 *dst, const UINT16 *src, int width, const
// copyline_palettea16
//============================================================
-INLINE void copyline_palettea16(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix, int xprescale)
+static inline void copyline_palettea16(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix, int xprescale)
{
int x;
@@ -2615,7 +2615,7 @@ INLINE void copyline_palettea16(UINT32 *dst, const UINT16 *src, int width, const
// copyline_rgb32
//============================================================
-INLINE void copyline_rgb32(UINT32 *dst, const UINT32 *src, int width, const rgb_t *palette, int xborderpix, int xprescale)
+static inline void copyline_rgb32(UINT32 *dst, const UINT32 *src, int width, const rgb_t *palette, int xborderpix, int xprescale)
{
int x;
@@ -2667,7 +2667,7 @@ INLINE void copyline_rgb32(UINT32 *dst, const UINT32 *src, int width, const rgb_
// copyline_argb32
//============================================================
-INLINE void copyline_argb32(UINT32 *dst, const UINT32 *src, int width, const rgb_t *palette, int xborderpix, int xprescale)
+static inline void copyline_argb32(UINT32 *dst, const UINT32 *src, int width, const rgb_t *palette, int xborderpix, int xprescale)
{
int x;
@@ -2710,7 +2710,7 @@ INLINE void copyline_argb32(UINT32 *dst, const UINT32 *src, int width, const rgb
}
}
-INLINE UINT32 ycc_to_rgb(UINT8 y, UINT8 cb, UINT8 cr)
+static inline UINT32 ycc_to_rgb(UINT8 y, UINT8 cb, UINT8 cr)
{
/* original equations:
@@ -2755,7 +2755,7 @@ INLINE UINT32 ycc_to_rgb(UINT8 y, UINT8 cb, UINT8 cr)
// copyline_yuy16_to_argb
//============================================================
-INLINE void copyline_yuy16_to_argb(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix, int xprescale)
+static inline void copyline_yuy16_to_argb(UINT32 *dst, const UINT16 *src, int width, const rgb_t *palette, int xborderpix, int xprescale)
{
int x;
diff --git a/src/osd/modules/sync/sync_ntc.cpp b/src/osd/modules/sync/sync_ntc.cpp
index e283be5000a..462c56ee434 100644
--- a/src/osd/modules/sync/sync_ntc.cpp
+++ b/src/osd/modules/sync/sync_ntc.cpp
@@ -177,7 +177,7 @@ void osd_scalable_lock_free(osd_scalable_lock *lock)
free(lock);
}
-INLINE pthread_t osd_compare_exchange_pthread_t(pthread_t volatile *ptr, pthread_t compare, pthread_t exchange)
+static inline pthread_t osd_compare_exchange_pthread_t(pthread_t volatile *ptr, pthread_t compare, pthread_t exchange)
{
#ifdef PTR64
INT64 result = compare_exchange64((INT64 volatile *)ptr, (INT64)compare, (INT64)exchange);
@@ -187,7 +187,7 @@ INLINE pthread_t osd_compare_exchange_pthread_t(pthread_t volatile *ptr, pthread
return (pthread_t)result;
}
-INLINE pthread_t osd_exchange_pthread_t(pthread_t volatile *ptr, pthread_t exchange)
+static inline pthread_t osd_exchange_pthread_t(pthread_t volatile *ptr, pthread_t exchange)
{
#ifdef PTR64
INT64 result = osd_exchange64((INT64 volatile *)ptr, (INT64)exchange);
diff --git a/src/osd/modules/sync/sync_os2.cpp b/src/osd/modules/sync/sync_os2.cpp
index 0bc452807e6..dba34065610 100644
--- a/src/osd/modules/sync/sync_os2.cpp
+++ b/src/osd/modules/sync/sync_os2.cpp
@@ -167,7 +167,7 @@ void osd_scalable_lock_free(osd_scalable_lock *lock)
free(lock);
}
-INLINE pthread_t osd_compare_exchange_pthread_t(pthread_t volatile *ptr, pthread_t compare, pthread_t exchange)
+static inline pthread_t osd_compare_exchange_pthread_t(pthread_t volatile *ptr, pthread_t compare, pthread_t exchange)
{
#ifdef PTR64
INT64 result = compare_exchange64((INT64 volatile *)ptr, (INT64)compare, (INT64)exchange);
@@ -177,7 +177,7 @@ INLINE pthread_t osd_compare_exchange_pthread_t(pthread_t volatile *ptr, pthread
return (pthread_t)result;
}
-INLINE pthread_t osd_exchange_pthread_t(pthread_t volatile *ptr, pthread_t exchange)
+static inline pthread_t osd_exchange_pthread_t(pthread_t volatile *ptr, pthread_t exchange)
{
#ifdef PTR64
INT64 result = osd_exchange64((INT64 volatile *)ptr, (INT64)exchange);
diff --git a/src/osd/osdcore.h b/src/osd/osdcore.h
index d39e49d3bff..b7180accac8 100644
--- a/src/osd/osdcore.h
+++ b/src/osd/osdcore.h
@@ -675,7 +675,7 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call
/* inline helper to queue a single work item using the same interface */
-INLINE osd_work_item *osd_work_item_queue(osd_work_queue *queue, osd_work_callback callback, void *param, UINT32 flags)
+static inline osd_work_item *osd_work_item_queue(osd_work_queue *queue, osd_work_callback callback, void *param, UINT32 flags)
{
return osd_work_item_queue_multiple(queue, callback, 1, param, 0, flags);
}
diff --git a/src/osd/sdl/input.cpp b/src/osd/sdl/input.cpp
index 1bfde78ee8b..e2732c0a61c 100644
--- a/src/osd/sdl/input.cpp
+++ b/src/osd/sdl/input.cpp
@@ -1525,7 +1525,7 @@ INT32 normalize_absolute_axis(INT32 raw, INT32 rawmin, INT32 rawmax)
//============================================================
#if (SDLMAME_SDL2)
-INLINE sdl_window_info * window_from_id(Uint32 windowID)
+static inline sdl_window_info * window_from_id(Uint32 windowID)
{
sdl_window_info *w;
SDL_Window *window = SDL_GetWindowFromID(windowID);
@@ -1541,7 +1541,7 @@ INLINE sdl_window_info * window_from_id(Uint32 windowID)
return NULL;
}
-INLINE void resize_all_windows(void)
+static inline void resize_all_windows(void)
{
sdl_window_info *w;
osd_ticks_t now = osd_ticks();
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 683f3369f68..47ab3cdd162 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -146,7 +146,7 @@ static void sdlwindow_sync(void);
//============================================================
-INLINE void execute_async(osd_work_callback callback, const worker_param &wp)
+static inline void execute_async(osd_work_callback callback, const worker_param &wp)
{
worker_param *wp_temp = (worker_param *) osd_malloc(sizeof(worker_param));
*wp_temp = wp;
@@ -158,7 +158,7 @@ INLINE void execute_async(osd_work_callback callback, const worker_param &wp)
callback((void *) wp_temp, 0);
}
-INLINE void execute_sync(osd_work_callback callback, const worker_param &wp)
+static inline void execute_sync(osd_work_callback callback, const worker_param &wp)
{
worker_param *wp_temp = (worker_param *) osd_malloc(sizeof(worker_param));
*wp_temp = wp;
@@ -171,7 +171,7 @@ INLINE void execute_sync(osd_work_callback callback, const worker_param &wp)
// execute_async_wait
//============================================================
-INLINE void execute_async_wait(osd_work_callback callback, const worker_param &wp)
+static inline void execute_async_wait(osd_work_callback callback, const worker_param &wp)
{
execute_async(callback, wp);
sdlwindow_sync();
@@ -380,7 +380,7 @@ void sdl_osd_interface::window_exit()
// sdlwindow_blit_surface_size
//============================================================
-INLINE int better_mode(int width0, int height0, int width1, int height1, float desired_aspect)
+static inline int better_mode(int width0, int height0, int width1, int height1, float desired_aspect)
{
float aspect0 = (float)width0 / (float)height0;
float aspect1 = (float)width1 / (float)height1;
diff --git a/src/osd/windows/input.cpp b/src/osd/windows/input.cpp
index 0fca59e2fe9..ccfd7b24006 100644
--- a/src/osd/windows/input.cpp
+++ b/src/osd/windows/input.cpp
@@ -416,7 +416,7 @@ static const key_trans_entry win_key_trans_table[] =
// INLINE FUNCTIONS
//============================================================
-INLINE void poll_if_necessary(running_machine &machine)
+static inline void poll_if_necessary(running_machine &machine)
{
// make sure we poll at least once every 1/4 second
if (GetTickCount() > last_poll + 1000 / 4)
@@ -424,7 +424,7 @@ INLINE void poll_if_necessary(running_machine &machine)
}
-INLINE input_item_id keyboard_map_scancode_to_itemid(int scancode)
+static inline input_item_id keyboard_map_scancode_to_itemid(int scancode)
{
int tablenum;
@@ -438,7 +438,7 @@ INLINE input_item_id keyboard_map_scancode_to_itemid(int scancode)
}
-INLINE INT32 normalize_absolute_axis(INT32 raw, INT32 rawmin, INT32 rawmax)
+static inline INT32 normalize_absolute_axis(INT32 raw, INT32 rawmin, INT32 rawmax)
{
INT32 center = (rawmax + rawmin) / 2;
diff --git a/src/osd/windows/window.h b/src/osd/windows/window.h
index 0010d2bbd28..62d4f57db55 100644
--- a/src/osd/windows/window.h
+++ b/src/osd/windows/window.h
@@ -171,13 +171,13 @@ extern int win_create_menu(running_machine &machine, HMENU *menus);
// rect_width / rect_height
//============================================================
-INLINE int rect_width(const RECT *rect)
+static inline int rect_width(const RECT *rect)
{
return rect->right - rect->left;
}
-INLINE int rect_height(const RECT *rect)
+static inline int rect_height(const RECT *rect)
{
return rect->bottom - rect->top;
}
diff --git a/src/osd/windows/winfile.cpp b/src/osd/windows/winfile.cpp
index 5c4bd309070..da4b0361591 100644
--- a/src/osd/windows/winfile.cpp
+++ b/src/osd/windows/winfile.cpp
@@ -33,7 +33,7 @@ static DWORD create_path_recursive(const TCHAR *path);
// INLINE FUNCTIONS
//============================================================
-INLINE int is_path_to_physical_drive(const char *path)
+static inline int is_path_to_physical_drive(const char *path)
{
return (_strnicmp(path, "\\\\.\\physicaldrive", 17) == 0);
}
diff --git a/src/tools/imgtool/library.h b/src/tools/imgtool/library.h
index 0ea52a68e44..f9b792bc740 100644
--- a/src/tools/imgtool/library.h
+++ b/src/tools/imgtool/library.h
@@ -297,7 +297,7 @@ union imgtoolinfo
-INLINE INT64 imgtool_get_info_int(const imgtool_class *imgclass, UINT32 state)
+static inline INT64 imgtool_get_info_int(const imgtool_class *imgclass, UINT32 state)
{
union imgtoolinfo info;
info.i = 0;
@@ -305,7 +305,7 @@ INLINE INT64 imgtool_get_info_int(const imgtool_class *imgclass, UINT32 state)
return info.i;
}
-INLINE void *imgtool_get_info_ptr(const imgtool_class *imgclass, UINT32 state)
+static inline void *imgtool_get_info_ptr(const imgtool_class *imgclass, UINT32 state)
{
union imgtoolinfo info;
info.p = nullptr;
@@ -313,7 +313,7 @@ INLINE void *imgtool_get_info_ptr(const imgtool_class *imgclass, UINT32 state)
return info.p;
}
-INLINE void *imgtool_get_info_fct(const imgtool_class *imgclass, UINT32 state)
+static inline void *imgtool_get_info_fct(const imgtool_class *imgclass, UINT32 state)
{
union imgtoolinfo info;
info.f = nullptr;
@@ -321,7 +321,7 @@ INLINE void *imgtool_get_info_fct(const imgtool_class *imgclass, UINT32 state)
return info.f;
}
-INLINE char *imgtool_get_info_string(const imgtool_class *imgclass, UINT32 state)
+static inline char *imgtool_get_info_string(const imgtool_class *imgclass, UINT32 state)
{
union imgtoolinfo info;
info.s = nullptr;
diff --git a/src/tools/imgtool/modules/concept.cpp b/src/tools/imgtool/modules/concept.cpp
index a5c5a37b1ad..3da7304c955 100644
--- a/src/tools/imgtool/modules/concept.cpp
+++ b/src/tools/imgtool/modules/concept.cpp
@@ -30,7 +30,7 @@ struct UINT16xE
Returns value of word in native format
*/
-INLINE UINT16 get_UINT16xE(int little_endian, UINT16xE word)
+static inline UINT16 get_UINT16xE(int little_endian, UINT16xE word)
{
return little_endian ? (word.bytes[0] | (word.bytes[1] << 8)) : ((word.bytes[0] << 8) | word.bytes[1]);
}
@@ -46,7 +46,7 @@ INLINE UINT16 get_UINT16xE(int little_endian, UINT16xE word)
word (O): pointer to word to write
data (I): value to write in word, in native format
*/
-INLINE void set_UINT16xE(int little_endian, UINT16xE *word, UINT16 data)
+static inline void set_UINT16xE(int little_endian, UINT16xE *word, UINT16 data)
{
if (little_endian)
{
diff --git a/src/tools/imgtool/modules/mac.cpp b/src/tools/imgtool/modules/mac.cpp
index 53ae4be3ec0..938a8a19ec5 100644
--- a/src/tools/imgtool/modules/mac.cpp
+++ b/src/tools/imgtool/modules/mac.cpp
@@ -131,24 +131,24 @@ struct UINT32BE
UINT8 bytes[4];
};
-INLINE UINT16 get_UINT16BE(UINT16BE word)
+static inline UINT16 get_UINT16BE(UINT16BE word)
{
return (word.bytes[0] << 8) | word.bytes[1];
}
-INLINE void set_UINT16BE(UINT16BE *word, UINT16 data)
+static inline void set_UINT16BE(UINT16BE *word, UINT16 data)
{
word->bytes[0] = (data >> 8) & 0xff;
word->bytes[1] = data & 0xff;
}
#if 0
-INLINE UINT32 get_UINT24BE(UINT24BE word)
+static inline UINT32 get_UINT24BE(UINT24BE word)
{
return (word.bytes[0] << 16) | (word.bytes[1] << 8) | word.bytes[2];
}
-INLINE void set_UINT24BE(UINT24BE *word, UINT32 data)
+static inline void set_UINT24BE(UINT24BE *word, UINT32 data)
{
word->bytes[0] = (data >> 16) & 0xff;
word->bytes[1] = (data >> 8) & 0xff;
@@ -156,12 +156,12 @@ INLINE void set_UINT24BE(UINT24BE *word, UINT32 data)
}
#endif
-INLINE UINT32 get_UINT32BE(UINT32BE word)
+static inline UINT32 get_UINT32BE(UINT32BE word)
{
return (word.bytes[0] << 24) | (word.bytes[1] << 16) | (word.bytes[2] << 8) | word.bytes[3];
}
-INLINE void set_UINT32BE(UINT32BE *word, UINT32 data)
+static inline void set_UINT32BE(UINT32BE *word, UINT32 data)
{
word->bytes[0] = (data >> 24) & 0xff;
word->bytes[1] = (data >> 16) & 0xff;
@@ -583,7 +583,7 @@ static int mac_stricmp(const UINT8 *s1, const UINT8 *s2)
Return a zero if s1 and s2 are equal, a negative value if s1 is less than
s2, and a positive value if s1 is greater than s2.
*/
-INLINE void mac_strcpy(UINT8 *dest, const UINT8 *src)
+static inline void mac_strcpy(UINT8 *dest, const UINT8 *src)
{
memcpy(dest, src, src[0]+1);
}
@@ -704,7 +704,7 @@ static imgtoolerr_t image_write_block(mac_l1_imgref *image, UINT32 block, const
Return tag length
*/
-INLINE int image_get_tag_len(mac_l1_imgref *image)
+static inline int image_get_tag_len(mac_l1_imgref *image)
{
return 0;
}
diff --git a/src/tools/imgtool/modules/ti99.cpp b/src/tools/imgtool/modules/ti99.cpp
index 220cbebdb27..eb72b22c577 100644
--- a/src/tools/imgtool/modules/ti99.cpp
+++ b/src/tools/imgtool/modules/ti99.cpp
@@ -278,23 +278,23 @@ struct UINT16LE
UINT8 bytes[2];
};
-INLINE UINT16 get_UINT16BE(UINT16BE word)
+static inline UINT16 get_UINT16BE(UINT16BE word)
{
return (word.bytes[0] << 8) | word.bytes[1];
}
-INLINE void set_UINT16BE(UINT16BE *word, UINT16 data)
+static inline void set_UINT16BE(UINT16BE *word, UINT16 data)
{
word->bytes[0] = (data >> 8) & 0xff;
word->bytes[1] = data & 0xff;
}
-INLINE UINT16 get_UINT16LE(UINT16LE word)
+static inline UINT16 get_UINT16LE(UINT16LE word)
{
return word.bytes[0] | (word.bytes[1] << 8);
}
-INLINE void set_UINT16LE(UINT16LE *word, UINT16 data)
+static inline void set_UINT16LE(UINT16LE *word, UINT16 data)
{
word->bytes[0] = data & 0xff;
word->bytes[1] = (data >> 8) & 0xff;
@@ -1081,7 +1081,7 @@ static void close_image_lvl1(ti99_lvl1_imgref *l1_img)
Return offset in image
*/
-INLINE int sector_address_to_image_offset(const ti99_lvl1_imgref *l1_img, const ti99_sector_address *address)
+static inline int sector_address_to_image_offset(const ti99_lvl1_imgref *l1_img, const ti99_sector_address *address)
{
int offset = 0;
@@ -2200,7 +2200,7 @@ static int alloc_fdr_AU(struct ti99_lvl2_imgref *l2_img, unsigned *fdr_AU)
return IMGTOOLERR_NOSPACE;
}
-INLINE int get_dsk_fdr_cluster_baseAU(struct ti99_lvl2_imgref *l2_img, dsk_fdr *fdr, int cluster_index)
+static inline int get_dsk_fdr_cluster_baseAU(struct ti99_lvl2_imgref *l2_img, dsk_fdr *fdr, int cluster_index)
{
int reply;
@@ -2213,7 +2213,7 @@ INLINE int get_dsk_fdr_cluster_baseAU(struct ti99_lvl2_imgref *l2_img, dsk_fdr *
return reply;
}
-INLINE int get_dsk_fdr_cluster_baseaphysrec(struct ti99_lvl2_imgref *l2_img, dsk_fdr *fdr, int cluster_index)
+static inline int get_dsk_fdr_cluster_baseaphysrec(struct ti99_lvl2_imgref *l2_img, dsk_fdr *fdr, int cluster_index)
{
int reply;
@@ -2226,18 +2226,18 @@ INLINE int get_dsk_fdr_cluster_baseaphysrec(struct ti99_lvl2_imgref *l2_img, dsk
return reply;
}
-INLINE int get_dsk_fdr_cluster_lastfphysrec(dsk_fdr *fdr, int cluster_index)
+static inline int get_dsk_fdr_cluster_lastfphysrec(dsk_fdr *fdr, int cluster_index)
{
return (fdr->clusters[cluster_index][2] << 4) | (fdr->clusters[cluster_index][1] >> 4);
}
-INLINE void set_dsk_fdr_cluster_lastfphysrec(dsk_fdr *fdr, int cluster_index, int data)
+static inline void set_dsk_fdr_cluster_lastfphysrec(dsk_fdr *fdr, int cluster_index, int data)
{
fdr->clusters[cluster_index][1] = (fdr->clusters[cluster_index][1] & 0x0f) | (data << 4);
fdr->clusters[cluster_index][2] = data >> 4;
}
-INLINE void set_dsk_fdr_cluster(struct ti99_lvl2_imgref *l2_img, dsk_fdr *fdr, int cluster_index, int baseAU, int lastfphysrec)
+static inline void set_dsk_fdr_cluster(struct ti99_lvl2_imgref *l2_img, dsk_fdr *fdr, int cluster_index, int baseAU, int lastfphysrec)
{
/* convert AU address to FDR value */
if (l2_img->AUformat.physrecsperAU <= 2)
@@ -2249,29 +2249,29 @@ INLINE void set_dsk_fdr_cluster(struct ti99_lvl2_imgref *l2_img, dsk_fdr *fdr, i
fdr->clusters[cluster_index][2] = lastfphysrec >> 4;
}
-INLINE unsigned get_win_fdr_fphysrecs(win_fdr *fdr)
+static inline unsigned get_win_fdr_fphysrecs(win_fdr *fdr)
{
return (((unsigned) fdr->xinfo_MSB << 12) & 0xf0000) | get_UINT16BE(fdr->fphysrecs_LSW);
}
-INLINE void set_win_fdr_fphysrecs(win_fdr *fdr, unsigned data)
+static inline void set_win_fdr_fphysrecs(win_fdr *fdr, unsigned data)
{
fdr->xinfo_MSB = (fdr->xinfo_MSB & 0x0f) | ((data >> 12) & 0xf0);
set_UINT16BE(&fdr->fphysrecs_LSW, data & 0xffff);
}
-INLINE unsigned get_win_fdr_fixrecs(win_fdr *fdr)
+static inline unsigned get_win_fdr_fixrecs(win_fdr *fdr)
{
return (((unsigned) fdr->xinfo_MSB << 16) & 0xf0000) | get_UINT16LE(fdr->fixrecs_LSW);
}
-INLINE void set_win_fdr_fixrecs(win_fdr *fdr, unsigned data)
+static inline void set_win_fdr_fixrecs(win_fdr *fdr, unsigned data)
{
fdr->xinfo_MSB = (fdr->xinfo_MSB & 0xf0) | ((data >> 16) & 0x0f);
set_UINT16LE(&fdr->fixrecs_LSW, data & 0xffff);
}
-INLINE unsigned get_win_fdr_prevsibFDR_aphysrec(struct ti99_lvl2_imgref *l2_img, win_fdr *fdr)
+static inline unsigned get_win_fdr_prevsibFDR_aphysrec(struct ti99_lvl2_imgref *l2_img, win_fdr *fdr)
{
unsigned prevsibFDR_AU = get_UINT16BE(fdr->prevsibFDR_AU);
@@ -2280,7 +2280,7 @@ INLINE unsigned get_win_fdr_prevsibFDR_aphysrec(struct ti99_lvl2_imgref *l2_img,
: 0;
}
-INLINE unsigned get_win_fdr_nextsibFDR_aphysrec(struct ti99_lvl2_imgref *l2_img, win_fdr *fdr)
+static inline unsigned get_win_fdr_nextsibFDR_aphysrec(struct ti99_lvl2_imgref *l2_img, win_fdr *fdr)
{
unsigned nextsibFDR_AU = get_UINT16BE(fdr->nextsibFDR_AU);
@@ -2289,7 +2289,7 @@ INLINE unsigned get_win_fdr_nextsibFDR_aphysrec(struct ti99_lvl2_imgref *l2_img,
: 0;
}
-INLINE unsigned get_win_fdr_cursibFDR_basefphysrec(win_fdr *fdr)
+static inline unsigned get_win_fdr_cursibFDR_basefphysrec(win_fdr *fdr)
{
return get_UINT16BE(fdr->prevsibFDR_AU) ? get_win_fdr_fphysrecs(fdr) : 0;
}
diff --git a/src/tools/imgtool/modules/ti990hd.cpp b/src/tools/imgtool/modules/ti990hd.cpp
index 2c2a6c3a13c..554addb97bd 100644
--- a/src/tools/imgtool/modules/ti990hd.cpp
+++ b/src/tools/imgtool/modules/ti990hd.cpp
@@ -47,23 +47,23 @@ struct UINT32BE
UINT8 bytes[4];
};
-INLINE UINT16 get_UINT16BE(UINT16BE word)
+static inline UINT16 get_UINT16BE(UINT16BE word)
{
return (word.bytes[0] << 8) | word.bytes[1];
}
-INLINE void set_UINT16BE(UINT16BE *word, UINT16 data)
+static inline void set_UINT16BE(UINT16BE *word, UINT16 data)
{
word->bytes[0] = (data >> 8) & 0xff;
word->bytes[1] = data & 0xff;
}
-INLINE UINT32 get_UINT32BE(UINT32BE word)
+static inline UINT32 get_UINT32BE(UINT32BE word)
{
return (word.bytes[0] << 24) | (word.bytes[1] << 16) | (word.bytes[2] << 8) | word.bytes[3];
}
-INLINE void set_UINT32BE(UINT32BE *word, UINT32 data)
+static inline void set_UINT32BE(UINT32BE *word, UINT32 data)
{
word->bytes[0] = (data >> 24) & 0xff;
word->bytes[1] = (data >> 16) & 0xff;
diff --git a/src/tools/regrep.cpp b/src/tools/regrep.cpp
index 6f5adbf8f22..121ebac6865 100644
--- a/src/tools/regrep.cpp
+++ b/src/tools/regrep.cpp
@@ -169,7 +169,7 @@ static void append_driver_list_table(const char *header, std::string &dirname, c
from a string
-------------------------------------------------*/
-INLINE char *trim_string(char *string)
+static inline char *trim_string(char *string)
{
int length;
@@ -191,7 +191,7 @@ INLINE char *trim_string(char *string)
index for a given entry
-------------------------------------------------*/
-INLINE int get_unique_index(const summary_file *curfile, int index)
+static inline int get_unique_index(const summary_file *curfile, int index)
{
int listnum, curindex = 0;