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

Comparing BasiliskII/src/uae_cpu/cpu_emulation.h (file contents):
Revision 1.6 by cebix, 2000-08-22T12:44:30Z vs.
Revision 1.7 by gbeauche, 2000-09-22T17:18:46Z

# Line 44 | Line 44 | extern uint32 ROMSize;                 // Size of ROM
44   const uint32 MacFrameBaseMac = 0xa0000000;
45   extern uint8 *MacFrameBaseHost; // Frame buffer base (host address space)
46   extern uint32 MacFrameSize;             // Size of frame buffer
47 – extern int MacFrameLayout;              // Frame buffer layout (see defines below)
47   #endif
48 + extern int MacFrameLayout;              // Frame buffer layout (see defines below)
49  
50   // Possible frame buffer layouts
51   enum {
# Line 57 | Line 57 | enum {
57   };
58  
59   // Mac memory access functions
60 – #if REAL_ADDRESSING
61 – static inline uint32 ReadMacInt32(uint32 addr) {return ntohl(*(uint32 *)addr);}
62 – static inline uint32 ReadMacInt16(uint32 addr) {return ntohs(*(uint16 *)addr);}
63 – static inline uint32 ReadMacInt8(uint32 addr) {return *(uint8 *)addr;}
64 – static inline void WriteMacInt32(uint32 addr, uint32 l) {*(uint32 *)addr = htonl(l);}
65 – static inline void WriteMacInt16(uint32 addr, uint32 w) {*(uint16 *)addr = htons(w);}
66 – static inline void WriteMacInt8(uint32 addr, uint32 b) {*(uint8 *)addr = b;}
67 – static inline uint8 *Mac2HostAddr(uint32 addr) {return (uint8 *)addr;}
68 – #else
60   #include "memory.h"
61   static inline uint32 ReadMacInt32(uint32 addr) {return get_long(addr);}
62   static inline uint32 ReadMacInt16(uint32 addr) {return get_word(addr);}
# Line 74 | Line 65 | static inline void WriteMacInt32(uint32
65   static inline void WriteMacInt16(uint32 addr, uint32 w) {put_word(addr, w);}
66   static inline void WriteMacInt8(uint32 addr, uint32 b) {put_byte(addr, b);}
67   static inline uint8 *Mac2HostAddr(uint32 addr) {return get_real_address(addr);}
68 < #endif
68 > static inline uint32 Host2MacAddr(uint8 *addr) {return get_virtual_address(addr);}
69 >
70   static inline void *Mac_memset(uint32 addr, int c, size_t n) {return memset(Mac2HostAddr(addr), c, n);}
71   static inline void *Mac2Host_memcpy(void *dest, uint32 src, size_t n) {return memcpy(dest, Mac2HostAddr(src), n);}
72   static inline void *Host2Mac_memcpy(uint32 dest, const void *src, size_t n) {return memcpy(Mac2HostAddr(dest), src, n);}

Diff Legend

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