--- xmil/z80x/z80dmap.c	2004/08/15 07:52:16	1.8
+++ xmil/z80x/z80dmap.c	2005/02/04 06:42:14	1.10
@@ -7,77 +7,108 @@
 
 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
-		if (dma.increment) {
+		CPU_REMCLOCK -= 6;
+#if !defined(DMAS_STOIC)
+		if (dma.increment)
+#else
+		if (dma.flag & DMAF_INCREMENT)
+#endif
+		{
 			if (!(flag1 & 0x20)) {
-				*off1 += (flag1 & 0x10)?1:-1;
+				cnt1->w.addr += (flag1 & 0x10)?1:-1;
 			}
 			if (!(flag2 & 0x20)) {
-				*off2 += (flag2 & 0x10)?1:-1;
+				cnt2->w.addr += (flag2 & 0x10)?1:-1;
 			}
 		}
-		dma.increment = 1;
-		addr = *off1;
+		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 = z80mem_read8(addr);
 		}
-		if (dma.cmd & 1) {
-			addr = *off2;
+		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.WR0 & 1) {
+			addr = cnt2->w.addr;
 			if (flag2 & 8) {
 				iocore_out(addr, dat);
 			}
 			else {
-TRACEOUT(("dma!"));
 				z80mem_write8(addr, dat);
-			}
-		}
-		if (dma.cmd & 2) {
-			if (!((dat ^ dma.MACH_BYT) & (~dma.MASK_BYT))) {
-				dma.working = FALSE;
-				dma.MACH_FLG = 1;
+				TRACEOUT(("dma w %.4x - %.2x", addr, dat));
 			}
 		}
 
-		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;
+#else
+			dma.flag &= ~(DMAF_WORKING | DMAF_ENDB);
+#endif
 		}
-		if (!dma.working) {
-			return;
+#if !defined(DMAS_STOIC)
+		if (!dma.working)
+#else
+		if (!(dma.flag & DMAF_WORKING))
+#endif
+		{
+			goto intr;
 		}
 	} while(dma.mode);
 	return;
@@ -88,151 +119,3 @@ intr:
 	}
 }
 
-
-
-
-
-#if 0	// old
-LABEL void z80dmap(void) {
-
-	__asm {
-				mov		al, dma.DMA_CMND
-				test	al, 3
-				je		dmaintend
-				cmp		dma.DMA_ENBL, 0
-				je		dmaintend
-				cmp		dma.ENDB_FLG, 0
-				jne		dmaintend
-				test	al, 2
-				je		ckcntmode
-				cmp		dma.MACH_FLG, 0
-				jne		short dmaintend
-ckcntmode:		cmp		dma.DMA_MODE, 1
-				je		dmaintmain
-				mov		al, dma.WR[5]
-				xor		al, dma.DMA_REDY
-				test	al, 8
-				je		dmaintmain
-dmaintend:		ret
-
-dmaintmain:		push	ebx
-				mov		ebx, offset dma.CNT_A
-				mov		ecx, offset dma.CNT_B
-
-				mov		dx, word ptr (dma.WR[1])
-				test	dma.WR[0], 4
-				jne		dma_lp
-				xchg	ebx, ecx
-				xchg	dl, dh
-
-dma_lp:			cmp		dma.ENDB_FLG, 0
-				jne		dmalpend
-				test	dma.DMA_CMND, 2
-				je		dma_lpst
-				cmp		dma.MACH_FLG, 0
-				jne		dmalpend
-dma_lpst:
-				push	ecx
-				push	edx
-				movzx	ecx, word ptr [ebx]
-				test	dl, 8
-				jne		dma_inport
-				call	memrd8_ecx_al
-dmasrcend:		pop		edx
-				pop		ecx
-
-				test	dma.DMA_CMND, 1
-				je		dmadstend
-
-				push	eax
-				push	ecx
-				push	edx
-				movzx	ecx, word ptr [ecx]
-				mov		dl, al
-				test	dh, 8
-				jne		dma_outport
-				call	memwr8_ecx_dl
-dmadstend:		pop		edx
-				pop		ecx
-				pop		eax
-
-				test	dma.DMA_CMND, 2
-				je		dmamachcend
-				xor		al, dma.MACH_BYT
-				mov		ah,	dma.MASK_BYT
-				not		ah
-				and		al, ah
-				jne		short dmamachcend
-				mov		dma.MACH_FLG, 1
-dmamachcend:
-				cmp		dma.DMA_MODE, 1
-				je		forcesrcaddr
-				mov		al, dma.WR[5]
-				xor		al, dma.DMA_REDY
-				and		al, 8
-				mov		dma.DMA_STOP, al
-				jne		dmadststpend
-
-forcesrcaddr:	test	dl, 20h
-				jne		dmasrcstpend
-				test	dl, 10h
-				je		dmasrcdec
-					inc		word ptr [ebx]
-				jmp		dmasrcstpend
-dmasrcdec:			dec		word ptr [ebx]
-dmasrcstpend:
-				test	dh, 20h
-				jne		dmadststpend
-				test	dh, 10h
-				je		dmadstdec
-					inc		word ptr [ecx]
-				jmp		dmadststpend
-dmadstdec:			dec		word ptr [ecx]
-dmadststpend:
-				inc		dma.BYT_N.w
-				je		dmaforceend
-				mov		ax, dma.BYT_L.w
-				or		ax, ax
-				je		dmplpedch				// BYT_L == 0なら無制限?
-				inc		ax
-				je		dmplpedch				// ver0.25
-				cmp		ax, dma.BYT_N.w
-				ja		dmplpedch
-dmaforceend:	mov		dma.ENDB_FLG, 1
-				jmp		dmalpend
-
-dmplpedch:		cmp		dma.DMA_MODE, 0
-				jne		dma_lp
-dmalpend:
-				pop		ebx
-				cmp		dma.INT_ENBL, 0
-				je		dmaintrptend
-				mov		dl, 2
-				mov		al, dma.INT_FLG
-				test	al, 1
-				je		dmaintrpt2ck
-				cmp		dma.MACH_FLG, 0
-				jne		dmaintrptcall
-dmaintrpt2ck:	mov		dl, 4
-				test	al, 2
-				je		dmaintrptend
-				cmp		dma.ENDB_FLG, 0
-				je		dmaintrptend
-dmaintrptcall:	movzx	ecx, dma.INT_VCT
-				test	al, 20h
-				je		dma_intrpt
-				and		cl, 0f9h
-				or		cl, dl
-dma_intrpt:		jmp		z80x_interrupt
-dmaintrptend:	ret
-
-
-dma_inport:		call	iocore_inp
-				jmp		dmasrcend
-
-dma_outport:	call	iocore_out
-				jmp		dmadstend
-	}
-}
-#endif
-