mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 09:35:32 -07:00
Code Issues Packages Projects Releases Activity

Makefile.mingw corrections and made the code pass much stricter checks (now mandated by Makefile.mignw) to ensure GCC 14 readiness.

Browse Source
This commit is contained in:
OBattler
2022-11-17 22:44:06 +01:00
parent 74eb753d59
commit 27ebb27db7
108 changed files with 682 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpu/386_common.c
View File

@@ -1452,7 +1452,7 @@ x86_int_sw_rm(int num)
void
x86illegal()
x86illegal(void)
{
x86_int(6);
}
@@ -1550,14 +1550,14 @@ idivl(int32_t val)
void
cpu_386_flags_extract()
cpu_386_flags_extract(void)
{
flags_extract();
}
void
cpu_386_flags_rebuild()
cpu_386_flags_rebuild(void)
{
flags_rebuild();
}

22
src/cpu/386_common.h
View File

@@ -225,25 +225,25 @@ static __inline void *get_ram_ptr(uint32_t a)
}
}
static __inline uint8_t getbyte()
static __inline uint8_t getbyte(void)
{
cpu_state.pc++;
return fastreadb(cs + (cpu_state.pc - 1));
}
static __inline uint16_t getword()
static __inline uint16_t getword(void)
{
cpu_state.pc+=2;
return fastreadw(cs+(cpu_state.pc-2));
}
static __inline uint32_t getlong()
static __inline uint32_t getlong(void)
{
cpu_state.pc+=4;
return fastreadl(cs+(cpu_state.pc-4));
}
static __inline uint64_t getquad()
static __inline uint64_t getquad(void)
{
cpu_state.pc+=8;
return fastreadl(cs+(cpu_state.pc-8)) | ((uint64_t)fastreadl(cs+(cpu_state.pc-4)) << 32);
@@ -251,7 +251,7 @@ static __inline uint64_t getquad()
static __inline uint8_t geteab()
static __inline uint8_t geteab(void)
{
if (cpu_mod == 3)
return (cpu_rm & 4) ? cpu_state.regs[cpu_rm & 3].b.h : cpu_state.regs[cpu_rm&3].b.l;
@@ -260,7 +260,7 @@ static __inline uint8_t geteab()
return readmemb(easeg, cpu_state.eaaddr);
}
static __inline uint16_t geteaw()
static __inline uint16_t geteaw(void)
{
if (cpu_mod == 3)
return cpu_state.regs[cpu_rm].w;
@@ -269,7 +269,7 @@ static __inline uint16_t geteaw()
return readmemw(easeg, cpu_state.eaaddr);
}
static __inline uint32_t geteal()
static __inline uint32_t geteal(void)
{
if (cpu_mod == 3)
return cpu_state.regs[cpu_rm].l;
@@ -278,22 +278,22 @@ static __inline uint32_t geteal()
return readmeml(easeg, cpu_state.eaaddr);
}
static __inline uint64_t geteaq()
static __inline uint64_t geteaq(void)
{
return readmemq(easeg, cpu_state.eaaddr);
}
static __inline uint8_t geteab_mem()
static __inline uint8_t geteab_mem(void)
{
if (eal_r) return *(uint8_t *)eal_r;
return readmemb(easeg,cpu_state.eaaddr);
}
static __inline uint16_t geteaw_mem()
static __inline uint16_t geteaw_mem(void)
{
if (eal_r) return *(uint16_t *)eal_r;
return readmemw(easeg,cpu_state.eaaddr);
}
static __inline uint32_t geteal_mem()
static __inline uint32_t geteal_mem(void)
{
if (eal_r) return *eal_r;
return readmeml(easeg,cpu_state.eaaddr);

4
src/cpu/386_dynarec.c
View File

@@ -260,7 +260,7 @@ static void prefetch_run(int instr_cycles, int bytes, int modrm, int reads, int
prefetch_bytes = 16;
}
static void prefetch_flush()
static void prefetch_flush(void)
{
prefetch_bytes = 0;
}
@@ -541,7 +541,7 @@ exec386_dynarec_dyn(void)
if (valid_block && block->was_recompiled)
#endif
{
void (*code)() = (void *)&block->data[BLOCK_START];
void (*code)(void) = (void *)&block->data[BLOCK_START];
#ifndef USE_NEW_DYNAREC
codeblock_hash[hash] = block;

4
src/cpu/386_ops.h
View File

@@ -80,7 +80,7 @@ static __inline void PUSH_L(uint32_t val)
}
}
static __inline uint16_t POP_W()
static __inline uint16_t POP_W(void)
{
uint16_t ret;
if (stack32)
@@ -96,7 +96,7 @@ static __inline uint16_t POP_W()
return ret;
}
static __inline uint32_t POP_L()
static __inline uint32_t POP_L(void)
{
uint32_t ret;
if (stack32)

4
src/cpu/808x.c
View File

@@ -494,7 +494,7 @@ pfq_fetchw(void)
}
static uint16_t
pfq_fetch()
pfq_fetch(void)
{
if (opcode & 1)
return pfq_fetchw();
@@ -520,7 +520,7 @@ pfq_add(int c, int add)
/* Clear the prefetch queue - called on reset and on anything that affects either CS or IP. */
static void
pfq_clear()
pfq_clear(void)
{
pfq_pos = 0;
prefetching = 0;

6
src/cpu/codegen_public.h
View File

@@ -50,11 +50,11 @@
#endif
extern void codegen_init();
extern void codegen_init(void);
#ifdef USE_NEW_DYNAREC
extern void codegen_close();
extern void codegen_close(void);
#endif
extern void codegen_flush();
extern void codegen_flush(void);
/*Current physical page of block being recompiled. -1 if no recompilation taking place */

6
src/cpu/codegen_timing_486.c
View File

@@ -283,12 +283,12 @@ static inline int COUNT(int *c, int op_32)
return *c;
}
void codegen_timing_486_block_start()
void codegen_timing_486_block_start(void)
{
regmask_modified = 0;
}
void codegen_timing_486_start()
void codegen_timing_486_start(void)
{
timing_count = 0;
last_prefix = 0;
@@ -406,7 +406,7 @@ void codegen_timing_486_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, uin
regmask_modified = get_dstdep_mask(deps[opcode], fetchdat, bit8);
}
void codegen_timing_486_block_end()
void codegen_timing_486_block_end(void)
{
}

6
src/cpu/codegen_timing_686.c
View File

@@ -774,13 +774,13 @@ static inline int COUNT(uint32_t c, int op_32)
return c & CYCLES_MASK;
}
void codegen_timing_686_block_start()
void codegen_timing_686_block_start(void)
{
prev_full = decode_delay = 0;
regmask_modified = last_regmask_modified = 0;
}
void codegen_timing_686_start()
void codegen_timing_686_start(void)
{
decode_delay = 0;
last_prefix = 0;
@@ -1036,7 +1036,7 @@ void codegen_timing_686_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, uin
}
}
void codegen_timing_686_block_end()
void codegen_timing_686_block_end(void)
{
if (prev_full)
{

10
src/cpu/codegen_timing_k6.c
View File

@@ -1858,7 +1858,7 @@ static int fpu_st_timestamp[8];
dependent uop chains*/
static int last_uop_timestamp = 0;
void decode_flush()
void decode_flush(void)
{
int c;
int uop_timestamp = 0;
@@ -2112,7 +2112,7 @@ static void decode_instruction(const risc86_instruction_t *ins, uint64_t deps, u
}
}
void codegen_timing_k6_block_start()
void codegen_timing_k6_block_start(void)
{
int c;
@@ -2136,7 +2136,7 @@ void codegen_timing_k6_block_start()
fpu_st_timestamp[c] = 0;
}
void codegen_timing_k6_start()
void codegen_timing_k6_start(void)
{
if (cpu_s->cpu_type == CPU_K6)
{
@@ -2324,7 +2324,7 @@ void codegen_timing_k6_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, uint
codegen_block_cycles += (last_complete_timestamp - old_last_complete_timestamp);
}
void codegen_timing_k6_block_end()
void codegen_timing_k6_block_end(void)
{
if (decode_buffer.nr_uops)
{
@@ -2334,7 +2334,7 @@ void codegen_timing_k6_block_end()
}
}
int codegen_timing_k6_jump_cycles()
int codegen_timing_k6_jump_cycles(void)
{
if (decode_buffer.nr_uops)
return 1;

10
src/cpu/codegen_timing_p6.c
View File

@@ -1691,7 +1691,7 @@ static int fpu_st_timestamp[8];
dependent uop chains*/
static int last_uop_timestamp = 0;
void decode_flush_p6()
void decode_flush_p6(void)
{
int c;
int start_timestamp, uop_timestamp = 0;
@@ -1926,7 +1926,7 @@ static void decode_instruction(const macro_op_t *ins, uint64_t deps, uint32_t fe
}
}
void codegen_timing_p6_block_start()
void codegen_timing_p6_block_start(void)
{
int c;
@@ -1946,7 +1946,7 @@ void codegen_timing_p6_block_start()
fpu_st_timestamp[c] = 0;
}
void codegen_timing_p6_start()
void codegen_timing_p6_start(void)
{
if (cpu_s->cpu_type == CPU_PENTIUMPRO)
{
@@ -2083,7 +2083,7 @@ void codegen_timing_p6_opcode(uint8_t opcode, uint32_t fetchdat, int op_32, uint
codegen_block_cycles += (last_complete_timestamp - old_last_complete_timestamp);
}
void codegen_timing_p6_block_end()
void codegen_timing_p6_block_end(void)
{
if (decode_buffer.nr_uops)
{
@@ -2093,7 +2093,7 @@ void codegen_timing_p6_block_end()
}
}
int codegen_timing_p6_jump_cycles()
int codegen_timing_p6_jump_cycles(void)
{
if (decode_buffer.nr_uops)
return 1;

6
src/cpu/codegen_timing_pentium.c
View File

@@ -931,12 +931,12 @@ static inline int codegen_timing_instr_length(uint64_t timing, uint32_t fetchdat
return len;
}
void codegen_timing_pentium_block_start()
void codegen_timing_pentium_block_start(void)
{
u_pipe_full = decode_delay = decode_delay_offset = 0;
}
void codegen_timing_pentium_start()
void codegen_timing_pentium_start(void)
{
last_prefix = 0;
prefixes = 0;
@@ -1296,7 +1296,7 @@ nopair:
addr_regmask = 0;
}
void codegen_timing_pentium_block_end()
void codegen_timing_pentium_block_end(void)
{
if (u_pipe_full)
{

6
src/cpu/codegen_timing_winchip.c
View File

@@ -283,12 +283,12 @@ static inline int COUNT(int *c, int op_32)
return *c;
}
void codegen_timing_winchip_block_start()
void codegen_timing_winchip_block_start(void)
{
regmask_modified = 0;
}
void codegen_timing_winchip_start()
void codegen_timing_winchip_start(void)
{
timing_count = 0;
last_prefix = 0;
@@ -406,7 +406,7 @@ void codegen_timing_winchip_opcode(uint8_t opcode, uint32_t fetchdat, int op_32,
regmask_modified = get_dstdep_mask(deps[opcode], fetchdat, bit8);
}
void codegen_timing_winchip_block_end()
void codegen_timing_winchip_block_end(void)
{
}

6
src/cpu/codegen_timing_winchip2.c
View File

@@ -541,14 +541,14 @@ static void codegen_instruction(uint32_t *timings, uint64_t *deps, uint8_t opcod
}
}
static void codegen_timing_winchip2_block_start()
static void codegen_timing_winchip2_block_start(void)
{
regmask_modified = 0;
decode_delay = decode_delay_offset = 0;
u_pipe_full = 0;
}
static void codegen_timing_winchip2_start()
static void codegen_timing_winchip2_start(void)
{
timing_count = 0;
last_prefix = 0;
@@ -719,7 +719,7 @@ static void codegen_timing_winchip2_opcode(uint8_t opcode, uint32_t fetchdat, in
regmask_modified = get_dstdep_mask(deps[opcode], fetchdat, bit8);
}
static void codegen_timing_winchip2_block_end()
static void codegen_timing_winchip2_block_end(void)
{
if (u_pipe_full)
{

4
src/cpu/cpu.h
View File

@@ -740,7 +740,7 @@ extern void cpu_fast_off_advance(void);
extern void cpu_fast_off_period_set(uint16_t vla, double period);
extern void cpu_fast_off_reset(void);
extern void smi_raise();
extern void nmi_raise();
extern void smi_raise(void);
extern void nmi_raise(void);
#endif /*EMU_CPU_H*/

4
src/cpu/x86.h
View File

@@ -77,7 +77,7 @@ enum
extern void x86_doabrt(int x86_abrt);
extern void x86illegal();
extern void x86seg_reset();
extern void x86illegal(void);
extern void x86seg_reset(void);
extern void x86gpf(char *s, uint16_t error);
extern void x86gpf_expected(char *s, uint16_t error);

24
src/cpu/x86_flags.h
View File

@@ -58,7 +58,7 @@ enum
#endif
};
static __inline int ZF_SET()
static __inline int ZF_SET(void)
{
switch (cpu_state.flags_op)
{
@@ -117,7 +117,7 @@ static __inline int ZF_SET()
#endif
}
static __inline int NF_SET()
static __inline int NF_SET(void)
{
switch (cpu_state.flags_op)
{
@@ -184,7 +184,7 @@ static __inline int NF_SET()
#endif
}
static __inline int PF_SET()
static __inline int PF_SET(void)
{
switch (cpu_state.flags_op)
{
@@ -243,7 +243,7 @@ static __inline int PF_SET()
#endif
}
static __inline int VF_SET()
static __inline int VF_SET(void)
{
switch (cpu_state.flags_op)
{
@@ -336,7 +336,7 @@ static __inline int VF_SET()
#endif
}
static __inline int AF_SET()
static __inline int AF_SET(void)
{
switch (cpu_state.flags_op)
{
@@ -409,7 +409,7 @@ static __inline int AF_SET()
#endif
}
static __inline int CF_SET()
static __inline int CF_SET(void)
{
switch (cpu_state.flags_op)
{
@@ -502,7 +502,7 @@ static __inline int CF_SET()
#endif
}
static __inline void flags_rebuild()
static __inline void flags_rebuild(void)
{
if (cpu_state.flags_op != FLAGS_UNKNOWN)
{
@@ -518,12 +518,12 @@ static __inline void flags_rebuild()
}
}
static __inline void flags_extract()
static __inline void flags_extract(void)
{
cpu_state.flags_op = FLAGS_UNKNOWN;
}
static __inline void flags_rebuild_c()
static __inline void flags_rebuild_c(void)
{
if (cpu_state.flags_op != FLAGS_UNKNOWN)
{
@@ -535,7 +535,7 @@ static __inline void flags_rebuild_c()
}
#ifdef USE_NEW_DYNAREC
static __inline int flags_res_valid()
static __inline int flags_res_valid(void)
{
if (cpu_state.flags_op == FLAGS_UNKNOWN ||
(cpu_state.flags_op >= FLAGS_ROL8 && cpu_state.flags_op <= FLAGS_ROR32))
@@ -779,5 +779,5 @@ static __inline void setsbc32(uint32_t a, uint32_t b)
}
#endif
extern void cpu_386_flags_extract();
extern void cpu_386_flags_rebuild();
extern void cpu_386_flags_extract(void);
extern void cpu_386_flags_rebuild(void);

6
src/cpu/x86seg.c
View File

@@ -94,7 +94,7 @@ seg_reset(x86seg *s)
void
x86seg_reset()
x86seg_reset(void)
{
seg_reset(&cpu_state.seg_cs);
seg_reset(&cpu_state.seg_ds);
@@ -838,7 +838,7 @@ PUSHL(uint32_t v)
uint16_t
POPW()
POPW(void)
{
uint16_t tempw;
if (stack32) {
@@ -857,7 +857,7 @@ POPW()
uint32_t
POPL()
POPL(void)
{
uint32_t templ;

6
src/cpu/x87.c
View File

@@ -47,7 +47,7 @@ fpu_log(const char *fmt, ...)
#define X87_TAG_EMPTY 3
#ifdef USE_NEW_DYNAREC
uint16_t x87_gettag()
uint16_t x87_gettag(void)
{
uint16_t ret = 0;
int c;
@@ -84,7 +84,7 @@ void x87_settag(uint16_t new_tag)
}
}
#else
uint16_t x87_gettag()
uint16_t x87_gettag(void)
{
uint16_t ret = 0;
int c;
@@ -115,7 +115,7 @@ void x87_settag(uint16_t new_tag)
#ifdef ENABLE_808X_LOG
void x87_dumpregs()
void x87_dumpregs(void)
{
if (cpu_state.ismmx)
{

6
src/cpu/x87.h
View File

@@ -6,7 +6,7 @@
extern uint32_t x87_pc_off,x87_op_off;
extern uint16_t x87_pc_seg,x87_op_seg;
static __inline void x87_set_mmx()
static __inline void x87_set_mmx(void)
{
uint64_t *p;
cpu_state.TOP = 0;
@@ -15,7 +15,7 @@ static __inline void x87_set_mmx()
cpu_state.ismmx = 1;
}
static __inline void x87_emms()
static __inline void x87_emms(void)
{
uint64_t *p;
p = (uint64_t *)cpu_state.tag;
@@ -24,7 +24,7 @@ static __inline void x87_emms()
}
uint16_t x87_gettag();
uint16_t x87_gettag(void);
void x87_settag(uint16_t new_tag);
#define TAG_EMPTY 0

6
src/cpu/x87_ops.h
View File

@@ -97,7 +97,7 @@ static int rounding_modes[4] = {FE_TONEAREST, FE_DOWNWARD, FE_UPWARD, FE_TOWARDZ
} while (0)
#endif
static __inline void x87_checkexceptions()
static __inline void x87_checkexceptions(void)
{
}
@@ -139,7 +139,7 @@ static __inline void x87_push_u64(uint64_t i)
#endif
}
static __inline double x87_pop()
static __inline double x87_pop(void)
{
double t = cpu_state.ST[cpu_state.TOP&7];
cpu_state.tag[cpu_state.TOP&7] = TAG_EMPTY;
@@ -242,7 +242,7 @@ static __inline int64_t x87_fround(double b)
#include "x87_ops_conv.h"
static __inline double x87_ld80()
static __inline double x87_ld80(void)
{
x87_conv_t test;
test.eind.ll = readmeml(easeg,cpu_state.eaaddr);

8
src/cpu/x87_ops_misc.h
View File

@@ -119,7 +119,7 @@ static int opFSTP(uint32_t fetchdat)
static int FSTOR()
static int FSTOR(void)
{
uint64_t *p;
FP_ENTER();
@@ -191,7 +191,7 @@ static int opFSTOR_a32(uint32_t fetchdat)
}
#endif
static int FSAVE()
static int FSAVE(void)
{
uint64_t *p;
@@ -751,7 +751,7 @@ static int opFCOS(uint32_t fetchdat)
#endif
static int FLDENV()
static int FLDENV(void)
{
FP_ENTER();
switch ((cr0 & 1) | (cpu_state.op32 & 0x100))
@@ -828,7 +828,7 @@ static int opFLDCW_a32(uint32_t fetchdat)
}
#endif
static int FSTENV()
static int FSTENV(void)
{
FP_ENTER();
cpu_state.npxs = (cpu_state.npxs & ~(7 << 11)) | ((cpu_state.TOP & 7) << 11);