--- np2/i386c/ia32/resolve.h	2004/01/27 15:53:56	1.2
+++ np2/i386c/ia32/resolve.h	2011/01/15 17:17:23	1.8
@@ -1,5 +1,3 @@
-/*	$Id: resolve.h,v 1.2 2004/01/27 15:53:56 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
  * All rights reserved.
@@ -12,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -34,17 +30,13 @@
 extern "C" {
 #endif
 
-DWORD (*calc_ea_dst_tbl[0x100])(void);
-DWORD (*calc_ea32_dst_tbl[0x100])(void);
-
 void resolve_init(void);
 
-#if defined(DEBUG) || !defined(IA32_INLINE_CALC_EA)
-DWORD calc_ea_dst(DWORD);
-#else
-INLINE static DWORD
-calc_ea_dst(DWORD op)
+static INLINE UINT32
+calc_ea_dst(UINT32 op)
 {
+	extern UINT32 (*calc_ea_dst_tbl[0x100])(void);
+	extern UINT32 (*calc_ea32_dst_tbl[0x100])(void);
 
 	__ASSERT(op < 0x100);
 
@@ -52,11 +44,6 @@ calc_ea_dst(DWORD op)
 		return ((*calc_ea_dst_tbl[op])() & 0xffff);
 	return (*calc_ea32_dst_tbl[op])();
 }
-#endif
-
-#define	calc_lea(op)	calc_ea_dst(op)
-#define	get_ea(op)	calc_ea_dst(op)
-#define	get_lea(op)	calc_ea_dst(op)
 
 #ifdef __cplusplus
 }