--- np2/i286c/i286c.c 2003/10/16 17:57:37 1.1 +++ np2/i286c/i286c.c 2005/05/20 13:59:47 1.29 @@ -1,20 +1,19 @@ #include "compiler.h" -#include "i286.h" +#include "cpucore.h" #include "i286c.h" -#include "memory.h" +#include "v30patch.h" #include "pccore.h" #include "iocore.h" -#include "dmap.h" +#include "dmax86.h" #include "i286c.mcr" +#if defined(ENABLE_TRAP) +#include "steptrap.h" +#endif - I286REGS i286r; - I286STAT i286s; - I286DTR GDTR; - I286DTR IDTR; - UINT16 MSW; + I286CORE i286core; -const BYTE 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, @@ -46,81 +45,90 @@ const BYTE iflags[256] = { // Z_FLAG 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}; // ---- - DWORD EA_FIX; - BYTE *reg8_b53[256]; - BYTE *reg8_b20[256]; - UINT16 *reg16_b53[256]; - UINT16 *reg16_b20[256]; - BYTE szpcflag[0x200]; - BYTE szpflag_w[0x10000]; - CALCEA c_calc_ea_dst[256]; - CALCLEA c_calc_lea[192]; - GETLEA c_get_ea[192]; - - -static UINT32 ea_nop(void) { +#if !defined(MEMOPTIMIZE) + UINT8 _szpflag16[0x10000]; +#endif - return(0); -} +#if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2) + UINT8 *_reg8_b53[256]; + UINT8 *_reg8_b20[256]; +#endif +#if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2) + UINT16 *_reg16_b53[256]; + UINT16 *_reg16_b20[256]; +#endif -void i286_initialize(void) { +void i286c_initialize(void) { +#if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2) UINT i; - UINT bit; - BYTE f; - int pos; - - 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; - } - szpcflag[i+0x000] = f; - szpcflag[i+0x100] = f | C_FLAG; - } +#endif +#if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2) for (i=0; i<0x100; i++) { + int pos; #if defined(BYTESEX_LITTLE) pos = ((i & 0x20)?1:0); #else pos = ((i & 0x20)?0:1); #endif pos += ((i >> 3) & 3) * 2; - reg8_b53[i] = ((BYTE *)&i286r) + pos; + _reg8_b53[i] = ((UINT8 *)&I286_REG) + pos; #if defined(BYTESEX_LITTLE) pos = ((i & 0x4)?1:0); #else pos = ((i & 0x4)?0:1); #endif pos += (i & 3) * 2; - reg8_b20[i] = ((BYTE *)&i286r) + pos; - reg16_b53[i] = ((UINT16 *)&i286r) + ((i >> 3) & 7); - reg16_b20[i] = ((UINT16 *)&i286r) + (i & 7); + _reg8_b20[i] = ((UINT8 *)&I286_REG) + pos; +#if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2) + _reg16_b53[i] = ((UINT16 *)&I286_REG) + ((i >> 3) & 7); + _reg16_b20[i] = ((UINT16 *)&I286_REG) + (i & 7); +#endif } +#endif - for (i=0; i<0xc0; i++) { - pos = ((i >> 3) & 0x18) + (i & 0x07); - c_calc_ea_dst[i] = i286c_ea_dst_tbl[pos]; - c_calc_lea[i] = i286c_lea_tbl[pos]; - c_get_ea[i] = i286c_ea_tbl[pos]; - } - for (; i<0x100; i++) { - c_calc_ea_dst[i] = ea_nop; - } +#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) { @@ -133,29 +141,105 @@ void i286_initialize(void) { if (i & 0x8000) { f |= S_FLAG; } - szpflag_w[i] = f; + _szpflag16[i] = f; } +#endif +#if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2) + i286cea_initialize(); +#endif + v30cinit(); + ZeroMemory(&i286core, sizeof(i286core)); +} + +void i286c_deinitialize(void) { + + 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 i286_reset(void) { +void i286c_reset(void) { - i286_initialize(); - ZeroMemory(&i286r, sizeof(i286r)); - ZeroMemory(&i286s, sizeof(i286s)); - I286_CS = 0x1fc0; - CS_BASE = 0x1fc00; - ZeroMemory(&GDTR, sizeof(GDTR)); - ZeroMemory(&IDTR, sizeof(IDTR)); - MSW = 0; + ZeroMemory(&i286core.s, sizeof(i286core.s)); + i286c_initreg(); } -void i286_resetprefetch(void) { +void i286c_shut(void) { + + ZeroMemory(&i286core.s, offsetof(I286STAT, cpu_type)); + i286c_initreg(); } -void CPUCALL i286_intnum(DWORD vect, WORD IP) { +void i286c_setextsize(UINT32 size) { -const BYTE *ptr; + if (CPU_EXTMEMSIZE != size) { + UINT8 *extmem; + extmem = CPU_EXTMEM; + if (extmem != NULL) { + _MFREE(extmem); + extmem = NULL; + } + if (size != 0) { + extmem = (UINT8 *)_MALLOC(size + 16, "EXTMEM"); + } + if (extmem != NULL) { + CPU_EXTMEM = extmem; + CPU_EXTMEMSIZE = size; + CPU_EXTMEMBASE = CPU_EXTMEM - 0x100000; + CPU_EXTLIMIT16 = min(size + 0x100000, 0xf00000); +#if defined(CPU_EXTLIMIT) + CPU_EXTLIMIT = size + 0x100000; +#endif + } + else { + CPU_EXTMEM = NULL; + CPU_EXTMEMSIZE = 0; + CPU_EXTMEMBASE = NULL; + CPU_EXTLIMIT16 = 0; +#if defined(CPU_EXTLIMIT) + CPU_EXTLIMIT = 0; +#endif + } + } + 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 UINT8 *ptr; + + if (vect < 0x10) TRACEOUT(("i286c_intnum - %.2x", vect)); REGPUSH0(REAL_FLAGREG) REGPUSH0(I286_CS) REGPUSH0(IP) @@ -163,66 +247,75 @@ const BYTE *ptr; I286_FLAG &= ~(T_FLAG | I_FLAG); I286_TRAP = 0; - ptr = I286_MEM + (vect * 4); + ptr = mem + (vect * 4); I286_IP = LOADINTELWORD(ptr+0); // real mode! I286_CS = LOADINTELWORD(ptr+2); // real mode! CS_BASE = I286_CS << 4; - I286_CLOCK(20) + I286_WORKCLOCK(20); } -void CPUCALL i286_interrupt(BYTE vect) { +void CPUCALL i286c_interrupt(REG8 vect) { - BYTE op; -const BYTE *ptr; + UINT op; +const UINT8 *ptr; op = i286_memoryread(I286_IP + CS_BASE); if (op == 0xf4) { // hlt I286_IP++; } - REGPUSH0(REAL_FLAGREG) + REGPUSH0(REAL_FLAGREG) // ここV30で辻褄が合わない REGPUSH0(I286_CS) REGPUSH0(I286_IP) I286_FLAG &= ~(T_FLAG | I_FLAG); I286_TRAP = 0; - ptr = I286_MEM + (vect * 4); - I286_IP = LOADINTELWORD(ptr+0); // real mode! - I286_CS = LOADINTELWORD(ptr+2); // real mode! - CS_BASE = (UINT32)I286_CS << 4; - I286_CLOCK(20) + ptr = mem + (vect * 4); + I286_IP = LOADINTELWORD(ptr + 0); // real mode! + I286_CS = LOADINTELWORD(ptr + 2); // real mode! + CS_BASE = I286_CS << 4; + I286_WORKCLOCK(20); } -void i286(void) { +void i286c(void) { UINT opcode; if (I286_TRAP) { do { +#if defined(ENABLE_TRAP) + steptrap(CPU_CS, CPU_IP); +#endif GET_PCBYTE(opcode); i286op[opcode](); if (I286_TRAP) { - i286_interrupt(1); + i286c_interrupt(1); } - dmap_i286(); - } while(nevent.remainclock > 0); + dmax86(); + } while(I286_REMCLOCK > 0); } else if (dmac.working) { do { +#if defined(ENABLE_TRAP) + steptrap(CPU_CS, CPU_IP); +#endif GET_PCBYTE(opcode); i286op[opcode](); - dmap_i286(); - } while(nevent.remainclock > 0); + dmax86(); + } while(I286_REMCLOCK > 0); } else { do { +#if defined(ENABLE_TRAP) + steptrap(CPU_CS, CPU_IP); +#endif GET_PCBYTE(opcode); i286op[opcode](); - } while(nevent.remainclock > 0); + } while(I286_REMCLOCK > 0); } } -void i286_step(void) { +void i286c_step(void) { UINT opcode; @@ -236,6 +329,67 @@ void i286_step(void) { if (I286_OV) { I286_FLAG |= (O_FLAG); } - dmap_i286(); + dmax86(); } + +// ---- test + +#if defined(I286C_TEST) +UINT8 BYTESZPF(UINT r) { + + if (r & (~0xff)) { + TRACEOUT(("BYTESZPF bound error: %x", r)); + } + return(iflags[r & 0xff]); +} + +UINT8 BYTESZPCF(UINT r) { + + if (r & (~0x1ff)) { + TRACEOUT(("BYTESZPCF bound error: %x", r)); + } + return(iflags[r & 0x1ff]); +} + +UINT8 WORDSZPF(UINT32 r) { + + UINT8 f1; + UINT8 f2; + + if (r & (~0xffff)) { + TRACEOUT(("WORDSZPF bound error: %x", r)); + } + f1 = _szpflag16[r & 0xffff]; + f2 = iflags[r & 0xff] & P_FLAG; + f2 += (r)?0:Z_FLAG; + f2 += (r >> 8) & S_FLAG; + if (f1 != f2) { + TRACEOUT(("word flag error: %.2x %.2x", f1, f2)); + } + return(f1); +} + +UINT8 WORDSZPCF(UINT32 r) { + + UINT8 f1; + UINT8 f2; + + if ((r & 0xffff0000) && (!(r & 0x00010000))) { + TRACEOUT(("WORDSZPCF bound error: %x", r)); + } + f1 = (r >> 16) & 1; + f1 += _szpflag16[LOW16(r)]; + + f2 = iflags[r & 0xff] & P_FLAG; + f2 += (LOW16(r))?0:Z_FLAG; + f2 += (r >> 8) & S_FLAG; + f2 += (r >> 16) & 1; + + if (f1 != f2) { + TRACEOUT(("word flag error: %.2x %.2x", f1, f2)); + } + return(f1); +} +#endif +