More buildfixes

11 files changed, 745 insertions, 739 deletions

diff --git a/source/fxemu.c b/source/fxemu.c
index c3af12d..4bdc0b0 100644
--- a/source/fxemu.c
+++ b/source/fxemu.c
@@ -15,14 +15,14 @@ void FxCacheWriteAccess(uint16_t vAddress)
       GSU.vCacheFlags |= 1 << ((vAddress & 0x1f0) >> 4);
 }
 
-void FxFlushCache()
+void FxFlushCache(void)
 {
    GSU.vCacheFlags = 0;
    GSU.vCacheBaseReg = 0;
    GSU.bCacheActive = false;
 }
 
-void fx_flushCache()
+void fx_flushCache(void)
 {
    GSU.vCacheFlags = 0;
    GSU.bCacheActive = false;
@@ -36,7 +36,7 @@ void fx_updateRamBank(uint8_t Byte)
    GSU.pvRamBank = GSU.apvRamBank[Byte & 0x3];
 }
 
-static void fx_readRegisterSpaceForCheck()
+static void fx_readRegisterSpaceForCheck(void)
 {
    R15 = GSU.pvRegisters[30];
    R15 |= ((uint32_t) GSU.pvRegisters[31]) << 8;
@@ -45,7 +45,7 @@ static void fx_readRegisterSpaceForCheck()
    GSU.vPrgBankReg = (uint32_t) GSU.pvRegisters[GSU_PBR];
 }
 
-static void fx_readRegisterSpaceForUse()
+static void fx_readRegisterSpaceForUse(void)
 {
    static uint32_t avHeight[] = { 128, 160, 192, 256 };
    static uint32_t avMult[] = { 16, 32, 32, 64 };
@@ -107,12 +107,12 @@ static void fx_readRegisterSpaceForUse()
    fx_computeScreenPointers();
 }
 
-void fx_dirtySCBR()
+void fx_dirtySCBR(void)
 {
    GSU.vSCBRDirty = true;
 }
 
-void fx_computeScreenPointers()
+void fx_computeScreenPointers(void)
 {
    if (GSU.vMode != GSU.vPrevMode || GSU.vPrevScreenHeight != GSU.vScreenHeight || GSU.vSCBRDirty)
    {
@@ -237,7 +237,7 @@ void fx_computeScreenPointers()
    }
 }
 
-static void fx_writeRegisterSpaceAfterCheck()
+static void fx_writeRegisterSpaceAfterCheck(void)
 {
    GSU.pvRegisters[30] = (uint8_t) R15;
    GSU.pvRegisters[31] = (uint8_t) (R15 >> 8);
@@ -246,7 +246,7 @@ static void fx_writeRegisterSpaceAfterCheck()
    GSU.pvRegisters[GSU_PBR] = (uint8_t) GSU.vPrgBankReg;
 }
 
-static void fx_writeRegisterSpaceAfterUse()
+static void fx_writeRegisterSpaceAfterUse(void)
 {
    int32_t i;
    uint8_t* p = GSU.pvRegisters;
@@ -348,7 +348,7 @@ void FxReset(FxInit_s* psFxInfo)
    fx_readRegisterSpaceForUse();
 }
 
-static bool fx_checkStartAddress()
+static bool fx_checkStartAddress(void)
 {
    /* Check if we start inside the cache */
    if (GSU.bCacheActive && R15 >= GSU.vCacheBaseReg && R15 < (GSU.vCacheBaseReg + 512))
@@ -406,38 +406,38 @@ int32_t FxEmulate(uint32_t nInstructions)
 }
 
 /* Errors */
-int32_t FxGetErrorCode()
+int32_t FxGetErrorCode(void)
 {
    return GSU.vErrorCode;
 }
 
-int32_t FxGetIllegalAddress()
+int32_t FxGetIllegalAddress(void)
 {
    return GSU.vIllegalAddress;
 }
 
 /* Access to internal registers */
-uint32_t FxGetColorRegister()
+uint32_t FxGetColorRegister(void)
 {
    return GSU.vColorReg & 0xff;
 }
 
-uint32_t FxGetPlotOptionRegister()
+uint32_t FxGetPlotOptionRegister(void)
 {
    return GSU.vPlotOptionReg & 0x1f;
 }
 
-uint32_t FxGetSourceRegisterIndex()
+uint32_t FxGetSourceRegisterIndex(void)
 {
    return GSU.pvSreg - GSU.avReg;
 }
 
-uint32_t FxGetDestinationRegisterIndex()
+uint32_t FxGetDestinationRegisterIndex(void)
 {
    return GSU.pvDreg - GSU.avReg;
 }
 
-uint8_t FxPipe()
+uint8_t FxPipe(void)
 {
    return GSU.vPipe;
 }
diff --git a/source/fxemu.h b/source/fxemu.h
index 3af330c..3161ebd 100644
--- a/source/fxemu.h
+++ b/source/fxemu.h
@@ -55,6 +55,6 @@ extern void fx_updateRamBank(uint8_t Byte);
 /* Return the number of bytes in an opcode */
 #define OPCODE_BYTES(op) ((((op) >= 0x05 && (op) <= 0xf) || ((op) >= 0xa0 && (op) <= 0xaf)) ? 2 : (((op) >= 0xf0) ? 3 : 1))
 
-extern void fx_computeScreenPointers();
+extern void fx_computeScreenPointers(void);
 
 #endif
diff --git a/source/fxinst.c b/source/fxinst.c
index 7eddcfe..1023e82 100644
--- a/source/fxinst.c
+++ b/source/fxinst.c
@@ -24,7 +24,7 @@ int32_t gsu_bank [512] = {0};
  */
 
 /* 00 - stop - stop GSU execution (and maybe generate an IRQ) */
-static INLINE void fx_stop()
+static INLINE void fx_stop(void)
 {
    CF(G);
    GSU.vCounter = 0;
@@ -41,16 +41,16 @@ static INLINE void fx_stop()
 }
 
 /* 01 - nop - no operation */
-static INLINE void fx_nop()
+static INLINE void fx_nop(void)
 {
    CLRFLAGS;
    R15++;
 }
 
-extern void fx_flushCache();
+extern void fx_flushCache(void);
 
 /* 02 - cache - reintialize GSU cache */
-static INLINE void fx_cache()
+static INLINE void fx_cache(void)
 {
    uint32_t c = R15 & 0xfff0;
    if (GSU.vCacheBaseReg != c || !GSU.bCacheActive)
@@ -64,7 +64,7 @@ static INLINE void fx_cache()
 }
 
 /* 03 - lsr - logic shift right */
-static INLINE void fx_lsr()
+static INLINE void fx_lsr(void)
 {
    uint32_t v;
    GSU.vCarry = SREG & 1;
@@ -78,7 +78,7 @@ static INLINE void fx_lsr()
 }
 
 /* 04 - rol - rotate left */
-static INLINE void fx_rol()
+static INLINE void fx_rol(void)
 {
    uint32_t v = USEX16((SREG << 1) + GSU.vCarry);
    GSU.vCarry = (SREG >> 15) & 1;
@@ -91,7 +91,7 @@ static INLINE void fx_rol()
 }
 
 /* 05 - bra - branch always */
-static INLINE void fx_bra()
+static INLINE void fx_bra(void)
 {
    uint8_t v = PIPE;
    R15++;
@@ -115,61 +115,61 @@ static INLINE void fx_bra()
 #define TEST_CY (GSU.vCarry & 1)
 
 /* 06 - blt - branch on less than */
-static INLINE void fx_blt()
+static INLINE void fx_blt(void)
 {
    BRA_COND((TEST_S != 0) != (TEST_OV != 0));
 }
 
 /* 07 - bge - branch on greater or equals */
-static INLINE void fx_bge()
+static INLINE void fx_bge(void)
 {
    BRA_COND((TEST_S != 0) == (TEST_OV != 0));
 }
 
 /* 08 - bne - branch on not equal */
-static INLINE void fx_bne()
+static INLINE void fx_bne(void)
 {
    BRA_COND(!TEST_Z);
 }
 
 /* 09 - beq - branch on equal */
-static INLINE void fx_beq()
+static INLINE void fx_beq(void)
 {
    BRA_COND(TEST_Z);
 }
 
 /* 0a - bpl - branch on plus */
-static INLINE void fx_bpl()
+static INLINE void fx_bpl(void)
 {
    BRA_COND(!TEST_S);
 }
 
 /* 0b - bmi - branch on minus */
-static INLINE void fx_bmi()
+static INLINE void fx_bmi(void)
 {
    BRA_COND(TEST_S);
 }
 
 /* 0c - bcc - branch on carry clear */
-static INLINE void fx_bcc()
+static INLINE void fx_bcc(void)
 {
    BRA_COND(!TEST_CY);
 }
 
 /* 0d - bcs - branch on carry set */
-static INLINE void fx_bcs()
+static INLINE void fx_bcs(void)
 {
    BRA_COND(TEST_CY);
 }
 
 /* 0e - bvc - branch on overflow clear */
-static INLINE void fx_bvc()
+static INLINE void fx_bvc(void)
 {
    BRA_COND(!TEST_OV);
 }
 
 /* 0f - bvs - branch on overflow set */
-static INLINE void fx_bvs()
+static INLINE void fx_bvs(void)
 {
    BRA_COND(TEST_OV);
 }
@@ -209,67 +209,67 @@ static INLINE void fx_bvs()
         R15++; \
     }
 
-static INLINE void fx_to_r0()
+static INLINE void fx_to_r0(void)
 {
    FX_TO(0);
 }
-static INLINE void fx_to_r1()
+static INLINE void fx_to_r1(void)
 {
    FX_TO(1);
 }
-static INLINE void fx_to_r2()
+static INLINE void fx_to_r2(void)
 {
    FX_TO(2);
 }
-static INLINE void fx_to_r3()
+static INLINE void fx_to_r3(void)
 {
    FX_TO(3);
 }
-static INLINE void fx_to_r4()
+static INLINE void fx_to_r4(void)
 {
    FX_TO(4);
 }
-static INLINE void fx_to_r5()
+static INLINE void fx_to_r5(void)
 {
    FX_TO(5);
 }
-static INLINE void fx_to_r6()
+static INLINE void fx_to_r6(void)
 {
    FX_TO(6);
 }
-static INLINE void fx_to_r7()
+static INLINE void fx_to_r7(void)
 {
    FX_TO(7);
 }
-static INLINE void fx_to_r8()
+static INLINE void fx_to_r8(void)
 {
    FX_TO(8);
 }
-static INLINE void fx_to_r9()
+static INLINE void fx_to_r9(void)
 {
    FX_TO(9);
 }
-static INLINE void fx_to_r10()
+static INLINE void fx_to_r10(void)
 {
    FX_TO(10);
 }
-static INLINE void fx_to_r11()
+static INLINE void fx_to_r11(void)
 {
    FX_TO(11);
 }
-static INLINE void fx_to_r12()
+static INLINE void fx_to_r12(void)
 {
    FX_TO(12);
 }
-static INLINE void fx_to_r13()
+static INLINE void fx_to_r13(void)
 {
    FX_TO(13);
 }
-static INLINE void fx_to_r14()
+static INLINE void fx_to_r14(void)
 {
    FX_TO_R14(14);
 }
-static INLINE void fx_to_r15()
+static INLINE void fx_to_r15(void)
 {
    FX_TO_R15(15);
 }
@@ -280,67 +280,67 @@ static INLINE void fx_to_r15()
     GSU.pvSreg = GSU.pvDreg = &GSU.avReg[reg]; \
     R15++
 
-static INLINE void fx_with_r0()
+static INLINE void fx_with_r0(void)
 {
    FX_WITH(0);
 }
-static INLINE void fx_with_r1()
+static INLINE void fx_with_r1(void)
 {
    FX_WITH(1);
 }
-static INLINE void fx_with_r2()
+static INLINE void fx_with_r2(void)
 {
    FX_WITH(2);
 }
-static INLINE void fx_with_r3()
+static INLINE void fx_with_r3(void)
 {
    FX_WITH(3);
 }
-static INLINE void fx_with_r4()
+static INLINE void fx_with_r4(void)
 {
    FX_WITH(4);
 }
-static INLINE void fx_with_r5()
+static INLINE void fx_with_r5(void)
 {
    FX_WITH(5);
 }
-static INLINE void fx_with_r6()
+static INLINE void fx_with_r6(void)
 {
    FX_WITH(6);
 }
-static INLINE void fx_with_r7()
+static INLINE void fx_with_r7(void)
 {
    FX_WITH(7);
 }
-static INLINE void fx_with_r8()
+static INLINE void fx_with_r8(void)
 {
    FX_WITH(8);
 }
-static INLINE void fx_with_r9()
+static INLINE void fx_with_r9(void)
 {
    FX_WITH(9);
 }
-static INLINE void fx_with_r10()
+static INLINE void fx_with_r10(void)
 {
    FX_WITH(10);
 }
-static INLINE void fx_with_r11()
+static INLINE void fx_with_r11(void)
 {
    FX_WITH(11);
 }
-static INLINE void fx_with_r12()
+static INLINE void fx_with_r12(void)
 {
    FX_WITH(12);
 }
-static INLINE void fx_with_r13()
+static INLINE void fx_with_r13(void)
 {
    FX_WITH(13);
 }
-static INLINE void fx_with_r14()
+static INLINE void fx_with_r14(void)
 {
    FX_WITH(14);
 }
-static INLINE void fx_with_r15()
+static INLINE void fx_with_r15(void)
 {
    FX_WITH(15);
 }
@@ -353,51 +353,51 @@ static INLINE void fx_with_r15()
     CLRFLAGS; \
     R15++
 
-static INLINE void fx_stw_r0()
+static INLINE void fx_stw_r0(void)
 {
    FX_STW(0);
 }
-static INLINE void fx_stw_r1()
+static INLINE void fx_stw_r1(void)
 {
    FX_STW(1);
 }
-static INLINE void fx_stw_r2()
+static INLINE void fx_stw_r2(void)
 {
    FX_STW(2);
 }
-static INLINE void fx_stw_r3()
+static INLINE void fx_stw_r3(void)
 {
    FX_STW(3);
 }
-static INLINE void fx_stw_r4()
+static INLINE void fx_stw_r4(void)
 {
    FX_STW(4);
 }
-static INLINE void fx_stw_r5()
+static INLINE void fx_stw_r5(void)
 {
    FX_STW(5);
 }
-static INLINE void fx_stw_r6()
+static INLINE void fx_stw_r6(void)
 {
    FX_STW(6);
 }
-static INLINE void fx_stw_r7()
+static INLINE void fx_stw_r7(void)
 {
    FX_STW(7);
 }
-static INLINE void fx_stw_r8()
+static INLINE void fx_stw_r8(void)
 {
    FX_STW(8);
 }
-static INLINE void fx_stw_r9()
+static INLINE void fx_stw_r9(void)
 {
    FX_STW(9);
 }
-static INLINE void fx_stw_r10()
+static INLINE void fx_stw_r10(void)
 {
    FX_STW(10);
 }
-static INLINE void fx_stw_r11()
+static INLINE void fx_stw_r11(void)
 {
    FX_STW(11);
 }
@@ -409,57 +409,57 @@ static INLINE void fx_stw_r11()
     CLRFLAGS; \
     R15++
 
