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

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

Browse Source
This commit is contained in:
OBattler
2017-10-16 06:19:49 +02:00
parent ed865610e9 fbd95451d2
commit 4d9f5f0d05
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpu/386_dynarec.c
View File

@@ -489,6 +489,7 @@ int dontprint=0;
#define CACHE_ON() (!(cr0 & (1 << 30)) /*&& (cr0 & 1)*/ && !(flags & T_FLAG)) #define CACHE_ON() (!(cr0 & (1 << 30)) /*&& (cr0 & 1)*/ && !(flags & T_FLAG))
#ifdef USE_DYNAREC
static int cpu_cycle_period(void) static int cpu_cycle_period(void)
{ {
switch(cpu_pci_speed) switch(cpu_pci_speed)
@@ -502,8 +503,8 @@ static int cpu_cycle_period(void)
} }
} }
#ifdef USE_DYNAREC
static int cycles_main = 0; static int cycles_main = 0;
void exec386_dynarec(int cycs) void exec386_dynarec(int cycs)
{ {
uint8_t temp; uint8_t temp;

2
src/mem.c
View File

@@ -15,7 +15,7 @@
#include "mem.h" #include "mem.h"
#include "rom.h" #include "rom.h"
#ifdef USE_DYNAREC #ifdef USE_DYNAREC
#include "cpu/codegen.h" # include "cpu/codegen.h"
#else #else
#define PAGE_MASK_INDEX_MASK 3 #define PAGE_MASK_INDEX_MASK 3
#define PAGE_MASK_INDEX_SHIFT 10 #define PAGE_MASK_INDEX_SHIFT 10

2
src/pc.c
View File

@@ -29,7 +29,7 @@
#include "ibm.h" #include "ibm.h"
#include "cpu/cpu.h" #include "cpu/cpu.h"
#ifdef USE_DYNAREC #ifdef USE_DYNAREC
#include "cpu/codegen.h" # include "cpu/codegen.h"
#endif #endif
#include "cpu/x86_ops.h" #include "cpu/x86_ops.h"
#include "io.h" #include "io.h"

6
src/win/Makefile.mingw
View File

@@ -87,7 +87,7 @@ ifndef MUNT
MUNT := y MUNT := y
endif endif
ifndef PAS16 ifndef PAS16
PAS16 = n PAS16 := n
endif endif
ifndef DYNAREC ifndef DYNAREC
DYNAREC := y DYNAREC := y
@@ -280,8 +280,8 @@ MAINOBJ := pc.o config.o random.o timer.o io.o dma.o nmi.o pic.o \
intel.o intel_flash.o intel_sio.o intel.o intel_flash.o intel_sio.o
CPUOBJ := cpu.o 386.o 386_dynarec.o 808x.o \ CPUOBJ := cpu.o 386.o 386_dynarec.o 808x.o \
x86seg.o x87.o \ x86seg.o x87.o \
$(DYNARECOBJ) $(DYNARECOBJ)
MCHOBJ := machine.o \ MCHOBJ := machine.o \
machine_common.o \ machine_common.o \