claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix Clang/WinSDK warnings

Browse Source
This commit is contained in:
David Hrdlička
2021-03-21 01:59:46 +01:00
parent c54c4c842c
commit 10cc122925
18 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -33,7 +33,17 @@ include(CPack)
include(CMakeDependentOption) include(CMakeDependentOption)
add_compile_definitions(CMAKE) add_compile_definitions(CMAKE)
add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
if(WIN32)
# Disables *_s function warnings
add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
# Disables POSIX name warnings
add_compile_definitions(_CRT_NONSTDC_NO_WARNINGS)
# Disables WinSock deprecation warnings
add_compile_definitions(_WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
option(RELEASE "Release build" OFF) option(RELEASE "Release build" OFF)
option(USB "USB support" OFF) option(USB "USB support" OFF)

2
src/chipset/headland.c
View File

@@ -132,7 +132,7 @@ get_addr(headland_t *dev, uint32_t addr, headland_mr_t *mr)
if (mr && mr->valid && (dev->cr[0] & 2) && (mr->mr & 0x200)) { if (mr && mr->valid && (dev->cr[0] & 2) && (mr->mr & 0x200)) {
addr = (addr & 0x3fff) | ((mr->mr & 0x1F) << 14); addr = (addr & 0x3fff) | ((mr->mr & 0x1F) << 14);
bank = (mr->mr >> 7) && 3; bank = (mr->mr >> 7) & 3;
if (bank_shift[bank] >= 21) if (bank_shift[bank] >= 21)
addr |= (mr->mr & 0x060) << 14; addr |= (mr->mr & 0x060) << 14;

2
src/chipset/umc_hb4.c
View File

@@ -366,7 +366,7 @@ hb4_init(const device_t *info)
hb4_t *dev = (hb4_t *)malloc(sizeof(hb4_t)); hb4_t *dev = (hb4_t *)malloc(sizeof(hb4_t));
memset(dev, 0, sizeof(hb4_t)); memset(dev, 0, sizeof(hb4_t));
dev->has_ide = (info->local && 0x886a); dev->has_ide = (info->local & 0x886a);
pci_add_card(PCI_ADD_NORTHBRIDGE, um8881_read, um8881_write, dev); /* Device 10: UMC 8881x */ pci_add_card(PCI_ADD_NORTHBRIDGE, um8881_read, um8881_write, dev); /* Device 10: UMC 8881x */
pci_add_card(PCI_ADD_SOUTHBRIDGE, um8886_read, um8886_write, dev); /* Device 12: UMC 8886xx */ pci_add_card(PCI_ADD_SOUTHBRIDGE, um8886_read, um8886_write, dev); /* Device 12: UMC 8886xx */

2
src/chipset/wd76c10.c
View File

@@ -332,7 +332,7 @@ wd76c10_write(uint16_t addr, uint16_t val, void *priv)
case 0xf073: case 0xf073:
dev->lock_reg = val & 0x00ff; dev->lock_reg = val & 0x00ff;
LOCK = !(val && 0x00da); LOCK = !(val & 0x00da);
break; break;
} }
} }

2
src/cpu/386_common.c
View File

@@ -1060,7 +1060,7 @@ enter_smm(int in_hlt)
smram_recalc_all(0); smram_recalc_all(0);
if (cpu_iscyrix) { if (cpu_iscyrix) {
if (!cyrix.smhr & SMHR_VALID) if (!(cyrix.smhr & SMHR_VALID))
cyrix.smhr = (cyrix.arr[3].base + cyrix.arr[3].size) | SMHR_VALID; cyrix.smhr = (cyrix.arr[3].base + cyrix.arr[3].size) | SMHR_VALID;
smram_state = cyrix.smhr & SMHR_ADDR_MASK; smram_state = cyrix.smhr & SMHR_ADDR_MASK;
} }

2
src/cpu/cpu.h
View File

@@ -268,7 +268,7 @@ typedef struct {
int32_t rm_mod_reg_data; int32_t rm_mod_reg_data;
} rm_data; } rm_data;
int8_t ssegs, ismmx, uint8_t ssegs, ismmx,
abrt, pad; abrt, pad;
int _cycles; int _cycles;

12
src/cpu/x87_ops.h
View File

