--- np2/i286x/memory.x86	2003/12/27 11:55:23	1.6
+++ np2/i286x/memory.x86	2005/05/20 13:59:47	1.15
@@ -2,19 +2,17 @@
 ;
 ; ToDo: egc word-boundary
 
-%include 'x86/np2asm.inc'
+%include 'np2asm.inc'
+%include 'cpucore.inc'
+%include 'iocore.inc'
+%include 'vram.inc'
 
 section .bss
 
 	global	_mem
 	extern	_i286core
-	extern	_grcg
-	extern	_extmem
-	extern	_gdcs
 	extern	_tramupdate
 	extern	_vramupdate
-	extern	_cgwindow
-;	extern	___font
 	extern	_vramop
 
 _mem	resb	0x200000
@@ -25,8 +23,8 @@ EXTMEMORY		equ		0
 VIDEOMEMORY		equ		_mem
 USERSMEMORY_R	equ		0a8000h
 USERSMEMORY_W	equ		0a0000h
-_extmemmng_ptr	equ		_i286core + i286core_t.ext
-_extmemmng_size	equ		_i286core + i286core_t.extsize
+_extmemmng_ptr	equ		_i286core + cpucore_t.ext
+_extmemmng_size	equ		_i286core + cpucore_t.extsize
 
 %if 1
 _font			equ		_mem + FONT_ADRS
@@ -84,21 +82,21 @@ section .text
 
 
 %if USE_EGCASM
-	extern	_egca_read
-	extern	_egca_read_w
-	extern	_egca_write
-	extern	_egca_write_w
+	extern	egc_read
+	extern	egc_read_w
+	extern	egc_write
+	extern	egc_write_w
 %else
-	extern	@egc_read@4
-	extern	@egc_read_w@4
-	extern	@egc_write@8
-	extern	@egc_write_w@8
+	extern	@memegc_rd8@4
+	extern	@memegc_rd16@4
+	extern	@memegc_wr8@8
+	extern	@memegc_wr16@8
 %endif
 
 ; normal memory
 					align	16
 @i286_wt:			mov		ebx, ecx
-					and		ebx, [_i286core + i286core_t.adrsmask]
+					and		ebx, [_i286core + cpucore_t.adrsmask]
 					mov		[MAINMEMORY + ebx], dl
 					pop		ebx
 					ret
