--- np2/i286a/i286a.inc	2003/12/16 04:58:00	1.2
+++ np2/i286a/i286a.inc	2003/12/18 13:21:32	1.6
@@ -24,15 +24,15 @@ CPU_DS_BASE			equ		56 - 112
 CPU_SS_FIX			equ		60 - 112
 CPU_DS_FIX			equ		64 - 112
 ; cpu_prefix		equ		68 - 112
-; cpu_trap			equ		70 - 112
+CPU_TRAP			equ		70 - 112
 ; cpu_type			equ		71 - 112
 ; cpu_pf_semaphore	equ		72 - 112
 ; cpu_repbak		equ		76 - 112
-; cpu_inport		equ		80 - 112
+CPU_INPUT			equ		80 - 112
 ; cpu_ovflag		equ		84 - 112
 CPU_GDTR			equ		88 - 112
 CPU_IDTR			equ		94 - 112
-; cpu_MSW			equ		100 - 112
+CPU_MSW				equ		100 - 112
 ; cpu_resetreq		equ		102 - 112
 ; cpu_itfbank		equ		103 - 112
 ; cpu_extmem		equ		104 - 112
@@ -71,6 +71,22 @@ $label		ldr		r7, [r9, #CPU_REMAINCLOCK]
 			str		r7, [r9, #CPU_REMAINCLOCK]
 	MEND
 
+	MACRO
+$label	CREMSET	$clock
+$label		mov		r7, $clock
+			str		r7, [r9, #CPU_REMAINCLOCK]
+	MEND
+
+	MACRO
+$label	CPUSV
+$label		str		r8, [r9, #CPU_FLAG]
+	MEND
+
+	MACRO
+$label	CPULD
+$label		ldr		r8, [r9, #CPU_FLAG]
+	MEND
+
 
 	MACRO
 $label	GETPC8
@@ -112,7 +128,7 @@ $label		ldr		r0, [r9, #CPU_CS_BASE]
 			bl		i286_memoryread
 			add		r8, r8, #(1 << 16)
 			and		$src, r0, #(6 << 2)
-			add		$src, r9, r12 lsr #2
+			add		$src, r9, $src lsr #2
 			tst		r0, #(1 << 5)
 			addne	$src, $src, #1
 	MEND
@@ -155,8 +171,8 @@ $label		ldr		r0, [r9, #CPU_CS_BASE]
 			add		r0, r0, r8 lsr #16
 			bl		i286_memoryread
 			add		r8, r8, #(1 << 16)
-			and		r12, r0, #(7 << 3)
-			add		r12, r9, r12 lsr #2
+			and		$src, r0, #(7 << 3)
+			add		$src, r9, $src lsr #2
 	MEND
 
 	MACRO