ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/uae_cpu/memory.h
(Generate patch)

Comparing BasiliskII/src/uae_cpu/memory.h (file contents):
Revision 1.2 by gbeauche, 2000-09-22T17:20:33Z vs.
Revision 1.6 by gbeauche, 2005-06-05T07:32:23Z

# Line 88 | Line 88 | extern void map_banks(addrbank *bank, in
88  
89   #else
90  
91 – extern uae_u32 alongget(uaecptr addr);
92 – extern uae_u32 awordget(uaecptr addr);
91   extern uae_u32 longget(uaecptr addr);
92   extern uae_u32 wordget(uaecptr addr);
93   extern uae_u32 byteget(uaecptr addr);
# Line 113 | Line 111 | extern void byteput(uaecptr addr, uae_u3
111   #endif /* !DIRECT_ADDRESSING && !REAL_ADDRESSING */
112  
113   #if REAL_ADDRESSING
114 < #define do_get_real_address(a)          ((uae_u8 *)(a))
115 < #define do_get_virtual_address(a)       ((uae_u32)(a))
118 < #define InitMEMBaseDiff(va, ra)         do { } while (0)
119 < #endif /* REAL_ADDRESSING */
120 <
114 > const uintptr MEMBaseDiff = 0;
115 > #endif
116   #if DIRECT_ADDRESSING
117   extern uintptr MEMBaseDiff;
118 < #define do_get_real_address(a)          ((uae_u8 *)(a) + MEMBaseDiff)
124 < #define do_get_virtual_address(a)       ((uae_u32)(a) - MEMBaseDiff)
125 < #define InitMEMBaseDiff(va, ra)         (MEMBaseDiff = (uintptr)(va) - (uintptr)(ra))
126 < #endif /* DIRECT_ADDRESSING */
118 > #endif
119  
120   #if REAL_ADDRESSING || DIRECT_ADDRESSING
121 + static __inline__ uae_u8 *do_get_real_address(uaecptr addr)
122 + {
123 +        return (uae_u8 *)MEMBaseDiff + addr;
124 + }
125 + static __inline__ uae_u32 do_get_virtual_address(uae_u8 *addr)
126 + {
127 +        return (uintptr)addr - MEMBaseDiff;
128 + }
129   static __inline__ uae_u32 get_long(uaecptr addr)
130   {
131      uae_u32 * const m = (uae_u32 *)do_get_real_address(addr);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines