--- np2/i286c/i286c_mn.c 2003/11/28 08:01:32 1.13 +++ np2/i286c/i286c_mn.c 2004/01/31 20:05:23 1.32 @@ -1,7 +1,6 @@ #include "compiler.h" -#include "i286.h" +#include "cpucore.h" #include "i286c.h" -#include "memory.h" #include "pccore.h" #include "iocore.h" #include "bios.h" @@ -10,6 +9,7 @@ #define MAX_PREFIX 8 + #define NEXT_OPCODE \ if (I286_REMCLOCK < 1) { \ I286_BASECLOCK += (1 - I286_REMCLOCK); \ @@ -27,7 +27,6 @@ I286FN _reserved(void) { - I286_WORKCLOCK(23); // ToDo INT_NUM(6, I286_IP - 1); } @@ -51,7 +50,7 @@ I286FN _add_ea_r8(void) { // 00: ad if (madr >= I286_MEMWRITEMAX) { dst = i286_memoryread(madr); ADDBYTE(res, dst, src); - i286_memorywrite(madr, (BYTE)res); + i286_memorywrite(madr, (REG8)res); return; } out = mem + madr; @@ -81,7 +80,7 @@ I286FN _add_ea_r16(void) { // 01: a if (INHIBIT_WORDP(madr)) { dst = i286_memoryread_w(madr); ADDWORD(res, dst, src); - i286_memorywrite_w(madr, (UINT16)res); + i286_memorywrite_w(madr, (REG16)res); return; } out = (UINT16 *)(mem + madr); @@ -148,8 +147,17 @@ I286FN _push_es(void) { // 06: pus I286FN _pop_es(void) { // 07: pop es - REGPOP(I286_ES, 5) - ES_BASE = (UINT32)I286_ES << 4; + UINT tmp; + + REGPOP(tmp, 5) + I286_ES = tmp; + if (!(I286_MSW & MSW_PE)) { + ES_BASE = tmp << 4; + NEXT_OPCODE + } + else { + ES_BASE = i286c_selector(tmp); + } } I286FN _or_ea_r8(void) { // 08: or EA, REG8 @@ -171,12 +179,14 @@ I286FN _or_ea_r8(void) { // 08: or if (madr >= I286_MEMWRITEMAX) { dst = i286_memoryread(madr); ORBYTE(dst, src); - i286_memorywrite(madr, (BYTE)dst); + i286_memorywrite(madr, (REG8)dst); return; } out = mem + madr; } - ORBYTE(*out, src); + dst = *out; + ORBYTE(dst, src); + *out = (BYTE)dst; } I286FN _or_ea_r16(void) { // 09: or EA, REG16 @@ -198,12 +208,14 @@ I286FN _or_ea_r16(void) { // 09: o if (INHIBIT_WORDP(madr)) { dst = i286_memoryread_w(madr); ORWORD(dst, src); - i286_memorywrite_w(madr, (UINT16)dst); + i286_memorywrite_w(madr, (REG16)dst); return; } out = (UINT16 *)(mem + madr); } - ORWORD(*out, src); + dst = *out; + ORWORD(dst, src); + *out = (UINT16)dst; } I286FN _or_r8_ea(void) { // 0a: or REG8, EA @@ -211,9 +223,12 @@ I286FN _or_r8_ea(void) { // 0a: or BYTE *out; UINT op; UINT src; + UINT dst; PREPART_REG8_EA(op, src, out, 2, 7); - ORBYTE(*out, src); + dst = *out; + ORBYTE(dst, src); + *out = (BYTE)dst; } I286FN _or_r16_ea(void) { // 0b: or REG16, EA @@ -221,27 +236,36 @@ I286FN _or_r16_ea(void) { // 0b: or UINT16 *out; UINT op; UINT32 src; + UINT32 dst; PREPART_REG16_EA(op, src, out, 2, 7); - ORWORD(*out, src); + dst = *out; + ORWORD(dst, src); + *out = (UINT16)dst; } I286FN _or_al_data8(void) { // 0c: or al, DATA8 UINT src; + UINT dst; I286_WORKCLOCK(3); GET_PCBYTE(src); - ORBYTE(I286_AL, src); + dst = I286_AL; + ORBYTE(dst, src); + I286_AL = (BYTE)dst; } I286FN _or_ax_data16(void) { // 0d: or ax, DATA16 UINT32 src; + UINT32 dst; I286_WORKCLOCK(3); GET_PCWORD(src); - ORWORD(I286_AX, src); + dst = I286_AX; + ORWORD(dst, src); + I286_AX = (UINT16)dst; } I286FN _push_cs(void) { // 0e: push cs @@ -269,7 +293,7 @@ I286FN _adc_ea_r8(void) { // 10: ad if (madr >= I286_MEMWRITEMAX) { dst = i286_memoryread(madr); ADCBYTE(res, dst, src); - i286_memorywrite(madr, (BYTE)res); + i286_memorywrite(madr, (REG8)res); return; } out = mem + madr; @@ -299,7 +323,7 @@ I286FN _adc_ea_r16(void) { // 11: a if (INHIBIT_WORDP(madr)) { dst = i286_memoryread_w(madr); ADCWORD(res, dst, src); - i286_memorywrite_w(madr, (UINT16)res); + i286_memorywrite_w(madr, (REG16)res); return; } out = (UINT16 *)(mem + madr); @@ -366,10 +390,22 @@ I286FN _push_ss(void) { // 16: pus I286FN _pop_ss(void) { // 17: pop ss - REGPOP(I286_SS, 5) - SS_BASE = I286_SS << 4; - SS_FIX = SS_BASE; - NEXT_OPCODE + UINT tmp; + UINT32 base; + + REGPOP(tmp, 5) + I286_SS = tmp; + if (!(I286_MSW & MSW_PE)) { + SS_BASE = tmp << 4; + SS_FIX = tmp << 4; + NEXT_OPCODE + } + else { + base = i286c_selector(tmp); + SS_BASE = base; + SS_FIX = base; + NEXT_OPCODE + } } I286FN _sbb_ea_r8(void) { // 18: sbb EA, REG8 @@ -392,7 +428,7 @@ I286FN _sbb_ea_r8(void) { // 18: sb if (madr >= I286_MEMWRITEMAX) { dst = i286_memoryread(madr); SBBBYTE(res, dst, src); - i286_memorywrite(madr, (BYTE)res); + i286_memorywrite(madr, (REG8)res); return; } out = mem + madr; @@ -422,7 +458,7 @@ I286FN _sbb_ea_r16(void) { // 19: s if (INHIBIT_WORDP(madr)) { dst = i286_memoryread_w(madr); SBBWORD(res, dst, src); - i286_memorywrite_w(madr, (UINT16)res); + i286_memorywrite_w(madr, (REG16)res); return; } out = (UINT16 *)(mem + madr); @@ -489,9 +525,22 @@ I286FN _push_ds(void) { // 1e: pus I286FN _pop_ds(void) { // 1f: pop ds - REGPOP(I286_DS, 5) - DS_BASE = I286_DS << 4; - DS_FIX = DS_BASE; + UINT tmp; + UINT32 base; + + REGPOP(tmp, 5) + I286_DS = tmp; + if (!(I286_MSW & MSW_PE)) { + DS_BASE = tmp << 4; + DS_FIX = tmp << 4; + NEXT_OPCODE + } + else { + base = i286c_selector(tmp); + DS_BASE = base; + DS_FIX = base; + NEXT_OPCODE + } } I286FN _and_ea_r8(void) { // 20: and EA, REG8 @@ -513,12 +562,14 @@ I286FN _and_ea_r8(void) { // 20: an if (madr >= I286_MEMWRITEMAX) { dst = i286_memoryread(madr); ANDBYTE(dst, src); - i286_memorywrite(madr, (BYTE)dst); + i286_memorywrite(madr, (REG8)dst); return; } out = mem + madr; } - ANDBYTE(*out, src); + dst = *out; + ANDBYTE(dst, src); + *out = (BYTE)dst; } I286FN _and_ea_r16(void) { // 21: and EA, REG16 @@ -540,12 +591,14 @@ I286FN _and_ea_r16(void) { // 21: a if (INHIBIT_WORDP(madr)) { dst = i286_memoryread_w(madr); ANDWORD(dst, src); - i286_memorywrite_w(madr, (UINT16)dst); + i286_memorywrite_w(madr, (REG16)dst); return; } out = (UINT16 *)(mem + madr); } - ANDWORD(*out, src); + dst = *out; + ANDWORD(dst, src); + *out = (UINT16)dst; } I286FN _and_r8_ea(void) { // 22: and REG8, EA @@ -553,9 +606,12 @@ I286FN _and_r8_ea(void) { // 22: an BYTE *out; UINT op; UINT src; + UINT dst; PREPART_REG8_EA(op, src, out, 2, 7); - ANDBYTE(*out, src); + dst = *out; + ANDBYTE(dst, src); + *out = (BYTE)dst; } I286FN _and_r16_ea(void) { // 23: and REG16, EA @@ -563,40 +619,49 @@ I286FN _and_r16_ea(void) { // 23: a UINT16 *out; UINT op; UINT32 src; + UINT32 dst; PREPART_REG16_EA(op, src, out, 2, 7); - ANDWORD(*out, src); + dst = *out; + ANDWORD(dst, src); + *out = (UINT16)dst; } I286FN _and_al_data8(void) { // 24: and al, DATA8 UINT src; + UINT dst; I286_WORKCLOCK(3); GET_PCBYTE(src); - ANDBYTE(I286_AL, src); + dst = I286_AL; + ANDBYTE(dst, src); + I286_AL = (BYTE)dst; } I286FN _and_ax_data16(void) { // 25: and ax, DATA16 UINT32 src; + UINT32 dst; I286_WORKCLOCK(3); GET_PCWORD(src); - ANDWORD(I286_AX, src); + dst = I286_AX; + ANDWORD(dst, src); + I286_AX = (UINT16)dst; } I286FN _segprefix_es(void) { // 26: es: SS_FIX = ES_BASE; DS_FIX = ES_BASE; - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op[op](); REMOVE_PREFIX - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -641,14 +706,14 @@ I286FN _sub_ea_r8(void) { // 28: su madr = CALC_EA(op); if (madr >= I286_MEMWRITEMAX) { dst = i286_memoryread(madr); - BYTE_SUB(res, dst, src); - i286_memorywrite(madr, (BYTE)res); + SUBBYTE(res, dst, src); + i286_memorywrite(madr, (REG8)res); return; } out = mem + madr; } dst = *out; - BYTE_SUB(res, dst, src); + SUBBYTE(res, dst, src); *out = (BYTE)res; } @@ -671,14 +736,14 @@ I286FN _sub_ea_r16(void) { // 29: s madr = CALC_EA(op); if (INHIBIT_WORDP(madr)) { dst = i286_memoryread_w(madr); - WORD_SUB(res, dst, src); - i286_memorywrite_w(madr, (UINT16)res); + SUBWORD(res, dst, src); + i286_memorywrite_w(madr, (REG16)res); return; } out = (UINT16 *)(mem + madr); } dst = *out; - WORD_SUB(res, dst, src); + SUBWORD(res, dst, src); *out = (UINT16)res; } @@ -692,7 +757,7 @@ I286FN _sub_r8_ea(void) { // 2a: su PREPART_REG8_EA(op, src, out, 2, 7); dst = *out; - BYTE_SUB(res, dst, src); + SUBBYTE(res, dst, src); *out = (BYTE)res; } @@ -706,7 +771,7 @@ I286FN _sub_r16_ea(void) { // 2b: s PREPART_REG16_EA(op, src, out, 2, 7); dst = *out; - WORD_SUB(res, dst, src); + SUBWORD(res, dst, src); *out = (UINT16)res; } @@ -717,7 +782,7 @@ I286FN _sub_al_data8(void) { // 2c: I286_WORKCLOCK(3); GET_PCBYTE(src); - BYTE_SUB(res, I286_AL, src); + SUBBYTE(res, I286_AL, src); I286_AL = (BYTE)res; } @@ -728,7 +793,7 @@ I286FN _sub_ax_data16(void) { // 2d: I286_WORKCLOCK(3); GET_PCWORD(src); - WORD_SUB(res, I286_AX, src); + SUBWORD(res, I286_AX, src); I286_AX = (UINT16)res; } @@ -736,13 +801,13 @@ I286FN _segprefix_cs(void) { // 2e: SS_FIX = CS_BASE; DS_FIX = CS_BASE; - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op[op](); REMOVE_PREFIX - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -783,13 +848,15 @@ I286FN _xor_ea_r8(void) { // 30: xo madr = CALC_EA(op); if (madr >= I286_MEMWRITEMAX) { dst = i286_memoryread(madr); - BYTE_XOR(dst, src); - i286_memorywrite(madr, (BYTE)dst); + XORBYTE(dst, src); + i286_memorywrite(madr, (REG8)dst); return; } out = mem + madr; } - BYTE_XOR(*out, src); + dst = *out; + XORBYTE(dst, src); + *out = (BYTE)dst; } I286FN _xor_ea_r16(void) { // 31: xor EA, REG16 @@ -810,13 +877,15 @@ I286FN _xor_ea_r16(void) { // 31: x madr = CALC_EA(op); if (INHIBIT_WORDP(madr)) { dst = i286_memoryread_w(madr); - WORD_XOR(dst, src); - i286_memorywrite_w(madr, (UINT16)dst); + XORWORD(dst, src); + i286_memorywrite_w(madr, (REG16)dst); return; } out = (UINT16 *)(mem + madr); } - WORD_XOR(*out, src); + dst = *out; + XORWORD(dst, src); + *out = (UINT16)dst; } I286FN _xor_r8_ea(void) { // 32: xor REG8, EA @@ -824,9 +893,12 @@ I286FN _xor_r8_ea(void) { // 32: xo BYTE *out; UINT op; UINT src; + UINT dst; PREPART_REG8_EA(op, src, out, 2, 7); - BYTE_XOR(*out, src); + dst = *out; + XORBYTE(dst, src); + *out = (BYTE)dst; } I286FN _xor_r16_ea(void) { // 33: or REG16, EA @@ -834,40 +906,49 @@ I286FN _xor_r16_ea(void) { // 33: o UINT16 *out; UINT op; UINT32 src; + UINT32 dst; PREPART_REG16_EA(op, src, out, 2, 7); - WORD_XOR(*out, src); + dst = *out; + XORWORD(dst, src); + *out = (UINT16)dst; } I286FN _xor_al_data8(void) { // 34: or al, DATA8 UINT src; + UINT dst; I286_WORKCLOCK(3); GET_PCBYTE(src); - BYTE_XOR(I286_AL, src); + dst = I286_AL; + XORBYTE(dst, src); + I286_AL = (BYTE)dst; } I286FN _xor_ax_data16(void) { // 35: or ax, DATA16 UINT32 src; + UINT32 dst; I286_WORKCLOCK(3); GET_PCWORD(src); - WORD_XOR(I286_AX, src); + dst = I286_AX; + XORWORD(dst, src); + I286_AX = (UINT16)dst; } I286FN _segprefix_ss(void) { // 36: ss: SS_FIX = SS_BASE; DS_FIX = SS_BASE; - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op[op](); REMOVE_PREFIX - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -885,6 +966,7 @@ I286FN _aaa(void) { // 37: aaa else { I286_FLAGL &= ~(A_FLAG | C_FLAG); } + I286_AL &= 0x0f; } I286FN _cmp_ea_r8(void) { // 38: cmp EA, REG8 @@ -898,12 +980,12 @@ I286FN _cmp_ea_r8(void) { // 38: cm if (op >= 0xc0) { I286_WORKCLOCK(2); dst = *(REG8_B20(op)); - BYTE_SUB(res, dst, src); + SUBBYTE(res, dst, src); } else { I286_WORKCLOCK(7); dst = i286_memoryread(CALC_EA(op)); - BYTE_SUB(res, dst, src); + SUBBYTE(res, dst, src); } } @@ -918,12 +1000,12 @@ I286FN _cmp_ea_r16(void) { // 39: c if (op >= 0xc0) { I286_WORKCLOCK(2); dst = *(REG16_B20(op)); - WORD_SUB(res, dst, src); + SUBWORD(res, dst, src); } else { I286_WORKCLOCK(7); dst = i286_memoryread_w(CALC_EA(op)); - WORD_SUB(res, dst, src); + SUBWORD(res, dst, src); } } @@ -937,7 +1019,7 @@ I286FN _cmp_r8_ea(void) { // 3a: cm PREPART_REG8_EA(op, src, out, 2, 6); dst = *out; - BYTE_SUB(res, dst, src); + SUBBYTE(res, dst, src); } I286FN _cmp_r16_ea(void) { // 3b: cmp REG16, EA @@ -950,7 +1032,7 @@ I286FN _cmp_r16_ea(void) { // 3b: c PREPART_REG16_EA(op, src, out, 2, 6); dst = *out; - WORD_SUB(res, dst, src); + SUBWORD(res, dst, src); } I286FN _cmp_al_data8(void) { // 3c: cmp al, DATA8 @@ -960,7 +1042,7 @@ I286FN _cmp_al_data8(void) { // 3c: I286_WORKCLOCK(3); GET_PCBYTE(src); - BYTE_SUB(res, I286_AL, src); + SUBBYTE(res, I286_AL, src); } I286FN _cmp_ax_data16(void) { // 3d: cmp ax, DATA16 @@ -970,20 +1052,20 @@ I286FN _cmp_ax_data16(void) { // 3d: I286_WORKCLOCK(3); GET_PCWORD(src); - WORD_SUB(res, I286_AX, src); + SUBWORD(res, I286_AX, src); } I286FN _segprefix_ds(void) { // 3e: ds: SS_FIX = DS_BASE; DS_FIX = DS_BASE; - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op[op](); REMOVE_PREFIX - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -1003,22 +1085,22 @@ I286FN _aas(void) { // 3f: aas } } -I286FN _inc_ax(void) INCWORD(I286_AX, 2) // 40: inc ax -I286FN _inc_cx(void) INCWORD(I286_CX, 2) // 41: inc cx -I286FN _inc_dx(void) INCWORD(I286_DX, 2) // 42: inc dx -I286FN _inc_bx(void) INCWORD(I286_BX, 2) // 43: inc bx -I286FN _inc_sp(void) INCWORD(I286_SP, 2) // 44: inc sp -I286FN _inc_bp(void) INCWORD(I286_BP, 2) // 45: inc bp -I286FN _inc_si(void) INCWORD(I286_SI, 2) // 46: inc si -I286FN _inc_di(void) INCWORD(I286_DI, 2) // 47: inc di -I286FN _dec_ax(void) DECWORD(I286_AX, 2) // 48: dec ax -I286FN _dec_cx(void) DECWORD(I286_CX, 2) // 49: dec cx -I286FN _dec_dx(void) DECWORD(I286_DX, 2) // 4a: dec dx -I286FN _dec_bx(void) DECWORD(I286_BX, 2) // 4b: dec bx -I286FN _dec_sp(void) DECWORD(I286_SP, 2) // 4c: dec sp -I286FN _dec_bp(void) DECWORD(I286_BP, 2) // 4d: dec bp -I286FN _dec_si(void) DECWORD(I286_SI, 2) // 4e: dec si -I286FN _dec_di(void) DECWORD(I286_DI, 2) // 4f: dec di +I286FN _inc_ax(void) INCWORD2(I286_AX, 2) // 40: inc ax +I286FN _inc_cx(void) INCWORD2(I286_CX, 2) // 41: inc cx +I286FN _inc_dx(void) INCWORD2(I286_DX, 2) // 42: inc dx +I286FN _inc_bx(void) INCWORD2(I286_BX, 2) // 43: inc bx +I286FN _inc_sp(void) INCWORD2(I286_SP, 2) // 44: inc sp +I286FN _inc_bp(void) INCWORD2(I286_BP, 2) // 45: inc bp +I286FN _inc_si(void) INCWORD2(I286_SI, 2) // 46: inc si +I286FN _inc_di(void) INCWORD2(I286_DI, 2) // 47: inc di +I286FN _dec_ax(void) DECWORD2(I286_AX, 2) // 48: dec ax +I286FN _dec_cx(void) DECWORD2(I286_CX, 2) // 49: dec cx +I286FN _dec_dx(void) DECWORD2(I286_DX, 2) // 4a: dec dx +I286FN _dec_bx(void) DECWORD2(I286_BX, 2) // 4b: dec bx +I286FN _dec_sp(void) DECWORD2(I286_SP, 2) // 4c: dec sp +I286FN _dec_bp(void) DECWORD2(I286_BP, 2) // 4d: dec bp +I286FN _dec_si(void) DECWORD2(I286_SI, 2) // 4e: dec si +I286FN _dec_di(void) DECWORD2(I286_DI, 2) // 4f: dec di I286FN _push_ax(void) REGPUSH(I286_AX, 3) // 50: push ax I286FN _push_cx(void) REGPUSH(I286_CX, 3) // 51: push cx @@ -1037,9 +1119,74 @@ I286FN _pop_bp(void) REGPOP(I286_BP, 5) I286FN _pop_si(void) REGPOP(I286_SI, 5) // 5E: pop si I286FN _pop_di(void) REGPOP(I286_DI, 5) // 5F: pop di +#if (defined(ARM) || defined(X11)) && defined(BYTESEX_LITTLE) + I286FN _pusha(void) { // 60: pusha - UINT16 tmp; + REG16 tmp; + UINT32 addr; + + I286_WORKCLOCK(17); + tmp = I286_SP; + addr = tmp + SS_BASE; + if ((tmp < 16) || (INHIBIT_WORDP(addr))) { + REGPUSH0(I286_AX) + REGPUSH0(I286_CX) + REGPUSH0(I286_DX) + REGPUSH0(I286_BX) + REGPUSH0(tmp) + REGPUSH0(I286_BP) + REGPUSH0(I286_SI) + REGPUSH0(I286_DI) + } + else { + *(UINT16 *)(mem + addr - 2) = I286_AX; + *(UINT16 *)(mem + addr - 4) = I286_CX; + *(UINT16 *)(mem + addr - 6) = I286_DX; + *(UINT16 *)(mem + addr - 8) = I286_BX; + *(UINT16 *)(mem + addr - 10) = tmp; + *(UINT16 *)(mem + addr - 12) = I286_BP; + *(UINT16 *)(mem + addr - 14) = I286_SI; + *(UINT16 *)(mem + addr - 16) = I286_DI; + I286_SP -= 16; + } +} + +I286FN _popa(void) { // 61: popa + + UINT tmp; + UINT32 addr; + + I286_WORKCLOCK(19); + tmp = I286_SP + 16; + addr = tmp + SS_BASE; + if ((tmp >= 0x10000) || (INHIBIT_WORDP(addr))) { + REGPOP0(I286_DI); + REGPOP0(I286_SI); + REGPOP0(I286_BP); + I286_SP += 2; + REGPOP0(I286_BX); + REGPOP0(I286_DX); + REGPOP0(I286_CX); + REGPOP0(I286_AX); + } + else { + I286_DI = *(UINT16 *)(mem + addr - 16); + I286_SI = *(UINT16 *)(mem + addr - 14); + I286_BP = *(UINT16 *)(mem + addr - 12); + I286_BX = *(UINT16 *)(mem + addr - 8); + I286_DX = *(UINT16 *)(mem + addr - 6); + I286_CX = *(UINT16 *)(mem + addr - 4); + I286_AX = *(UINT16 *)(mem + addr - 2); + I286_SP = tmp; + } +} + +#else + +I286FN _pusha(void) { // 60: pusha + + REG16 tmp; tmp = I286_SP; REGPUSH0(I286_AX) @@ -1066,12 +1213,14 @@ I286FN _popa(void) { // 61: popa I286_WORKCLOCK(19); } +#endif + I286FN _bound(void) { // 62: bound UINT vect = 0; UINT op; UINT32 madr; - UINT16 reg; + REG16 reg; I286_WORKCLOCK(13); // ToDo GET_PCBYTE(op); @@ -1079,7 +1228,7 @@ I286FN _bound(void) { // 62: bound reg = *(REG16_B53(op)); madr = CALC_EA(op); if (reg >= i286_memoryread_w(madr)) { - madr += 2; // ToDo + madr += 2; // ToDo if (reg <= i286_memoryread_w(madr)) { return; } @@ -1150,7 +1299,7 @@ I286FN _imul_reg_ea_data8(void) { // 6B I286FN _insb(void) { // 6C: insb - BYTE dat; + REG8 dat; I286_WORKCLOCK(5); dat = iocore_inp8(I286_DX); @@ -1160,7 +1309,7 @@ I286FN _insb(void) { // 6C: insb I286FN _insw(void) { // 6D: insw - UINT16 dat; + REG16 dat; I286_WORKCLOCK(5); dat = iocore_inp16(I286_DX); @@ -1170,22 +1319,22 @@ I286FN _insw(void) { // 6D: insw I286FN _outsb(void) { // 6E: outsb - BYTE dat; + REG8 dat; I286_WORKCLOCK(3); dat = i286_memoryread(I286_SI + DS_FIX); I286_SI += STRING_DIR; - iocore_out8(I286_DX, dat); + iocore_out8(I286_DX, (BYTE)dat); } I286FN _outsw(void) { // 6F: outsw - UINT16 dat; + REG16 dat; I286_WORKCLOCK(3); dat = i286_memoryread_w(I286_SI + DS_FIX); I286_SI += STRING_DIRx2; - iocore_out16(I286_DX, dat); + iocore_out16(I286_DX, (UINT16)dat); } I286FN _jo_short(void) { // 70: jo short @@ -1543,6 +1692,7 @@ I286FN _mov_seg_ea(void) { // 8E: mo UINT op; UINT tmp; + UINT32 base; UINT16 ipbak; ipbak = I286_IP; @@ -1555,23 +1705,30 @@ I286FN _mov_seg_ea(void) { // 8E: mo I286_WORKCLOCK(5); tmp = i286_memoryread_w(CALC_EA(op)); } + if (!(I286_MSW & MSW_PE)) { + base = tmp << 4; + } + else { + base = i286c_selector(tmp); + } + switch(op & 0x18) { case 0x00: // es I286_ES = (UINT16)tmp; - ES_BASE = tmp << 4; + ES_BASE = base; break; case 0x10: // ss I286_SS = (UINT16)tmp; - SS_BASE = tmp << 4; - SS_FIX = SS_BASE; + SS_BASE = base; + SS_FIX = base; NEXT_OPCODE break; case 0x18: // ds I286_DS = (UINT16)tmp; - DS_BASE = tmp << 4; - DS_FIX = DS_BASE; + DS_BASE = base; + DS_FIX = base; break; default: // cs @@ -1695,12 +1852,20 @@ I286FN _pushf(void) { // 9C: pushf I286FN _popf(void) { // 9D: popf + UINT flag; + + REGPOP0(flag) + I286_OV = flag & O_FLAG; + I286_FLAG = flag & (0xfff ^ O_FLAG); + I286_TRAP = ((flag & 0x300) == 0x300); I286_WORKCLOCK(5); - REGPOP0(I286_FLAG) - I286_OV = I286_FLAG & O_FLAG; - I286_FLAG &= (0xfff ^ O_FLAG); - I286_TRAP = ((I286_FLAG & 0x300) == 0x300); +#if defined(INTR_FAST) + if ((I286_TRAP) || ((flag & I_FLAG) && (PICEXISTINTR))) { + I286IRQCHECKTERM + } +#else I286IRQCHECKTERM +#endif } I286FN _sahf(void) { // 9E: sahf @@ -1782,7 +1947,7 @@ I286FN _cmpsb(void) { // A6: cmpsb I286_WORKCLOCK(8); dst = i286_memoryread(I286_SI + DS_FIX); src = i286_memoryread(I286_DI + ES_BASE); - BYTE_SUB(res, dst, src) + SUBBYTE(res, dst, src) I286_SI += STRING_DIR; I286_DI += STRING_DIR; } @@ -1796,7 +1961,7 @@ I286FN _cmpsw(void) { // A7: cmpsw I286_WORKCLOCK(8); dst = i286_memoryread_w(I286_SI + DS_FIX); src = i286_memoryread_w(I286_DI + ES_BASE); - WORD_SUB(res, dst, src) + SUBWORD(res, dst, src) I286_SI += STRING_DIRx2; I286_DI += STRING_DIRx2; } @@ -1860,7 +2025,7 @@ I286FN _scasb(void) { // AE: scasb I286_WORKCLOCK(7); src = i286_memoryread(I286_DI + ES_BASE); dst = I286_AL; - BYTE_SUB(res, dst, src) + SUBBYTE(res, dst, src) I286_DI += STRING_DIR; } @@ -1873,7 +2038,7 @@ I286FN _scasw(void) { // AF: scasw I286_WORKCLOCK(7); src = i286_memoryread_w(I286_DI + ES_BASE); dst = I286_AX; - WORD_SUB(res, dst, src) + SUBWORD(res, dst, src) I286_DI += STRING_DIRx2; } @@ -2074,7 +2239,7 @@ I286FN _enter(void) { // C8: enter I286_BP = I286_SP; while(level--) { #if 1 // なにやってんだヲレ - UINT16 val; + REG16 val; bp -= 2; I286_SP -= 2; val = i286_memoryread_w(bp + SS_BASE); @@ -2121,7 +2286,7 @@ I286FN _ret_far(void) { // CB: ret I286FN _int_03(void) { // CC: int 3 - I286_WORKCLOCK(23); + I286_WORKCLOCK(3); INT_NUM(3, I286_IP); } @@ -2129,7 +2294,7 @@ I286FN _int_data8(void) { // CD: int UINT vect; - I286_WORKCLOCK(23); + I286_WORKCLOCK(3); GET_PCBYTE(vect) INT_NUM(vect, I286_IP); } @@ -2138,23 +2303,29 @@ I286FN _into(void) { // CE: into I286_WORKCLOCK(4); if (I286_OV) { - I286_WORKCLOCK(24 - 4); INT_NUM(4, I286_IP); } } I286FN _iret(void) { // CF: iret - extirq_pop(); - I286_WORKCLOCK(31); + UINT flag; + REGPOP0(I286_IP) REGPOP0(I286_CS) - REGPOP0(I286_FLAG) - I286_OV = I286_FLAG & O_FLAG; - I286_FLAG &= 0x7ff; - I286_TRAP = ((I286_FLAG & 0x300) == 0x300); + REGPOP0(flag) + I286_OV = flag & O_FLAG; + I286_FLAG = flag & (0xfff ^ O_FLAG); + I286_TRAP = ((flag & 0x300) == 0x300); CS_BASE = I286_CS << 4; + I286_WORKCLOCK(31); +#if defined(INTR_FAST) + if ((I286_TRAP) || ((flag & I_FLAG) && (PICEXISTINTR))) { + I286IRQCHECKTERM + } +#else I286IRQCHECKTERM +#endif } I286FN _shift_ea8_1(void) { // D0: shift EA8, 1 @@ -2208,7 +2379,7 @@ I286FN _shift_ea8_cl(void) { // D2: sh BYTE *out; UINT op; UINT32 madr; - BYTE cl; + REG8 cl; GET_PCBYTE(op) if (op >= 0xc0) { @@ -2236,7 +2407,7 @@ I286FN _shift_ea16_cl(void) { // D3: s UINT16 *out; UINT op; UINT32 madr; - BYTE cl; + REG8 cl; GET_PCBYTE(op) if (op >= 0xc0) { @@ -2342,9 +2513,9 @@ I286FN _in_al_data8(void) { // E4: i I286_WORKCLOCK(5); GET_PCBYTE(port) - i286reg.inport = CS_BASE + I286_IP; + I286_INPADRS = CS_BASE + I286_IP; I286_AL = iocore_inp8(port); - i286reg.inport = 0; + I286_INPADRS = 0; } I286FN _in_ax_data8(void) { // E5: in ax, DATA8 @@ -2444,12 +2615,12 @@ I286FN _lock(void) { // F0: lock I286FN _repne(void) { // F2: repne - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op_repne[op](); - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -2458,12 +2629,12 @@ I286FN _repne(void) { // F2: repne I286FN _repe(void) { // F3: repe - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op_repe[op](); - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -2520,10 +2691,24 @@ I286FN _cli(void) { // FA: cli I286FN _sti(void) { // FB: sti I286_WORKCLOCK(2); +#if defined(INTR_FAST) + if (I286_FLAG & I_FLAG) { + NEXT_OPCODE; + return; // 更新の意味なし + } +#endif I286_FLAG |= I_FLAG; - I286_TRAP = (I286_FLAG & T_FLAG) >> 8; // ToDo - + I286_TRAP = (I286_FLAG & T_FLAG) >> 8; +#if defined(INTR_FAST) + if ((I286_TRAP) || (PICEXISTINTR)) { + REMAIN_ADJUST(1) + } + else { + NEXT_OPCODE; + } +#else REMAIN_ADJUST(1) +#endif } I286FN _cld(void) { // FC: cld @@ -2838,13 +3023,13 @@ I286FN _repe_segprefix_es(void) { DS_FIX = ES_BASE; SS_FIX = ES_BASE; - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op_repe[op](); REMOVE_PREFIX - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -2855,13 +3040,13 @@ I286FN _repe_segprefix_cs(void) { DS_FIX = CS_BASE; SS_FIX = CS_BASE; - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op_repe[op](); REMOVE_PREFIX - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -2872,13 +3057,13 @@ I286FN _repe_segprefix_ss(void) { DS_FIX = SS_BASE; SS_FIX = SS_BASE; - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op_repe[op](); REMOVE_PREFIX - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -2889,13 +3074,13 @@ I286FN _repe_segprefix_ds(void) { DS_FIX = DS_BASE; SS_FIX = DS_BASE; - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op_repe[op](); REMOVE_PREFIX - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -3183,13 +3368,13 @@ I286FN _repne_segprefix_es(void) { DS_FIX = ES_BASE; SS_FIX = ES_BASE; - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op_repne[op](); REMOVE_PREFIX - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -3200,13 +3385,13 @@ I286FN _repne_segprefix_cs(void) { DS_FIX = CS_BASE; SS_FIX = CS_BASE; - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op_repne[op](); REMOVE_PREFIX - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -3217,13 +3402,13 @@ I286FN _repne_segprefix_ss(void) { DS_FIX = SS_BASE; SS_FIX = SS_BASE; - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op_repne[op](); REMOVE_PREFIX - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP); @@ -3234,13 +3419,13 @@ I286FN _repne_segprefix_ds(void) { DS_FIX = DS_BASE; SS_FIX = DS_BASE; - i286reg.prefix++; - if (i286reg.prefix < MAX_PREFIX) { + I286_PREFIX++; + if (I286_PREFIX < MAX_PREFIX) { UINT op; GET_PCBYTE(op); i286op_repne[op](); REMOVE_PREFIX - i286reg.prefix = 0; + I286_PREFIX = 0; } else { INT_NUM(6, I286_IP);