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

Fixed the Dev branch.

Browse Source
This commit is contained in:
OBattler
2018-05-21 19:34:51 +02:00
parent 5d8deea63b
commit 22d387c156
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cpu/386_ops.h
View File

@@ -8,7 +8,7 @@
* *
* 286/386+ instruction handlers list. * 286/386+ instruction handlers list.
* *
* Version: @(#)386_ops.h 1.0.2 2018/05/05 * Version: @(#)386_ops.h 1.0.3 2018/05/21
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk> * Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -167,6 +167,15 @@ static int ILLEGAL(uint32_t fetchdat)
return 0; return 0;
} }
#if defined(DEV_BRANCH) && (defined(USE_AMD_K) || defined(USE_I686))
static int internal_illegal(char *s)
{
cpu_state.pc = cpu_state.oldpc;
x86gpf(s, 0);
return cpu_state.abrt;
}
#endif
#include "x86seg.h" #include "x86seg.h"
#if defined(DEV_BRANCH) && defined(USE_AMD_K) #if defined(DEV_BRANCH) && defined(USE_AMD_K)
# include "x86_ops_amd.h" # include "x86_ops_amd.h"

13
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
# #
# Makefile for Win32 (MinGW32) environment. # Makefile for Win32 (MinGW32) environment.
# #
# Version: @(#)Makefile.mingw 1.0.116 2018/05/01 # Version: @(#)Makefile.mingw 1.0.117 2018/05/21
# #
# Authors: Miran Grca, <mgrca8@gmail.com> # Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com> # Fred N. van Kempen, <decwiz@yahoo.com>
@@ -41,9 +41,6 @@ ifeq ($(DEV_BUILD), y)
ifndef CRASHDUMP ifndef CRASHDUMP
CRASHDUMP := y CRASHDUMP := y
endif endif
ifndef GREENB
GREENB := y
endif
ifndef I686 ifndef I686
I686 := y I686 := y
endif endif
@@ -84,9 +81,6 @@ else
ifndef CRASHDUMP ifndef CRASHDUMP
CRASHDUMP := n CRASHDUMP := n
endif endif
ifndef GREENB
GREENB := n
endif
ifndef I686 ifndef I686
I686 := n I686 := n
endif endif
@@ -357,11 +351,6 @@ OPTS += -DUSE_CRASHDUMP
DEVBROBJ += win_crashdump.o DEVBROBJ += win_crashdump.o
endif endif
ifeq ($(GREENB), y)
OPTS += -DUSE_GREENB
DEVBROBJ += m_at_4gpv31.o
endif
ifeq ($(I686), y) ifeq ($(I686), y)
OPTS += -DUSE_I686 OPTS += -DUSE_I686
endif endif