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

Comparing BasiliskII/src/uae_cpu/memory.cpp (file contents):
Revision 1.6 by gbeauche, 2002-09-01T16:32:02Z vs.
Revision 1.8 by gbeauche, 2005-06-05T07:32:23Z

# Line 37 | Line 37 | addrbank mem_banks[65536];
37   #endif
38  
39   #ifdef NO_INLINE_MEMORY_ACCESS
40 < __inline__ uae_u32 longget (uaecptr addr)
40 > uae_u32 longget (uaecptr addr)
41   {
42      return call_mem_get_func (get_mem_bank (addr).lget, addr);
43   }
44 < __inline__ uae_u32 wordget (uaecptr addr)
44 > uae_u32 wordget (uaecptr addr)
45   {
46      return call_mem_get_func (get_mem_bank (addr).wget, addr);
47   }
48 < __inline__ uae_u32 byteget (uaecptr addr)
48 > uae_u32 byteget (uaecptr addr)
49   {
50      return call_mem_get_func (get_mem_bank (addr).bget, addr);
51   }
52 < __inline__ void longput (uaecptr addr, uae_u32 l)
52 > void longput (uaecptr addr, uae_u32 l)
53   {
54      call_mem_put_func (get_mem_bank (addr).lput, addr, l);
55   }
56 < __inline__ void wordput (uaecptr addr, uae_u32 w)
56 > void wordput (uaecptr addr, uae_u32 w)
57   {
58      call_mem_put_func (get_mem_bank (addr).wput, addr, w);
59   }
60 < __inline__ void byteput (uaecptr addr, uae_u32 b)
60 > void byteput (uaecptr addr, uae_u32 b)
61   {
62      call_mem_put_func (get_mem_bank (addr).bput, addr, b);
63   }
# Line 132 | Line 132 | static void REGPARAM2 ram_bput(uaecptr,
132   static int REGPARAM2 ram_check(uaecptr addr, uae_u32 size) REGPARAM;
133   static uae_u8 *REGPARAM2 ram_xlate(uaecptr addr) REGPARAM;
134  
135 < static uae_u32 RAMBaseDiff;     // RAMBaseHost - RAMBaseMac
135 > static uintptr RAMBaseDiff;     // RAMBaseHost - RAMBaseMac
136  
137   uae_u32 REGPARAM2 ram_lget(uaecptr addr)
138   {
# Line 252 | Line 252 | static void REGPARAM2 rom_bput(uaecptr,
252   static int REGPARAM2 rom_check(uaecptr addr, uae_u32 size) REGPARAM;
253   static uae_u8 *REGPARAM2 rom_xlate(uaecptr addr) REGPARAM;
254  
255 < static uae_u32 ROMBaseDiff;     // ROMBaseHost - ROMBaseMac
255 > static uintptr ROMBaseDiff;     // ROMBaseHost - ROMBaseMac
256  
257   uae_u32 REGPARAM2 rom_lget(uaecptr addr)
258   {
# Line 363 | Line 363 | static void REGPARAM2 frame_host_888_lpu
363   static int REGPARAM2 frame_check(uaecptr addr, uae_u32 size) REGPARAM;
364   static uae_u8 *REGPARAM2 frame_xlate(uaecptr addr) REGPARAM;
365  
366 < static uae_u32 FrameBaseDiff;   // MacFrameBaseHost - MacFrameBaseMac
366 > static uintptr FrameBaseDiff;   // MacFrameBaseHost - MacFrameBaseMac
367  
368   uae_u32 REGPARAM2 frame_direct_lget(uaecptr addr)
369   {
# Line 565 | Line 565 | void memory_init(void)
565          // Limit RAM size to not overlap ROM
566          uint32 ram_size = RAMSize > ROMBaseMac ? ROMBaseMac : RAMSize;
567  
568 <        RAMBaseDiff = (uae_u32)RAMBaseHost - (uae_u32)RAMBaseMac;
569 <        ROMBaseDiff = (uae_u32)ROMBaseHost - (uae_u32)ROMBaseMac;
570 <        FrameBaseDiff = (uae_u32)MacFrameBaseHost - (uae_u32)MacFrameBaseMac;
568 >        RAMBaseDiff = (uintptr)RAMBaseHost - (uintptr)RAMBaseMac;
569 >        ROMBaseDiff = (uintptr)ROMBaseHost - (uintptr)ROMBaseMac;
570 >        FrameBaseDiff = (uintptr)MacFrameBaseHost - (uintptr)MacFrameBaseMac;
571  
572          // Map RAM and ROM
573          if (TwentyFourBitAddressing) {

Diff Legend

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