--- np2/i286c/cpucore.h 2003/12/08 00:55:31 1.1 +++ np2/i286c/cpucore.h 2003/12/25 19:26:55 1.6 @@ -6,6 +6,12 @@ // //---------------------------------------------------------------------------- +#include "memory.h" + +#if defined(CPUCORE_IA32) +#error : not support CPUCORE_IA32 +#endif + #if !defined(CPUDEBUG) enum { I286_MEMREADMAX = 0xa4000, @@ -162,6 +168,12 @@ typedef struct { typedef struct { // for ver0.73 BYTE *ext; UINT32 extsize; +#if defined(CPUSTRUC_MEMWAIT) + UINT8 tramwait; + UINT8 vramwait; + UINT8 grcgwait; + UINT8 padding; +#endif } I286EXT; typedef struct { @@ -179,6 +191,7 @@ extern const UINT8 iflags[]; void i286c_initialize(void); void i286c_reset(void); +void i286c_shut(void); void CPUCALL i286c_interrupt(REG8 vect); @@ -241,6 +254,13 @@ void v30c_step(void); #define CPU_TYPE i286core.s.cpu_type +#if defined(CPUSTRUC_MEMWAIT) +#define MEMWAIT_TRAM i286core.e.tramwait +#define MEMWAIT_VRAM i286core.e.vramwait +#define MEMWAIT_GRCG i286core.e.grcgwait +#endif + + #define CPU_isDI (!(i286core.s.r.w.flag & I_FLAG)) #define CPU_isEI (i286core.s.r.w.flag & I_FLAG) #define CPU_CLI i286core.s.r.w.flag &= ~I_FLAG; \ @@ -254,4 +274,5 @@ void v30c_step(void); #define CPU_INTERRUPT(v) i286c_interrupt(v) #define CPU_EXEC i286c #define CPU_EXECV30 v30c +#define CPU_SHUT i286c_shut