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

Fixed compile-breaking bugs.

Browse Source
This commit is contained in:
OBattler
2017-06-01 18:55:01 +02:00
parent d8e66ad829
commit 6491036670
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/CPU/386.c
View File

@@ -28,6 +28,13 @@ uint32_t oldpc2;
int trap; int trap;
uint16_t flags,eflags;
uint32_t oldds,oldss,olddslimit,oldsslimit,olddslimitw,oldsslimitw;
x86seg gdt,ldt,idt,tr;
x86seg _cs,_ds,_es,_ss,_fs,_gs;
x86seg _oldds;
extern int cpl_override; extern int cpl_override;
@@ -40,6 +47,9 @@ uint16_t ea_rseg;
int is486; int is486;
int cgate32; int cgate32;
uint32_t cr2, cr3, cr4;
uint32_t dr[8];
uint8_t romext[32768]; uint8_t romext[32768];

2
src/CPU/cpu.c
View File

@@ -74,6 +74,7 @@ int cpu_hasrdtsc;
int cpu_hasMMX, cpu_hasMSR; int cpu_hasMMX, cpu_hasMSR;
int cpu_hasCR4; int cpu_hasCR4;
int cpu_use_dynarec; int cpu_use_dynarec;
int cpu_pci_speed;
uint64_t cpu_CR4_mask; uint64_t cpu_CR4_mask;
@@ -606,6 +607,7 @@ void cpu_set()
if (cpu_s->multi) if (cpu_s->multi)
cpu_busspeed = cpu_s->rspeed / cpu_s->multi; cpu_busspeed = cpu_s->rspeed / cpu_s->multi;
cpu_multi = cpu_s->multi; cpu_multi = cpu_s->multi;
cpu_pci_speed = cpu_s->pci_speed;
cpu_hasrdtsc = 0; cpu_hasrdtsc = 0;
cpu_hasMMX = 0; cpu_hasMMX = 0;
cpu_hasMSR = 0; cpu_hasMSR = 0;

1
src/CPU/cpu.h
View File

@@ -117,6 +117,7 @@ extern int cpu_iscyrix;
extern int cpu_16bitbus; extern int cpu_16bitbus;
extern int cpu_busspeed; extern int cpu_busspeed;
extern int cpu_multi; extern int cpu_multi;
extern int cpu_pci_speed;
extern int cpu_hasrdtsc; extern int cpu_hasrdtsc;
extern int cpu_hasMSR; extern int cpu_hasMSR;