--- np2/x11/compiler.h	2003/11/30 16:18:08	1.6
+++ np2/x11/compiler.h	2004/06/16 12:50:49	1.20
@@ -31,14 +31,16 @@
 
 #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>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -50,35 +52,33 @@
 #define	OSLANG_EUC
 #define	OSLINEBREAK_LF
 
-typedef	signed char	CHAR;
-typedef	signed short	SHORT;
-typedef	signed int	INT;
-typedef	signed long	LONG;
-
-typedef	unsigned char	UCHAR;
-typedef	unsigned short	USHORT;
-typedef	unsigned int	UINT;
-typedef	unsigned long	ULONG;
-
-typedef	signed char	SINT8;
-typedef	signed short	SINT16;
-typedef	signed int	SINT32;
-
-typedef	unsigned char	UINT8;
-typedef	unsigned short	UINT16;
-typedef	unsigned int	UINT32;
+typedef	signed char		CHAR;
+typedef	signed short		SHORT;
+typedef	signed int		INT;
+typedef	signed long		LONG;
+
+typedef	unsigned char		UCHAR;
+typedef	unsigned short		USHORT;
+typedef	unsigned int		UINT;
+typedef	unsigned long		ULONG;
+
+typedef	signed char		SINT8;
+typedef	signed short		SINT16;
+typedef	signed int		SINT32;
+typedef	signed long long	SINT64;
+
+typedef	unsigned char		UINT8;
+typedef	unsigned short		UINT16;
+typedef	unsigned int		UINT32;
+typedef	unsigned long long	UINT64;
+
+typedef	unsigned char		BYTE;
+typedef	unsigned short		WORD;
+typedef	unsigned int		DWORD;
 
-typedef	unsigned char	BYTE;
-typedef	unsigned char	TCHAR;
+typedef	unsigned char		TCHAR;
 
-typedef	int		BOOL;
-
-#include "common.h"
-#include "milstr.h"
-#include "_memory.h"
-#include "rect.h"
-#include "lstarray.h"
-#include "trace.h"
+typedef	int			BOOL;
 
 #ifndef	TRUE
 #define	TRUE	1
@@ -113,15 +113,47 @@ typedef	int		BOOL;
 #define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))
 #endif
 
+#ifndef	UNUSED
 #define	UNUSED(v)	((void)(v))
-#define	INLINE		__inline
+#endif
+
+#define	FASTCALL
 #define	SOUNDCALL
+#define	MEMCALL
+#define	CPUCALL
 
 #ifdef	DEBUG
+#define	INLINE
 #define	__ASSERT(s)	assert(s)
 #else
+#ifndef	__ASSERT
 #define	__ASSERT(s)
 #endif
+#ifndef	INLINE
+#define	INLINE		__inline
+#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])))
@@ -132,24 +164,62 @@ UINT32 gettick();
 #define	GETRAND()	random()
 #define	SPRINTF		sprintf
 
-#if defined(i386) || defined(__i386__)
+#if defined(CPUCORE_IA32)
+void toolkit_msgbox(const char *title, const char *msg);
+#define	msgbox(title, msg)	toolkit_msgbox(title, msg);
+
+#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
 
-#define	SUPPORT_8BPP
-#define	SUPPORT_24BPP
+#undef	SUPPORT_8BPP
 #define	SUPPORT_16BPP
+#define	SUPPORT_24BPP
 #define	SUPPORT_32BPP
 #define	SUPPORT_NORMALDISP
 
-#if defined(USE_GTK)
+#define	SUPPORT_PC9861K
+#define	SUPPORT_HOSTDRV
+
+#undef	SUPPORT_SASI
+#undef	SUPPORT_SCSI
+#undef	SUPPORT_IDE
+
+#if USE_GTK > 0
+#define	SUPPORT_S98
 #define	SUPPORT_KEYDISP
+#define	SUPPORT_SOFTKBD	0
+#endif
+
+#if USE_SDL > 0
+#define	USE_SYSMENU
+#define	SCREEN_BPP	16
+#undef	SUPPORT_8BPP
+#undef	SUPPORT_24BPP
+#undef	SUPPORT_32BPP
 #endif
 
 /*
@@ -159,4 +229,11 @@ UINT32 gettick();
 extern char timidity_cfgfile_path[MAX_PATH];
 #define	TIMIDITY_CFGFILE	timidity_cfgfile_path
 
+#include "common.h"
+#include "milstr.h"
+#include "_memory.h"
+#include "rect.h"
+#include "lstarray.h"
+#include "trace.h"
+
 #endif	/* NP2_X11_COMPILER_H__ */