--- np2/bios/bios18.c	2004/02/11 17:39:59	1.15
+++ np2/bios/bios18.c	2004/02/19 06:10:13	1.19
@@ -93,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;
 
@@ -109,29 +148,15 @@ void bios0x18_16(BYTE chr, BYTE atr) {
 
 #define	SWAPU16(a, b) { UINT16 tmp; tmp = (a); (a) = (b); (b) = tmp; }
 
-static REG8 swapbit(REG8 bit) {
-
-	REG8	ret;
-
-	ret = 0;
-	while(bit) {
-		ret = (ret << 1) + (bit & 1);
-		bit >>= 1;
-	}
-	return(ret);
-}
 
-static void setbiosgdc(UINT32 csrw, const GDCVECT *vect, UINT vcnt,
-																UINT8 ope) {
+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);
 
-	vcnt = min(vcnt, 11);
-	if (vcnt) {
-		CopyMemory(gdc.s.para + GDC_VECTW, vect, vcnt);
-	}
+	gdc.s.para[GDC_VECTW] = vect->ope;
+	gdc_vectreset(&gdc.s);
 
 	gdc.s.para[GDC_WRITE] = ope;
 	mem[MEMB_PRXDUPD] &= ~3;
@@ -169,8 +194,10 @@ static void bios18_47(void) {
 	GBSX2 = LOADINTELWORD(ucw.GBSX2);
 	GBSY2 = LOADINTELWORD(ucw.GBSY2);
 	ZeroMemory(&vect, sizeof(vect));
+	data = 0;
+	data2 = 0;
 	if (ucw.GBDTYP == 0x01) {
-		func = gdcsub_line;
+		func = gdcsub_vectl;
 		if ((GBSX1 > GBSX2) ||
 			((GBSX1 == GBSX2) && (GBSY1 > GBSY2))) {
 			SWAPU16(GBSX1, GBSX2);
@@ -207,7 +234,7 @@ static void bios18_47(void) {
 		STOREINTELWORD(vect.D2, data);
 	}
 	else if (ucw.GBDTYP <= 0x02) {
-		func = gdcsub_box;
+		func = gdcsub_vectr;
 		vect.ope = 0x40 + (ucw.GBDSP & 7);
 		dx = GBSX2 - GBSX1;
 		if (dx < 0) {
@@ -249,7 +276,7 @@ static void bios18_47(void) {
 		STOREINTELWORD(vect.DM, data);
 	}
 	else {
-		func = gdcsub_circle;
+		func = gdcsub_vectc;
 		vect.ope = 0x20 + (ucw.GBDSP & 7);
 		vect.DC[0] = ucw.GBLNG1[0];
 		vect.DC[1] = ucw.GBLNG1[1];
@@ -268,7 +295,8 @@ static void bios18_47(void) {
 	}
 	csrw = (GBSY1 * 40) + (GBSX1 >> 4);
 	csrw += (GBSX1 & 0xf) << 20;
-	GBMDOTI = (swapbit(ucw.GBMDOTI[0]) << 8) + swapbit(ucw.GBMDOTI[1]);
+	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);
@@ -287,7 +315,7 @@ static void bios18_47(void) {
 	// 最後に使った奴を記憶
 	*(UINT16 *)(mem + MEMW_PRXGLS) = *(UINT16 *)(ucw.GBMDOTI);
 	*(UINT16 *)(gdc.s.para + GDC_TEXTW) = *(UINT16 *)(ucw.GBMDOTI);
-	setbiosgdc(csrw, &vect, (ucw.GBDTYP != 0x01)?11:9, ope);
+	setbiosgdc(csrw, &vect, ope);
 }
 
 static void bios18_49(void) {
@@ -311,7 +339,7 @@ static void bios18_49(void) {
 	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] = swapbit(ucw.GBMDOTI[i]);
+		pat[i] = GDCPATREVERSE(ucw.GBMDOTI[i]);
 		gdc.s.para[GDC_TEXTW + i] = pat[i];
 	}
 	vect.ope = 0x10 + (ucw.GBDSP & 7);
@@ -323,8 +351,7 @@ static void bios18_49(void) {
 	}
 	else {
 		STOREINTELWORD(vect.DC, 7);
-		vect.D[0] = gdc.s.para[GDC_VECTW + 3];
-		vect.D[1] = gdc.s.para[GDC_VECTW + 4];
+		STOREINTELWORD(vect.D, 7);
 	}
 
 	GBSX1 = LOADINTELWORD(ucw.GBSX1);
@@ -350,7 +377,7 @@ static void bios18_49(void) {
 	}
 
 	// 最後に使った奴を記憶
-	setbiosgdc(csrw, &vect, 5, ope);
+	setbiosgdc(csrw, &vect, ope);
 }
 
 
@@ -362,7 +389,6 @@ void bios0x18(void) {
 		BOOL	b;
 		UINT16	w;
 		UINT32	d;
-const CRTDATA	*crt;
 	}		tmp;
 
 	UINT	pos;
@@ -433,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モードのセンス
@@ -508,6 +502,12 @@ const CRTDATA	*crt;
  			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;