@@ -106,7 +104,7 @@ section .text
 ; tram write
 					align	16
 @tram_wt:			mov		ebx, [_vramop + vramop_t.tramwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					mov		ebx, ecx
 					cmp		ecx, 000a2000h
 					jnc		short wtram_a
@@ -122,6 +120,8 @@ wtram_a:			cmp		ecx, 000a3fe0h
 					jc		short wtram_m
 					cmp		ecx, 000a4000h
 					jnc		wcgwindow_s
+					test	ecx, 2
+					je		short wtram_m
 					cmp		byte [_gdcs + gdcs_t.msw_accessable], 0
 					je		short wtram_e
 wtram_m:			shr		ebx, 1
@@ -155,7 +155,7 @@ wcgwindow_e:		pop		ebx
 					or		byte [_vramupdate + ebx], 1
 					or		byte [_gdcs + gdcs_t.grphdisp], 1
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -167,7 +167,7 @@ wcgwindow_e:		pop		ebx
 					or		byte [_vramupdate + ebx], 2
 					or		byte [_gdcs + gdcs_t.grphdisp], 2
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -188,7 +188,7 @@ wcgwindow_e:		pop		ebx
 					or		byte [_gdcs + gdcs_t.grphdisp], 1
 
 grcg_rmw:			mov		ebx, [_vramop + vramop_t.grcgwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					mov		ebx, dword [_grcg + grcg_t.mode]
 					mov		bl, dl
 					not		bl
@@ -237,7 +237,7 @@ grcgrmw_end:		pop		ecx
 					or		byte [_gdcs + gdcs_t.grphdisp], 1
 
 grcg_tdw:			mov		ebx, [_vramop + vramop_t.grcgwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					mov		bh, [_grcg + grcg_t.modereg]
 					shr		bh, 1
 					jc		short grcgtdw_r
@@ -262,12 +262,14 @@ grcgtdw_end:		pop		ecx
 ; EGC bridge
 					align	16
 @egc_wt:			VRAMTRACE
+					mov		ebx, [_vramop + vramop_t.grcgwait]
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					pop		ebx
 %if USE_EGCASM
-					jmp		_egca_write
+					jmp		egc_write
 %else
 					pushad
-					call	@egc_write@8
+					call	@memegc_wr8@8
 					popad
 					ret
 %endif
@@ -279,14 +281,13 @@ grcgtdw_end:		pop		ecx
 					and		ecx, 3fffh
 					shr		ebx, 12
 					and		ebx, byte (3*4)
-					add		ecx, [_extmem + extmem_t.pageptr + ebx]
+					add		ecx, [_i286core + cpucore_t.ems + ebx]
 					mov		[EXTMEMORY + ecx], dl
 					pop		ecx
 					pop		ebx
 					ret
 
 @i286_wb:			mov		[MAINMEMORY + 1c8000h - 0e8000h + ecx], dl
-					pop		ecx
 					pop		ebx
 					ret
 
@@ -301,7 +302,7 @@ grcgtdw_end:		pop		ecx
 ; normal memory
 					align	16
 @i286_rd:			mov		ebx, ecx
-					and		ebx, [_i286core + i286core_t.adrsmask]
+					and		ebx, [_i286core + cpucore_t.adrsmask]
 					mov		al, [MAINMEMORY + ebx]
 					pop		ebx
 					ret
@@ -309,7 +310,7 @@ grcgtdw_end:		pop		ecx
 ; font cg-window
 					align	16
 @tram_rd:			mov		ebx, [_vramop + vramop_t.tramwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					cmp		ecx, 0a4000h
 					jnc		rcgwindow_s
 rcgwindow_n:		mov		al, [MAINMEMORY + ecx]
@@ -332,7 +333,7 @@ rcgwindow_s:		cmp		ecx, 0a5000h
 					align	16
 @vram_r0:			mov		al, [VIDEOMEMORY + ecx]
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -340,7 +341,7 @@ rcgwindow_s:		cmp		ecx, 0a5000h
 					align	16
 @vram_r1:			mov		al, [VIDEOMEMORY + VRAM_STEP + ecx]
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -355,7 +356,7 @@ rcgwindow_s:		cmp		ecx, 0a5000h
 					and		ecx, 7fffh
 
 grcg_tcr:			mov		ebx, [_vramop + vramop_t.grcgwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					mov		al, 0
 					mov		bh, [_grcg + grcg_t.modereg]
 					shr		bh, 1
@@ -384,12 +385,14 @@ grcgtcr_end:		not		al
 
 ; EGC bridge
 					align	16
-@egc_rd:			pop		ebx
+@egc_rd:			mov		ebx, [_vramop + vramop_t.grcgwait]
+					sub		[_i286core + cpucore_t.remainclock], ebx
+					pop		ebx
 %if USE_EGCASM
-					jmp		_egca_read
+					jmp		egc_read
 %else
 					pushad
-					call	@egc_read@4
+					call	@memegc_rd8@4
 					mov		[esp + 28], al
 					popad
 					ret
@@ -403,7 +406,7 @@ grcgtcr_end:		not		al
 					and		ecx, 3fffh
 					shr		ebx, 12
 					and		ebx, byte (3*4)
-					add		ecx, [_extmem + extmem_t.pageptr + ebx]
+					add		ecx, [_i286core + cpucore_t.ems + ebx]
 					mov		al, [EXTMEMORY + ecx]
 					pop		ecx
 					pop		ebx
@@ -412,7 +415,7 @@ grcgtcr_end:		not		al
 ; BIOS or ITF
 					align	16
 @i286_rb:			pop		ebx
-					cmp		byte [_i286core + i286core_t.itfbank], 0
+					cmp		byte [_i286core + cpucore_t.itfbank], 0
 					jne		readmem_itf
 					mov		al, [MAINMEMORY + ecx]
 					ret
@@ -424,7 +427,7 @@ readmem_itf:		mov		al, [MAINMEMORY + VRA
 ; normal memory
 					align	16
 @i286w_wt:			mov		ebx, ecx
-					and		ebx, [_i286core + i286core_t.adrsmask]
+					and		ebx, [_i286core + cpucore_t.adrsmask]
 					mov		[MAINMEMORY + ebx], dx
 					pop		ebx
 					ret
@@ -432,7 +435,7 @@ readmem_itf:		mov		al, [MAINMEMORY + VRA
 ; tram write
 					align	16
 @tramw_wt:			mov		ebx, [_vramop + vramop_t.tramwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					mov		ebx, ecx
 					cmp		ecx, 000a1fffh
 					jnc		short wtramw_a
@@ -455,6 +458,8 @@ wtramw_a:			je		short wword_a1fffh
 					jc		short wtramw_m
 					cmp		ecx, 000a3fffh
 					jnc		wcgwindoww_s
+					test	ecx, 2
+					je		short wtramw_m
 					cmp		byte [_gdcs + gdcs_t.msw_accessable], 0
 					je		short wtramw_e
 wtramw_m:			and		ebx, 1fffh
@@ -507,7 +512,7 @@ wcgwinw_odd:		add		ebx, dword [_cgwindow
 					or		word [_vramupdate + ebx], 0101h
 					or		byte [_gdcs + gdcs_t.grphdisp], 1
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -519,7 +524,7 @@ wcgwinw_odd:		add		ebx, dword [_cgwindow
 					or		word [_vramupdate + ebx], 0202h
 					or		byte [_gdcs + gdcs_t.grphdisp], 2
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -540,7 +545,7 @@ wcgwinw_odd:		add		ebx, dword [_cgwindow
 					or		byte [_gdcs + gdcs_t.grphdisp], 1
 
 grcgw_rmw:			mov		ebx, [_vramop + vramop_t.grcgwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					push	eax
 					mov		ebx, dword [_grcg + grcg_t.mode]
 					mov		bx, dx
@@ -591,7 +596,7 @@ grcgwrmw_end:		pop		eax
 					or		byte [_gdcs + gdcs_t.grphdisp], 1
 
 grcgw_tdw:			mov		ebx, [_vramop + vramop_t.grcgwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					mov		ebx, [_grcg + grcg_t.mode]
 					test	ebx, 010000h
 					jne		short grcgwtdw_r
@@ -616,26 +621,14 @@ grcgwtdw_end:		pop		ecx
 ; EGC bridge
 					align	16
 @egcw_wt:			VRAMTRACE_W
+					mov		ebx, [_vramop + vramop_t.grcgwait]
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					pop		ebx
 %if USE_EGCASM
-					jmp		_egca_write_w
+					jmp		egc_write_w
 %else
-					test	ecx, 1
-					jne		short egcw_wtodd
 					pushad
-					call	@egc_write_w@8
-					popad
-					ret
-egcw_wtodd:
-					pushad
-					push	ecx
-					push	edx
-					call	@egc_write@8
-					pop		edx
-					pop		ecx
-					inc		ecx
-					shr		edx, 8
-					call	@egc_write@8
+					call	@memegc_wr16@8
 					popad
 					ret
 %endif
@@ -647,14 +640,13 @@ egcw_wtodd:
 					and		ecx, 3fffh
 					shr		ebx, 12
 					and		ebx, byte (3*4)
-					add		ecx, [_extmem + extmem_t.pageptr + ebx]
+					add		ecx, [_i286core + cpucore_t.ems + ebx]
 					mov		[EXTMEMORY + ecx], dx
 					pop		ecx
 					pop		ebx
 					ret
 
 @i286w_wb:			mov		[MAINMEMORY + 1c8000h - 0e8000h + ecx], dx
-					pop		ecx
 					pop		ebx
 					ret
 
@@ -663,7 +655,7 @@ egcw_wtodd:
 ; normal memory
 					align	16
 @i286w_rd:			mov		ebx, ecx
-					and		ebx, [_i286core + i286core_t.adrsmask]
+					and		ebx, [_i286core + cpucore_t.adrsmask]
 					mov		ax, [MAINMEMORY + ebx]
 					pop		ebx
 					ret
@@ -671,7 +663,7 @@ egcw_wtodd:
 ; font cg-window
 					align	16
 @tramw_rd:			mov		ebx, [_vramop + vramop_t.tramwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					cmp		ecx, 0a3fffh
 					jnc		rcgwwindow_s
 					mov		ax, [MAINMEMORY + ecx]
@@ -725,7 +717,7 @@ rcgwwindow_a4fff:	mov		ebx, dword [_cgwi
 					align	16
 @vramw_r0:			mov		ax, [VIDEOMEMORY + ecx]
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -733,7 +725,7 @@ rcgwwindow_a4fff:	mov		ebx, dword [_cgwi
 					align	16
 @vramw_r1:			mov		ax, [VIDEOMEMORY + VRAM_STEP + ecx]
 					mov		ebx, [_vramop + vramop_t.vramwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					pop		ebx
 					ret
 
@@ -748,7 +740,7 @@ rcgwwindow_a4fff:	mov		ebx, dword [_cgwi
 					and		ecx, 7fffh
 
 grcgw_tcr:			mov		ebx, [_vramop + vramop_t.grcgwait]
-					sub		[_i286core + i286core_t.remainclock], ebx
+					sub		[_i286core + cpucore_t.remainclock], ebx
 					mov		ax, 0
 					mov		ebx, [_grcg + grcg_t.mode]
 					test	ebx, 010000h
@@ -777,38 +769,19 @@ grcgwtcr_end:		not		ax
 
 ; EGC bridge
 					align	16
-@egcw_rd:			pop		ebx
-					test	ecx, 1
-					jne		short egcw_rdodd
+@egcw_rd:			mov		ebx, [_vramop + vramop_t.grcgwait]
+					sub		[_i286core + cpucore_t.remainclock], ebx
+					pop		ebx
 %if USE_EGCASM
-					jmp		_egca_read_w
+					jmp		egc_read_w
 %else
 					pushad
-					call	@egc_read_w@4
+					call	@memegc_rd16@4
 					mov		[esp + 28], ax
 					popad
 					ret
 %endif
 
-egcw_rdodd:
-%if USE_EGCASM
-					inc		ecx
-					call	_egca_read
-					mov		ah, al
-					dec		ecx
-					jmp		_egca_read
-%else
-					pushad
-					push	ecx
-					call	@egc_read@4
-					pop		ecx
-					mov		[esp+28], al
-					inc		ecx
-					call	@egc_read@4
-					mov		[esp+29], al
-					popad
-%endif
-					ret
 
 ; EMM read
 					align	16
@@ -817,7 +790,7 @@ egcw_rdodd:
 					and		ecx, 3fffh
 					shr		ebx, 12
 					and		ebx, byte (3*4)
-					add		ecx, [_extmem + extmem_t.pageptr + ebx]
+					add		ecx, [_i286core + cpucore_t.ems + ebx]
 					mov		ax, [EXTMEMORY + ecx]
 					pop		ecx
 					pop		ebx
@@ -826,7 +799,7 @@ egcw_rdodd:
 ; BIOS or ITF
 					align	16
 @i286w_rb:			pop		ebx
-					cmp		byte [_i286core + i286core_t.itfbank], 0
+					cmp		byte [_i286core + cpucore_t.itfbank], 0
 					jne		readwmem_itf
 					mov		ax, [MAINMEMORY + ecx]
 					ret
@@ -962,6 +935,7 @@ vramw_write		dd	@vramw_w0,		@vramw_w1		;
 
 section .text
 
+	global	@i286_memorymap@4
 	global	@i286_vram_dispatch@4
 
 	global	@i286_memorywrite@8
@@ -987,7 +961,7 @@ section .text
 					align	16
 writeextmem_w:
 %if USE_HIMEM
-					cmp		ecx, 10ffefh				; HIMEM
+					cmp		ecx, (USE_HIMEM - 1)
 					jae		near writehimem_w
 %endif
 					push	ebx
@@ -1025,7 +999,7 @@ writemain_b:		mov		[MAINMEMORY + ecx], d
 					align	16
 writeextmem_b:
 %if USE_HIMEM
-					cmp		ecx, 10fff0h				; HIMEM
+					cmp		ecx, USE_HIMEM
 					jae		near writehimem
 %endif
 					push	ebx
@@ -1042,7 +1016,7 @@ writeextmem_b:
 					align	16
 readmemory_w:
 %if USE_HIMEM
-					cmp		ecx, 10ffefh				; HIMEM
+					cmp		ecx, (USE_HIMEM - 1)
 					jae		near readhimem_w
 %endif
 					push	ebx
@@ -1077,7 +1051,7 @@ readmain_b:			mov		al, [MAINMEMORY + ecx
 					align	16
 readmemory_b:
 %if USE_HIMEM
-					cmp		ecx, 10fff0h				; HIMEM
+					cmp		ecx, USE_HIMEM
 					jae		near readhimem
 %endif
 					push	ebx