--- np2/x11/compiler.h	2004/01/23 14:35:45	1.10
+++ np2/x11/compiler.h	2004/05/25 14:06:10	1.19
@@ -31,13 +31,14 @@
 
 #define	VERMOUTH_LIB
 #undef	SOUND_CRITICAL
-#define	SOUNDRESERVE	100
+#undef	SOUNDRESERVE
 
 #endif  /* NOSOUND */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <assert.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <setjmp.h>
 #include <stdio.h>
@@ -133,6 +134,27 @@ typedef	int			BOOL;
 #endif
 #endif
 
+/* archtecture */
+/* amd64 */
+#if defined(amd64) || defined(__AMD64__) || defined(__amd64__) || \
+    defined(x86_64) || defined(__x86_64__) || defined(__X86_64__)
+#define	NP2_CPU_ARCH_AMD64
+#endif /* amd64 */
+/* i386 */
+#if defined(i386) || defined(__i386__) || defined(NP2_CPU_ARCH_AMD64)
+#define	NP2_CPU_ARCH_IA32
+#endif /* i386 */
+
+#if defined(__GNUC__)
+#define	GCC_ATTR_PACKED	__attribute__((packed))
+#if defined(NP2_CPU_ARCH_IA32)
+#define	GCC_CPU_ARCH_IA32
+#endif
+#if defined(NP2_CPU_ARCH_AMD64)
+#define	GCC_CPU_ARCH_AMD64
+#endif
+#endif /* __GNUC__ */
+
 #ifndef	NELEMENTS
 #define	NELEMENTS(a)	((int)(sizeof(a) / sizeof(a[0])))
 #endif
@@ -142,20 +164,36 @@ UINT32 gettick();
 #define	GETRAND()	random()
 #define	SPRINTF		sprintf
 
+#if defined(CPUCORE_IA32)
 void toolkit_msgbox(const char *title, const char *msg);
 #define	msgbox(title, msg)	toolkit_msgbox(title, msg);
 
-#if defined(i386) || defined(__i386__)
+#define	SUPPORT_PC9821
+#define	SUPPORT_CRT31KHZ
+#else
+#define	SUPPORT_CRT15KHZ
+#endif
+
+#if defined(NP2_CPU_ARCH_IA32)
 #undef	MEMOPTIMIZE
+#define LOADINTELDWORD(a)	(*((UINT32 *)(a)))
+#define LOADINTELWORD(a)	(*((UINT16 *)(a)))
+#define STOREINTELDWORD(a, b)	*(UINT32 *)(a) = (b)
+#define STOREINTELWORD(a, b)	*(UINT16 *)(a) = (b)
+#if defined(__GNUC__) && defined(IA32_USE_GCC_ATTR_REGPARM)
+#define	GCC_ATTR_REGPARM	__attribute__((regparm(2)))
+#endif
 #elif defined(arm) || defined (__arm__)
 #define	MEMOPTIMIZE	2
 #define	REG8		UINT
 #define	REG16		UINT
+#define	OPNGENARM
 #else
 #define	MEMOPTIMIZE	1
 #endif
 
 #define	SUPPORT_EUC
+#define	SUPPORT_SJIS
 
 #undef	SUPPORT_8BPP
 #define	SUPPORT_16BPP
@@ -163,15 +201,22 @@ void toolkit_msgbox(const char *title, c
 #define	SUPPORT_32BPP
 #define	SUPPORT_NORMALDISP
 
+#define	SUPPORT_PC9861K
 #define	SUPPORT_HOSTDRV
 
-#if defined(USE_GTK)
+#undef	SUPPORT_SASI
+#undef	SUPPORT_SCSI
+#undef	SUPPORT_IDE
+
+#if USE_GTK > 0
+#define	SUPPORT_S98
 #define	SUPPORT_KEYDISP
 #endif
 
-#if defined(USE_SDL)
+#if USE_SDL > 0
 #define	USE_SYSMENU
 #define	SCREEN_BPP	16
+#undef	SUPPORT_8BPP
 #undef	SUPPORT_24BPP
 #undef	SUPPORT_32BPP
 #endif