--- np2/x11/compiler.h	2011/01/15 16:01:52	1.41
+++ np2/x11/compiler.h	2011/12/21 18:01:16	1.44
@@ -1,5 +1,3 @@
-/*	$Id: compiler.h,v 1.41 2011/01/15 16:01:52 monaka Exp $	*/
-
 /*-
  * Copyright (c) 2003, 2004 NONAKA Kimihiro
  * All rights reserved.
@@ -141,21 +139,8 @@ typedef	gboolean	BOOL;
 #define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))
 #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
+#ifndef	NELEMENTS
+#define	NELEMENTS(a)	((int)(sizeof(a) / sizeof(a[0])))
 #endif
 
 /* archtecture */
@@ -178,10 +163,6 @@ typedef	gboolean	BOOL;
 #endif
 #endif /* __GNUC__ */
 
-#ifndef	NELEMENTS
-#define	NELEMENTS(a)	((int)(sizeof(a) / sizeof(a[0])))
-#endif
-
 UINT32 gettick(void);
 #define	GETTICK()	gettick()
 #define	GETRAND()	random()
@@ -197,8 +178,10 @@ UINT32 gettick(void);
 #if defined(CPUCORE_IA32)
 #define	msgbox(title, msg)	toolkit_messagebox(title, msg);
 
+#if !defined(DISABLE_PC9821)
 #define	SUPPORT_PC9821
 #define	SUPPORT_CRT31KHZ
+#endif
 #define	SUPPORT_IDEIO
 #else
 #define	SUPPORT_CRT15KHZ
@@ -210,6 +193,9 @@ UINT32 gettick(void);
 #define LOADINTELWORD(a)	(*((UINT16 *)(a)))
 #define STOREINTELDWORD(a, b)	*(UINT32 *)(a) = (b)
 #define STOREINTELWORD(a, b)	*(UINT16 *)(a) = (b)
+#if !defined(DEBUG) && !defined(NP2_CPU_ARCH_AMD64)
+#define	FASTCALL	__attribute__((regparm(2)))
+#endif	/* !DEBUG && !NP2_CPU_ARCH_AMD64 */
 #elif defined(arm) || defined (__arm__)
 #define	MEMOPTIMIZE	2
 #define	REG8		UINT
@@ -219,6 +205,31 @@ UINT32 gettick(void);
 #define	MEMOPTIMIZE	1
 #endif
 
+#ifndef	FASTCALL
+#define	FASTCALL
+#endif
+#define	CPUCALL		FASTCALL
+#define	MEMCALL		FASTCALL
+#define	DMACCALL	FASTCALL
+#define	IOOUTCALL	FASTCALL
+#define	IOINPCALL	FASTCALL
+#define	SOUNDCALL	FASTCALL
+#define	VRAMCALL	FASTCALL
+#define	SCRNCALL	FASTCALL
+#define	VERMOUTHCL	FASTCALL
+
+#ifdef	DEBUG
+#define	INLINE
+#define	__ASSERT(s)	assert(s)
+#else
+#ifndef	__ASSERT
+#define	__ASSERT(s)
+#endif
+#ifndef	INLINE
+#define	INLINE		inline
+#endif
+#endif
+
 #define	SUPPORT_EUC
 
 #undef	SUPPORT_8BPP