--- np2/i286c/i286c.c 2003/12/12 01:04:40 1.14 +++ np2/i286c/i286c.c 2005/02/08 09:57:26 1.26 @@ -4,13 +4,13 @@ #include "v30patch.h" #include "pccore.h" #include "iocore.h" -#include "dmap.h" +#include "dmax86.h" #include "i286c.mcr" I286CORE i286core; -const UINT8 iflags[256] = { // Z_FLAG, S_FLAG, P_FLAG +const UINT8 iflags[512] = { // Z_FLAG, S_FLAG, P_FLAG 0x44, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x00, 0x00, 0x04, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04, @@ -42,13 +42,43 @@ const UINT8 iflags[256] = { // Z_FLA 0x80, 0x84, 0x84, 0x80, 0x84, 0x80, 0x80, 0x84, 0x84, 0x80, 0x80, 0x84, 0x80, 0x84, 0x84, 0x80, 0x84, 0x80, 0x80, 0x84, 0x80, 0x84, 0x84, 0x80, - 0x80, 0x84, 0x84, 0x80, 0x84, 0x80, 0x80, 0x84}; + 0x80, 0x84, 0x84, 0x80, 0x84, 0x80, 0x80, 0x84, + 0x45, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01, + 0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05, + 0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05, + 0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01, + 0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05, + 0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01, + 0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01, + 0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05, + 0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05, + 0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01, + 0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01, + 0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05, + 0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01, + 0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05, + 0x01, 0x05, 0x05, 0x01, 0x05, 0x01, 0x01, 0x05, + 0x05, 0x01, 0x01, 0x05, 0x01, 0x05, 0x05, 0x01, + 0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85, + 0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81, + 0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81, + 0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85, + 0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81, + 0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85, + 0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85, + 0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81, + 0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81, + 0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85, + 0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85, + 0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81, + 0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85, + 0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81, + 0x85, 0x81, 0x81, 0x85, 0x81, 0x85, 0x85, 0x81, + 0x81, 0x85, 0x85, 0x81, 0x85, 0x81, 0x81, 0x85}; // ---- - UINT8 _szpcflag8[0x200]; - #if !defined(MEMOPTIMIZE) UINT8 _szpflag16[0x10000]; #endif @@ -64,26 +94,9 @@ const UINT8 iflags[256] = { // Z_FLA void i286c_initialize(void) { +#if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2) UINT i; - UINT bit; - REG8 f; - - for (i=0; i<0x100; i++) { - f = P_FLAG; - for (bit=0x80; bit; bit>>=1) { - if (i & bit) { - f ^= P_FLAG; - } - } - if (!(i & 0xff)) { - f |= Z_FLAG; - } - if (i & 0x80) { - f |= S_FLAG; - } - _szpcflag8[i+0x000] = f; - _szpcflag8[i+0x100] = f | C_FLAG; - } +#endif #if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2) for (i=0; i<0x100; i++) { @@ -111,6 +124,8 @@ void i286c_initialize(void) { #if !defined(MEMOPTIMIZE) for (i=0; i<0x10000; i++) { + REG8 f; + UINT bit; f = P_FLAG; for (bit=0x80; bit; bit>>=1) { if (i & bit) { @@ -130,19 +145,80 @@ void i286c_initialize(void) { i286cea_initialize(); #endif v30cinit(); + ZeroMemory(&i286core, sizeof(i286core)); } -void i286c_reset(void) { +void i286c_deinitialize(void) { - ZeroMemory(&I286_STAT, sizeof(I286_STAT)); - I286_CS = 0x1fc0; - CS_BASE = 0x1fc00; + if (CPU_EXTMEM) { + _MFREE(CPU_EXTMEM); + CPU_EXTMEM = NULL; + CPU_EXTMEMSIZE = 0; + } +} + +static void i286c_initreg(void) { + + I286_CS = 0xf000; + CS_BASE = 0xf0000; + I286_IP = 0xfff0; I286_ADRSMASK = 0xfffff; } +void i286c_reset(void) { + + ZeroMemory(&i286core.s, sizeof(i286core.s)); + i286c_initreg(); +} + +void i286c_shut(void) { + + ZeroMemory(&i286core.s, offsetof(I286STAT, cpu_type)); + i286c_initreg(); +} + +void i286c_setextsize(UINT32 size) { + + if (CPU_EXTMEMSIZE != size) { + if (CPU_EXTMEM) { + _MFREE(CPU_EXTMEM); + CPU_EXTMEM = NULL; + } + if (size) { + CPU_EXTMEM = (UINT8 *)_MALLOC(size + 16, "EXTMEM"); + if (CPU_EXTMEM == NULL) { + size = 0; + } + } + CPU_EXTMEMSIZE = size; + } + i286core.e.ems[0] = mem + 0xc0000; + i286core.e.ems[1] = mem + 0xc4000; + i286core.e.ems[2] = mem + 0xc8000; + i286core.e.ems[3] = mem + 0xcc000; +} + +void i286c_setemm(UINT frame, UINT32 addr) { + + UINT8 *ptr; + + frame &= 3; + if (addr < USE_HIMEM) { + ptr = mem + addr; + } + else if ((addr - 0x100000 + 0x4000) <= CPU_EXTMEMSIZE) { + ptr = CPU_EXTMEM + (addr - 0x100000); + } + else { + ptr = mem + 0xc0000 + (frame << 14); + } + i286core.e.ems[frame] = ptr; +} + + void CPUCALL i286c_intnum(UINT vect, REG16 IP) { -const BYTE *ptr; +const UINT8 *ptr; REGPUSH0(REAL_FLAGREG) REGPUSH0(I286_CS) @@ -161,7 +237,7 @@ const BYTE *ptr; void CPUCALL i286c_interrupt(REG8 vect) { UINT op; -const BYTE *ptr; +const UINT8 *ptr; op = i286_memoryread(I286_IP + CS_BASE); if (op == 0xf4) { // hlt @@ -192,14 +268,14 @@ void i286c(void) { if (I286_TRAP) { i286c_interrupt(1); } - dmap_i286(); + dmax86(); } while(I286_REMCLOCK > 0); } else if (dmac.working) { do { GET_PCBYTE(opcode); i286op[opcode](); - dmap_i286(); + dmax86(); } while(I286_REMCLOCK > 0); } else { @@ -224,39 +300,39 @@ void i286c_step(void) { if (I286_OV) { I286_FLAG |= (O_FLAG); } - dmap_i286(); + dmax86(); } // ---- test #if defined(I286C_TEST) -BYTE BYTESZPF(UINT r) { +UINT8 BYTESZPF(UINT r) { if (r & (~0xff)) { TRACEOUT(("BYTESZPF bound error: %x", r)); } - return(_szpcflag8[r & 0xff]); + return(iflags[r & 0xff]); } -BYTE BYTESZPCF(UINT r) { +UINT8 BYTESZPCF(UINT r) { if (r & (~0x1ff)) { TRACEOUT(("BYTESZPCF bound error: %x", r)); } - return(_szpcflag8[r & 0x1ff]); + return(iflags[r & 0x1ff]); } -BYTE WORDSZPF(UINT32 r) { +UINT8 WORDSZPF(UINT32 r) { - BYTE f1; - BYTE f2; + UINT8 f1; + UINT8 f2; if (r & (~0xffff)) { TRACEOUT(("WORDSZPF bound error: %x", r)); } f1 = _szpflag16[r & 0xffff]; - f2 = _szpcflag8[r & 0xff] & P_FLAG; + f2 = iflags[r & 0xff] & P_FLAG; f2 += (r)?0:Z_FLAG; f2 += (r >> 8) & S_FLAG; if (f1 != f2) { @@ -265,10 +341,10 @@ BYTE WORDSZPF(UINT32 r) { return(f1); } -BYTE WORDSZPCF(UINT32 r) { +UINT8 WORDSZPCF(UINT32 r) { - BYTE f1; - BYTE f2; + UINT8 f1; + UINT8 f2; if ((r & 0xffff0000) && (!(r & 0x00010000))) { TRACEOUT(("WORDSZPCF bound error: %x", r)); @@ -276,7 +352,7 @@ BYTE WORDSZPCF(UINT32 r) { f1 = (r >> 16) & 1; f1 += _szpflag16[LOW16(r)]; - f2 = _szpcflag8[r & 0xff] & P_FLAG; + f2 = iflags[r & 0xff] & P_FLAG; f2 += (LOW16(r))?0:Z_FLAG; f2 += (r >> 8) & S_FLAG; f2 += (r >> 16) & 1;