--- np2/i286x/memory.x86	2004/02/18 02:03:37	1.12
+++ np2/i286x/memory.x86	2005/03/18 06:49:17	1.14
@@ -3,16 +3,14 @@
 ; ToDo: egc word-boundary
 
 %include 'x86/np2asm.inc'
+%include '../io/x86/iocore.inc'
 
 section .bss
 
 	global	_mem
 	extern	_i286core
-	extern	_grcg
-	extern	_gdcs
 	extern	_tramupdate
 	extern	_vramupdate
-	extern	_cgwindow
 	extern	_vramop
 
 _mem	resb	0x200000
@@ -87,10 +85,10 @@ section .text
 	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
@@ -269,7 +267,7 @@ grcgtdw_end:		pop		ecx
 					jmp		egc_write
 %else
 					pushad
-					call	@egc_write@8
+					call	@memegc_wr8@8
 					popad
 					ret
 %endif
@@ -392,7 +390,7 @@ grcgtcr_end:		not		al
 					jmp		egc_read
 %else
 					pushad
-					call	@egc_read@4
+					call	@memegc_rd8@4
 					mov		[esp + 28], al
 					popad
 					ret
@@ -628,7 +626,7 @@ grcgwtdw_end:		pop		ecx
 					jmp		egc_write_w
 %else
 					pushad
-					call	@egc_write_w@8
+					call	@memegc_wr16@8
 					popad
 					ret
 %endif
@@ -776,7 +774,7 @@ grcgwtcr_end:		not		ax
 					jmp		egc_read_w
 %else
 					pushad
-					call	@egc_read_w@4
+					call	@memegc_rd16@4
 					mov		[esp + 28], ax
 					popad
 					ret