--- np2/i286a/i286a.inc	2004/01/07 06:53:47	1.17
+++ np2/i286a/i286a.inc	2004/07/17 20:43:02	1.20
@@ -17,9 +17,9 @@ MSW_MP				equ		&0002
 MSW_EM				equ		&0004
 MSW_TS				equ		&0008
 
-CPU_SIZE			equ		124
+CPU_SIZE			equ		(104 + 32)
 CPU_STAT			equ		(0 - CPU_SIZE)
-CPU_EXT				equ		(108 - CPU_SIZE)
+CPU_EXT				equ		(104 - CPU_SIZE)
 
 CPU_REG				equ		CPU_STAT + 0
 CPU_SEG				equ		CPU_STAT + 16
@@ -31,22 +31,21 @@ CPU_SS_FIX			equ		CPU_STAT + 44
 CPU_DS_FIX			equ		CPU_STAT + 48
 CPU_ADRSMASK		equ		CPU_STAT + 52
 CPU_PREFIX			equ		CPU_STAT + 56
-; cpu_trap			equ		CPU_STAT + 58
-; cpu_resetreq		equ		CPU_STAT + 59
-CPU_GDTR			equ		CPU_STAT + 60
-CPU_MSW				equ		CPU_STAT + 66
-CPU_IDTR			equ		CPU_STAT + 68
-CPU_LDTR			equ		CPU_STAT + 74
-CPU_LDTRC			equ		CPU_STAT + 76
-CPU_TR				equ		CPU_STAT + 82
-CPU_TRC				equ		CPU_STAT + 84
-; cpu_type			equ		CPU_STAT + 92
-CPU_ITFBANK			equ		CPU_STAT + 93
-; cpu_ram_d0		equ		CPU_STAT + 94
-CPU_REMAINCLOCK		equ		CPU_STAT + 96
-CPU_BASECLOCK		equ		CPU_STAT + 100
-; cpu_clock			equ		CPU_STAT + 104
-; cpu_stat_size		equ		108
+; cpu_resetreq		equ		CPU_STAT + 57
+CPU_GDTR			equ		CPU_STAT + 58
+CPU_MSW				equ		CPU_STAT + 64
+CPU_IDTR			equ		CPU_STAT + 66
+CPU_LDTR			equ		CPU_STAT + 72
+CPU_LDTRC			equ		CPU_STAT + 74
+CPU_TR				equ		CPU_STAT + 80
+CPU_TRC				equ		CPU_STAT + 82
+; cpu_type			equ		CPU_STAT + 88
+CPU_ITFBANK			equ		CPU_STAT + 89
+; cpu_ram_d0		equ		CPU_STAT + 90
+CPU_REMAINCLOCK		equ		CPU_STAT + 92
+CPU_BASECLOCK		equ		CPU_STAT + 96
+; cpu_clock			equ		CPU_STAT + 100
+; cpu_stat_size		equ		104
 
 CPU_AL				equ		CPU_STAT + 0
 CPU_AH				equ		CPU_STAT + 1
@@ -75,11 +74,12 @@ CPU_IP				equ		CPU_STAT + 26
 
 CPU_EXTMEM			equ		CPU_EXT + 0
 CPU_EXTMEMSIZE		equ		CPU_EXT + 4
-CPU_INPUT			equ		CPU_EXT + 8
-MEMWAIT_TRAM		equ		CPU_EXT + 12
-MEMWAIT_VRAM		equ		CPU_EXT + 13
-MEMWAIT_GRCG		equ		CPU_EXT + 14
-; cpu_ext_size		equ		16
+CPU_EMS				equ		CPU_EXT + 8
+CPU_INPUT			equ		CPU_EXT + 24
+MEMWAIT_TRAM		equ		CPU_EXT + 28
+MEMWAIT_VRAM		equ		CPU_EXT + 29
+MEMWAIT_GRCG		equ		CPU_EXT + 30
+; cpu_ext_size		equ		32
 
 MAX_PREFIX			equ		8
 
@@ -191,9 +191,8 @@ $label		CPUDBGL
 			mov		pc, r11
 	MEND
 
-
 	MACRO
-$label	WORDACC	$r, $l
+$label	ACCWORD	$r, $l
 $label		tst		$r, #1
 			bne		$l
 			cmp		$r, #I286_MEMWRITEMAX