Merge branch 'master' of https://github.com/86Box/86Box

src/include/86box/chipset.h

@@ -95,9 +95,7 @@ extern const device_t	sis_85c461_device;
 extern const device_t	sis_85c471_device;
 extern const device_t	sis_85c496_device;
 extern const device_t	sis_85c496_ls486e_device;
-#if defined(DEV_BRANCH) && defined(USE_SIS_85C50X)
 extern const device_t	sis_85c50x_device;
-#endif
 
 /* ST */
 #if defined(DEV_BRANCH) && defined(USE_STPC)

src/include/86box/machine.h

@@ -301,6 +301,7 @@ extern int	machine_at_403tg_init(const machine_t *);
 extern int	machine_at_pc330_6571_init(const machine_t *);
 
 extern int	machine_at_sis401_init(const machine_t *);
+extern int	machine_at_av4_init(const machine_t *);
 extern int	machine_at_valuepoint433_init(const machine_t *);
 
 extern int	machine_at_vli486sv2g_init(const machine_t *);
@@ -354,10 +355,8 @@ extern int	machine_at_excalibur_init(const machine_t *);
 
 extern int	machine_at_batman_init(const machine_t *);
 extern int	machine_at_ambradp60_init(const machine_t *);
-#if defined(DEV_BRANCH) && defined(USE_DELLS4)
 extern int	machine_at_dellxp60_init(const machine_t *);
 extern int	machine_at_opti560l_init(const machine_t *);
-#endif
 extern int	machine_at_valuepointp60_init(const machine_t *);
 extern int	machine_at_p5mp3_init(const machine_t *);
 extern int	machine_at_pb520r_init(const machine_t *);
@@ -376,6 +375,10 @@ extern int	machine_at_vectra54_init(const machine_t *);
 extern int	machine_at_powermate_v_init(const machine_t *);
 extern int	machine_at_acerv30_init(const machine_t *);
 
+extern int	machine_at_p5sp4_init(const machine_t *);
+extern int	machine_at_p54sp4_init(const machine_t *);
+extern int	machine_at_sq588_init(const machine_t *);
+
 #ifdef EMU_DEVICE_H
 extern const device_t	*at_endeavor_get_device(void);
 #define at_vectra54_get_device at_endeavor_get_device

src/include/86box/sio.h

@@ -23,6 +23,7 @@ extern const device_t	f82c710_device;
 extern const device_t	fdc37c661_device;
 extern const device_t	fdc37c663_device;
 extern const device_t	fdc37c665_device;
+extern const device_t	fdc37c665_ide_device;
 extern const device_t	fdc37c666_device;
 extern const device_t	fdc37c669_device;
 extern const device_t	fdc37c669_370_device;

src/include/86box/vid_svga.h

@@ -22,6 +22,7 @@
 #define	FLAG_ADDR_BY8		2
 #define FLAG_EXT_WRITE		4
 #define FLAG_LATCH8		8
+#define FLAG_NOSKEW		16
 
 
 typedef struct {

src/include/86box/vid_voodoo_codegen_x86-64.h

@@ -9,13 +9,17 @@
 #include <sys/mman.h>
 #include <unistd.h>
 #endif
-#if WIN64
+#if _WIN64
 #define BITMAP windows_BITMAP
 #include <windows.h>
 #undef BITMAP
 #endif
 
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
 #include <xmmintrin.h>
+#endif
 
 #define BLOCK_NUM 8
 #define BLOCK_MASK (BLOCK_NUM-1)
@@ -752,7 +756,7 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo
         addbyte(0x6f);
         addbyte(0x07 | (3 << 3));
 
-#if WIN64
+#if _WIN64
         addbyte(0x48); /*MOV RDI, RCX (voodoo_state)*/
         addbyte(0x89);
         addbyte(0xcf);
@@ -3428,7 +3432,7 @@ void voodoo_codegen_init(voodoo_t *voodoo)
 {
         int c;
 
-#if WIN64
+#if _WIN64
         voodoo->codegen_data = VirtualAlloc(NULL, sizeof(voodoo_x86_data_t) * BLOCK_NUM * 4, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
 #else
         voodoo->codegen_data = mmap(0, sizeof(voodoo_x86_data_t) * BLOCK_NUM*4, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_ANON|MAP_PRIVATE, 0, 0);
@@ -3458,7 +3462,7 @@ void voodoo_codegen_init(voodoo_t *voodoo)
 
 void voodoo_codegen_close(voodoo_t *voodoo)
 {
-#if WIN64
+#if _WIN64
         VirtualFree(voodoo->codegen_data, 0, MEM_RELEASE);
 #else
         munmap(voodoo->codegen_data, sizeof(voodoo_x86_data_t) * BLOCK_NUM*4);

src/include/86box/vid_voodoo_codegen_x86.h

@@ -15,7 +15,11 @@
 #undef BITMAP
 #endif
 
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
 #include <xmmintrin.h>
+#endif
 
 #define BLOCK_NUM 8
 #define BLOCK_MASK (BLOCK_NUM-1)

src/include/86box/vid_voodoo_render.h

@@ -1,4 +1,4 @@
-#if !(defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32) && !(defined __amd64__)
+#if !(defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined __amd64__ || defined _M_X64)
 #define NO_CODEGEN
 #endif