diff --git a/src/cpu/386_ops.h b/src/cpu/386_ops.h index 303790623..d961bd4ac 100644 --- a/src/cpu/386_ops.h +++ b/src/cpu/386_ops.h @@ -8,7 +8,7 @@ * * 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, * Sarah Walker, @@ -167,6 +167,15 @@ static int ILLEGAL(uint32_t fetchdat) 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" #if defined(DEV_BRANCH) && defined(USE_AMD_K) # include "x86_ops_amd.h" diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index 5591e06ea..b6164a547 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -8,7 +8,7 @@ # # 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, # Fred N. van Kempen, @@ -41,9 +41,6 @@ ifeq ($(DEV_BUILD), y) ifndef CRASHDUMP CRASHDUMP := y endif - ifndef GREENB - GREENB := y - endif ifndef I686 I686 := y endif @@ -84,9 +81,6 @@ else ifndef CRASHDUMP CRASHDUMP := n endif - ifndef GREENB - GREENB := n - endif ifndef I686 I686 := n endif @@ -357,11 +351,6 @@ OPTS += -DUSE_CRASHDUMP DEVBROBJ += win_crashdump.o endif -ifeq ($(GREENB), y) -OPTS += -DUSE_GREENB -DEVBROBJ += m_at_4gpv31.o -endif - ifeq ($(I686), y) OPTS += -DUSE_I686 endif