-static INLINE void fx_stb_r0()
+static INLINE void fx_stb_r0(void)
 {
    FX_STB(0);
 }
-static INLINE void fx_stb_r1()
+static INLINE void fx_stb_r1(void)
 {
    FX_STB(1);
 }
-static INLINE void fx_stb_r2()
+static INLINE void fx_stb_r2(void)
 {
    FX_STB(2);
 }
-static INLINE void fx_stb_r3()
+static INLINE void fx_stb_r3(void)
 {
    FX_STB(3);
 }
-static INLINE void fx_stb_r4()
+static INLINE void fx_stb_r4(void)
 {
    FX_STB(4);
 }
-static INLINE void fx_stb_r5()
+static INLINE void fx_stb_r5(void)
 {
    FX_STB(5);
 }
-static INLINE void fx_stb_r6()
+static INLINE void fx_stb_r6(void)
 {
    FX_STB(6);
 }
-static INLINE void fx_stb_r7()
+static INLINE void fx_stb_r7(void)
 {
    FX_STB(7);
 }
-static INLINE void fx_stb_r8()
+static INLINE void fx_stb_r8(void)
 {
    FX_STB(8);
 }
-static INLINE void fx_stb_r9()
+static INLINE void fx_stb_r9(void)
 {
    FX_STB(9);
 }
-static INLINE void fx_stb_r10()
+static INLINE void fx_stb_r10(void)
 {
    FX_STB(10);
 }
-static INLINE void fx_stb_r11()
+static INLINE void fx_stb_r11(void)
 {
    FX_STB(11);
 }
 
 /* 3c - loop - decrement loop counter, and branch on not zero */
-static INLINE void fx_loop()
+static INLINE void fx_loop(void)
 {
    GSU.vSign = GSU.vZero = --R12;
    if ((uint16_t) R12 != 0)
@@ -470,7 +470,7 @@ static INLINE void fx_loop()
 }
 
 /* 3d - alt1 - set alt1 mode */
-static INLINE void fx_alt1()
+static INLINE void fx_alt1(void)
 {
    SF(ALT1);
    CF(B);
@@ -478,7 +478,7 @@ static INLINE void fx_alt1()
 }
 
 /* 3e - alt2 - set alt2 mode */
-static INLINE void fx_alt2()
+static INLINE void fx_alt2(void)
 {
    SF(ALT2);
    CF(B);
@@ -486,7 +486,7 @@ static INLINE void fx_alt2()
 }
 
 /* 3f - alt3 - set alt3 mode */
