--- np2/i286c/i286c.h 2003/12/08 00:55:31 1.10 +++ np2/i286c/i286c.h 2003/12/26 02:02:09 1.14 @@ -7,8 +7,6 @@ #endif -#define I286_MEM mem - #define I286_STAT i286core.s.r #define I286_REG i286core.s.r @@ -53,6 +51,10 @@ #define I286_GDTR i286core.s.GDTR #define I286_IDTR i286core.s.IDTR +#define I286_LDTR i286core.s.LDTR +#define I286_LDTRC i286core.s.LDTRC +#define I286_TR i286core.s.TR +#define I286_TRC i286core.s.TRC #define I286_MSW i286core.s.MSW #define I286_REMCLOCK i286core.s.remainclock @@ -69,9 +71,8 @@ typedef void (*I286OP)(void); -extern UINT8 _szpcflag[0x200]; - extern void CPUCALL i286c_intnum(UINT vect, REG16 IP); +extern UINT32 i286c_selector(UINT sel); #if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2) extern void i286cea_initialize(void); @@ -104,10 +105,10 @@ typedef void (CPUCALL * I286OPSFTR8)(UIN typedef void (CPUCALL * I286OPSFTE8)(UINT32 madr); typedef void (CPUCALL * I286OPSFTR16)(UINT16 *p); typedef void (CPUCALL * I286OPSFTE16)(UINT32 madr); -typedef void (CPUCALL * I286OPSFTR8CL)(UINT8 *p, BYTE cl); -typedef void (CPUCALL * I286OPSFTE8CL)(UINT32 madr, BYTE cl); -typedef void (CPUCALL * I286OPSFTR16CL)(UINT16 *p, BYTE cl); -typedef void (CPUCALL * I286OPSFTE16CL)(UINT32 madr, BYTE cl); +typedef void (CPUCALL * I286OPSFTR8CL)(UINT8 *p, REG8 cl); +typedef void (CPUCALL * I286OPSFTE8CL)(UINT32 madr, REG8 cl); +typedef void (CPUCALL * I286OPSFTR16CL)(UINT16 *p, REG8 cl); +typedef void (CPUCALL * I286OPSFTE16CL)(UINT32 madr, REG8 cl); extern const I286OPSFTR8 sft_r8_table[]; extern const I286OPSFTE8 sft_e8_table[];