--- np2/win9x/x86/np2asm.inc	2003/11/21 06:51:14	1.4
+++ np2/win9x/x86/np2asm.inc	2004/02/07 21:23:22	1.11
@@ -1,6 +1,6 @@
 
 USE_EGCASM		equ		1
-USE_HIMEM		equ		1
+USE_HIMEM		equ		0110000h
 
 EARG1			equ		4
 EARG2			equ		(EARG1+4)
@@ -47,11 +47,40 @@ SCRN_BUFSIZE	equ		04b000h
 
 GDCCMD_MAX		equ		32
 
-				struc	i286reg_t
+				struc	i286core_t
 .reg			resw	14
+.es_base		resd	1
+.cs_base		resd	1
+.ss_base		resd	1
+.ds_base		resd	1
+.ss_fix			resd	1
+.ds_fix			resd	1
+.adrsmask		resd	1
+.prefix			resw	1
+.trap			resb	1
+.resetreq		resb	1
+.prefetchque	resd	1
+.GDTR			resb	6
+.MSW			resw	1
+.IDTR			resb	6
+.LDTR			resw	1
+.LDTRC			resb	6
+.TR				resw	1
+.TRC			resb	6
+				resb	2
+
+.cpu_type		resb	1
+.itfbank		resb	1
+.ram_d0			resw	1
 .remainclock	resd	1
 .baseclock		resd	1
 .clock			resd	1
+
+.ext			resd	1
+.extsize		resd	1
+.ems			resd	4
+.repbak			resd	1
+.inport			resd	1
 				endstruc
 
 				struc	gdcd_t
@@ -71,18 +100,23 @@ GDCCMD_MAX		equ		32
 .s				resb	gdcd_t_size
 .mode1			resb	1
 .mode2			resb	1
+.clock			resb	1
+.crt15khz		resb	1
+.m_drawing		resb	1
+.s_drawing		resb	1
 .vsync			resb	1
 .vsyncint		resb	1
+.display		resb	1
+.bitac			resb	1
+.reserved		resb	2
 .analog			resd	1
 .palnum			resd	1
 .degpal			resb	4
 .anapal			resd	16
-.clock			resb	1
-.display		resb	1
-.bitac			resb	1
-.m_drawing		resb	1
-.s_drawing		resb	1
-.reserved		resb	3
+.dispclock		resd	1
+.vsyncclock		resd	1
+.rasterclock	resd	1
+.hsyncclock		resd	1
 				endstruc
 
 				struc	gdcs_t
@@ -105,14 +139,6 @@ GDCCMD_MAX		equ		32
 .tile_e			resw	1
 				endstruc
 
-				struc	extmem_t
-.maxmem			resd	1
-.adrsmask		resd	1
-.pageptr		resd	4
-.target			resd	1
-.page			resd	4
-				endstruc
-
 				struc	cgwin_t
 .low			resd	1
 .high			resd	1
@@ -143,9 +169,6 @@ GDCCMD_MAX		equ		32
 .func			resd	1
 .remain			resd	1
 .stack			resd	1
-				resd	4
-.buf			resb	(4096/8 + 4*4)
-				resd	4
 .inptr			resd	1
 .outptr			resd	1
 .mask2			resw	1
@@ -154,6 +177,10 @@ GDCCMD_MAX		equ		32
 .dstbit			resb	1
 .sft8bitl		resb	1
 .sft8bitr		resb	1
+
+				resd	4
+.buf			resb	(4096/8 + 4*4)
+				resd	4
 				endstruc
 
 				struc	dsync_t