--- np2/i386c/ia32/resolve.h 2004/01/27 15:53:56 1.2 +++ np2/i386c/ia32/resolve.h 2004/02/20 16:09:04 1.4 @@ -1,4 +1,4 @@ -/* $Id: resolve.h,v 1.2 2004/01/27 15:53:56 monaka Exp $ */ +/* $Id: resolve.h,v 1.4 2004/02/20 16:09:04 monaka Exp $ */ /* * Copyright (c) 2002-2003 NONAKA Kimihiro @@ -34,16 +34,16 @@ 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); +UINT32 calc_ea_dst(UINT32 op); #else -INLINE static DWORD -calc_ea_dst(DWORD op) +UINT32 (*calc_ea_dst_tbl[0x100])(void); +UINT32 (*calc_ea32_dst_tbl[0x100])(void); + +INLINE static UINT32 +calc_ea_dst(UINT32 op) { __ASSERT(op < 0x100); @@ -54,10 +54,6 @@ calc_ea_dst(DWORD 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 } #endif