--- np2/bios/bios18.c 2004/02/29 07:36:56 1.28 +++ np2/bios/bios18.c 2004/06/18 07:42:13 1.38 @@ -8,8 +8,6 @@ #include "font.h" -static int sti_waiting = 0; - typedef struct { BYTE GBON_PTN; BYTE GBBCC; @@ -41,10 +39,10 @@ typedef struct { static const UINT8 modenum[4] = {3, 1, 0, 2}; static const CRTDATA crtdata[7] = { - {0x07, 0x00, 0x07, 0x08}, // 200-20 - {0x09, 0x1f, 0x08, 0x08}, // 200-25 - {0x0f, 0x00, 0x0f, 0x10}, // 400-20 - {0x13, 0x1e, 0x11, 0x10}, // 400-25 + {0x09, 0x1f, 0x08, 0x08}, // 200-20 + {0x07, 0x00, 0x07, 0x08}, // 200-25 + {0x13, 0x1e, 0x11, 0x10}, // 400-20 + {0x0f, 0x00, 0x0f, 0x10}, // 400-25 {0x17, 0x1c, 0x13, 0x10}, // 480-20 {0x12, 0x1f, 0x11, 0x10}, // 480-25 {0x0f, 0x00, 0x0f, 0x10}}; // 480-30 @@ -114,8 +112,8 @@ const CRTDATA *crt; gdc.mode1 |= 0x08; crt += 2; } - if (mode & 0x01) { - crt += 1; // 20行 + if (!(mode & 0x01)) { + crt += 1; // 25行 } if (mode & 0x02) { gdc.mode1 |= 0x04; // 40桁 @@ -135,6 +133,14 @@ const CRTDATA *crt; bios0x18_10(0); } +void bios0x18_0c(void) { + + if (!(gdcs.textdisp & GDCSCRN_ENABLE)) { + gdcs.textdisp |= GDCSCRN_ENABLE; + screenupdate |= 2; + } +} + static void bios0x18_0f(UINT seg, UINT off, REG8 num, REG8 cnt) { BYTE *p; @@ -167,10 +173,10 @@ static void bios0x18_0f(UINT seg, UINT o #endif while((cnt--) && (p < (gdc.m.para + GDC_SCROLL + 0x10))) { - t = i286_memword_read(seg, off); + t = MEML_READ16(seg, off); t >>= 1; STOREINTELWORD(p, t); - t = i286_memword_read(seg, off + 2); + t = MEML_READ16(seg, off + 2); t *= raster; STOREINTELWORD(p + 2, t); off += 4; @@ -208,27 +214,27 @@ const BYTE *p; switch(code >> 8) { case 0x00: // 8x8 size = 0x0101; - i286_memword_write(seg, off, 0x0101); + MEML_WRITE16(seg, off, 0x0101); p = fontrom + 0x82000 + ((code & 0xff) << 4); - i286_memstr_write(seg, off + 2, p, 8); + MEML_WRITESTR(seg, off + 2, p, 8); break; - case 0x28: // 8x16 KANJI - case 0x29: +// case 0x28: + case 0x29: // 8x16 KANJI case 0x2a: case 0x2b: size = 0x0102; - i286_memword_write(seg, off, 0x0102); + MEML_WRITE16(seg, off, 0x0102); p = fontrom; p += (code & 0x7f) << 12; p += (((code >> 8) - 0x20) & 0x7f) << 4; - i286_memstr_write(seg, off + 2, p, 16); + MEML_WRITESTR(seg, off + 2, p, 16); break; case 0x80: // 8x16 ANK size = 0x0102; p = fontrom + 0x80000 + ((code & 0xff) << 4); - i286_memstr_write(seg, off + 2, p, 16); + MEML_WRITESTR(seg, off + 2, p, 16); break; default: @@ -240,10 +246,10 @@ const BYTE *p; buf[i*2+0] = *p; buf[i*2+1] = *(p+0x800); } - i286_memstr_write(seg, off + 2, buf, 32); + MEML_WRITESTR(seg, off + 2, buf, 32); break; } - i286_memword_write(seg, off, size); + MEML_WRITE16(seg, off, size); return(size); } @@ -254,7 +260,7 @@ static void bios0x18_1a(REG16 seg, REG16 UINT i; if (((code >> 8) & 0x7e) == 0x76) { - i286_memstr_read(seg, off + 2, buf, 32); + MEML_READSTR(seg, off + 2, buf, 32); p = fontrom; p += (code & 0x7f) << 12; p += (((code >> 8) - 0x20) & 0x7f) << 4; @@ -300,9 +306,9 @@ const CRTDATA *p; gdc_analogext(TRUE); mem[MEMB_PRXDUPD] |= 0x80; crt = 4; - master = 3; + master = 3 + (scrn & 3); slave = 1; - gdc.display |= 0x10; + gdc.analog |= (1 << GDCANALOG_256E); } else #endif @@ -335,10 +341,10 @@ const CRTDATA *p; gdc_analogext(FALSE); mem[MEMB_PRXDUPD] &= ~0x80; } + gdc.analog &= ~(1 << (GDCANALOG_256E)); #endif } crt += (scrn & 3); - master += (scrn & 3); if (rate & 4) { gdc.display |= (1 << GDCDISP_31); @@ -468,7 +474,7 @@ void bios0x18_42(REG8 mode) { scrn = bios0x18_31bh(); if ((mem[MEMB_CRT_BIOS] & 0x80) && (((scrn & 0x30) == 0x30) || (crtmode == 3))) { - bios0x18_30(rate, (crtmode << 4) + 1); + bios0x18_30(rate, (REG8)((crtmode << 4) + 1)); } else { #endif @@ -561,7 +567,7 @@ static void bios0x18_47(void) { SINT16 dy; gdc_forceready(GDCWORK_SLAVE); - i286_memstr_read(CPU_DS, CPU_BX, &ucw, sizeof(ucw)); + MEML_READSTR(CPU_DS, CPU_BX, &ucw, sizeof(ucw)); GBSX1 = LOADINTELWORD(ucw.GBSX1); GBSY1 = LOADINTELWORD(ucw.GBSY1); GBSX2 = LOADINTELWORD(ucw.GBSX2); @@ -620,7 +626,8 @@ static void bios0x18_47(void) { vect.ope = 0x20 + (ucw.GBDSP & 7); vect.DC[0] = ucw.GBLNG1[0]; vect.DC[1] = ucw.GBLNG1[1]; - data = LOADINTELWORD(ucw.GBLNG2) - 1; +// data = LOADINTELWORD(ucw.GBLNG2) - 1; + data = LOADINTELWORD(ucw.GBCIR) - 1; STOREINTELWORD(vect.D, data); data >>= 1; STOREINTELWORD(vect.D2, data); @@ -672,7 +679,7 @@ static void bios0x18_49(void) { gdc_forceready(GDCWORK_SLAVE); - i286_memstr_read(CPU_DS, CPU_BX, &ucw, sizeof(ucw)); + MEML_READSTR(CPU_DS, CPU_BX, &ucw, sizeof(ucw)); for (i=0; i<8; i++) { mem[MEMW_PRXGLS + i] = ucw.GBMDOTI[i]; pat[i] = GDCPATREVERSE(ucw.GBMDOTI[i]); @@ -754,23 +761,12 @@ void bios0x18(void) { } tmp; int i; -#if 1 +#if 0 TRACEOUT(("int18 AX=%.4x %.4x:%.4x", CPU_AX, - i286_memword_read(CPU_SS, CPU_SP+2), - i286_memword_read(CPU_SS, CPU_SP))); + MEML_READ16(CPU_SS, CPU_SP+2), + MEML_READ16(CPU_SS, CPU_SP))); #endif - sti_waiting ^= 1; - if (sti_waiting) { // 割込み許可の遊び - CPU_STI; - if (PICEXISTINTR) { - CPU_IP--; - nevent_forceexit(); - return; - } - } - sti_waiting = 0; - switch(CPU_AH) { case 0x00: // キー・データの読みだし if (mem[MEMB_KB_COUNT]) { @@ -803,7 +799,7 @@ void bios0x18(void) { break; case 0x04: // キー入力状態のセンス - CPU_AH = mem[0x00052a + (CPU_AL & 0x0f)]; + CPU_AH = mem[MEMX_KB_KY_STS + (CPU_AL & 0x0f)]; break; case 0x05: // キー入力センス @@ -825,10 +821,7 @@ void bios0x18(void) { break; case 0x0c: // テキスト画面の表示開始 - if (!(gdcs.textdisp & GDCSCRN_ENABLE)) { - gdcs.textdisp |= GDCSCRN_ENABLE; - screenupdate |= 2; - } + bios0x18_0c(); break; case 0x0d: // テキスト画面の表示終了 @@ -940,12 +933,10 @@ void bios0x18(void) { if (tmp.r8 == 0x05) { CPU_AL = 0; CPU_BH = 0; - TRACEOUT(("success")); } else { CPU_AL = 1; CPU_BH = 1; - TRACEOUT(("failure")); } } break; @@ -970,7 +961,7 @@ void bios0x18(void) { break; case 0x43: // パレットの設定 - i286_memstr_read(CPU_DS, CPU_BX + offsetof(UCWTBL, GBCPC), + MEML_READSTR(CPU_DS, CPU_BX + offsetof(UCWTBL, GBCPC), tmp.col, 4); for (i=0; i<4; i++) { gdc_setdegitalpal(6 - (i*2), (REG8)(tmp.col[i] >> 4)); @@ -980,7 +971,7 @@ void bios0x18(void) { case 0x44: // ボーダカラーの設定 // if (!(mem[MEMB_PRXCRT] & 0x40)) { -// color = i286_membyte_read(CPU_DS, CPU_BX + 1); +// color = MEML_READ8(CPU_DS, CPU_BX + 1); // } break;