-static INLINE void fx_alt3()
+static INLINE void fx_alt3(void)
 {
    SF(ALT1);
    SF(ALT2);
@@ -505,51 +505,51 @@ static INLINE void fx_alt3()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_ldw_r0()
+static INLINE void fx_ldw_r0(void)
 {
    FX_LDW(0);
 }
-static INLINE void fx_ldw_r1()
+static INLINE void fx_ldw_r1(void)
 {
    FX_LDW(1);
 }
-static INLINE void fx_ldw_r2()
+static INLINE void fx_ldw_r2(void)
 {
    FX_LDW(2);
 }
-static INLINE void fx_ldw_r3()
+static INLINE void fx_ldw_r3(void)
 {
    FX_LDW(3);
 }
-static INLINE void fx_ldw_r4()
+static INLINE void fx_ldw_r4(void)
 {
    FX_LDW(4);
 }
-static INLINE void fx_ldw_r5()
+static INLINE void fx_ldw_r5(void)
 {
    FX_LDW(5);
 }
-static INLINE void fx_ldw_r6()
+static INLINE void fx_ldw_r6(void)
 {
    FX_LDW(6);
 }
-static INLINE void fx_ldw_r7()
+static INLINE void fx_ldw_r7(void)
 {
    FX_LDW(7);
 }
-static INLINE void fx_ldw_r8()
+static INLINE void fx_ldw_r8(void)
 {
    FX_LDW(8);
 }
-static INLINE void fx_ldw_r9()
+static INLINE void fx_ldw_r9(void)
 {
    FX_LDW(9);
 }
-static INLINE void fx_ldw_r10()
+static INLINE void fx_ldw_r10(void)
 {
    FX_LDW(10);
 }
-static INLINE void fx_ldw_r11()
+static INLINE void fx_ldw_r11(void)
 {
    FX_LDW(11);
 }
@@ -564,57 +564,57 @@ static INLINE void fx_ldw_r11()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_ldb_r0()
+static INLINE void fx_ldb_r0(void)
 {
    FX_LDB(0);
 }
-static INLINE void fx_ldb_r1()
+static INLINE void fx_ldb_r1(void)
 {
    FX_LDB(1);
 }
-static INLINE void fx_ldb_r2()
+static INLINE void fx_ldb_r2(void)
 {
    FX_LDB(2);
 }
-static INLINE void fx_ldb_r3()
+static INLINE void fx_ldb_r3(void)
 {
    FX_LDB(3);
 }
-static INLINE void fx_ldb_r4()
+static INLINE void fx_ldb_r4(void)
 {
    FX_LDB(4);
 }
-static INLINE void fx_ldb_r5()
+static INLINE void fx_ldb_r5(void)
 {
    FX_LDB(5);
 }
-static INLINE void fx_ldb_r6()
+static INLINE void fx_ldb_r6(void)
 {
    FX_LDB(6);
 }
-static INLINE void fx_ldb_r7()
+static INLINE void fx_ldb_r7(void)
 {
    FX_LDB(7);
 }
-static INLINE void fx_ldb_r8()
+static INLINE void fx_ldb_r8(void)
 {
    FX_LDB(8);
 }
-static INLINE void fx_ldb_r9()
+static INLINE void fx_ldb_r9(void)
 {
    FX_LDB(9);
 }
-static INLINE void fx_ldb_r10()
+static INLINE void fx_ldb_r10(void)
 {
    FX_LDB(10);
 }
-static INLINE void fx_ldb_r11()
+static INLINE void fx_ldb_r11(void)
 {
    FX_LDB(11);
 }
 
 /* 4c - plot - plot pixel with R1,R2 as x,y and the color register as the color */
-static INLINE void fx_plot_2bit()
+static INLINE void fx_plot_2bit(void)
 {
    uint32_t x = USEX8(R1);
    uint32_t y = USEX8(R2);
@@ -646,7 +646,7 @@ static INLINE void fx_plot_2bit()
 }
 
 /* 2c(ALT1) - rpix - read color of the pixel with R1,R2 as x,y */
-static INLINE void fx_rpix_2bit()
+static INLINE void fx_rpix_2bit(void)
 {
    uint32_t x = USEX8(R1);
    uint32_t y = USEX8(R2);
@@ -666,7 +666,7 @@ static INLINE void fx_rpix_2bit()
 }
 
 /* 4c - plot - plot pixel with R1,R2 as x,y and the color register as the color */
-static INLINE void fx_plot_4bit()
+static INLINE void fx_plot_4bit(void)
 {
    uint32_t x = USEX8(R1);
    uint32_t y = USEX8(R2);
@@ -706,7 +706,7 @@ static INLINE void fx_plot_4bit()
 }
 
 /* 4c(ALT1) - rpix - read color of the pixel with R1,R2 as x,y */
-static INLINE void fx_rpix_4bit()
+static INLINE void fx_rpix_4bit(void)
 {
    uint32_t x = USEX8(R1);
    uint32_t y = USEX8(R2);
@@ -728,7 +728,7 @@ static INLINE void fx_rpix_4bit()
 }
 
 /* 8c - plot - plot pixel with R1,R2 as x,y and the color register as the color */
-static INLINE void fx_plot_8bit()
+static INLINE void fx_plot_8bit(void)
 {
    uint32_t x = USEX8(R1);
    uint32_t y = USEX8(R2);
@@ -786,7 +786,7 @@ static INLINE void fx_plot_8bit()
 }
 
 /* 4c(ALT1) - rpix - read color of the pixel with R1,R2 as x,y */
-static INLINE void fx_rpix_8bit()
+static INLINE void fx_rpix_8bit(void)
 {
    uint32_t x = USEX8(R1);
    uint32_t y = USEX8(R2);
@@ -814,12 +814,12 @@ static INLINE void fx_rpix_8bit()
 
 /* 4o - plot - plot pixel with R1,R2 as x,y and the color register as the color */
 /* 4c(ALT1) - rpix - read color of the pixel with R1,R2 as x,y */
-static INLINE void fx_obj_func()
+static INLINE void fx_obj_func(void)
 {
 }
 
 /* 4d - swap - swap upper and lower byte of a register */
-static INLINE void fx_swap()
+static INLINE void fx_swap(void)
 {
    uint8_t c = (uint8_t)SREG;
    uint8_t d = (uint8_t)(SREG >> 8);
@@ -833,7 +833,7 @@ static INLINE void fx_swap()
 }
 
 /* 4e - color - copy source register to color register */
-static INLINE void fx_color()
+static INLINE void fx_color(void)
 {
    uint8_t c = (uint8_t)SREG;
    if (GSU.vPlotOptionReg & 0x04)
@@ -850,7 +850,7 @@ static INLINE void fx_color()
 }
 
 /* 4e(ALT1) - cmode - set plot option register */
-static INLINE void fx_cmode()
+static INLINE void fx_cmode(void)
 {
    GSU.vPlotOptionReg = SREG;
 
@@ -865,7 +865,7 @@ static INLINE void fx_cmode()
 }
 
 /* 4f - not - perform exclusive exor with 1 on all bits */
-static INLINE void fx_not()
+static INLINE void fx_not(void)
 {
    uint32_t v = ~SREG;
    R15++;
@@ -888,67 +888,67 @@ static INLINE void fx_not()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_add_r0()
+static INLINE void fx_add_r0(void)
 {
    FX_ADD(0);
 }
-static INLINE void fx_add_r1()
+static INLINE void fx_add_r1(void)
 {
    FX_ADD(1);
 }
-static INLINE void fx_add_r2()
+static INLINE void fx_add_r2(void)
 {
    FX_ADD(2);
 }
-static INLINE void fx_add_r3()
+static INLINE void fx_add_r3(void)
 {
    FX_ADD(3);
 }
-static INLINE void fx_add_r4()
+static INLINE void fx_add_r4(void)
 {
    FX_ADD(4);
 }
-static INLINE void fx_add_r5()
+static INLINE void fx_add_r5(void)
 {
    FX_ADD(5);
 }
-static INLINE void fx_add_r6()
+static INLINE void fx_add_r6(void)
 {
    FX_ADD(6);
 }
-static INLINE void fx_add_r7()
+static INLINE void fx_add_r7(void)
 {
    FX_ADD(7);
 }
-static INLINE void fx_add_r8()
+static INLINE void fx_add_r8(void)
 {
    FX_ADD(8);
 }
-static INLINE void fx_add_r9()
+static INLINE void fx_add_r9(void)
 {
    FX_ADD(9);
 }
-static INLINE void fx_add_r10()
+static INLINE void fx_add_r10(void)
 {
    FX_ADD(10);
 }
-static INLINE void fx_add_r11()
+static INLINE void fx_add_r11(void)
 {
    FX_ADD(11);
 }
-static INLINE void fx_add_r12()
+static INLINE void fx_add_r12(void)
 {
    FX_ADD(12);
 }
-static INLINE void fx_add_r13()
+static INLINE void fx_add_r13(void)
 {
    FX_ADD(13);
 }
-static INLINE void fx_add_r14()
+static INLINE void fx_add_r14(void)
 {
    FX_ADD(14);
 }
-static INLINE void fx_add_r15()
+static INLINE void fx_add_r15(void)
 {
    FX_ADD(15);
 }
@@ -965,67 +965,67 @@ static INLINE void fx_add_r15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_adc_r0()
+static INLINE void fx_adc_r0(void)
 {
    FX_ADC(0);
 }
-static INLINE void fx_adc_r1()
+static INLINE void fx_adc_r1(void)
 {
    FX_ADC(1);
 }
-static INLINE void fx_adc_r2()
+static INLINE void fx_adc_r2(void)
 {
    FX_ADC(2);
 }
-static INLINE void fx_adc_r3()
+static INLINE void fx_adc_r3(void)
 {
    FX_ADC(3);
 }
-static INLINE void fx_adc_r4()
+static INLINE void fx_adc_r4(void)
 {
    FX_ADC(4);
 }
-static INLINE void fx_adc_r5()
+static INLINE void fx_adc_r5(void)
 {
    FX_ADC(5);
 }
-static INLINE void fx_adc_r6()
+static INLINE void fx_adc_r6(void)
 {
    FX_ADC(6);
 }
-static INLINE void fx_adc_r7()
+static INLINE void fx_adc_r7(void)
 {
    FX_ADC(7);
 }
-static INLINE void fx_adc_r8()
+static INLINE void fx_adc_r8(void)
 {
    FX_ADC(8);
 }
-static INLINE void fx_adc_r9()
+static INLINE void fx_adc_r9(void)
 {
    FX_ADC(9);
 }
-static INLINE void fx_adc_r10()
+static INLINE void fx_adc_r10(void)
 {
    FX_ADC(10);
 }
-static INLINE void fx_adc_r11()
+static INLINE void fx_adc_r11(void)
 {
    FX_ADC(11);
 }
-static INLINE void fx_adc_r12()
+static INLINE void fx_adc_r12(void)
 {
    FX_ADC(12);
 }
-static INLINE void fx_adc_r13()
+static INLINE void fx_adc_r13(void)
 {
    FX_ADC(13);
 }
-static INLINE void fx_adc_r14()
+static INLINE void fx_adc_r14(void)
 {
    FX_ADC(14);
 }
-static INLINE void fx_adc_r15()
+static INLINE void fx_adc_r15(void)
 {
    FX_ADC(15);
 }
@@ -1042,67 +1042,67 @@ static INLINE void fx_adc_r15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_add_i0()
+static INLINE void fx_add_i0(void)
 {
    FX_ADD_I(0);
 }
-static INLINE void fx_add_i1()
+static INLINE void fx_add_i1(void)
 {
    FX_ADD_I(1);
 }
-static INLINE void fx_add_i2()
+static INLINE void fx_add_i2(void)
 {
    FX_ADD_I(2);
 }
-static INLINE void fx_add_i3()
+static INLINE void fx_add_i3(void)
 {
    FX_ADD_I(3);
 }
-static INLINE void fx_add_i4()
+static INLINE void fx_add_i4(void)
 {
    FX_ADD_I(4);
 }
-static INLINE void fx_add_i5()
+static INLINE void fx_add_i5(void)
 {
    FX_ADD_I(5);
 }
-static INLINE void fx_add_i6()
+static INLINE void fx_add_i6(void)
 {
    FX_ADD_I(6);
 }
-static INLINE void fx_add_i7()
+static INLINE void fx_add_i7(void)
 {
    FX_ADD_I(7);
 }
-static INLINE void fx_add_i8()
+static INLINE void fx_add_i8(void)
 {
    FX_ADD_I(8);
 }
-static INLINE void fx_add_i9()
+static INLINE void fx_add_i9(void)
 {
    FX_ADD_I(9);
 }
-static INLINE void fx_add_i10()
+static INLINE void fx_add_i10(void)
 {
    FX_ADD_I(10);
 }
-static INLINE void fx_add_i11()
+static INLINE void fx_add_i11(void)
 {
    FX_ADD_I(11);
 }
-static INLINE void fx_add_i12()
+static INLINE void fx_add_i12(void)
 {
    FX_ADD_I(12);
 }
-static INLINE void fx_add_i13()
+static INLINE void fx_add_i13(void)
 {
    FX_ADD_I(13);
 }
-static INLINE void fx_add_i14()
+static INLINE void fx_add_i14(void)
 {
    FX_ADD_I(14);
 }
-static INLINE void fx_add_i15()
+static INLINE void fx_add_i15(void)
 {
    FX_ADD_I(15);
 }
@@ -1119,67 +1119,67 @@ static INLINE void fx_add_i15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_adc_i0()
+static INLINE void fx_adc_i0(void)
 {
    FX_ADC_I(0);
 }
-static INLINE void fx_adc_i1()
+static INLINE void fx_adc_i1(void)
 {
    FX_ADC_I(1);
 }
-static INLINE void fx_adc_i2()
+static INLINE void fx_adc_i2(void)
 {
    FX_ADC_I(2);
 }
-static INLINE void fx_adc_i3()
+static INLINE void fx_adc_i3(void)
 {
    FX_ADC_I(3);
 }
-static INLINE void fx_adc_i4()
+static INLINE void fx_adc_i4(void)
 {
    FX_ADC_I(4);
 }
-static INLINE void fx_adc_i5()
+static INLINE void fx_adc_i5(void)
 {
    FX_ADC_I(5);
 }
-static INLINE void fx_adc_i6()
+static INLINE void fx_adc_i6(void)
 {
    FX_ADC_I(6);
 }
-static INLINE void fx_adc_i7()
+static INLINE void fx_adc_i7(void)
 {
    FX_ADC_I(7);
 }
-static INLINE void fx_adc_i8()
+static INLINE void fx_adc_i8(void)
 {
    FX_ADC_I(8);
 }
-static INLINE void fx_adc_i9()
+static INLINE void fx_adc_i9(void)
 {
    FX_ADC_I(9);
 }
-static INLINE void fx_adc_i10()
+static INLINE void fx_adc_i10(void)
 {
    FX_ADC_I(10);
 }
-static INLINE void fx_adc_i11()
+static INLINE void fx_adc_i11(void)
 {
    FX_ADC_I(11);
 }
-static INLINE void fx_adc_i12()
+static INLINE void fx_adc_i12(void)
 {
    FX_ADC_I(12);
 }
-static INLINE void fx_adc_i13()
+static INLINE void fx_adc_i13(void)
 {
    FX_ADC_I(13);
 }
-static INLINE void fx_adc_i14()
+static INLINE void fx_adc_i14(void)
 {
    FX_ADC_I(14);
 }
-static INLINE void fx_adc_i15()
+static INLINE void fx_adc_i15(void)
 {
    FX_ADC_I(15);
 }
@@ -1196,67 +1196,67 @@ static INLINE void fx_adc_i15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_sub_r0()
+static INLINE void fx_sub_r0(void)
 {
    FX_SUB(0);
 }
-static INLINE void fx_sub_r1()
+static INLINE void fx_sub_r1(void)
 {
    FX_SUB(1);
 }
-static INLINE void fx_sub_r2()
+static INLINE void fx_sub_r2(void)
 {
    FX_SUB(2);
 }
-static INLINE void fx_sub_r3()
+static INLINE void fx_sub_r3(void)
 {
    FX_SUB(3);
 }
-static INLINE void fx_sub_r4()
+static INLINE void fx_sub_r4(void)
 {
    FX_SUB(4);
 }
-static INLINE void fx_sub_r5()
+static INLINE void fx_sub_r5(void)
 {
    FX_SUB(5);
 }
-static INLINE void fx_sub_r6()
+static INLINE void fx_sub_r6(void)
 {
    FX_SUB(6);
 }
-static INLINE void fx_sub_r7()
+static INLINE void fx_sub_r7(void)
 {
    FX_SUB(7);
 }
-static INLINE void fx_sub_r8()
+static INLINE void fx_sub_r8(void)
 {
    FX_SUB(8);
 }
-static INLINE void fx_sub_r9()
+static INLINE void fx_sub_r9(void)
 {
    FX_SUB(9);
 }
-static INLINE void fx_sub_r10()
+static INLINE void fx_sub_r10(void)
 {
    FX_SUB(10);
 }
-static INLINE void fx_sub_r11()
+static INLINE void fx_sub_r11(void)
 {
    FX_SUB(11);
 }
-static INLINE void fx_sub_r12()
+static INLINE void fx_sub_r12(void)
 {
    FX_SUB(12);
 }
-static INLINE void fx_sub_r13()
+static INLINE void fx_sub_r13(void)
 {
    FX_SUB(13);
 }
-static INLINE void fx_sub_r14()
+static INLINE void fx_sub_r14(void)
 {
    FX_SUB(14);
 }
-static INLINE void fx_sub_r15()
+static INLINE void fx_sub_r15(void)
 {
    FX_SUB(15);
 }
@@ -1273,67 +1273,67 @@ static INLINE void fx_sub_r15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_sbc_r0()
+static INLINE void fx_sbc_r0(void)
 {
    FX_SBC(0);
 }
-static INLINE void fx_sbc_r1()
+static INLINE void fx_sbc_r1(void)
 {
    FX_SBC(1);
 }
-static INLINE void fx_sbc_r2()
+static INLINE void fx_sbc_r2(void)
 {
    FX_SBC(2);
 }
-static INLINE void fx_sbc_r3()
+static INLINE void fx_sbc_r3(void)
 {
    FX_SBC(3);
 }
-static INLINE void fx_sbc_r4()
+static INLINE void fx_sbc_r4(void)
 {
    FX_SBC(4);
 }
-static INLINE void fx_sbc_r5()
+static INLINE void fx_sbc_r5(void)
 {
    FX_SBC(5);
 }
-static INLINE void fx_sbc_r6()
+static INLINE void fx_sbc_r6(void)
 {
    FX_SBC(6);
 }
-static INLINE void fx_sbc_r7()
+static INLINE void fx_sbc_r7(void)
 {
    FX_SBC(7);
 }
-static INLINE void fx_sbc_r8()
+static INLINE void fx_sbc_r8(void)
 {
    FX_SBC(8);
 }
-static INLINE void fx_sbc_r9()
+static INLINE void fx_sbc_r9(void)
 {
    FX_SBC(9);
 }
-static INLINE void fx_sbc_r10()
+static INLINE void fx_sbc_r10(void)
 {
    FX_SBC(10);
 }
-static INLINE void fx_sbc_r11()
+static INLINE void fx_sbc_r11(void)
 {
    FX_SBC(11);
 }
-static INLINE void fx_sbc_r12()
+static INLINE void fx_sbc_r12(void)
 {
    FX_SBC(12);
 }
-static INLINE void fx_sbc_r13()
+static INLINE void fx_sbc_r13(void)
 {
    FX_SBC(13);
 }
-static INLINE void fx_sbc_r14()
+static INLINE void fx_sbc_r14(void)
 {
    FX_SBC(14);
 }
-static INLINE void fx_sbc_r15()
+static INLINE void fx_sbc_r15(void)
 {
    FX_SBC(15);
 }
@@ -1350,67 +1350,67 @@ static INLINE void fx_sbc_r15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_sub_i0()
+static INLINE void fx_sub_i0(void)
 {
    FX_SUB_I(0);
 }
-static INLINE void fx_sub_i1()
+static INLINE void fx_sub_i1(void)
 {
    FX_SUB_I(1);
 }
-static INLINE void fx_sub_i2()
+static INLINE void fx_sub_i2(void)
 {
    FX_SUB_I(2);
 }
-static INLINE void fx_sub_i3()
+static INLINE void fx_sub_i3(void)
 {
    FX_SUB_I(3);
 }
-static INLINE void fx_sub_i4()
+static INLINE void fx_sub_i4(void)
 {
    FX_SUB_I(4);
 }
-static INLINE void fx_sub_i5()
+static INLINE void fx_sub_i5(void)
 {
    FX_SUB_I(5);
 }
-static INLINE void fx_sub_i6()
+static INLINE void fx_sub_i6(void)
 {
    FX_SUB_I(6);
 }
-static INLINE void fx_sub_i7()
+static INLINE void fx_sub_i7(void)
 {
    FX_SUB_I(7);
 }
-static INLINE void fx_sub_i8()
+static INLINE void fx_sub_i8(void)
 {
    FX_SUB_I(8);
 }
-static INLINE void fx_sub_i9()
+static INLINE void fx_sub_i9(void)
 {
    FX_SUB_I(9);
 }
-static INLINE void fx_sub_i10()
+static INLINE void fx_sub_i10(void)
 {
    FX_SUB_I(10);
 }
-static INLINE void fx_sub_i11()
+static INLINE void fx_sub_i11(void)
 {
    FX_SUB_I(11);
 }
-static INLINE void fx_sub_i12()
+static INLINE void fx_sub_i12(void)
 {
    FX_SUB_I(12);
 }
-static INLINE void fx_sub_i13()
+static INLINE void fx_sub_i13(void)
 {
    FX_SUB_I(13);
 }
-static INLINE void fx_sub_i14()
+static INLINE void fx_sub_i14(void)
 {
    FX_SUB_I(14);
 }
-static INLINE void fx_sub_i15()
+static INLINE void fx_sub_i15(void)
 {
    FX_SUB_I(15);
 }
@@ -1425,73 +1425,73 @@ static INLINE void fx_sub_i15()
     R15++; \
     CLRFLAGS
 
-static INLINE void fx_cmp_r0()
+static INLINE void fx_cmp_r0(void)
 {
    FX_CMP(0);
 }
-static INLINE void fx_cmp_r1()
+static INLINE void fx_cmp_r1(void)
 {
    FX_CMP(1);
 }
-static INLINE void fx_cmp_r2()
+static INLINE void fx_cmp_r2(void)
 {
    FX_CMP(2);
 }
-static INLINE void fx_cmp_r3()
+static INLINE void fx_cmp_r3(void)
 {
    FX_CMP(3);
 }
-static INLINE void fx_cmp_r4()
+static INLINE void fx_cmp_r4(void)
 {
    FX_CMP(4);
 }
-static INLINE void fx_cmp_r5()
+static INLINE void fx_cmp_r5(void)
 {
    FX_CMP(5);
 }
-static INLINE void fx_cmp_r6()
+static INLINE void fx_cmp_r6(void)
 {
    FX_CMP(6);
 }
-static INLINE void fx_cmp_r7()
+static INLINE void fx_cmp_r7(void)
 {
    FX_CMP(7);
 }
-static INLINE void fx_cmp_r8()
+static INLINE void fx_cmp_r8(void)
 {
    FX_CMP(8);
 }
-static INLINE void fx_cmp_r9()
+static INLINE void fx_cmp_r9(void)
 {
    FX_CMP(9);
 }
-static INLINE void fx_cmp_r10()
+static INLINE void fx_cmp_r10(void)
 {
    FX_CMP(10);
 }
-static INLINE void fx_cmp_r11()
+static INLINE void fx_cmp_r11(void)
 {
    FX_CMP(11);
 }
-static INLINE void fx_cmp_r12()
+static INLINE void fx_cmp_r12(void)
 {
    FX_CMP(12);
 }
-static INLINE void fx_cmp_r13()
+static INLINE void fx_cmp_r13(void)
 {
    FX_CMP(13);
 }
-static INLINE void fx_cmp_r14()
+static INLINE void fx_cmp_r14(void)
 {
    FX_CMP(14);
 }
-static INLINE void fx_cmp_r15()
+static INLINE void fx_cmp_r15(void)
 {
    FX_CMP(15);
 }
 
 /* 70 - merge - R7 as upper byte, R8 as lower byte (used for texture-mapping) */
-static INLINE void fx_merge()
+static INLINE void fx_merge(void)
 {
    uint32_t v = (R7 & 0xff00) | ((R8 & 0xff00) >> 8);
    R15++;
@@ -1514,63 +1514,63 @@ static INLINE void fx_merge()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_and_r1()
+static INLINE void fx_and_r1(void)
 {
    FX_AND(1);
 }
-static INLINE void fx_and_r2()
+static INLINE void fx_and_r2(void)
 {
    FX_AND(2);
 }
-static INLINE void fx_and_r3()
+static INLINE void fx_and_r3(void)
 {
    FX_AND(3);
 }
-static INLINE void fx_and_r4()
+static INLINE void fx_and_r4(void)
 {
    FX_AND(4);
 }
-static INLINE void fx_and_r5()
+static INLINE void fx_and_r5(void)
 {
    FX_AND(5);
 }
-static INLINE void fx_and_r6()
+static INLINE void fx_and_r6(void)
 {
    FX_AND(6);
 }
-static INLINE void fx_and_r7()
+static INLINE void fx_and_r7(void)
 {
    FX_AND(7);
 }
-static INLINE void fx_and_r8()
+static INLINE void fx_and_r8(void)
 {
    FX_AND(8);
 }
-static INLINE void fx_and_r9()
+static INLINE void fx_and_r9(void)
 {
    FX_AND(9);
 }
-static INLINE void fx_and_r10()
+static INLINE void fx_and_r10(void)
 {
    FX_AND(10);
 }
-static INLINE void fx_and_r11()
+static INLINE void fx_and_r11(void)
 {
    FX_AND(11);
 }
-static INLINE void fx_and_r12()
+static INLINE void fx_and_r12(void)
 {
    FX_AND(12);
 }
-static INLINE void fx_and_r13()
+static INLINE void fx_and_r13(void)
 {
    FX_AND(13);
 }
-static INLINE void fx_and_r14()
+static INLINE void fx_and_r14(void)
 {
    FX_AND(14);
 }
-static INLINE void fx_and_r15()
+static INLINE void fx_and_r15(void)
 {
    FX_AND(15);
 }
@@ -1585,63 +1585,63 @@ static INLINE void fx_and_r15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_bic_r1()
+static INLINE void fx_bic_r1(void)
 {
    FX_BIC(1);
 }
-static INLINE void fx_bic_r2()
+static INLINE void fx_bic_r2(void)
 {
    FX_BIC(2);
 }
-static INLINE void fx_bic_r3()
+static INLINE void fx_bic_r3(void)
 {
    FX_BIC(3);
 }
-static INLINE void fx_bic_r4()
+static INLINE void fx_bic_r4(void)
 {
    FX_BIC(4);
 }
-static INLINE void fx_bic_r5()
+static INLINE void fx_bic_r5(void)
 {
    FX_BIC(5);
 }
-static INLINE void fx_bic_r6()
+static INLINE void fx_bic_r6(void)
 {
    FX_BIC(6);
 }
-static INLINE void fx_bic_r7()
+static INLINE void fx_bic_r7(void)
 {
    FX_BIC(7);
 }
-static INLINE void fx_bic_r8()
+static INLINE void fx_bic_r8(void)
 {
    FX_BIC(8);
 }
-static INLINE void fx_bic_r9()
+static INLINE void fx_bic_r9(void)
 {
    FX_BIC(9);
 }
-static INLINE void fx_bic_r10()
+static INLINE void fx_bic_r10(void)
 {
    FX_BIC(10);
 }
-static INLINE void fx_bic_r11()
+static INLINE void fx_bic_r11(void)
 {
    FX_BIC(11);
 }
-static INLINE void fx_bic_r12()
+static INLINE void fx_bic_r12(void)
 {
    FX_BIC(12);
 }
-static INLINE void fx_bic_r13()
+static INLINE void fx_bic_r13(void)
 {
    FX_BIC(13);
 }
-static INLINE void fx_bic_r14()
+static INLINE void fx_bic_r14(void)
 {
    FX_BIC(14);
 }
-static INLINE void fx_bic_r15()
+static INLINE void fx_bic_r15(void)
 {
    FX_BIC(15);
 }
@@ -1656,63 +1656,63 @@ static INLINE void fx_bic_r15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_and_i1()
+static INLINE void fx_and_i1(void)
 {
    FX_AND_I(1);
 }
-static INLINE void fx_and_i2()
+static INLINE void fx_and_i2(void)
 {
    FX_AND_I(2);
 }
-static INLINE void fx_and_i3()
+static INLINE void fx_and_i3(void)
 {
    FX_AND_I(3);
 }
-static INLINE void fx_and_i4()
+static INLINE void fx_and_i4(void)
 {
    FX_AND_I(4);
 }
-static INLINE void fx_and_i5()
+static INLINE void fx_and_i5(void)
 {
    FX_AND_I(5);
 }
-static INLINE void fx_and_i6()
+static INLINE void fx_and_i6(void)
 {
    FX_AND_I(6);
 }
-static INLINE void fx_and_i7()
+static INLINE void fx_and_i7(void)
 {
    FX_AND_I(7);
 }
-static INLINE void fx_and_i8()
+static INLINE void fx_and_i8(void)
 {
    FX_AND_I(8);
 }
-static INLINE void fx_and_i9()
+static INLINE void fx_and_i9(void)
 {
    FX_AND_I(9);
 }
-static INLINE void fx_and_i10()
+static INLINE void fx_and_i10(void)
 {
    FX_AND_I(10);
 }
-static INLINE void fx_and_i11()
+static INLINE void fx_and_i11(void)
 {
    FX_AND_I(11);
 }
-static INLINE void fx_and_i12()
+static INLINE void fx_and_i12(void)
 {
    FX_AND_I(12);
 }
-static INLINE void fx_and_i13()
+static INLINE void fx_and_i13(void)
 {
    FX_AND_I(13);
 }
-static INLINE void fx_and_i14()
+static INLINE void fx_and_i14(void)
 {
    FX_AND_I(14);
 }
-static INLINE void fx_and_i15()
+static INLINE void fx_and_i15(void)
 {
    FX_AND_I(15);
 }
@@ -1727,63 +1727,63 @@ static INLINE void fx_and_i15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_bic_i1()
+static INLINE void fx_bic_i1(void)
 {
    FX_BIC_I(1);
 }
-static INLINE void fx_bic_i2()
+static INLINE void fx_bic_i2(void)
 {
    FX_BIC_I(2);
 }
-static INLINE void fx_bic_i3()
+static INLINE void fx_bic_i3(void)
 {
    FX_BIC_I(3);
 }
-static INLINE void fx_bic_i4()
+static INLINE void fx_bic_i4(void)
 {
    FX_BIC_I(4);
 }
-static INLINE void fx_bic_i5()
+static INLINE void fx_bic_i5(void)
 {
    FX_BIC_I(5);
 }
-static INLINE void fx_bic_i6()
+static INLINE void fx_bic_i6(void)
 {
    FX_BIC_I(6);
 }
-static INLINE void fx_bic_i7()
+static INLINE void fx_bic_i7(void)
 {
    FX_BIC_I(7);
 }
-static INLINE void fx_bic_i8()
+static INLINE void fx_bic_i8(void)
 {
    FX_BIC_I(8);
 }
-static INLINE void fx_bic_i9()
+static INLINE void fx_bic_i9(void)
 {
    FX_BIC_I(9);
 }
-static INLINE void fx_bic_i10()
+static INLINE void fx_bic_i10(void)
 {
    FX_BIC_I(10);
 }
-static INLINE void fx_bic_i11()
+static INLINE void fx_bic_i11(void)
 {
    FX_BIC_I(11);
 }
-static INLINE void fx_bic_i12()
+static INLINE void fx_bic_i12(void)
 {
    FX_BIC_I(12);
 }
-static INLINE void fx_bic_i13()
+static INLINE void fx_bic_i13(void)
 {
    FX_BIC_I(13);
 }
-static INLINE void fx_bic_i14()
+static INLINE void fx_bic_i14(void)
 {
    FX_BIC_I(14);
 }
-static INLINE void fx_bic_i15()
+static INLINE void fx_bic_i15(void)
 {
    FX_BIC_I(15);
 }
@@ -1798,67 +1798,67 @@ static INLINE void fx_bic_i15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_mult_r0()
+static INLINE void fx_mult_r0(void)
 {
    FX_MULT(0);
 }
-static INLINE void fx_mult_r1()
+static INLINE void fx_mult_r1(void)
 {
    FX_MULT(1);
 }
-static INLINE void fx_mult_r2()
+static INLINE void fx_mult_r2(void)
 {
    FX_MULT(2);
 }
-static INLINE void fx_mult_r3()
+static INLINE void fx_mult_r3(void)
 {
    FX_MULT(3);
 }
-static INLINE void fx_mult_r4()
+static INLINE void fx_mult_r4(void)
 {
    FX_MULT(4);
 }
-static INLINE void fx_mult_r5()
+static INLINE void fx_mult_r5(void)
 {
    FX_MULT(5);
 }
-static INLINE void fx_mult_r6()
+static INLINE void fx_mult_r6(void)
 {
    FX_MULT(6);
 }
-static INLINE void fx_mult_r7()
+static INLINE void fx_mult_r7(void)
 {
    FX_MULT(7);
 }
-static INLINE void fx_mult_r8()
+static INLINE void fx_mult_r8(void)
 {
    FX_MULT(8);
 }
-static INLINE void fx_mult_r9()
+static INLINE void fx_mult_r9(void)
 {
    FX_MULT(9);
 }
-static INLINE void fx_mult_r10()
+static INLINE void fx_mult_r10(void)
 {
    FX_MULT(10);
 }
-static INLINE void fx_mult_r11()
+static INLINE void fx_mult_r11(void)
 {
    FX_MULT(11);
 }
-static INLINE void fx_mult_r12()
+static INLINE void fx_mult_r12(void)
 {
    FX_MULT(12);
 }
-static INLINE void fx_mult_r13()
+static INLINE void fx_mult_r13(void)
 {
    FX_MULT(13);
 }
-static INLINE void fx_mult_r14()
+static INLINE void fx_mult_r14(void)
 {
    FX_MULT(14);
 }
-static INLINE void fx_mult_r15()
+static INLINE void fx_mult_r15(void)
 {
    FX_MULT(15);
 }
@@ -1873,67 +1873,67 @@ static INLINE void fx_mult_r15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_umult_r0()
+static INLINE void fx_umult_r0(void)
 {
    FX_UMULT(0);
 }
-static INLINE void fx_umult_r1()
+static INLINE void fx_umult_r1(void)
 {
    FX_UMULT(1);
 }
-static INLINE void fx_umult_r2()
+static INLINE void fx_umult_r2(void)
 {
    FX_UMULT(2);
 }
-static INLINE void fx_umult_r3()
+static INLINE void fx_umult_r3(void)
 {
    FX_UMULT(3);
 }
-static INLINE void fx_umult_r4()
+static INLINE void fx_umult_r4(void)
 {
    FX_UMULT(4);
 }
-static INLINE void fx_umult_r5()
+static INLINE void fx_umult_r5(void)
 {
    FX_UMULT(5);
 }
-static INLINE void fx_umult_r6()
+static INLINE void fx_umult_r6(void)
 {
    FX_UMULT(6);
 }
-static INLINE void fx_umult_r7()
+static INLINE void fx_umult_r7(void)
 {
    FX_UMULT(7);
 }
-static INLINE void fx_umult_r8()
+static INLINE void fx_umult_r8(void)
 {
    FX_UMULT(8);
 }
-static INLINE void fx_umult_r9()
+static INLINE void fx_umult_r9(void)
 {
    FX_UMULT(9);
 }
-static INLINE void fx_umult_r10()
+static INLINE void fx_umult_r10(void)
 {
    FX_UMULT(10);
 }
-static INLINE void fx_umult_r11()
+static INLINE void fx_umult_r11(void)
 {
    FX_UMULT(11);
 }
-static INLINE void fx_umult_r12()
+static INLINE void fx_umult_r12(void)
 {
    FX_UMULT(12);
 }
-static INLINE void fx_umult_r13()
+static INLINE void fx_umult_r13(void)
 {
    FX_UMULT(13);
 }
-static INLINE void fx_umult_r14()
+static INLINE void fx_umult_r14(void)
 {
    FX_UMULT(14);
 }
-static INLINE void fx_umult_r15()
+static INLINE void fx_umult_r15(void)
 {
    FX_UMULT(15);
 }
@@ -1948,67 +1948,67 @@ static INLINE void fx_umult_r15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_mult_i0()
+static INLINE void fx_mult_i0(void)
 {
    FX_MULT_I(0);
 }
-static INLINE void fx_mult_i1()
+static INLINE void fx_mult_i1(void)
 {
    FX_MULT_I(1);
 }
-static INLINE void fx_mult_i2()
+static INLINE void fx_mult_i2(void)
 {
    FX_MULT_I(2);
 }
-static INLINE void fx_mult_i3()
+static INLINE void fx_mult_i3(void)
 {
    FX_MULT_I(3);
 }
-static INLINE void fx_mult_i4()
+static INLINE void fx_mult_i4(void)
 {
    FX_MULT_I(4);
 }
-static INLINE void fx_mult_i5()
+static INLINE void fx_mult_i5(void)
 {
    FX_MULT_I(5);
 }
-static INLINE void fx_mult_i6()
+static INLINE void fx_mult_i6(void)
 {
    FX_MULT_I(6);
 }
-static INLINE void fx_mult_i7()
+static INLINE void fx_mult_i7(void)
 {
    FX_MULT_I(7);
 }
-static INLINE void fx_mult_i8()
+static INLINE void fx_mult_i8(void)
 {
    FX_MULT_I(8);
 }
-static INLINE void fx_mult_i9()
+static INLINE void fx_mult_i9(void)
 {
    FX_MULT_I(9);
 }
-static INLINE void fx_mult_i10()
+static INLINE void fx_mult_i10(void)
 {
    FX_MULT_I(10);
 }
-static INLINE void fx_mult_i11()
+static INLINE void fx_mult_i11(void)
 {
    FX_MULT_I(11);
 }
-static INLINE void fx_mult_i12()
+static INLINE void fx_mult_i12(void)
 {
    FX_MULT_I(12);
 }
-static INLINE void fx_mult_i13()
+static INLINE void fx_mult_i13(void)
 {
    FX_MULT_I(13);
 }
-static INLINE void fx_mult_i14()
+static INLINE void fx_mult_i14(void)
 {
    FX_MULT_I(14);
 }
-static INLINE void fx_mult_i15()
+static INLINE void fx_mult_i15(void)
 {
    FX_MULT_I(15);
 }
@@ -2023,73 +2023,73 @@ static INLINE void fx_mult_i15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_umult_i0()
+static INLINE void fx_umult_i0(void)
 {
    FX_UMULT_I(0);
 }
-static INLINE void fx_umult_i1()
+static INLINE void fx_umult_i1(void)
 {
    FX_UMULT_I(1);
 }
-static INLINE void fx_umult_i2()
+static INLINE void fx_umult_i2(void)
 {
    FX_UMULT_I(2);
 }
-static INLINE void fx_umult_i3()
+static INLINE void fx_umult_i3(void)
 {
    FX_UMULT_I(3);
 }
-static INLINE void fx_umult_i4()
+static INLINE void fx_umult_i4(void)
 {
    FX_UMULT_I(4);
 }
-static INLINE void fx_umult_i5()
+static INLINE void fx_umult_i5(void)
 {
    FX_UMULT_I(5);
 }
-static INLINE void fx_umult_i6()
+static INLINE void fx_umult_i6(void)
 {
    FX_UMULT_I(6);
 }
-static INLINE void fx_umult_i7()
+static INLINE void fx_umult_i7(void)
 {
    FX_UMULT_I(7);
 }
-static INLINE void fx_umult_i8()
+static INLINE void fx_umult_i8(void)
 {
    FX_UMULT_I(8);
 }
-static INLINE void fx_umult_i9()
+static INLINE void fx_umult_i9(void)
 {
    FX_UMULT_I(9);
 }
-static INLINE void fx_umult_i10()
+static INLINE void fx_umult_i10(void)
 {
    FX_UMULT_I(10);
 }
-static INLINE void fx_umult_i11()
+static INLINE void fx_umult_i11(void)
 {
    FX_UMULT_I(11);
 }
-static INLINE void fx_umult_i12()
+static INLINE void fx_umult_i12(void)
 {
    FX_UMULT_I(12);
 }
-static INLINE void fx_umult_i13()
+static INLINE void fx_umult_i13(void)
 {
    FX_UMULT_I(13);
 }
-static INLINE void fx_umult_i14()
+static INLINE void fx_umult_i14(void)
 {
    FX_UMULT_I(14);
 }
-static INLINE void fx_umult_i15()
+static INLINE void fx_umult_i15(void)
 {
    FX_UMULT_I(15);
 }
 
 /* 90 - sbk - store word to last accessed RAM address */
-static INLINE void fx_sbk()
+static INLINE void fx_sbk(void)
 {
    RAM(GSU.vLastRamAdr) = (uint8_t)SREG;
    RAM(GSU.vLastRamAdr ^ 1) = (uint8_t)(SREG >> 8);
@@ -2103,25 +2103,25 @@ static INLINE void fx_sbk()
     CLRFLAGS; \
     R15++
 
-static INLINE void fx_link_i1()
+static INLINE void fx_link_i1(void)
 {
    FX_LINK_I(1);
 }
-static INLINE void fx_link_i2()
+static INLINE void fx_link_i2(void)
 {
    FX_LINK_I(2);
 }
-static INLINE void fx_link_i3()
+static INLINE void fx_link_i3(void)
 {
    FX_LINK_I(3);
 }
-static INLINE void fx_link_i4()
+static INLINE void fx_link_i4(void)
 {
    FX_LINK_I(4);
 }
 
 /* 95 - sex - sign extend 8 bit to 16 bit */
-static INLINE void fx_sex()
+static INLINE void fx_sex(void)
 {
    uint32_t v = (uint32_t)SEX8(SREG);
    R15++;
@@ -2133,7 +2133,7 @@ static INLINE void fx_sex()
 }
 
 /* 96 - asr - aritmetric shift right by one */
-static INLINE void fx_asr()
+static INLINE void fx_asr(void)
 {
    uint32_t v;
    GSU.vCarry = SREG & 1;
@@ -2147,7 +2147,7 @@ static INLINE void fx_asr()
 }
 
 /* 96(ALT1) - div2 - aritmetric shift right by one */
-static INLINE void fx_div2()
+static INLINE void fx_div2(void)
 {
    uint32_t v;
    int32_t s = SEX16(SREG);
@@ -2165,7 +2165,7 @@ static INLINE void fx_div2()
 }
 
 /* 97 - ror - rotate right by one */
-static INLINE void fx_ror()
+static INLINE void fx_ror(void)
 {
    uint32_t v = (USEX16(SREG) >> 1) | (GSU.vCarry << 15);
    GSU.vCarry = SREG & 1;
@@ -2182,27 +2182,27 @@ static INLINE void fx_ror()
     R15 = GSU.avReg[reg]; \
     CLRFLAGS
 
-static INLINE void fx_jmp_r8()
+static INLINE void fx_jmp_r8(void)
 {
    FX_JMP(8);
 }
-static INLINE void fx_jmp_r9()
+static INLINE void fx_jmp_r9(void)
 {
    FX_JMP(9);
 }
-static INLINE void fx_jmp_r10()
+static INLINE void fx_jmp_r10(void)
 {
    FX_JMP(10);
 }
-static INLINE void fx_jmp_r11()
+static INLINE void fx_jmp_r11(void)
 {
    FX_JMP(11);
 }
-static INLINE void fx_jmp_r12()
+static INLINE void fx_jmp_r12(void)
 {
    FX_JMP(12);
 }
-static INLINE void fx_jmp_r13()
+static INLINE void fx_jmp_r13(void)
 {
    FX_JMP(13);
 }
@@ -2216,33 +2216,33 @@ static INLINE void fx_jmp_r13()
     fx_cache(); \
     R15--
 
-static INLINE void fx_ljmp_r8()
+static INLINE void fx_ljmp_r8(void)
 {
    FX_LJMP(8);
 }
-static INLINE void fx_ljmp_r9()
+static INLINE void fx_ljmp_r9(void)
 {
    FX_LJMP(9);
 }
-static INLINE void fx_ljmp_r10()
+static INLINE void fx_ljmp_r10(void)
 {
    FX_LJMP(10);
 }
-static INLINE void fx_ljmp_r11()
+static INLINE void fx_ljmp_r11(void)
 {
    FX_LJMP(11);
 }
-static INLINE void fx_ljmp_r12()
+static INLINE void fx_ljmp_r12(void)
 {
    FX_LJMP(12);
 }
-static INLINE void fx_ljmp_r13()
+static INLINE void fx_ljmp_r13(void)
 {
    FX_LJMP(13);
 }
 
 /* 9e - lob - set upper byte to zero (keep low byte) */
-static INLINE void fx_lob()
+static INLINE void fx_lob(void)
 {
    uint32_t v = USEX8(SREG);
    R15++;
@@ -2254,7 +2254,7 @@ static INLINE void fx_lob()
 }
 
 /* 9f - fmult - 16 bit to 32 bit signed multiplication, upper 16 bits only */
-static INLINE void fx_fmult()
+static INLINE void fx_fmult(void)
 {
    uint32_t v;
    uint32_t c = (uint32_t)(SEX16(SREG) * SEX16(R6));
@@ -2269,7 +2269,7 @@ static INLINE void fx_fmult()
 }
 
 /* 9f(ALT1) - lmult - 16 bit to 32 bit signed multiplication */
-static INLINE void fx_lmult()
+static INLINE void fx_lmult(void)
 {
    uint32_t v;
    uint32_t c = (uint32_t)(SEX16(SREG) * SEX16(R6));
@@ -2294,68 +2294,68 @@ static INLINE void fx_lmult()
     GSU.avReg[reg] = SEX8(v); \
     CLRFLAGS
 
-static INLINE void fx_ibt_r0()
+static INLINE void fx_ibt_r0(void)
 {
    FX_IBT(0);
 }
-static INLINE void fx_ibt_r1()
+static INLINE void fx_ibt_r1(void)
 {
    FX_IBT(1);
 }
-static INLINE void fx_ibt_r2()
+static INLINE void fx_ibt_r2(void)
 {
    FX_IBT(2);
 }
-static INLINE void fx_ibt_r3()
+static INLINE void fx_ibt_r3(void)
 {
    FX_IBT(3);
 }
-static INLINE void fx_ibt_r4()
+static INLINE void fx_ibt_r4(void)
 {
    FX_IBT(4);
 }
-static INLINE void fx_ibt_r5()
+static INLINE void fx_ibt_r5(void)
 {
    FX_IBT(5);
 }
-static INLINE void fx_ibt_r6()
+static INLINE void fx_ibt_r6(void)
 {
    FX_IBT(6);
 }
-static INLINE void fx_ibt_r7()
+static INLINE void fx_ibt_r7(void)
 {
    FX_IBT(7);
 }
-static INLINE void fx_ibt_r8()
+static INLINE void fx_ibt_r8(void)
 {
    FX_IBT(8);
 }
-static INLINE void fx_ibt_r9()
+static INLINE void fx_ibt_r9(void)
 {
    FX_IBT(9);
 }
-static INLINE void fx_ibt_r10()
+static INLINE void fx_ibt_r10(void)
 {
    FX_IBT(10);
 }
-static INLINE void fx_ibt_r11()
+static INLINE void fx_ibt_r11(void)
 {
    FX_IBT(11);
 }
-static INLINE void fx_ibt_r12()
+static INLINE void fx_ibt_r12(void)
 {
    FX_IBT(12);
 }
-static INLINE void fx_ibt_r13()
+static INLINE void fx_ibt_r13(void)
 {
    FX_IBT(13);
 }
-static INLINE void fx_ibt_r14()
+static INLINE void fx_ibt_r14(void)
 {
    FX_IBT(14);
    READR14;
 }
-static INLINE void fx_ibt_r15()
+static INLINE void fx_ibt_r15(void)
 {
    FX_IBT(15);
 }
@@ -2370,68 +2370,68 @@ static INLINE void fx_ibt_r15()
     GSU.avReg[reg] |= ((uint32_t) RAM(GSU.vLastRamAdr + 1)) << 8; \
     CLRFLAGS
 
-static INLINE void fx_lms_r0()
+static INLINE void fx_lms_r0(void)
 {
    FX_LMS(0);
 }
-static INLINE void fx_lms_r1()
+static INLINE void fx_lms_r1(void)
 {
    FX_LMS(1);
 }
-static INLINE void fx_lms_r2()
+static INLINE void fx_lms_r2(void)
 {
    FX_LMS(2);
 }
-static INLINE void fx_lms_r3()
+static INLINE void fx_lms_r3(void)
 {
    FX_LMS(3);
 }
-static INLINE void fx_lms_r4()
+static INLINE void fx_lms_r4(void)
 {
    FX_LMS(4);
 }
-static INLINE void fx_lms_r5()
+static INLINE void fx_lms_r5(void)
 {
    FX_LMS(5);
 }
-static INLINE void fx_lms_r6()
+static INLINE void fx_lms_r6(void)
 {
    FX_LMS(6);
 }
-static INLINE void fx_lms_r7()
+static INLINE void fx_lms_r7(void)
 {
    FX_LMS(7);
 }
-static INLINE void fx_lms_r8()
+static INLINE void fx_lms_r8(void)
 {
    FX_LMS(8);
 }
-static INLINE void fx_lms_r9()
+static INLINE void fx_lms_r9(void)
 {
    FX_LMS(9);
 }
-static INLINE void fx_lms_r10()
+static INLINE void fx_lms_r10(void)
 {
    FX_LMS(10);
 }
-static INLINE void fx_lms_r11()
+static INLINE void fx_lms_r11(void)
 {
    FX_LMS(11);
 }
-static INLINE void fx_lms_r12()
+static INLINE void fx_lms_r12(void)
 {
    FX_LMS(12);
 }
-static INLINE void fx_lms_r13()
+static INLINE void fx_lms_r13(void)
 {
    FX_LMS(13);
 }
-static INLINE void fx_lms_r14()
+static INLINE void fx_lms_r14(void)
 {
    FX_LMS(14);
    READR14;
 }
-static INLINE void fx_lms_r15()
+static INLINE void fx_lms_r15(void)
 {
    FX_LMS(15);
 }
@@ -2448,67 +2448,67 @@ static INLINE void fx_lms_r15()
     CLRFLAGS; \
     R15++
 
-static INLINE void fx_sms_r0()
+static INLINE void fx_sms_r0(void)
 {
    FX_SMS(0);
 }
-static INLINE void fx_sms_r1()
+static INLINE void fx_sms_r1(void)
 {
    FX_SMS(1);
 }
-static INLINE void fx_sms_r2()
+static INLINE void fx_sms_r2(void)
 {
    FX_SMS(2);
 }
-static INLINE void fx_sms_r3()
+static INLINE void fx_sms_r3(void)
 {
    FX_SMS(3);
 }
-static INLINE void fx_sms_r4()
+static INLINE void fx_sms_r4(void)
 {
    FX_SMS(4);
 }
-static INLINE void fx_sms_r5()
+static INLINE void fx_sms_r5(void)
 {
    FX_SMS(5);
 }
-static INLINE void fx_sms_r6()
+static INLINE void fx_sms_r6(void)
 {
    FX_SMS(6);
 }
-static INLINE void fx_sms_r7()
+static INLINE void fx_sms_r7(void)
 {
    FX_SMS(7);
 }
-static INLINE void fx_sms_r8()
+static INLINE void fx_sms_r8(void)
 {
    FX_SMS(8);
 }
-static INLINE void fx_sms_r9()
+static INLINE void fx_sms_r9(void)
 {
    FX_SMS(9);
 }
-static INLINE void fx_sms_r10()
+static INLINE void fx_sms_r10(void)
 {
    FX_SMS(10);
 }
-static INLINE void fx_sms_r11()
+static INLINE void fx_sms_r11(void)
 {
    FX_SMS(11);
 }
-static INLINE void fx_sms_r12()
+static INLINE void fx_sms_r12(void)
 {
    FX_SMS(12);
 }
-static INLINE void fx_sms_r13()
+static INLINE void fx_sms_r13(void)
 {
    FX_SMS(13);
 }
-static INLINE void fx_sms_r14()
+static INLINE void fx_sms_r14(void)
 {
    FX_SMS(14);
 }
-static INLINE void fx_sms_r15()
+static INLINE void fx_sms_r15(void)
 {
    FX_SMS(15);
 }
@@ -2533,73 +2533,73 @@ static INLINE void fx_sms_r15()
         R15++; \
     }
 
-static INLINE void fx_from_r0()
+static INLINE void fx_from_r0(void)
 {
    FX_FROM(0);
 }
-static INLINE void fx_from_r1()
+static INLINE void fx_from_r1(void)
 {
    FX_FROM(1);
 }
-static INLINE void fx_from_r2()
+static INLINE void fx_from_r2(void)
 {
    FX_FROM(2);
 }
-static INLINE void fx_from_r3()
+static INLINE void fx_from_r3(void)
 {
    FX_FROM(3);
 }
-static INLINE void fx_from_r4()
+static INLINE void fx_from_r4(void)
 {
    FX_FROM(4);
 }
-static INLINE void fx_from_r5()
+static INLINE void fx_from_r5(void)
 {
    FX_FROM(5);
 }
-static INLINE void fx_from_r6()
+static INLINE void fx_from_r6(void)
 {
    FX_FROM(6);
 }
-static INLINE void fx_from_r7()
+static INLINE void fx_from_r7(void)
 {
    FX_FROM(7);
 }
-static INLINE void fx_from_r8()
+static INLINE void fx_from_r8(void)
 {
    FX_FROM(8);
 }
-static INLINE void fx_from_r9()
+static INLINE void fx_from_r9(void)
 {
    FX_FROM(9);
 }
-static INLINE void fx_from_r10()
+static INLINE void fx_from_r10(void)
 {
    FX_FROM(10);
 }
-static INLINE void fx_from_r11()
+static INLINE void fx_from_r11(void)
 {
    FX_FROM(11);
 }
-static INLINE void fx_from_r12()
+static INLINE void fx_from_r12(void)
 {
    FX_FROM(12);
 }
-static INLINE void fx_from_r13()
+static INLINE void fx_from_r13(void)
 {
    FX_FROM(13);
 }
-static INLINE void fx_from_r14()
+static INLINE void fx_from_r14(void)
 {
    FX_FROM(14);
 }
-static INLINE void fx_from_r15()
+static INLINE void fx_from_r15(void)
 {
    FX_FROM(15);
 }
 
 /* c0 - hib - move high-byte to low-byte */
-static INLINE void fx_hib()
+static INLINE void fx_hib(void)
 {
    uint32_t v = USEX8(SREG >> 8);
    R15++;
@@ -2620,63 +2620,63 @@ static INLINE void fx_hib()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_or_r1()
+static INLINE void fx_or_r1(void)
 {
    FX_OR(1);
 }
-static INLINE void fx_or_r2()
+static INLINE void fx_or_r2(void)
 {
    FX_OR(2);
 }
-static INLINE void fx_or_r3()
+static INLINE void fx_or_r3(void)
 {
    FX_OR(3);
 }
-static INLINE void fx_or_r4()
+static INLINE void fx_or_r4(void)
 {
    FX_OR(4);
 }
-static INLINE void fx_or_r5()
+static INLINE void fx_or_r5(void)
 {
    FX_OR(5);
 }
-static INLINE void fx_or_r6()
+static INLINE void fx_or_r6(void)
 {
    FX_OR(6);
 }
-static INLINE void fx_or_r7()
+static INLINE void fx_or_r7(void)
 {
    FX_OR(7);
 }
-static INLINE void fx_or_r8()
+static INLINE void fx_or_r8(void)
 {
    FX_OR(8);
 }
-static INLINE void fx_or_r9()
+static INLINE void fx_or_r9(void)
 {
    FX_OR(9);
 }
-static INLINE void fx_or_r10()
+static INLINE void fx_or_r10(void)
 {
    FX_OR(10);
 }
-static INLINE void fx_or_r11()
+static INLINE void fx_or_r11(void)
 {
    FX_OR(11);
 }
-static INLINE void fx_or_r12()
+static INLINE void fx_or_r12(void)
 {
    FX_OR(12);
 }
-static INLINE void fx_or_r13()
+static INLINE void fx_or_r13(void)
 {
    FX_OR(13);
 }
-static INLINE void fx_or_r14()
+static INLINE void fx_or_r14(void)
 {
    FX_OR(14);
 }
-static INLINE void fx_or_r15()
+static INLINE void fx_or_r15(void)
 {
    FX_OR(15);
 }
@@ -2691,63 +2691,63 @@ static INLINE void fx_or_r15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_xor_r1()
+static INLINE void fx_xor_r1(void)
 {
    FX_XOR(1);
 }
-static INLINE void fx_xor_r2()
+static INLINE void fx_xor_r2(void)
 {
    FX_XOR(2);
 }
-static INLINE void fx_xor_r3()
+static INLINE void fx_xor_r3(void)
 {
    FX_XOR(3);
 }
-static INLINE void fx_xor_r4()
+static INLINE void fx_xor_r4(void)
 {
    FX_XOR(4);
 }
-static INLINE void fx_xor_r5()
+static INLINE void fx_xor_r5(void)
 {
    FX_XOR(5);
 }
-static INLINE void fx_xor_r6()
+static INLINE void fx_xor_r6(void)
 {
    FX_XOR(6);
 }
-static INLINE void fx_xor_r7()
+static INLINE void fx_xor_r7(void)
 {
    FX_XOR(7);
 }
-static INLINE void fx_xor_r8()
+static INLINE void fx_xor_r8(void)
 {
    FX_XOR(8);
 }
-static INLINE void fx_xor_r9()
+static INLINE void fx_xor_r9(void)
 {
    FX_XOR(9);
 }
-static INLINE void fx_xor_r10()
+static INLINE void fx_xor_r10(void)
 {
    FX_XOR(10);
 }
-static INLINE void fx_xor_r11()
+static INLINE void fx_xor_r11(void)
 {
    FX_XOR(11);
 }
-static INLINE void fx_xor_r12()
+static INLINE void fx_xor_r12(void)
 {
    FX_XOR(12);
 }
-static INLINE void fx_xor_r13()
+static INLINE void fx_xor_r13(void)
 {
    FX_XOR(13);
 }
-static INLINE void fx_xor_r14()
+static INLINE void fx_xor_r14(void)
 {
    FX_XOR(14);
 }
-static INLINE void fx_xor_r15()
+static INLINE void fx_xor_r15(void)
 {
    FX_XOR(15);
 }
@@ -2762,63 +2762,63 @@ static INLINE void fx_xor_r15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_or_i1()
+static INLINE void fx_or_i1(void)
 {
    FX_OR_I(1);
 }
-static INLINE void fx_or_i2()
+static INLINE void fx_or_i2(void)
 {
    FX_OR_I(2);
 }
-static INLINE void fx_or_i3()
+static INLINE void fx_or_i3(void)
 {
    FX_OR_I(3);
 }
-static INLINE void fx_or_i4()
+static INLINE void fx_or_i4(void)
 {
    FX_OR_I(4);
 }
-static INLINE void fx_or_i5()
+static INLINE void fx_or_i5(void)
 {
    FX_OR_I(5);
 }
-static INLINE void fx_or_i6()
+static INLINE void fx_or_i6(void)
 {
    FX_OR_I(6);
 }
-static INLINE void fx_or_i7()
+static INLINE void fx_or_i7(void)
 {
    FX_OR_I(7);
 }
-static INLINE void fx_or_i8()
+static INLINE void fx_or_i8(void)
 {
    FX_OR_I(8);
 }
-static INLINE void fx_or_i9()
+static INLINE void fx_or_i9(void)
 {
    FX_OR_I(9);
 }
-static INLINE void fx_or_i10()
+static INLINE void fx_or_i10(void)
 {
    FX_OR_I(10);
 }
-static INLINE void fx_or_i11()
+static INLINE void fx_or_i11(void)
 {
    FX_OR_I(11);
 }
-static INLINE void fx_or_i12()
+static INLINE void fx_or_i12(void)
 {
    FX_OR_I(12);
 }
-static INLINE void fx_or_i13()
+static INLINE void fx_or_i13(void)
 {
    FX_OR_I(13);
 }
-static INLINE void fx_or_i14()
+static INLINE void fx_or_i14(void)
 {
    FX_OR_I(14);
 }
-static INLINE void fx_or_i15()
+static INLINE void fx_or_i15(void)
 {
    FX_OR_I(15);
 }
@@ -2833,63 +2833,63 @@ static INLINE void fx_or_i15()
     TESTR14; \
     CLRFLAGS
 
-static INLINE void fx_xor_i1()
+static INLINE void fx_xor_i1(void)
 {
    FX_XOR_I(1);
 }
-static INLINE void fx_xor_i2()
+static INLINE void fx_xor_i2(void)
 {
    FX_XOR_I(2);
 }
-static INLINE void fx_xor_i3()
+static INLINE void fx_xor_i3(void)
 {
    FX_XOR_I(3);
 }
-static INLINE void fx_xor_i4()
+static INLINE void fx_xor_i4(void)
 {
    FX_XOR_I(4);
 }
-static INLINE void fx_xor_i5()
+static INLINE void fx_xor_i5(void)
 {
    FX_XOR_I(5);
 }
-static INLINE void fx_xor_i6()
+static INLINE void fx_xor_i6(void)
 {
    FX_XOR_I(6);
 }
-static INLINE void fx_xor_i7()
+static INLINE void fx_xor_i7(void)
 {
    FX_XOR_I(7);
 }
-static INLINE void fx_xor_i8()
+static INLINE void fx_xor_i8(void)
 {
    FX_XOR_I(8);
 }
-static INLINE void fx_xor_i9()
+static INLINE void fx_xor_i9(void)
 {
    FX_XOR_I(9);
 }
-static INLINE void fx_xor_i10()
+static INLINE void fx_xor_i10(void)
 {
    FX_XOR_I(10);
 }
-static INLINE void fx_xor_i11()
+static INLINE void fx_xor_i11(void)
 {
    FX_XOR_I(11);
 }
-static INLINE void fx_xor_i12()
+static INLINE void fx_xor_i12(void)
 {
    FX_XOR_I(12);
 }
-static INLINE void fx_xor_i13()
+static INLINE void fx_xor_i13(void)
 {
    FX_XOR_I(13);
 }
-static INLINE void fx_xor_i14()
+static INLINE void fx_xor_i14(void)
 {
    FX_XOR_I(14);
 }
-static INLINE void fx_xor_i15()
+static INLINE void fx_xor_i15(void)
 {
    FX_XOR_I(15);
 }
@@ -2902,70 +2902,70 @@ static INLINE void fx_xor_i15()
     CLRFLAGS; \
     R15++
 
-static INLINE void fx_inc_r0()
+static INLINE void fx_inc_r0(void)
 {
    FX_INC(0);
 }
-static INLINE void fx_inc_r1()
+static INLINE void fx_inc_r1(void)
 {
    FX_INC(1);
 }
-static INLINE void fx_inc_r2()
+static INLINE void fx_inc_r2(void)
 {
    FX_INC(2);
 }
-static INLINE void fx_inc_r3()
+static INLINE void fx_inc_r3(void)
 {
    FX_INC(3);
 }
-static INLINE void fx_inc_r4()
+static INLINE void fx_inc_r4(void)
 {
    FX_INC(4);
 }
-static INLINE void fx_inc_r5()
+static INLINE void fx_inc_r5(void)
 {
    FX_INC(5);
 }
-static INLINE void fx_inc_r6()
+static INLINE void fx_inc_r6(void)
 {
    FX_INC(6);
 }
-static INLINE void fx_inc_r7()
+static INLINE void fx_inc_r7(void)
 {
    FX_INC(7);
 }
-static INLINE void fx_inc_r8()
+static INLINE void fx_inc_r8(void)
 {
    FX_INC(8);
 }
-static INLINE void fx_inc_r9()
+static INLINE void fx_inc_r9(void)
 {
    FX_INC(9);
 }
-static INLINE void fx_inc_r10()
+static INLINE void fx_inc_r10(void)
 {
    FX_INC(10);
 }
-static INLINE void fx_inc_r11()
+static INLINE void fx_inc_r11(void)
 {
    FX_INC(11);
 }
-static INLINE void fx_inc_r12()
+static INLINE void fx_inc_r12(void)
 {
    FX_INC(12);
 }
-static INLINE void fx_inc_r13()
+static INLINE void fx_inc_r13(void)
 {
    FX_INC(13);
 }
-static INLINE void fx_inc_r14()
+static INLINE void fx_inc_r14(void)
 {
    FX_INC(14);
    READR14;
 }
 
 /* df - getc - transfer ROM buffer to color register */
-static INLINE void fx_getc()
+static INLINE void fx_getc(void)
 {
 #ifndef FX_DO_ROMBUFFER
    uint8_t c;
@@ -2987,7 +2987,7 @@ static INLINE void fx_getc()
 }
 
 /* df(ALT2) - ramb - set current RAM bank */
-static INLINE void fx_ramb()
+static INLINE void fx_ramb(void)
 {
    GSU.vRamBankReg = SREG & (FX_RAM_BANKS - 1);
    GSU.pvRamBank = GSU.apvRamBank[GSU.vRamBankReg & 0x3];
@@ -2996,7 +2996,7 @@ static INLINE void fx_ramb()
 }
 
 /* df(ALT3) - romb - set current ROM bank */
-static INLINE void fx_romb()
+static INLINE void fx_romb(void)
 {
    GSU.vRomBankReg = USEX8(SREG) & 0x7f;
    GSU.pvRomBank = GSU.apvRomBank[GSU.vRomBankReg];
@@ -3012,70 +3012,70 @@ static INLINE void fx_romb()
     CLRFLAGS; \
     R15++
 
-static INLINE void fx_dec_r0()
+static INLINE void fx_dec_r0(void)
 {
    FX_DEC(0);
 }
-static INLINE void fx_dec_r1()
+static INLINE void fx_dec_r1(void)
 {
    FX_DEC(1);
 }
-static INLINE void fx_dec_r2()
+static INLINE void fx_dec_r2(void)
 {
    FX_DEC(2);
 }
-static INLINE void fx_dec_r3()
+static INLINE void fx_dec_r3(void)
 {
    FX_DEC(3);
 }
-static INLINE void fx_dec_r4()
+static INLINE void fx_dec_r4(void)
 {
    FX_DEC(4);
 }
-static INLINE void fx_dec_r5()
+static INLINE void fx_dec_r5(void)
 {
    FX_DEC(5);
 }
-static INLINE void fx_dec_r6()
+static INLINE void fx_dec_r6(void)
 {
    FX_DEC(6);
 }
-static INLINE void fx_dec_r7()
+static INLINE void fx_dec_r7(void)
 {
    FX_DEC(7);
 }
-static INLINE void fx_dec_r8()
+static INLINE void fx_dec_r8(void)
 {
    FX_DEC(8);
 }
-static INLINE void fx_dec_r9()
+static INLINE void fx_dec_r9(void)
 {
    FX_DEC(9);
 }
-static INLINE void fx_dec_r10()
+static INLINE void fx_dec_r10(void)
 {
    FX_DEC(10);
 }
-static INLINE void fx_dec_r11()
+static INLINE void fx_dec_r11(void)
 {
    FX_DEC(11);
 }
-static INLINE void fx_dec_r12()
+static INLINE void fx_dec_r12(void)
 {
    FX_DEC(12);
 }
-static INLINE void fx_dec_r13()
+static INLINE void fx_dec_r13(void)
 {
    FX_DEC(13);
 }
-static INLINE void fx_dec_r14()
+static INLINE void fx_dec_r14(void)
 {
    FX_DEC(14);
    READR14;
 }
 
 /* ef - getb - get byte from ROM at address R14 */
-static INLINE void fx_getb()
+static INLINE void fx_getb(void)
 {
    uint32_t v;
 #ifndef FX_DO_ROMBUFFER
@@ -3090,7 +3090,7 @@ static INLINE void fx_getb()
 }
 
 /* ef(ALT1) - getbh - get high-byte from ROM at address R14 */
-static INLINE void fx_getbh()
+static INLINE void fx_getbh(void)
 {
    uint32_t v;
 #ifndef FX_DO_ROMBUFFER
@@ -3107,7 +3107,7 @@ static INLINE void fx_getbh()
 }
 
 /* ef(ALT2) - getbl - get low-byte from ROM at address R14 */
-static INLINE void fx_getbl()
+static INLINE void fx_getbl(void)
 {
    uint32_t v;
 #ifndef FX_DO_ROMBUFFER
@@ -3123,7 +3123,7 @@ static INLINE void fx_getbl()
 }
 
 /* ef(ALT3) - getbs - get sign extended byte from ROM at address R14 */
-static INLINE void fx_getbs()
+static INLINE void fx_getbs(void)
 {
    uint32_t v;
 #ifndef FX_DO_ROMBUFFER
@@ -3151,68 +3151,68 @@ static INLINE void fx_getbs()
     GSU.avReg[reg] = v; \
     CLRFLAGS
 
-static INLINE void fx_iwt_r0()
+static INLINE void fx_iwt_r0(void)
 {
    FX_IWT(0);
 }
-static INLINE void fx_iwt_r1()
+static INLINE void fx_iwt_r1(void)
 {
    FX_IWT(1);
 }
-static INLINE void fx_iwt_r2()
+static INLINE void fx_iwt_r2(void)
 {
    FX_IWT(2);
 }
-static INLINE void fx_iwt_r3()
+static INLINE void fx_iwt_r3(void)
 {
    FX_IWT(3);
 }
-static INLINE void fx_iwt_r4()
+static INLINE void fx_iwt_r4(void)
 {
    FX_IWT(4);
 }
-static INLINE void fx_iwt_r5()
+static INLINE void fx_iwt_r5(void)
 {
    FX_IWT(5);
 }
-static INLINE void fx_iwt_r6()
+static INLINE void fx_iwt_r6(void)
 {
    FX_IWT(6);
 }
-static INLINE void fx_iwt_r7()
+static INLINE void fx_iwt_r7(void)
 {
    FX_IWT(7);
 }
-static INLINE void fx_iwt_r8()
+static INLINE void fx_iwt_r8(void)
 {
    FX_IWT(8);
 }
-static INLINE void fx_iwt_r9()
+static INLINE void fx_iwt_r9(void)
 {
    FX_IWT(9);
 }
-static INLINE void fx_iwt_r10()
+static INLINE void fx_iwt_r10(void)
 {
    FX_IWT(10);
 }
-static INLINE void fx_iwt_r11()
+static INLINE void fx_iwt_r11(void)
 {
    FX_IWT(11);
 }
-static INLINE void fx_iwt_r12()
+static INLINE void fx_iwt_r12(void)
 {
    FX_IWT(12);
 }
-static INLINE void fx_iwt_r13()
+static INLINE void fx_iwt_r13(void)
 {
    FX_IWT(13);
 }
-static INLINE void fx_iwt_r14()
+static INLINE void fx_iwt_r14(void)
 {
    FX_IWT(14);
    READR14;
 }
-static INLINE void fx_iwt_r15()
+static INLINE void fx_iwt_r15(void)
 {
    FX_IWT(15);
 }
@@ -3230,68 +3230,68 @@ static INLINE void fx_iwt_r15()
     GSU.avReg[reg] |= USEX8(RAM(GSU.vLastRamAdr ^ 1)) << 8; \
     CLRFLAGS
 
-static INLINE void fx_lm_r0()
+static INLINE void fx_lm_r0(void)
 {
    FX_LM(0);
 }
-static INLINE void fx_lm_r1()
+static INLINE void fx_lm_r1(void)
 {
    FX_LM(1);
 }
-static INLINE void fx_lm_r2()
+static INLINE void fx_lm_r2(void)
 {
    FX_LM(2);
 }
-static INLINE void fx_lm_r3()
+static INLINE void fx_lm_r3(void)
 {
    FX_LM(3);
 }
-static INLINE void fx_lm_r4()
+static INLINE void fx_lm_r4(void)
 {
    FX_LM(4);
 }
-static INLINE void fx_lm_r5()
+static INLINE void fx_lm_r5(void)
 {
    FX_LM(5);
 }
-static INLINE void fx_lm_r6()
+static INLINE void fx_lm_r6(void)
 {
    FX_LM(6);
 }
-static INLINE void fx_lm_r7()
+static INLINE void fx_lm_r7(void)
 {
    FX_LM(7);
 }
-static INLINE void fx_lm_r8()
+static INLINE void fx_lm_r8(void)
 {
    FX_LM(8);
 }
-static INLINE void fx_lm_r9()
+static INLINE void fx_lm_r9(void)
 {
    FX_LM(9);
 }
-static INLINE void fx_lm_r10()
+static INLINE void fx_lm_r10(void)
 {
    FX_LM(10);
 }
-static INLINE void fx_lm_r11()
+static INLINE void fx_lm_r11(void)
 {
    FX_LM(11);
 }
-static INLINE void fx_lm_r12()
+static INLINE void fx_lm_r12(void)
 {
    FX_LM(12);
 }
-static INLINE void fx_lm_r13()
+static INLINE void fx_lm_r13(void)
 {
    FX_LM(13);
 }
-static INLINE void fx_lm_r14()
+static INLINE void fx_lm_r14(void)
 {
    FX_LM(14);
    READR14;
 }
-static INLINE void fx_lm_r15()
+static INLINE void fx_lm_r15(void)
 {
    FX_LM(15);
 }
@@ -3311,67 +3311,67 @@ static INLINE void fx_lm_r15()
     CLRFLAGS; \
     R15++
 
-static INLINE void fx_sm_r0()
+static INLINE void fx_sm_r0(void)
 {
    FX_SM(0);
 }
-static INLINE void fx_sm_r1()
+static INLINE void fx_sm_r1(void)
 {
    FX_SM(1);
 }
-static INLINE void fx_sm_r2()
+static INLINE void fx_sm_r2(void)
 {
    FX_SM(2);
 }
-static INLINE void fx_sm_r3()
+static INLINE void fx_sm_r3(void)
 {
    FX_SM(3);
 }
-static INLINE void fx_sm_r4()
+static INLINE void fx_sm_r4(void)
 {
    FX_SM(4);
 }
-static INLINE void fx_sm_r5()
+static INLINE void fx_sm_r5(void)
 {
    FX_SM(5);
 }
-static INLINE void fx_sm_r6()
+static INLINE void fx_sm_r6(void)
 {
    FX_SM(6);
 }
-static INLINE void fx_sm_r7()
+static INLINE void fx_sm_r7(void)
 {
    FX_SM(7);
 }
-static INLINE void fx_sm_r8()
+static INLINE void fx_sm_r8(void)
 {
    FX_SM(8);
 }
-static INLINE void fx_sm_r9()
+static INLINE void fx_sm_r9(void)
 {
    FX_SM(9);
 }
-static INLINE void fx_sm_r10()
+static INLINE void fx_sm_r10(void)
 {
    FX_SM(10);
 }
-static INLINE void fx_sm_r11()
+static INLINE void fx_sm_r11(void)
 {
    FX_SM(11);
 }
-static INLINE void fx_sm_r12()
+static INLINE void fx_sm_r12(void)
 {
    FX_SM(12);
 }
-static INLINE void fx_sm_r13()
+static INLINE void fx_sm_r13(void)
 {
    FX_SM(13);
 }
-static INLINE void fx_sm_r14()
+static INLINE void fx_sm_r14(void)
 {
    FX_SM(14);
 }
-static INLINE void fx_sm_r15()
+static INLINE void fx_sm_r15(void)
 {
    FX_SM(15);
 }
@@ -3388,14 +3388,14 @@ uint32_t fx_run(uint32_t nInstructions)
 }
 
 /*** Special table for the different plot configurations ***/
-void (*fx_apfPlotTable[])() =
+void (*fx_apfPlotTable[])(void) =
 {
    &fx_plot_2bit, &fx_plot_4bit, &fx_plot_4bit, &fx_plot_8bit, &fx_obj_func,
    &fx_rpix_2bit, &fx_rpix_4bit, &fx_rpix_4bit, &fx_rpix_8bit, &fx_obj_func,
 };
 
 /*** Opcode table ***/
-void (*fx_apfOpcodeTable[])() =
+void (*fx_apfOpcodeTable[])(void) =
 {
    /*
     * ALT0 Table
diff --git a/source/fxinst.h b/source/fxinst.h
index e63c68c..68555b2 100644
--- a/source/fxinst.h
+++ b/source/fxinst.h
@@ -169,8 +169,8 @@ typedef struct
    uint32_t    vScreenRealHeight;        /* 128, 160, 192 or 256 */
    uint32_t    vPrevScreenHeight;
    uint32_t    vScreenSize;
-   void      (*pfPlot)();
-   void      (*pfRpix)();
+   void      (*pfPlot)(void);
+   void      (*pfRpix)(void);
    uint8_t*    pvRamBank;                /* Pointer to current RAM-bank */
    uint8_t*    pvRomBank;                /* Pointer to current ROM-bank */
    uint8_t*    pvPrgBank;                /* Pointer to current program ROM-bank */
@@ -340,8 +340,8 @@ typedef struct
     (*fx_apfOpcodeTable[ (GSU.vStatusReg & 0x300) | vOpcode ])(); \
 }
 
-extern void (*fx_apfOpcodeTable[])();
-extern void (*fx_apfPlotTable[])();
+extern void (*fx_apfOpcodeTable[])(void);
+extern void (*fx_apfPlotTable[])(void);
 
 uint32_t fx_run(uint32_t nInstructions);
 
diff --git a/source/memmap.c b/source/memmap.c
index 31b46e6..5efeacb 100644
--- a/source/memmap.c
+++ b/source/memmap.c
@@ -237,7 +237,7 @@ static char* Safe(const char* s)
 /* S9xInitMemory()                                                                                     */
 /* This function allocates and zeroes all the memory needed by the emulator                   */
 /**********************************************************************************************/
-bool S9xInitMemory()
+bool S9xInitMemory(void)
 {
    // DS2 DMA notes: These would do well to be allocated with 32 extra bytes
    // so they can be 32-byte aligned. [Neb]
@@ -288,7 +288,7 @@ bool S9xInitMemory()
    return true;
 }
 
-void S9xDeinitMemory()
+void S9xDeinitMemory(void)
 {
    if (Memory.RAM)
    {
@@ -569,9 +569,11 @@ bool LoadROM(
 #endif
       )
 {
+   int32_t hi_score, lo_score;
    int32_t TotalFileSize = 0;
    bool Interleaved = false;
    bool Tales = false;
+   const uint8_t* src;
 
    uint8_t* RomHeader = Memory.ROM;
    Memory.ExtendedFormat = NOPE;
@@ -594,7 +596,7 @@ again:
 
    Memory.HeaderCount = 0;
    TotalFileSize = game->size;
-   const uint8_t* src = game->data;
+   src = game->data;
    Memory.HeaderCount = 0;
 
    if ((((game->size & 0x1FFF) == 0x200) && !Settings.ForceNoHeader) || Settings.ForceHeader)
@@ -657,8 +659,8 @@ again:
    }
 #endif
 
-   int32_t hi_score = ScoreHiROM(true, 0);
-   int32_t lo_score = ScoreLoROM(true, 0);
+   hi_score = ScoreHiROM(true, 0);
+   lo_score = ScoreLoROM(true, 0);
 
    if (Memory.HeaderCount == 0 && !Settings.ForceNoHeader &&
        strncmp((char *) &Memory.ROM [0], "BANDAI SFC-ADX", 14) &&
@@ -933,13 +935,17 @@ again:
 }
 
 /* compatibility wrapper */
-void S9xDeinterleaveMode2()
+void S9xDeinterleaveMode2(void)
 {
    S9xDeinterleaveType2(true);
 }
 
 void S9xDeinterleaveType2(bool reset)
 {
+   uint32_t TmpAdj;
+   uint8_t *tmp;
+   uint8_t blocks [256];
+   int32_t i;
    int32_t nblocks = Memory.CalculatedSize >> 16;
    int32_t step = 64;
 
@@ -947,8 +953,6 @@ void S9xDeinterleaveType2(bool reset)
       step >>= 1;
 
    nblocks = step;
-   uint8_t blocks [256];
-   int32_t i;
 
    for (i = 0; i < nblocks * 2; i++)
    {
@@ -957,10 +961,9 @@ void S9xDeinterleaveType2(bool reset)
    }
 
 #ifdef DS2_DMA
-   uint32_t TmpAdj;
-   uint8_t* tmp = (uint8_t*) AlignedMalloc(0x10000, 32, &TmpAdj);
+   tmp = (uint8_t*) AlignedMalloc(0x10000, 32, &TmpAdj);
 #else
-   uint8_t* tmp = (uint8_t*) malloc(0x10000);
+   tmp = (uint8_t*) malloc(0x10000);
 #endif
 
    if (tmp)
@@ -975,6 +978,7 @@ void S9xDeinterleaveType2(bool reset)
          {
             if (blocks [j] == i)
             {
+               uint8_t b;
 #ifdef DS2_DMA
                ds2_DMAcopy_32Byte(2 /* channel: emu internal */, tmp,
                                   &Memory.ROM [blocks [j] * 0x10000], 0x10000);
@@ -1001,7 +1005,7 @@ void S9xDeinterleaveType2(bool reset)
                // memmove converted: Different mallocs [Neb]
                memcpy(&Memory.ROM [blocks [i] * 0x10000], tmp, 0x10000);
 #endif
-               uint8_t b = blocks [j];
+               b          = blocks [j];
                blocks [j] = blocks [i];
                blocks [i] = b;
                break;
@@ -1382,7 +1386,7 @@ void InitROM(bool Interleaved)
                           Settings.ForceInterleaved2 = false;
 }
 
-void FixROMSpeed()
+void FixROMSpeed(void)
 {
    int32_t c;
 
@@ -1394,7 +1398,7 @@ void FixROMSpeed()
          Memory.MemorySpeed [c] = (uint8_t) CPU.FastROMSpeed;
 }
 
-void ResetSpeedMap()
+void ResetSpeedMap(void)
 {
    int32_t i;
    memset(Memory.MemorySpeed, SLOW_ONE_CYCLE, 0x1000);
@@ -1444,7 +1448,7 @@ void map_index(uint32_t bank_s, uint32_t bank_e, uint32_t addr_s, uint32_t addr_
    }
 }
 
-void WriteProtectROM()
+void WriteProtectROM(void)
 {
    // memmove converted: Different mallocs [Neb]
    memcpy(Memory.WriteMap, Memory.Map, sizeof(Memory.Map));
@@ -1454,7 +1458,7 @@ void WriteProtectROM()
          Memory.WriteMap [c] = (uint8_t*) MAP_NONE;
 }
 
-void MapRAM()
+void MapRAM(void)
 {
    int32_t c, i;
 
@@ -1510,7 +1514,7 @@ void MapRAM()
    WriteProtectROM();
 }
 
-void MapExtraRAM()
+void MapExtraRAM(void)
 {
    int32_t c;
 
@@ -1544,7 +1548,7 @@ void MapExtraRAM()
    }
 }
 
-void LoROMMap()
+void LoROMMap(void)
 {
    int32_t c;
    int32_t i;
@@ -1607,7 +1611,7 @@ void LoROMMap()
    WriteProtectROM();
 }
 
-void DSPMap()
+void DSPMap(void)
 {
    switch (Settings.DSP)
    {
@@ -1647,7 +1651,7 @@ void DSPMap()
    }
 }
 
-void SetaDSPMap()
+void SetaDSPMap(void)
 {
    int32_t c;
    int32_t i;
@@ -1709,7 +1713,7 @@ void SetaDSPMap()
    WriteProtectROM();
 }
 
-void HiROMMap()
+void HiROMMap(void)
 {
    int32_t i;
    int32_t c;
@@ -1856,7 +1860,7 @@ void TalesROMMap(bool Interleaved)
    WriteProtectROM();
 }
 
-void AlphaROMMap()
+void AlphaROMMap(void)
 {
    int32_t c;
    int32_t i;
@@ -1899,7 +1903,7 @@ void AlphaROMMap()
    WriteProtectROM();
 }
 
-void DetectSuperFxRamSize()
+void DetectSuperFxRamSize(void)
 {
    if (Memory.ROM[0x7FDA] == 0x33)
       Memory.SRAMSize = Memory.ROM[0x7FBD];
@@ -1909,7 +1913,7 @@ void DetectSuperFxRamSize()
       Memory.SRAMSize = 5;
 }
 
-void SuperFXROMMap()
+void SuperFXROMMap(void)
 {
    int32_t c;
    int32_t i;
@@ -1995,7 +1999,7 @@ void SuperFXROMMap()
    WriteProtectROM();
 }
 
-void SA1ROMMap()
+void SA1ROMMap(void)
 {
    int32_t c;
    int32_t i;
@@ -2074,7 +2078,7 @@ void SA1ROMMap()
    Memory.BWRAM = Memory.SRAM;
 }
 
-void LoROM24MBSMap()
+void LoROM24MBSMap(void)
 {
    int32_t c;
    int32_t i;
@@ -2140,7 +2144,7 @@ void LoROM24MBSMap()
    WriteProtectROM();
 }
 
-void SufamiTurboLoROMMap()
+void SufamiTurboLoROMMap(void)
 {
    int32_t c;
    int32_t i;
@@ -2210,7 +2214,7 @@ void SufamiTurboLoROMMap()
    WriteProtectROM();
 }
 
-void SRAM512KLoROMMap()
+void SRAM512KLoROMMap(void)
 {
    int32_t c;
    int32_t i;
@@ -2253,7 +2257,7 @@ void SRAM512KLoROMMap()
    WriteProtectROM();
 }
 
-void SRAM1024KLoROMMap()
+void SRAM1024KLoROMMap(void)
 {
    int32_t c;
    int32_t i;
@@ -2283,7 +2287,7 @@ void SRAM1024KLoROMMap()
    WriteProtectROM();
 }
 
-void CapcomProtectLoROMMap()
+void CapcomProtectLoROMMap(void)
 {
    int32_t c;
    int32_t i;
@@ -2409,7 +2413,7 @@ void JumboLoROMMap(bool Interleaved)
    WriteProtectROM();
 }
 
-void SPC7110HiROMMap()
+void SPC7110HiROMMap(void)
 {
    int32_t c;
    int32_t i;
@@ -2505,22 +2509,22 @@ void SPC7110Sram(uint8_t newstate)
    }
 }
 
-const char* TVStandard()
+const char* TVStandard(void)
 {
    return Settings.PAL ? "PAL" : "NTSC";
 }
 
-const char* Speed()
+const char* Speed(void)
 {
    return Memory.ROMSpeed & 0x10 ? "120ns" : "200ns";
 }
 
-const char* MapType()
+const char* MapType(void)
 {
    return Memory.HiROM ? "HiROM" : "LoROM";
 }
 
-const char* StaticRAMSize()
+const char* StaticRAMSize(void)
 {
    static char tmp [20];
 
@@ -2530,7 +2534,7 @@ const char* StaticRAMSize()
    return tmp;
 }
 
-const char* Size()
+const char* Size(void)
 {
    static char tmp [20];
 
@@ -2540,7 +2544,7 @@ const char* Size()
    return tmp;
 }
 
-const char* KartContents()
+const char* KartContents(void)
 {
    static char tmp [30];
    static const char* CoPro [16] =
@@ -2592,14 +2596,14 @@ const char* KartContents()
    return tmp;
 }
 
-const char* MapMode()
+const char* MapMode(void)
 {
    static char tmp [4];
    sprintf(tmp, "%02x", Memory.ROMSpeed & ~0x10);
    return tmp;
 }
 
-const char* ROMID()
+const char* ROMID(void)
 {
    return Memory.ROMId;
 }
@@ -2614,7 +2618,7 @@ bool match_id(const char* str)
    return strncmp(Memory.ROMId, str, strlen(str)) == 0;
 }
 
-void ApplyROMFixes()
+void ApplyROMFixes(void)
 {
    /*
    HACKS NSRT can fix that we hadn't detected before.
diff --git a/source/memmap.h b/source/memmap.h
index 0d24aae..e60cb52 100644
--- a/source/memmap.h
+++ b/source/memmap.h
@@ -39,45 +39,45 @@ bool LoadROM(const struct retro_game_info* game);
 bool LoadROM(const char*);
 #endif
 void InitROM(bool);
-bool S9xInitMemory();
-void S9xDeinitMemory();
-void FreeSDD1Data();
+bool S9xInitMemory(void);
+void S9xDeinitMemory(void);
+void FreeSDD1Data(void);
 
-void WriteProtectROM();
-void FixROMSpeed();
-void MapRAM();
-void MapExtraRAM();
+void WriteProtectROM(void);
+void FixROMSpeed(void);
+void MapRAM(void);
+void MapExtraRAM(void);
 
-void BSLoROMMap();
+void BSLoROMMap(void);
 void JumboLoROMMap(bool);
-void LoROMMap();
-void LoROM24MBSMap();
-void SRAM512KLoROMMap();
-void SRAM1024KLoROMMap();
-void SufamiTurboLoROMMap();
-void HiROMMap();
-void SuperFXROMMap();
+void LoROMMap(void);
+void LoROM24MBSMap(void);
+void SRAM512KLoROMMap(void);
+void SRAM1024KLoROMMap(void);
+void SufamiTurboLoROMMap(void);
+void HiROMMap(void);
+void SuperFXROMMap(void);
 void TalesROMMap(bool);
-void AlphaROMMap();
-void SA1ROMMap();
-void BSHiROMMap();
-void SPC7110HiROMMap();
+void AlphaROMMap(void);
+void SA1ROMMap(void);
+void BSHiROMMap(void);
+void SPC7110HiROMMap(void);
 void SPC7110Sram(uint8_t);
-void SetaDSPMap();
-void ApplyROMFixes();
-void DSPMap();
-void CapcomProtectLoROMMap();
-
-const char* TVStandard();
-const char* Speed();
-const char* StaticRAMSize();
-const char* MapType();
-const char* MapMode();
-const char* KartContents();
-const char* Size();
-const char* Headers();
-const char* ROMID();
-const char* CompanyID();
+void SetaDSPMap(void);
+void ApplyROMFixes(void);
+void DSPMap(void);
+void CapcomProtectLoROMMap(void);
+
+const char* TVStandard(void);
+const char* Speed(void);
+const char* StaticRAMSize(void);
+const char* MapType(void);
+const char* MapMode(void);
+const char* KartContents(void);
+const char* Size(void);
+const char* Headers(void);
+const char* ROMID(void);
+const char* CompanyID(void);
 void ParseSNESHeader(uint8_t*);
 
 enum
@@ -135,10 +135,10 @@ typedef struct
    uint8_t* BSRAM;
 } CMemory;
 
-void ResetSpeedMap();
+void ResetSpeedMap(void);
 
 extern CMemory Memory;
-void S9xDeinterleaveMode2();
+void S9xDeinterleaveMode2(void);
 
 uint8_t S9xGetByte(uint32_t Address);
 uint16_t S9xGetWord(uint32_t Address);
diff --git a/source/sdd1emu.c b/source/sdd1emu.c
index fc2e809..25da823 100644
--- a/source/sdd1emu.c
+++ b/source/sdd1emu.c
@@ -1,5 +1,7 @@
 #include "../copyright"
 
+#include <retro_inline.h>
+
 /* S-DD1 decompressor
  *
  * Based on code and documentation by Andreas Naive, who deserves a great deal
@@ -84,7 +86,7 @@ static uint8_t run_table[128] =
    113, 49,  81,  17,  97,  33,  65,  1
 };
 
-static inline uint8_t GetCodeword(int32_t bits)
+static INLINE uint8_t GetCodeword(int32_t bits)
 {
    uint8_t tmp;
 
@@ -108,7 +110,7 @@ static inline uint8_t GetCodeword(int32_t bits)
    return run_table[tmp];
 }
 
-static inline uint8_t GolombGetBit(int32_t code_size)
+static INLINE uint8_t GolombGetBit(int32_t code_size)
 {
    if (!bit_ctr[code_size]) bit_ctr[code_size] = GetCodeword(code_size);
    bit_ctr[code_size]--;
@@ -120,7 +122,7 @@ static inline uint8_t GolombGetBit(int32_t code_size)
    return (bit_ctr[code_size] == 0) ? 1 : 0;
 }
 
-static inline uint8_t ProbGetBit(uint8_t context)
+static INLINE uint8_t ProbGetBit(uint8_t context)
 {
    uint8_t state = context_states[context];
    uint8_t bit = GolombGetBit(evolution_table[state].code_size);
@@ -146,7 +148,7 @@ static inline uint8_t ProbGetBit(uint8_t context)
    return context_MPS[context]; /* we know bit is 0, so don't bother xoring */
 }
 
-static inline uint8_t GetBit(uint8_t cur_bitplane)
+static INLINE uint8_t GetBit(uint8_t cur_bitplane)
 {
    uint8_t bit;
 
diff --git a/source/spc7110.c b/source/spc7110.c
index fb8f280..bdeb7be 100644
--- a/source/spc7110.c
+++ b/source/spc7110.c
@@ -28,7 +28,7 @@
 #endif
 
 const char* S9xGetFilename(const char*);
-char* osd_GetPackDir();
+char* osd_GetPackDir(void);
 //really not needed, but usually MS adds the _ to POSIX functions,
 //while *nix doesn't, so this was to "un-M$" the function.
 #define splitpath _splitpath
@@ -40,9 +40,9 @@ char* osd_GetPackDir();
 uint16_t cacheMegs = 5;
 
 //using function pointers to initialize cache management
-void (*CleanUp7110)() = NULL;
+void (*CleanUp7110)(void) = NULL;
 void (*LoadUp7110)(char*) = &SPC7110Load;
-void (*Copy7110)() = NULL;
+void (*Copy7110)(void) = NULL;
 
 //size and offset of the pack data
 //offset and size of reads from pack
@@ -77,10 +77,10 @@ char pfold[9];              // Hack variable for log naming (each game makes a d
 Pack7110* decompack = NULL; // Decompression pack uses a fair chunk of RAM, so dynalloc it.
 SPC7110Regs s7r;            // SPC7110 registers, about 33KB
 S7RTC rtc_f9;               // FEOEZ (and Shounen Jump no SHou) RTC
-void S9xUpdateRTC();        // S-RTC function hacked to work with the RTC
+void S9xUpdateRTC(void);        // S-RTC function hacked to work with the RTC
 
 //Emulate power on state
-void S9xSpc7110Init()
+void S9xSpc7110Init(void)
 {
    s7r.DataRomOffset = 0x00100000; //handy constant!
    s7r.DataRomSize = Memory.CalculatedSize - s7r.DataRomOffset;
@@ -140,7 +140,7 @@ void S9xSpc7110Init()
 }
 
 //full cache decompression routine (memcpy) Method 1
-void MovePackData()
+void MovePackData(void)
 {
    //log the last entry
    Data7110* log = &(decompack->tableEnts[decompack->idx].location[decompack->last_idx]);
@@ -222,7 +222,7 @@ void MovePackData()
 
 // This is similar to the last function, but it keeps the last 5 accessed files open,
 // and reads the data directly. Method 2
-void ReadPackData()
+void ReadPackData(void)
 {
    static int32_t table_age_2;
    static int32_t table_age_3;
@@ -358,7 +358,7 @@ void ReadPackData()
 
 //Cache Method 3: some entries are cached, others are file handles.
 //use is_file to distinguish.
-void GetPackData()
+void GetPackData(void)
 {
    Data7110* log = &
                    (decompack->tableEnts[decompack->idx].location[decompack->last_idx]);
@@ -1387,7 +1387,7 @@ int32_t S9xRTCDaysInMonth(int32_t month, int32_t year)
 /* Advance the RTC time                                                                 */
 /**********************************************************************************************/
 
-void  S9xUpdateRTC()
+void  S9xUpdateRTC(void)
 {
    time_t cur_systime;
    int32_t time_diff;
@@ -1745,7 +1745,7 @@ void SPC7110Grab(char* dirname)
 }
 
 //Cache 1 clean up function
-void Del7110Gfx()
+void Del7110Gfx(void)
 {
    int32_t i;
    if (Settings.SPC7110)
@@ -1770,7 +1770,7 @@ void Del7110Gfx()
 }
 
 //Cache2 cleanup function
-void Close7110Gfx()
+void Close7110Gfx(void)
 {
    int32_t i;
    if (Settings.SPC7110)
@@ -1795,7 +1795,7 @@ void Close7110Gfx()
 }
 
 //cache 3's clean-up code
-void Drop7110Gfx()
+void Drop7110Gfx(void)
 {
    int32_t i;
    if (Settings.SPC7110)
@@ -1828,7 +1828,7 @@ void Drop7110Gfx()
 }
 
 //emulate a reset.
-void S9xSpc7110Reset()
+void S9xSpc7110Reset(void)
 {
    s7r.reg4800 = 0;
    s7r.reg4801 = 0;
@@ -1886,7 +1886,7 @@ void S9xSpc7110Reset()
 //there's nothing really weird here, just
 //reading the old log, and writing a new one.
 //note the logs are explicitly little-endian, not host byte order.
-void Do7110Logging()
+void Do7110Logging(void)
 {
    uint8_t ent_temp;
    FILE* flog;
diff --git a/source/spc7110.h b/source/spc7110.h
index 8557071..dd93d50 100644
--- a/source/spc7110.h
+++ b/source/spc7110.h
@@ -7,23 +7,23 @@
 #define DECOMP_BUFFER_SIZE 0x10000
 
 extern void (*LoadUp7110)(char*);
-extern void (*CleanUp7110)();
-extern void (*Copy7110)();
+extern void (*CleanUp7110)(void);
+extern void (*Copy7110)(void);
 
 extern uint16_t cacheMegs;
 
-void Del7110Gfx();
-void Close7110Gfx();
-void Drop7110Gfx();
+void Del7110Gfx(void);
+void Close7110Gfx(void);
+void Drop7110Gfx(void);
 uint8_t S9xGetSPC7110(uint16_t Address);
 uint8_t S9xGetSPC7110Byte(uint32_t Address);
 uint8_t* Get7110BasePtr(uint32_t);
 void S9xSetSPC7110(uint8_t data, uint16_t Address);
-void S9xSpc7110Init();
+void S9xSpc7110Init(void);
 uint8_t* Get7110BasePtr(uint32_t);
-void S9xSpc7110Reset();
-void S9xUpdateRTC();
-void Do7110Logging();
+void S9xSpc7110Reset(void);
+void S9xUpdateRTC(void);
+void Do7110Logging(void);
 int32_t S9xRTCDaysInMonth(int32_t month, int32_t year);
 
 //These are platform-dependant functions, but should work on
diff --git a/source/srtc.c b/source/srtc.c
index bbc05ee..9e7c2e9 100644
--- a/source/srtc.c
+++ b/source/srtc.c
@@ -55,13 +55,13 @@ static int32_t month_keys[12] = { 1, 4, 4, 0, 2, 5, 0, 3, 6, 1, 4, 6 };
  *********************************************************************************************/
 
 
-void S9xResetSRTC()
+void S9xResetSRTC(void)
 {
    rtc.index = -1;
    rtc.mode = MODE_READ;
 }
 
-void S9xHardResetSRTC()
+void S9xHardResetSRTC(void)
 {
    memset(&rtc, 0, sizeof(rtc));
    rtc.index = -1;
@@ -74,10 +74,10 @@ void S9xHardResetSRTC()
 }
 
 /**********************************************************************************************/
-/* S9xSRTCComputeDayOfWeek()                                                                  */
+/* S9xSRTCComputeDayOfWeek(void)                                                                  */
 /* Return 0-6 for Sunday-Saturday                                                             */
 /**********************************************************************************************/
-uint32_t S9xSRTCComputeDayOfWeek()
+uint32_t S9xSRTCComputeDayOfWeek(void)
 {
    uint32_t year = rtc.data[10] * 10 + rtc.data[9];
    uint32_t month = rtc.data[8];
@@ -102,7 +102,7 @@ uint32_t S9xSRTCComputeDayOfWeek()
 
 
 /**********************************************************************************************/
-/* S9xSRTCDaysInMonth()                                                                       */
+/* S9xSRTCDaysInMonth(void)                                                                       */
 /* Return the number of days in a specific month for a certain year                           */
 /**********************************************************************************************/
 int32_t S9xSRTCDaysInMmonth(int32_t month, int32_t year)
@@ -140,10 +140,10 @@ int32_t S9xSRTCDaysInMmonth(int32_t month, int32_t year)
 
 
 /**********************************************************************************************/
-/* S9xUpdateSrtcTime()                                                                        */
+/* S9xUpdateSrtcTime(void)                                                                        */
 /* Advance the  S-RTC time if counting is enabled                                             */
 /**********************************************************************************************/
-void  S9xUpdateSrtcTime()
+void  S9xUpdateSrtcTime(void)
 {
    time_t  cur_systime;
    int32_t time_diff;
@@ -280,7 +280,7 @@ void  S9xUpdateSrtcTime()
 
 
 /**********************************************************************************************/
-/* S9xSetSRTC()                                                                               */
+/* S9xSetSRTC(void)                                                                               */
 /* This function sends data to the S-RTC used in Dai Kaijyu Monogatari II                     */
 /**********************************************************************************************/
 void S9xSetSRTC(uint8_t data, uint16_t Address)
@@ -382,7 +382,7 @@ void S9xSetSRTC(uint8_t data, uint16_t Address)
 }
 
 /**********************************************************************************************/
-/* S9xGetSRTC()                                                                               */
+/* S9xGetSRTC(void)                                                                               */
 /* This function retrieves data from the S-RTC                                                */
 /**********************************************************************************************/
 uint8_t S9xGetSRTC(uint16_t Address)
diff --git a/source/srtc.h b/source/srtc.h
index 0688a54..98fe369 100644
--- a/source/srtc.h
+++ b/source/srtc.h
@@ -45,13 +45,13 @@ typedef struct
 
 extern SRTC_DATA rtc;
 
-void    S9xUpdateSrtcTime();
+void    S9xUpdateSrtcTime(void);
 void    S9xSetSRTC(uint8_t data, uint16_t Address);
 uint8_t S9xGetSRTC(uint16_t Address);
-void    S9xSRTCPreSaveState();
-void    S9xSRTCPostLoadState();
-void    S9xResetSRTC();
-void    S9xHardResetSRTC();
+void    S9xSRTCPreSaveState(void);
+void    S9xSRTCPostLoadState(void);
+void    S9xResetSRTC(void);
+void    S9xHardResetSRTC(void);
 
 #define SRTC_SRAM_PAD (4 + 8 + 1 + MAX_RTC_INDEX)