--- np2/bios/bios18.c 2003/10/21 11:22:05 1.3 +++ np2/bios/bios18.c 2004/02/07 21:23:21 1.12 @@ -1,6 +1,5 @@ #include "compiler.h" -#include "i286.h" -#include "memory.h" +#include "cpucore.h" #include "pccore.h" #include "iocore.h" #include "bios.h" @@ -31,23 +30,27 @@ typedef struct { BYTE GBFILL; } UCWTBL; -#if 0 typedef struct { - BYTE raster; - BYTE cfi; - BYTE pl; - BYTE bl; - BYTE cl; - BYTE ssl; - BYTE padding[2]; + UINT8 raster; + UINT8 pl; + UINT8 bl; + UINT8 cl; } CRTDATA; -static const CRTDATA crtdata[] = { - {0x07, 0x3b, 0x00, 0x07, 0x08, 0x00}, - {0x09, 0x4b, 0x1f, 0x08, 0x08, 0x00}, - {0x0f, 0x7b, 0x00, 0x0f, 0x10, 0x00}, - {0x13, 0x9b, 0x1e, 0x11, 0x10, 0x00}}; -#endif +static const CRTDATA crtdata[4] = { + {0x07, 0x00, 0x07, 0x08}, + {0x09, 0x1f, 0x08, 0x08}, + {0x0f, 0x00, 0x0f, 0x10}, + {0x13, 0x1e, 0x11, 0x10}}; + +typedef struct { + UINT8 lr; + UINT8 cfi; +} CSRFORM; + +static const CSRFORM csrform[4] = { + {0x07, 0x3b}, {0x09, 0x4b}, + {0x0f, 0x7b}, {0x13, 0x9b}}; static UINT16 keyget(void) { @@ -68,6 +71,24 @@ static UINT16 keyget(void) { return(0xffff); } +static void bios0x18_10(REG8 curdel) { + + UINT8 sts; + UINT pos; + + sts = mem[MEMB_CRT_STS_FLAG]; + mem[MEMB_CRT_STS_FLAG] = sts & (~0x40); + pos = sts & 0x01; + if (sts & 0x80) { + pos += 2; + } + mem[MEMB_CRT_CNT] = (curdel << 5); + gdc.m.para[GDC_CSRFORM + 0] = csrform[pos].lr; + gdc.m.para[GDC_CSRFORM + 1] = curdel << 5; + gdc.m.para[GDC_CSRFORM + 2] = csrform[pos].cfi; + gdcs.textdisp |= GDCSCRN_ALLDRAW2 | GDCSCRN_EXT; +} + void bios0x18_16(BYTE chr, BYTE atr) { UINT32 i; @@ -103,7 +124,7 @@ static void bios18_47(void) { } gdc_forceready(&gdc.s); - i286_memstr_read(I286_DS, I286_BX, &ucw, sizeof(ucw)); + i286_memstr_read(CPU_DS, CPU_BX, &ucw, sizeof(ucw)); GBSX1 = LOADINTELWORD(ucw.GBSX1); GBSY1 = LOADINTELWORD(ucw.GBSY1); GBSX2 = LOADINTELWORD(ucw.GBSX2); @@ -165,13 +186,13 @@ static void bios18_47(void) { else { return; } - if ((I286_CH & 0xc0) == 0x40) { + if ((CPU_CH & 0xc0) == 0x40) { GBSY1 += 200; } csrw = (GBSY1 * 40) + (GBSX1 >> 4); csrw += (GBSX1 & 0xf) << 20; GBMDOTI = LOADINTELWORD(ucw.GBMDOTI); - if ((I286_CH & 0x30) == 0x30) { + if ((CPU_CH & 0x30) == 0x30) { if (ucw.GBON_PTN & 1) { func(0x04000 + csrw, &vect, GBMDOTI, GDCOPE_SET); } @@ -192,55 +213,67 @@ static void bios18_47(void) { } } else { - func(csrw + 0x4000 + ((I286_CH & 0x30) << 10), &vect, + func(csrw + 0x4000 + ((CPU_CH & 0x30) << 10), &vect, GBMDOTI, ucw.GBDOTU); } } void bios0x18(void) { + union { + BOOL b; + UINT16 w; + UINT32 d; +const CRTDATA *crt; + } tmp; + UINT pos; BYTE buf[34]; BYTE *p; int i; - UINT16 tmp; - UINT32 pal; -// TRACE_("int18", I286_AH); +#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))); +#endif sti_waiting ^= 1; - if (!sti_waiting) { // 割込み許可の遊び - I286_IP--; - I286_STI; - nevent_forceexit(); - return; + if (sti_waiting) { // 割込み許可の遊び + CPU_STI; + if (PICEXISTINTR) { + CPU_IP--; + nevent_forceexit(); + return; + } } + sti_waiting = 0; - switch(I286_AH) { + switch(CPU_AH) { case 0x00: // キー・データの読みだし if (mem[MEMB_KB_COUNT]) { - I286_AX = keyget(); + CPU_AX = keyget(); } else { - I286_IP--; - I286_REMCLOCK = -1; + CPU_IP--; + CPU_REMCLOCK = -1; break; } break; case 0x01: // キー・バッファ状態のセンス if (mem[MEMB_KB_COUNT]) { - pos = GETBIOSMEM16(MEMW_KB_BUF_HEAD); - I286_AX = GETBIOSMEM16(pos); - I286_BH = 1; + tmp.d = GETBIOSMEM16(MEMW_KB_BUF_HEAD); + CPU_AX = GETBIOSMEM16(tmp.d); + CPU_BH = 1; } else { - I286_BH = 0; + CPU_BH = 0; } break; case 0x02: // シフト・キー状態のセンス - I286_AL = mem[MEMB_SHIFT_STS]; + CPU_AL = mem[MEMB_SHIFT_STS]; break; case 0x03: // キーボード・インタフェイスの初期化 @@ -248,75 +281,57 @@ void bios0x18(void) { break; case 0x04: // キー入力状態のセンス - I286_AH = mem[0x00052a + (I286_AL & 0x0f)]; + CPU_AH = mem[0x00052a + (CPU_AL & 0x0f)]; break; case 0x05: // キー入力センス if (mem[MEMB_KB_COUNT]) { - I286_AX = keyget(); - I286_BH = 1; + CPU_AX = keyget(); + CPU_BH = 1; } else { - I286_BH = 0; + CPU_BH = 0; } break; case 0x0a: // CRTモードの設定 -#if 1 - mem[MEMB_CRT_STS_FLAG] = 0x80 | (I286_AL & 0x0f); // GDCバッファを空に if (gdc.m.cnt) { gdc_work(GDCWORK_MASTER); } gdc_forceready(&gdc.m); - gdc.mode1 &= ~(0x25); - gdc.mode1 |= 0x08; - if (I286_AL & 0x02) { + gdc.mode1 &= ~(0x2d); + mem[MEMB_CRT_STS_FLAG] = CPU_AL; + tmp.crt = crtdata; + if (!(np2cfg.dipsw[0] & 1)) { + mem[MEMB_CRT_STS_FLAG] |= 0x80; + gdc.mode1 |= 0x08; + tmp.crt += 2; + } + if (CPU_AL & 0x01) { + tmp.crt += 1; // 20行 + } + if (CPU_AL & 0x02) { gdc.mode1 |= 0x04; // 40桁 } - if (I286_AL & 0x04) { + if (CPU_AL & 0x04) { gdc.mode1 |= 0x01; // アトリビュート } - if (I286_AL & 0x08) { + if (CPU_AL & 0x08) { gdc.mode1 |= 0x20; // コードアクセス } - if (I286_AL & 0x01) { // 20行 - mem[MEMB_CRT_RASTER] = 0x13; - gdc.m.para[GDC_CSRFORM + 0] = 0x13; - gdc.m.para[GDC_CSRFORM + 1] = 0x00; - gdc.m.para[GDC_CSRFORM + 2] = 0x9b; - crtc.reg.pl = 0x1e; - crtc.reg.bl = 0x11; - } - else { // 25行 - mem[MEMB_CRT_RASTER] = 0x0f; - gdc.m.para[GDC_CSRFORM + 0] = 0x0f; - gdc.m.para[GDC_CSRFORM + 1] = 0x00; - gdc.m.para[GDC_CSRFORM + 2] = 0x7b; - crtc.reg.pl = 0x00; - crtc.reg.bl = 0x0f; - } - crtc.reg.cl = 0x10; - crtc.reg.ssl = 0x00; - gdcs.textdisp |= GDCSCRN_ALLDRAW2; + mem[MEMB_CRT_RASTER] = tmp.crt->raster; + crtc.reg.pl = tmp.crt->pl; + crtc.reg.bl = tmp.crt->bl; + crtc.reg.cl = tmp.crt->cl; + crtc.reg.ssl = 0; gdc_restorekacmode(); + bios0x18_10(0); break; -#else - // GDCバッファを空に - if (gdc.m.cnt) { - gdc_work(GDCWORK_MASTER); - } - gdc_forceready(&gdc.m); - - mem[MEMB_CRT_STS_FLAG] = I286_AL; - if (systemport_r(0x33) & 0x08) { - mem[MEMB_CRT_STS_FLAG] |= 0x80; - } -#endif case 0x0b: // CRTモードのセンス - I286_AL = mem[MEMB_CRT_STS_FLAG]; + CPU_AL = mem[MEMB_CRT_STS_FLAG]; break; case 0x0c: // テキスト画面の表示開始 @@ -341,36 +356,44 @@ void bios0x18(void) { gdc_forceready(&gdc.m); ZeroMemory(&gdc.m.para[GDC_SCROLL], 16); - tmp = I286_DX >> 1; - STOREINTELWORD(gdc.m.para + GDC_SCROLL, tmp); + tmp.w = CPU_DX >> 1; + STOREINTELWORD(mem + MEMW_CRT_W_VRAMADR, tmp.w); + STOREINTELWORD(gdc.m.para + GDC_SCROLL + 0, tmp.w); + tmp.w = 200 << 4; + if (mem[MEMB_CRT_STS_FLAG] & 0x80) { + tmp.w <<= 1; + } + STOREINTELWORD(mem + MEMW_CRT_W_RASTER, tmp.w); + STOREINTELWORD(gdc.m.para + GDC_SCROLL + 2, tmp.w); gdcs.textdisp |= GDCSCRN_ALLDRAW2; screenupdate |= 2; break; case 0x0f: // 複数の表示領域の設定 - SETBIOSMEM16(0x0053e, I286_CX); - SETBIOSMEM16(0x00540, I286_BX); - mem[0x00547] = I286_DH; - mem[0x0053D] = I286_DL; + SETBIOSMEM16(0x0053e, CPU_CX); + SETBIOSMEM16(0x00540, CPU_BX); + mem[0x00547] = CPU_DH; + mem[0x0053D] = CPU_DL; // wait sync int - if ((i = I286_DL) > 0) { - pos = I286_CX; - p = gdc.m.para + GDC_SCROLL + (I286_DH << 2); + if ((i = CPU_DL) > 0) { + pos = CPU_CX; + p = gdc.m.para + GDC_SCROLL + (CPU_DH << 2); while((i--) && (p < (gdc.m.para + GDC_SCROLL + 0x10))) { - tmp = i286_memword_read(I286_BX, pos); - tmp >>= 1; - STOREINTELWORD(p, tmp); - tmp = i286_memword_read(I286_BX, pos + 2); - if (!(mem[MEMB_CRT_STS_FLAG] & 1)) { // 25 - tmp *= (16 * 16); + REG16 t; + t = i286_memword_read(CPU_BX, pos); + t >>= 1; + STOREINTELWORD(p, t); + t = i286_memword_read(CPU_BX, pos + 2); + if (!(mem[MEMB_CRT_STS_FLAG] & 0x01)) { // 25 + t *= (16 * 16); } - else { // 20 - tmp *= (20 * 16); + else { // 20 + t *= (20 * 16); } - if (!(mem[MEMB_CRT_STS_FLAG] & 0x80)) { // ver0.29 - tmp >>= 1; + if (!(mem[MEMB_CRT_STS_FLAG] & 0x80)) { + t >>= 1; } - STOREINTELWORD(p + 2, tmp); + STOREINTELWORD(p + 2, t); pos += 4; p += 4; } @@ -385,11 +408,7 @@ void bios0x18(void) { gdc_work(GDCWORK_MASTER); } gdc_forceready(&gdc.m); - - gdc.m.para[GDC_CSRFORM + 0] &= 0x7f; - gdc.m.para[GDC_CSRFORM + 1] &= 0xdf; - gdc.m.para[GDC_CSRFORM + 1] |= (I286_AL & 1) << 5; - gdcs.textdisp |= GDCSCRN_EXT; + bios0x18_10((REG8)(CPU_AL & 1)); break; case 0x11: // カーソルの表示開始 @@ -425,47 +444,47 @@ void bios0x18(void) { } gdc_forceready(&gdc.m); - tmp = I286_DX >> 1; - if (LOADINTELWORD(gdc.m.para + GDC_CSRW) != tmp) { - STOREINTELWORD(gdc.m.para + GDC_CSRW, tmp); + tmp.w = CPU_DX >> 1; + if (LOADINTELWORD(gdc.m.para + GDC_CSRW) != tmp.w) { + STOREINTELWORD(gdc.m.para + GDC_CSRW, tmp.w); gdcs.textdisp |= GDCSCRN_EXT; } break; case 0x14: // フォントパターンの読み出し - switch(I286_DH) { + switch(CPU_DH) { case 0x00: // 8x8 - i286_memword_write(I286_BX, I286_CX, 0x0101); - i286_memstr_write(I286_BX, I286_CX+2, - &font[0x82000 + (I286_DL << 3)], 8); + i286_memword_write(CPU_BX, CPU_CX, 0x0101); + i286_memstr_write(CPU_BX, CPU_CX + 2, + fontrom + 0x82000 + (CPU_DL << 4), 8); break; case 0x28: // 8x16 KANJI case 0x29: case 0x2a: case 0x2b: - i286_memword_write(I286_BX, I286_CX, 0x0102); - i286_memstr_write(I286_BX, I286_CX+2, - &font[((I286_DL & 0x7f) << 12) - + ((I286_DH - 0x20) << 4)], 16); + i286_memword_write(CPU_BX, CPU_CX, 0x0102); + i286_memstr_write(CPU_BX, CPU_CX + 2, + fontrom + ((CPU_DL & 0x7f) << 12) + + ((CPU_DH - 0x20) << 4), 16); break; case 0x80: // 8x16 ANK - i286_memword_write(I286_BX, I286_CX, 0x0102); - i286_memstr_write(I286_BX, I286_CX+2, - &font[0x80000 + (I286_DL << 4)], 16); + i286_memword_write(CPU_BX, CPU_CX, 0x0102); + i286_memstr_write(CPU_BX, CPU_CX + 2, + fontrom + 0x80000 + (CPU_DL << 4), 16); break; default: buf[0] = 0x02; buf[1] = 0x02; - p = &font[((I286_DL & 0x7f) << 12) - + (((I286_DH - 0x20) & 0x7f) << 4)]; + p = fontrom + ((CPU_DL & 0x7f) << 12) + + (((CPU_DH - 0x20) & 0x7f) << 4); for (i=1; i<17; i++, p++) { buf[i*2+0] = *p; buf[i*2+1] = *(p+0x800); } - i286_memstr_write(I286_BX, I286_CX, buf, 34); + i286_memstr_write(CPU_BX, CPU_CX, buf, 34); break; } break; @@ -474,7 +493,7 @@ void bios0x18(void) { break; case 0x16: // テキストVRAMの初期化 - bios0x18_16(I286_DL, I286_DH); + bios0x18_16(CPU_DL, CPU_DH); break; case 0x17: // ブザーの起呼 @@ -489,10 +508,10 @@ void bios0x18(void) { break; case 0x1a: // ユーザー文字の定義 - if ((I286_DH & 0x7e) == 0x76) { - i286_memstr_read(I286_BX, I286_CX+2, buf, 32); - p = &font[((I286_DL & 0x7f) << 12) - + (((I286_DH - 0x20) & 0x7f) << 4)]; + if ((CPU_DH & 0x7e) == 0x76) { + i286_memstr_read(CPU_BX, CPU_CX + 2, buf, 32); + p = fontrom + ((CPU_DL & 0x7f) << 12) + + (((CPU_DH - 0x20) & 0x7f) << 4); for (i=0; i<16; i++, p++) { *p = buf[i*2+0]; *(p+0x800) = buf[i*2+1]; @@ -502,7 +521,7 @@ void bios0x18(void) { break; case 0x1b: // KCGアクセスモードの設定 - switch(I286_AL) { // 実装し忘れ // ver0.28 + switch(CPU_AL) { case 0: mem[MEMB_CRT_STS_FLAG] &= ~0x08; gdc.mode1 &= ~0x20; @@ -518,17 +537,28 @@ void bios0x18(void) { break; case 0x40: // グラフィック画面の表示開始 + // GDCバッファを空に + if (gdc.s.cnt) { + gdc_work(GDCWORK_SLAVE); + } if (!(gdcs.grphdisp & GDCSCRN_ENABLE)) { gdcs.grphdisp |= GDCSCRN_ENABLE; screenupdate |= 2; } + mem[MEMB_PRXCRT] |= 0x80; break; case 0x41: // グラフィック画面の表示終了 + // GDCバッファを空に + if (gdc.s.cnt) { + gdc_work(GDCWORK_SLAVE); + } + gdc_forceready(&gdc.s); if (gdcs.grphdisp & GDCSCRN_ENABLE) { gdcs.grphdisp &= ~(GDCSCRN_ENABLE); screenupdate |= 2; } + mem[MEMB_PRXCRT] &= 0x7f; break; case 0x42: // 表示領域の設定 @@ -539,7 +569,7 @@ void bios0x18(void) { gdc_forceready(&gdc.s); ZeroMemory(&gdc.s.para[GDC_SCROLL], 8); - switch(I286_CH & 0xc0) { + switch(CPU_CH & 0xc0) { case 0x40: // UPPER if ((mem[MEMB_PRXDUPD] & 0x24) == 0x24) { mem[MEMB_PRXDUPD] ^= 4; @@ -547,8 +577,7 @@ void bios0x18(void) { gdc.s.para[GDC_PITCH] = 40; gdcs.grphdisp |= GDCSCRN_EXT; } - gdc.mode1 |= 0x10; - gdc.s.para[GDC_CSRFORM] = 1; + tmp.b = TRUE; gdc.s.para[GDC_SCROLL+0] = (200*40) & 0xff; gdc.s.para[GDC_SCROLL+1] = (200*40) >> 8; break; @@ -560,8 +589,7 @@ void bios0x18(void) { gdc.s.para[GDC_PITCH] = 40; gdcs.grphdisp |= GDCSCRN_EXT; } - gdc.mode1 |= 0x10; - gdc.s.para[GDC_CSRFORM] = 1; + tmp.b = TRUE; break; default: // ALL @@ -571,22 +599,29 @@ void bios0x18(void) { gdc.s.para[GDC_PITCH] = 80; gdcs.grphdisp |= GDCSCRN_EXT; } - gdc.mode1 &= ~(0x10); - gdc.s.para[GDC_CSRFORM] = 0; + tmp.b = FALSE; break; } - gdcs.disp = (I286_CH >> 4) & 1; // 00/05/23 + if ((!tmp.b) || (gdc.crt15khz)) { + gdc.mode1 &= ~(0x10); + gdc.s.para[GDC_CSRFORM] = 0; + } + else { + gdc.mode1 |= 0x10; + gdc.s.para[GDC_CSRFORM] = 1; + } + gdcs.disp = (CPU_CH >> 4) & 1; gdcs.grphdisp |= GDCSCRN_ALLDRAW2; screenupdate |= 2; break; case 0x43: // パレットの設定 - i286_memstr_read(I286_DS, I286_BX + offsetof(UCWTBL, GBCPC), + i286_memstr_read(CPU_DS, CPU_BX + offsetof(UCWTBL, GBCPC), buf, 4); - pal = LOADINTELDWORD(buf); + tmp.d = LOADINTELDWORD(buf); for (i=8; i--;) { - gdc_setdegitalpal(i, (BYTE)(pal & 15)); - pal >>= 4; + gdc_setdegitalpal(i, (REG8)(tmp.d & 15)); + tmp.d >>= 4; } break;