--- np2/i286c/cpucore.h 2003/12/12 01:04:40 1.3 +++ np2/i286c/cpucore.h 2003/12/26 02:02:09 1.8 @@ -37,6 +37,13 @@ enum { }; enum { + MSW_PE = 0x0001, + MSW_MP = 0x0002, + MSW_EM = 0x0004, + MSW_TS = 0x0008 +}; + +enum { CPUTYPE_V30 = 0x01 }; @@ -159,8 +166,12 @@ typedef struct { UINT32 inport; UINT32 ovflag; I286DTR GDTR; - I286DTR IDTR; UINT16 MSW; + I286DTR IDTR; + UINT16 LDTR; // ver0.73 + I286DTR LDTRC; + UINT16 TR; + I286DTR TRC; UINT8 resetreq; // ver0.72 UINT8 itfbank; // ver0.72 } I286STAT; @@ -168,6 +179,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 { @@ -185,6 +202,7 @@ extern const UINT8 iflags[]; void i286c_initialize(void); void i286c_reset(void); +void i286c_shut(void); void CPUCALL i286c_interrupt(REG8 vect); @@ -247,6 +265,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; \ @@ -260,4 +285,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