@@ -47,9 +47,13 @@ static int rounding_modes[4] = {FE_TONEAREST, FE_DOWNWARD, FE_UPWARD, FE_TOWARDZ
#define STATUS_ZERODIVIDE 4 #define STATUS_ZERODIVIDE 4
#if defined(_MSC_VER) && !defined(__clang__) #if defined(_MSC_VER) && !defined(__clang__)
# define X87_INLINE_ASM defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 # if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
# define X87_INLINE_ASM
# endif
#else #else
# define X87_INLINE_ASM defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined _M_X64 || defined __amd64__ # if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined _M_X64 || defined __amd64__
# define X87_INLINE_ASM
# endif
#endif #endif
#ifdef FPU_8087 #ifdef FPU_8087
@@ -317,7 +321,7 @@ static __inline void x87_stmmx(MMX_REG r)
static __inline uint16_t x87_compare(double a, double b) static __inline uint16_t x87_compare(double a, double b)
{ {
#if X87_INLINE_ASM #ifdef X87_INLINE_ASM
uint32_t result; uint32_t result;
double ea = a, eb = b; double ea = a, eb = b;
const uint64_t ia = 0x3fec1a6ff866a936ull; const uint64_t ia = 0x3fec1a6ff866a936ull;
@@ -379,7 +383,7 @@ static __inline uint16_t x87_compare(double a, double b)
static __inline uint16_t x87_ucompare(double a, double b) static __inline uint16_t x87_ucompare(double a, double b)
{ {
#if X87_INLINE_ASM #ifdef X87_INLINE_ASM
uint32_t result; uint32_t result;
#if !defined(_MSC_VER) || defined(__clang__) #if !defined(_MSC_VER) || defined(__clang__)

2
src/device/hwm_lm78.c
View File

@@ -366,7 +366,7 @@ lm78_read(lm78_t *dev, uint8_t reg, uint8_t bank)
else if ((masked_reg >= 0x28) && (masked_reg <= 0x2a)) /* fan speeds */ else if ((masked_reg >= 0x28) && (masked_reg <= 0x2a)) /* fan speeds */
ret = LM78_RPM_TO_REG(dev->values->fans[reg & 3], 1 << ((dev->regs[((reg & 3) == 2) ? 0x4b : 0x47] >> ((reg & 3) ? 6 : 4)) & 0x3)); ret = LM78_RPM_TO_REG(dev->values->fans[reg & 3], 1 << ((dev->regs[((reg & 3) == 2) ? 0x4b : 0x47] >> ((reg & 3) ? 6 : 4)) & 0x3));
else if ((reg == 0x4f) && (dev->local & LM78_WINBOND)) /* two-byte vendor ID register */ else if ((reg == 0x4f) && (dev->local & LM78_WINBOND)) /* two-byte vendor ID register */
ret = (dev->regs[0x4e] & 0x80) ? (LM78_WINBOND_VENDOR_ID >> 8) : LM78_WINBOND_VENDOR_ID; ret = (dev->regs[0x4e] & 0x80) ? (uint8_t) (LM78_WINBOND_VENDOR_ID >> 8) : (uint8_t) LM78_WINBOND_VENDOR_ID;
else else
ret = dev->regs[masked_reg]; ret = dev->regs[masked_reg];
} }

2
src/machine/machine_table.c
View File

@@ -451,7 +451,7 @@ const machine_t machines[] = {
int int
machine_count(void) machine_count(void)
{ {
return((sizeof(machines) / sizeof(machine)) - 1); return((sizeof(machines) / sizeof(machine_t)) - 1);
} }

5
src/network/net_pcnet.c
View File

@@ -1997,11 +1997,6 @@ pcnet_csr_readw(nic_t *dev, uint16_t rap)
return pcnet_bcr_readw(dev,BCR_SWS); return pcnet_bcr_readw(dev,BCR_SWS);
case 68: /* Custom register to pass link speed to driver */ case 68: /* Custom register to pass link speed to driver */
return pcnetLinkSpd(dev->u32LinkSpeed); return pcnetLinkSpd(dev->u32LinkSpeed);
case 88:
val = dev->aCSR[89];
val <<= 16;
val |= dev->aCSR[88];
break;
default: default:
val = dev->aCSR[rap]; val = dev->aCSR[rap];
break; break;

2
src/network/slirp/util.h
View File

@@ -48,7 +48,7 @@
#if defined(_MSC_VER) && !defined(__clang__) #if defined(_MSC_VER) && !defined(__clang__)
#define SLIRP_PACKED #define SLIRP_PACKED
#elif defined(_WIN32) && (defined(__x86_64__) || defined(__i386__)) #elif defined(_WIN32) && (defined(__x86_64__) || defined(__i386__)) && !defined(__clang__)
#define SLIRP_PACKED __attribute__((gcc_struct, packed)) #define SLIRP_PACKED __attribute__((gcc_struct, packed))
#else #else
#define SLIRP_PACKED __attribute__((packed)) #define SLIRP_PACKED __attribute__((packed))

2
src/nvr_at.c
View File

@@ -675,7 +675,7 @@ nvr_read(uint16_t addr, void *priv)
cycles -= ISA_CYCLES(8); cycles -= ISA_CYCLES(8);
if (/* (addr & 1) && */(local->bank[addr_id] == 0xff)) if (local->bank[addr_id] == 0xff)
return 0xff; return 0xff;
if (addr & 1) switch(local->addr[addr_id]) { if (addr & 1) switch(local->addr[addr_id]) {

4
src/printer/prt_escp.c
View File

@@ -520,7 +520,7 @@ reset_printer(escp_t *dev)
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)
dev->horizontal_tabs[i] = i * 8.0 * (1.0 / dev->cpi); dev->horizontal_tabs[i] = i * 8.0 * (1.0 / dev->cpi);
dev->num_horizontal_tabs = 32; dev->num_horizontal_tabs = 32;
dev->num_vertical_tabs = 255; dev->num_vertical_tabs = -1;
if (dev->page != NULL) if (dev->page != NULL)
dev->page->dirty = 0; dev->page->dirty = 0;
@@ -885,7 +885,7 @@ process_char(escp_t *dev, uint8_t ch)
(dev->num_vertical_tabs > 0 && dev->vertical_tabs[dev->num_vertical_tabs - 1] > (double)ch * dev->linespacing)) { (dev->num_vertical_tabs > 0 && dev->vertical_tabs[dev->num_vertical_tabs - 1] > (double)ch * dev->linespacing)) {
dev->esc_pending = 0; dev->esc_pending = 0;
} else { } else {
if (dev->num_vertical_tabs < 16) if (dev->num_vertical_tabs >= 0 && dev->num_vertical_tabs < 16)
dev->vertical_tabs[dev->num_vertical_tabs++] = (double)ch * dev->linespacing; dev->vertical_tabs[dev->num_vertical_tabs++] = (double)ch * dev->linespacing;
} }
} }

2
src/sio/sio_pc87311.c
View File

@@ -161,7 +161,7 @@ void pc87311_uart_handler(uint8_t num, pc87311_t *dev)
{ {
serial_remove(dev->uart[num & 1]); serial_remove(dev->uart[num & 1]);
switch ((!num & 1) ? UART1_BA : UART2_BA) switch (!(num & 1) ? UART1_BA : UART2_BA)
{ {
case 0: case 0:
dev->base = 0x03f8; dev->base = 0x03f8;

20
src/sio/sio_w83877f.c
View File

@@ -190,20 +190,12 @@ w83877f_serial_handler(w83877f_t *dev, int uart)
if (!(dev->regs[4] & reg_mask) && (dev->regs[reg_id] & 0xc0)) if (!(dev->regs[4] & reg_mask) && (dev->regs[reg_id] & 0xc0))
serial_setup(dev->uart[uart], make_port(dev, reg_id), (dev->regs[0x28] & irq_mask) >> irq_shift); serial_setup(dev->uart[uart], make_port(dev, reg_id), (dev->regs[0x28] & irq_mask) >> irq_shift);
switch (!!(dev->regs[0x19] & (0x02 >> uart))) { if (dev->regs[0x19] & (0x02 >> uart)) {
case 0: clock_src = 14769000.0;
switch (!!(dev->regs[0x03] & (0x02 >> uart))) { } else if (dev->regs[0x03] & (0x02 >> uart)) {
case 0: clock_src = 24000000.0 / 12.0;
clock_src = 24000000.0 / 13.0; } else {
break; clock_src = 24000000.0 / 13.0;
case 1:
clock_src = 24000000.0 / 12.0;
break;
}
break;
case 1:
clock_src = 14769000.0;
break;
} }
serial_set_clock_src(dev->uart[uart], clock_src); serial_set_clock_src(dev->uart[uart], clock_src);

2
src/sound/munt/Structures.h
View File

@@ -28,7 +28,7 @@ namespace MT32Emu {
#define MT32EMU_MEMADDR(x) ((((x) & 0x7f0000) >> 2) | (((x) & 0x7f00) >> 1) | ((x) & 0x7f)) #define MT32EMU_MEMADDR(x) ((((x) & 0x7f0000) >> 2) | (((x) & 0x7f00) >> 1) | ((x) & 0x7f))
#define MT32EMU_SYSEXMEMADDR(x) ((((x) & 0x1FC000) << 2) | (((x) & 0x3F80) << 1) | ((x) & 0x7f)) #define MT32EMU_SYSEXMEMADDR(x) ((((x) & 0x1FC000) << 2) | (((x) & 0x3F80) << 1) | ((x) & 0x7f))
#ifdef _MSC_VER #if defined(_MSC_VER) && !defined(__clang__)
#define MT32EMU_ALIGN_PACKED __declspec(align(1)) #define MT32EMU_ALIGN_PACKED __declspec(align(1))
#else #else
#define MT32EMU_ALIGN_PACKED __attribute__((packed)) #define MT32EMU_ALIGN_PACKED __attribute__((packed))

1
src/win/win.c
View File

@@ -32,6 +32,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <wchar.h> #include <wchar.h>
#include <io.h>
#define HAVE_STDARG_H #define HAVE_STDARG_H
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/config.h> #include <86box/config.h>

2
src/win/win_dialog.c
View File

@@ -35,7 +35,7 @@
#define STRING_OR_RESOURCE(s) ((!(s)) ? (NULL) : ((((uintptr_t)s) < ((uintptr_t)65636)) ? (MAKEINTRESOURCE(s)) : (s))) #define STRING_OR_RESOURCE(s) ((!(s)) ? (NULL) : ((((uintptr_t)s) < ((uintptr_t)65636)) ? (MAKEINTRESOURCE((uintptr_t)s)) : (s)))
WCHAR wopenfilestring[512]; WCHAR wopenfilestring[512];