--- np2/i386c/memory.h	2003/12/08 06:24:03	1.2
+++ np2/i386c/memory.h	2003/12/11 15:02:16	1.4
@@ -17,7 +17,7 @@
 #define	VRAM_G		0x0b8000
 #define	VRAM_E		0x0e0000
 
-#define	VRAM_POS(a)	((a) & (VRAM_STEP | 0x7fff))
+#define	VRAMADDRMASKEX(a)	((a) & (VRAM_STEP | 0x7fff))
 
 #define	VRAM0_B		VRAM_B
 #define	VRAM0_R		VRAM_R
@@ -139,18 +139,3 @@ void MEMCALL i286_memx_write(UINT32 addr
 #ifdef __cplusplus
 }
 #endif
-
-
-// とりあえず
-#define	GETDWORD(a)		(((UINT32)(a)[0]) |				\
-						((UINT32)(a)[1] << 8) |			\
-						((UINT32)(a)[2] << 16) |		\
-						((UINT32)(a)[3] << 24))
-#define	GETWORD(a)		(((UINT16)(a)[0]) | ((UINT16)(a)[1] << 8))
-#define	SETDWORD(a, b)	*((a)+0) = (BYTE)((b));			\
-						*((a)+1) = (BYTE)((b)>>8);		\
-						*((a)+2) = (BYTE)((b)>>16);		\
-						*((a)+3) = (BYTE)((b)>>24)
-#define	SETWORD(a, b)	*((a)+0) = (BYTE)((b));			\
-						*((a)+1) = (BYTE)((b)>>8)
-