--- np2/bios/bios18.c	2004/02/07 21:23:21	1.12
+++ np2/bios/bios18.c	2004/02/20 08:32:23	1.20
@@ -52,6 +52,10 @@ static const CSRFORM csrform[4] = {
 						{0x07, 0x3b}, {0x09, 0x4b},
 						{0x0f, 0x7b}, {0x13, 0x9b}};
 
+static const UINT8 sync200l[8] = {0x02,0x26,0x03,0x11,0x86,0x0f,0xc8,0x94};
+static const UINT8 sync200m[8] = {0x02,0x26,0x03,0x11,0x83,0x07,0x90,0x65};
+static const UINT8 sync400m[8] = {0x02,0x4e,0x07,0x25,0x87,0x07,0x90,0x65};
+
 
 static UINT16 keyget(void) {
 
@@ -89,7 +93,46 @@ static void bios0x18_10(REG8 curdel) {
 	gdcs.textdisp |= GDCSCRN_ALLDRAW2 | GDCSCRN_EXT;
 }
 
-void bios0x18_16(BYTE chr, BYTE atr) {
+void bios0x18_0a(REG8 mode) {
+
+const CRTDATA	*crt;
+
+	// GDCバッファを空に
+	if (gdc.m.cnt) {
+		gdc_work(GDCWORK_MASTER);
+	}
+	gdc_forceready(&gdc.m);
+
+	gdc.mode1 &= ~(0x2d);
+	mem[MEMB_CRT_STS_FLAG] = mode;
+	crt = crtdata;
+	if (!(np2cfg.dipsw[0] & 1)) {
+		mem[MEMB_CRT_STS_FLAG] |= 0x80;
+		gdc.mode1 |= 0x08;
+		crt += 2;
+	}
+	if (mode & 0x01) {
+		crt += 1;					// 20行
+	}
+	if (mode & 0x02) {
+		gdc.mode1 |= 0x04;				// 40桁
+	}
+	if (mode & 0x04) {
+		gdc.mode1 |= 0x01;				// アトリビュート
+	}
+	if (mode & 0x08) {
+		gdc.mode1 |= 0x20;				// コードアクセス
+	}
+	mem[MEMB_CRT_RASTER] = crt->raster;
+	crtc.reg.pl = crt->pl;
+	crtc.reg.bl = crt->bl;
+	crtc.reg.cl = crt->cl;
+	crtc.reg.ssl = 0;
+	gdc_restorekacmode();
+	bios0x18_10(0);
+}
+
+void bios0x18_16(REG8 chr, REG8 atr) {
 
 	UINT32	i;
 
@@ -105,6 +148,22 @@ void bios0x18_16(BYTE chr, BYTE atr) {
 
 #define	SWAPU16(a, b) { UINT16 tmp; tmp = (a); (a) = (b); (b) = tmp; }
 
+
+static void setbiosgdc(UINT32 csrw, const GDCVECT *vect, UINT8 ope) {
+
+	gdc.s.para[GDC_CSRW + 0] = (BYTE)csrw;
+	gdc.s.para[GDC_CSRW + 1] = (BYTE)(csrw >> 8);
+	gdc.s.para[GDC_CSRW + 2] = (BYTE)(csrw >> 16);
+
+	gdc.s.para[GDC_VECTW] = vect->ope;
+	gdc_vectreset(&gdc.s);
+
+	gdc.s.para[GDC_WRITE] = ope;
+	mem[MEMB_PRXDUPD] &= ~3;
+	mem[MEMB_PRXDUPD] |= ope;
+}
+
+
 static void bios18_47(void) {
 
 	UCWTBL		ucw;
@@ -116,7 +175,11 @@ static void bios18_47(void) {
 	GDCSUBFN	func;
 	UINT32		csrw;
 	UINT16		data;
+	UINT16		data2;
 	UINT16		GBMDOTI;
+	UINT8		ope;
+	SINT16		dx;
+	SINT16		dy;
 
 	// GDCバッファを空に
 	if (gdc.s.cnt) {
@@ -125,14 +188,16 @@ static void bios18_47(void) {
 	gdc_forceready(&gdc.s);
 
 	i286_memstr_read(CPU_DS, CPU_BX, &ucw, sizeof(ucw));
+
 	GBSX1 = LOADINTELWORD(ucw.GBSX1);
 	GBSY1 = LOADINTELWORD(ucw.GBSY1);
 	GBSX2 = LOADINTELWORD(ucw.GBSX2);
 	GBSY2 = LOADINTELWORD(ucw.GBSY2);
 	ZeroMemory(&vect, sizeof(vect));
+	data = 0;
+	data2 = 0;
 	if (ucw.GBDTYP == 0x01) {
-		short dx, dy;
-		func = gdcsub_line;
+		func = gdcsub_vectl;
 		if ((GBSX1 > GBSX2) ||
 			((GBSX1 == GBSX2) && (GBSY1 > GBSY2))) {
 			SWAPU16(GBSX1, GBSX2);
@@ -159,6 +224,7 @@ static void bios18_47(void) {
 				SWAPU16(dx, dy);
 			}
 		}
+		vect.ope += 0x08;
 		STOREINTELWORD(vect.DC, dx);
 		data = dy * 2;
 		STOREINTELWORD(vect.D1, data);
@@ -167,64 +233,162 @@ static void bios18_47(void) {
 		data -= dx;
 		STOREINTELWORD(vect.D2, data);
 	}
-	else if (ucw.GBDTYP == 0x02) {
-		func = gdcsub_box;
-		if (GBSX1 > GBSX2) {
-			SWAPU16(GBSX1, GBSX2);
+	else if (ucw.GBDTYP <= 0x02) {
+		func = gdcsub_vectr;
+		vect.ope = 0x40 + (ucw.GBDSP & 7);
+		dx = GBSX2 - GBSX1;
+		if (dx < 0) {
+			dx = 0 - dx;
 		}
-		if (GBSY1 > GBSY2) {
-			SWAPU16(GBSY1, GBSY2);
+		dy = GBSY2 - GBSY1;
+		if (dy < 0) {
+			dy = 0 - dy;
+		}
+		switch(ucw.GBDSP & 3) {
+			case 0:
+				data = dy;
+				data2 = dx;
+				break;
+
+			case 1:
+				data2 = (UINT16)dx + (UINT16)dy;
+				data2 >>= 1;
+				data = (UINT16)dx - (UINT16)dy;
+				data = (data >> 1) & 0x3fff;
+				break;
+
+			case 2:
+				data = dx;
+				data2 = dy;
+				break;
+
+			case 3:
+				data2 = (UINT16)dx + (UINT16)dy;
+				data2 >>= 1;
+				data = (UINT16)dy - (UINT16)dx;
+				data = (data >> 1) & 0x3fff;
+				break;
 		}
 		STOREINTELWORD(vect.DC, 3);
+		STOREINTELWORD(vect.D, data);
+		STOREINTELWORD(vect.D2, data2);
 		STOREINTELWORD(vect.D1, 0xffff);
-		data = GBSX2 - GBSX1;
 		STOREINTELWORD(vect.DM, data);
-		STOREINTELWORD(vect.D2, data);
-		data = GBSY2 - GBSY1;
+	}
+	else {
+		func = gdcsub_vectc;
+		vect.ope = 0x20 + (ucw.GBDSP & 7);
+		vect.DC[0] = ucw.GBLNG1[0];
+		vect.DC[1] = ucw.GBLNG1[1];
+		data = LOADINTELWORD(ucw.GBLNG2) - 1;
 		STOREINTELWORD(vect.D, data);
+		data >>= 1;
+		STOREINTELWORD(vect.D2, data);
+		STOREINTELWORD(vect.D1, 0x3fff);
+		if (ucw.GBDTYP == 0x04) {
+			vect.DM[0] = ucw.GBMDOT[0];
+			vect.DM[1] = ucw.GBMDOT[1];
+		}
+	}
+	if ((CPU_CH & 0xc0) == 0x40) {
+		GBSY1 += 200;
+	}
+	csrw = (GBSY1 * 40) + (GBSX1 >> 4);
+	csrw += (GBSX1 & 0xf) << 20;
+	GBMDOTI = (GDCPATREVERSE(ucw.GBMDOTI[0]) << 8) +
+											GDCPATREVERSE(ucw.GBMDOTI[1]);
+	if ((CPU_CH & 0x30) == 0x30) {
+		ope = (ucw.GBON_PTN & 1)?GDCOPE_SET:GDCOPE_CLEAR;
+		func(csrw + 0x4000, &vect, GBMDOTI, ope);
+		ope = (ucw.GBON_PTN & 2)?GDCOPE_SET:GDCOPE_CLEAR;
+		func(csrw + 0x8000, &vect, GBMDOTI, ope);
+		ope = (ucw.GBON_PTN & 4)?GDCOPE_SET:GDCOPE_CLEAR;
+		csrw += 0xc000;
+		func(csrw, &vect, GBMDOTI, ope);
 	}
 	else {
-		return;
+		ope = ucw.GBDOTU & 3;
+		csrw += 0x4000 + ((CPU_CH & 0x30) << 10);
+		func(csrw, &vect, GBMDOTI, ope);
+	}
+
+	// 最後に使った奴を記憶
+	*(UINT16 *)(mem + MEMW_PRXGLS) = *(UINT16 *)(ucw.GBMDOTI);
+	*(UINT16 *)(gdc.s.para + GDC_TEXTW) = *(UINT16 *)(ucw.GBMDOTI);
+	setbiosgdc(csrw, &vect, ope);
+}
+
+static void bios18_49(void) {
+
+	UCWTBL		ucw;
+	UINT		i;
+	BYTE		pat[8];
+	UINT16		tmp;
+	GDCVECT		vect;
+	UINT16		GBSX1;
+	UINT16		GBSY1;
+	UINT32		csrw;
+	UINT8		ope;
+
+	// GDCバッファを空に
+	if (gdc.s.cnt) {
+		gdc_work(GDCWORK_SLAVE);
+	}
+	gdc_forceready(&gdc.s);
+
+	i286_memstr_read(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]);
+		gdc.s.para[GDC_TEXTW + i] = pat[i];
+	}
+	vect.ope = 0x10 + (ucw.GBDSP & 7);
+	if (*(UINT16 *)ucw.GBLNG1) {
+		tmp = (LOADINTELWORD(ucw.GBLNG2) - 1) & 0x3fff;
+		STOREINTELWORD(vect.DC, tmp);
+		vect.D[0] = ucw.GBLNG1[0];
+		vect.D[1] = ucw.GBLNG1[1];
 	}
+	else {
+		STOREINTELWORD(vect.DC, 7);
+		STOREINTELWORD(vect.D, 7);
+	}
+
+	GBSX1 = LOADINTELWORD(ucw.GBSX1);
+	GBSY1 = LOADINTELWORD(ucw.GBSY1);
 	if ((CPU_CH & 0xc0) == 0x40) {
 		GBSY1 += 200;
 	}
 	csrw = (GBSY1 * 40) + (GBSX1 >> 4);
 	csrw += (GBSX1 & 0xf) << 20;
-	GBMDOTI = LOADINTELWORD(ucw.GBMDOTI);
 	if ((CPU_CH & 0x30) == 0x30) {
-		if (ucw.GBON_PTN & 1) {
-			func(0x04000 + csrw, &vect, GBMDOTI, GDCOPE_SET);
-		}
-		else {
-			func(0x04000 + csrw, &vect, GBMDOTI, GDCOPE_CLEAR);
-		}
-		if (ucw.GBON_PTN & 2) {
-			func(0x08000 + csrw, &vect, GBMDOTI, GDCOPE_SET);
-		}
-		else {
-			func(0x08000 + csrw, &vect, GBMDOTI, GDCOPE_CLEAR);
-		}
-		if (ucw.GBON_PTN & 4) {
-			func(0x0c000 + csrw, &vect, GBMDOTI, GDCOPE_SET);
-		}
-		else {
-			func(0x0c000 + csrw, &vect, GBMDOTI, GDCOPE_CLEAR);
-		}
+		ope = (ucw.GBON_PTN & 1)?GDCOPE_SET:GDCOPE_CLEAR;
+		gdcsub_text(csrw + 0x4000, &vect, pat, ope);
+		ope = (ucw.GBON_PTN & 2)?GDCOPE_SET:GDCOPE_CLEAR;
+		gdcsub_text(csrw + 0x8000, &vect, pat, ope);
+		ope = (ucw.GBON_PTN & 4)?GDCOPE_SET:GDCOPE_CLEAR;
+		csrw += 0xc000;
+		gdcsub_text(csrw, &vect, pat, ope);
 	}
 	else {
-		func(csrw + 0x4000 + ((CPU_CH & 0x30) << 10), &vect,
-														GBMDOTI, ucw.GBDOTU);
+		ope = ucw.GBDOTU & 3;
+		csrw += 0x4000 + ((CPU_CH & 0x30) << 10);
+		gdcsub_text(csrw, &vect, pat, ope);
 	}
+
+	// 最後に使った奴を記憶
+	setbiosgdc(csrw, &vect, ope);
 }
 
+
+// ----
+
 void bios0x18(void) {
 
 	union {
 		BOOL	b;
 		UINT16	w;
 		UINT32	d;
-const CRTDATA	*crt;
 	}		tmp;
 
 	UINT	pos;
@@ -295,39 +459,7 @@ const CRTDATA	*crt;
  			break;
 
    		case 0x0a:						// CRTモードの設定
-			// GDCバッファを空に
-			if (gdc.m.cnt) {
-				gdc_work(GDCWORK_MASTER);
-			}
-			gdc_forceready(&gdc.m);
-
-			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 (CPU_AL & 0x04) {
-				gdc.mode1 |= 0x01;				// アトリビュート
-			}
-			if (CPU_AL & 0x08) {
-				gdc.mode1 |= 0x20;				// コードアクセス
-			}
-			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);
+			bios0x18_0a(CPU_AL);
 			break;
 
    		case 0x0b:						// CRTモードのセンス
@@ -357,19 +489,25 @@ const CRTDATA	*crt;
 
 			ZeroMemory(&gdc.m.para[GDC_SCROLL], 16);
 			tmp.w = CPU_DX >> 1;
-			STOREINTELWORD(mem + MEMW_CRT_W_VRAMADR, tmp.w);
+			SETBIOSMEM16(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);
+			SETBIOSMEM16(MEMW_CRT_W_RASTER, tmp.w);
 			STOREINTELWORD(gdc.m.para + GDC_SCROLL + 2, tmp.w);
 			gdcs.textdisp |= GDCSCRN_ALLDRAW2;
 			screenupdate |= 2;
  			break;
 
 		case 0x0f:						// 複数の表示領域の設定
+			// GDCバッファを空に
+			if (gdc.m.cnt) {
+				gdc_work(GDCWORK_MASTER);
+			}
+			gdc_forceready(&gdc.m);
+
 			SETBIOSMEM16(0x0053e, CPU_CX);
 			SETBIOSMEM16(0x00540, CPU_BX);
 			mem[0x00547] = CPU_DH;
@@ -408,6 +546,7 @@ const CRTDATA	*crt;
 				gdc_work(GDCWORK_MASTER);
 			}
 			gdc_forceready(&gdc.m);
+
 			bios0x18_10((REG8)(CPU_AL & 1));
  			break;
 
@@ -417,7 +556,7 @@ const CRTDATA	*crt;
 				gdc_work(GDCWORK_MASTER);
 			}
 			gdc_forceready(&gdc.m);
-													// 00/08/02
+
 			if (gdc.m.para[GDC_CSRFORM] != (mem[MEMB_CRT_RASTER] | 0x80)) {
 				gdc.m.para[GDC_CSRFORM] = mem[MEMB_CRT_RASTER] | 0x80;
 			}
@@ -430,7 +569,7 @@ const CRTDATA	*crt;
 				gdc_work(GDCWORK_MASTER);
 			}
 			gdc_forceready(&gdc.m);
-													// 00/08/02
+
 			if (gdc.m.para[GDC_CSRFORM] != mem[MEMB_CRT_RASTER]) {
 				gdc.m.para[GDC_CSRFORM] = mem[MEMB_CRT_RASTER];
 				gdcs.textdisp |= GDCSCRN_ALLDRAW | GDCSCRN_EXT;
@@ -569,40 +708,34 @@ const CRTDATA	*crt;
 			gdc_forceready(&gdc.s);
 
 			ZeroMemory(&gdc.s.para[GDC_SCROLL], 8);
-			switch(CPU_CH & 0xc0) {
-				case 0x40:					// UPPER
-					if ((mem[MEMB_PRXDUPD] & 0x24) == 0x24) {
-						mem[MEMB_PRXDUPD] ^= 4;
-						gdc.clock &= ~3;
-						gdc.s.para[GDC_PITCH] = 40;
-						gdcs.grphdisp |= GDCSCRN_EXT;
-					}
-					tmp.b = TRUE;
+			if ((CPU_CH & 0xc0) == 0xc0) {		// ALL
+				tmp.b = FALSE;
+				if ((mem[MEMB_PRXDUPD] & 0x24) == 0x20) {
+					mem[MEMB_PRXDUPD] ^= 4;
+					gdc.clock |= 3;
+					CopyMemory(gdc.s.para + GDC_SYNC, sync400m, 8);
+					gdc.s.para[GDC_PITCH] = 80;
+					gdcs.grphdisp |= GDCSCRN_EXT;
+					mem[MEMB_PRXDUPD] |= 0x08;
+				}
+			}
+			else {
+				tmp.b = TRUE;
+				if ((mem[MEMB_PRXDUPD] & 0x24) == 0x24) {
+					mem[MEMB_PRXDUPD] ^= 4;
+					gdc.clock &= ~3;
+					CopyMemory(gdc.s.para + GDC_SYNC,
+						(mem[MEMB_PRXCRT] & 0x40)?sync200m:sync200l, 8);
+					gdc.s.para[GDC_PITCH] = 40;
+					gdcs.grphdisp |= GDCSCRN_EXT;
+					mem[MEMB_PRXDUPD] |= 0x08;
+				}
+				if (CPU_CH & 0x40) {			// UPPER
 					gdc.s.para[GDC_SCROLL+0] = (200*40) & 0xff;
 					gdc.s.para[GDC_SCROLL+1] = (200*40) >> 8;
-					break;
-
-				case 0x80:					// LOWER
-					if ((mem[MEMB_PRXDUPD] & 0x24) == 0x24) {
-						mem[MEMB_PRXDUPD] ^= 4;
-						gdc.clock &= ~3;
-						gdc.s.para[GDC_PITCH] = 40;
-						gdcs.grphdisp |= GDCSCRN_EXT;
-					}
-					tmp.b = TRUE;
-					break;
-
-				default:					// ALL
-					if ((mem[MEMB_PRXDUPD] & 0x24) == 0x20) {
-						mem[MEMB_PRXDUPD] ^= 4;
-						gdc.clock |= 3;
-						gdc.s.para[GDC_PITCH] = 80;
-						gdcs.grphdisp |= GDCSCRN_EXT;
-					}
-					tmp.b = FALSE;
-					break;
+				}
 			}
-			if ((!tmp.b) || (gdc.crt15khz)) {
+			if ((!tmp.b) || (!(mem[MEMB_PRXCRT] & 0x40))) {
 				gdc.mode1 &= ~(0x10);
 				gdc.s.para[GDC_CSRFORM] = 0;
 			}
@@ -625,9 +758,38 @@ const CRTDATA	*crt;
 			}
 			break;
 
+		case 0x44:						// ボーダカラーの設定
+//			if (!(mem[MEMB_PRXCRT] & 0x40)) {
+//				color = i286_membyte_read(CPU_DS, CPU_BX + 1);
+//			}
+			break;
+
+		case 0x45:
+		case 0x46:
+			TRACEOUT(("unsupport bios 18-%.2x", CPU_AH));
+			break;
+
 		case 0x47:						// 直線、矩形の描画
+		case 0x48:						// 円の描画
 			bios18_47();
 			break;
+
+		case 0x49:						// グラフィック文字の描画
+			bios18_49();
+			break;
+
+		case 0x4a:						// 描画モードの設定
+			if (!(mem[MEMB_PRXCRT] & 0x01)) {
+				gdc.s.para[GDC_SYNC] = CPU_CH;
+				gdcs.grphdisp |= GDCSCRN_EXT;
+				if (CPU_CH & 0x10) {
+					mem[MEMB_PRXDUPD] &= ~0x08;
+				}
+				else {
+					mem[MEMB_PRXDUPD] |= 0x08;
+				}
+			}
+			break;
 	}
 }