--- xmil/z80c/z80dmap.c	2004/08/11 16:09:04	1.8
+++ xmil/z80c/z80dmap.c	2005/02/04 06:42:14	1.11
@@ -7,80 +7,107 @@
 
 void z80dmap(void) {
 
-	UINT16	*off1;
-	UINT16	*off2;
-	REG8	flag1;
-	REG8	flag2;
+	DMACNT	*cnt1;
+	DMACNT	*cnt2;
 	UINT	addr;
 	REG8	dat;
+	REG8	flag1;
+	REG8	flag2;
 
-	if (!dma.working) {
+#if !defined(DMAS_STOIC)
+	if (!dma.working)
+#else
+	if (!(dma.flag & DMAF_WORKING))
+#endif
+	{
 		return;
 	}
 
-	if (dma.WR[0] & 4) {
-		off1 = &dma.CNT_A.w;
-		flag1 = dma.WR[1];
-		off2 = &dma.CNT_B.w;
-		flag2 = dma.WR[2];
+	if (dma.WR0 & 4) {
+		cnt1 = &dma.cnt_a;
+		cnt2 = &dma.cnt_b;
 	}
 	else {
-		off2 = &dma.CNT_A.w;
-		flag2 = dma.WR[1];
-		off1 = &dma.CNT_B.w;
-		flag1 = dma.WR[2];
+		cnt2 = &dma.cnt_a;
+		cnt1 = &dma.cnt_b;
 	}
 
+	flag1 = cnt1->b.flag;
+	flag2 = cnt2->b.flag;
 	do {		// dma_lp
-		addr = *off1;
+		CPU_REMCLOCK -= 6;
+#if !defined(DMAS_STOIC)
+		if (dma.increment)
+#else
+		if (dma.flag & DMAF_INCREMENT)
+#endif
+		{
+			if (!(flag1 & 0x20)) {
+				cnt1->w.addr += (flag1 & 0x10)?1:-1;
+			}
+			if (!(flag2 & 0x20)) {
+				cnt2->w.addr += (flag2 & 0x10)?1:-1;
+			}
+		}
+		else {
+#if !defined(DMAS_STOIC)
+			dma.increment = 1;
+#else
+			dma.flag |= DMAF_INCREMENT;
+#endif
+		}
+		addr = cnt1->w.addr;
 		if (flag1 & 8) {
 			dat = iocore_inp(addr);
+			TRACEOUT(("dma r %.4x - %.2x", addr, dat));
 		}
 		else {
-			dat = mem_read8(addr);
-		}
-		if (dma.cmd & 1) {
-			addr = *off2;
-			if (flag2 & 8) {
-				iocore_out(addr, dat);
-			}
-			else {
-				mem_write8(addr, dat);
-			}
+			dat = z80mem_read8(addr);
 		}
-		if (dma.cmd & 2) {
+		if (dma.WR0 & 2) {
 			if (!((dat ^ dma.MACH_BYT) & (~dma.MASK_BYT))) {
+#if !defined(DMAS_STOIC)
 				dma.working = FALSE;
 				dma.MACH_FLG = 1;
+#else
+				dma.flag &= ~(DMAF_WORKING | DMAF_MACH);
+#endif
 			}
 		}
-		if (dma.mode != 1) {
-			dma.DMA_STOP = (dma.WR[5] ^ dma.ready) & 8;
-			if (dma.DMA_STOP) {
-				dma.working = FALSE;			// 既にセットされてる筈だが
-				goto dma_stop;
+		if (dma.WR0 & 1) {
+			addr = cnt2->w.addr;
+			if (flag2 & 8) {
+				iocore_out(addr, dat);
+			}
+			else {
+				z80mem_write8(addr, dat);
+				TRACEOUT(("dma w %.4x - %.2x", addr, dat));
 			}
-		}
-		if (!(flag1 & 0x20)) {
-			*off1 += (flag1 & 0x10)?1:-1;
-		}
-		if (!(flag2 & 0x20)) {
-			*off2 += (flag2 & 0x10)?1:-1;
 		}
 
-dma_stop:
-		dma.BYT_N.w++;
-		if (dma.BYT_N.w == 0) {
+		dma.leng.w.n++;
+		if (dma.leng.w.n == 0) {
+#if !defined(DMAS_STOIC)
 			dma.working = FALSE;
 			dma.ENDB_FLG = 1;
-			goto intr;
+#else
+			dma.flag &= ~(DMAF_WORKING | DMAF_ENDB);
+#endif
 		}
-		if ((dma.BYT_L.w) && (dma.BYT_L.w != 0xffff) && (dma.BYT_N.w >= (dma.BYT_L.w + 1))) {
+		else if ((dma.leng.w.l) && ((dma.leng.w.n - 1) >= dma.leng.w.l)) {
+#if !defined(DMAS_STOIC)
 			dma.working = FALSE;
 			dma.ENDB_FLG = 1;
-			goto intr;
-		}
-		if (!dma.working) {
+#else
+			dma.flag &= ~(DMAF_WORKING | DMAF_ENDB);
+#endif
+		}
+#if !defined(DMAS_STOIC)
+		if (!dma.working)
+#else
+		if (!(dma.flag & DMAF_WORKING))
+#endif
+		{
 			goto intr;
 		}
 	} while(dma.mode);