80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Make everything compile correctly

Browse Source 
Everything should compile fine now.
This commit is contained in:
nerd73
2020-03-23 13:05:44 -06:00
parent d555614739
commit 169bd9bdab
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu_common/cpu.c
View File

@@ -2528,10 +2528,6 @@ void cpu_RDMSR()
EAX = mtrr_fix4k_msr[ECX - 0x268] & 0xffffffff; EAX = mtrr_fix4k_msr[ECX - 0x268] & 0xffffffff;
EDX = mtrr_fix4k_msr[ECX - 0x268] >> 32; EDX = mtrr_fix4k_msr[ECX - 0x268] >> 32;
break; break;
case 0x277:
EAX = pat_msr & 0xffffffff;
EDX = pat_msr >> 32;
break;
case 0x2FF: case 0x2FF:
EAX = mtrr_deftype_msr & 0xffffffff; EAX = mtrr_deftype_msr & 0xffffffff;
EDX = mtrr_deftype_msr >> 32; EDX = mtrr_deftype_msr >> 32;

2
src/cpu_common/cpu.h
View File

@@ -215,9 +215,7 @@ typedef union {
int16_t sw[4]; int16_t sw[4];
uint8_t b[8]; uint8_t b[8];
int8_t sb[8]; int8_t sb[8];
#ifdef USE_NEW_DYNAREC
float f[2]; float f[2];
#endif
} MMX_REG; } MMX_REG;
typedef struct { typedef struct {

4
src/machine/m_at_socket8.c
View File

@@ -136,8 +136,8 @@ machine_at_6abx3_init(const machine_t *model)
device_add(&intel_flash_bxt_device); device_add(&intel_flash_bxt_device);
return ret; return ret;
}
##if defined(DEV_BRANCH) && defined(USE_I686) #if defined(DEV_BRANCH) && defined(USE_I686)
int int
machine_at_p2bls_init(const machine_t *model) machine_at_p2bls_init(const machine_t *model)
{ {