--- BasiliskII/src/uae_cpu/memory.h 2001/06/26 22:35:42 1.3 +++ BasiliskII/src/uae_cpu/memory.h 2001/07/07 09:08:54 1.4 @@ -114,15 +114,19 @@ extern void byteput(uaecptr addr, uae_u3 #if REAL_ADDRESSING const uintptr MEMBaseDiff = 0; -#define do_get_real_address(a) ((uae_u8 *)(a)) -#define do_get_virtual_address(a) ((uae_u32)(a)) -#endif /* REAL_ADDRESSING */ - +#endif #if DIRECT_ADDRESSING extern uintptr MEMBaseDiff; -#define do_get_real_address(a) ((uae_u8 *)(a) + MEMBaseDiff) -#define do_get_virtual_address(a) ((uae_u32)(a) - MEMBaseDiff) -#endif /* DIRECT_ADDRESSING */ +#endif + +static __inline__ uae_u8 *do_get_real_address(uaecptr addr) +{ + return (uae_u8 *)MEMBaseDiff + addr; +} +static __inline__ uae_u32 do_get_virtual_address(uae_u8 *addr) +{ + return (uintptr)addr - MEMBaseDiff; +} #if REAL_ADDRESSING || DIRECT_ADDRESSING static __inline__ uae_u32 get_long(uaecptr addr)