--- SheepShaver/src/include/cpu_emulation.h 2004/05/31 09:04:44 1.12 +++ SheepShaver/src/include/cpu_emulation.h 2004/11/13 14:09:16 1.14 @@ -54,6 +54,8 @@ struct KernelData { // RAM and ROM pointers (allocated and set by main_*.cpp) extern uint32 RAMBase; // Base address of Mac RAM extern uint32 RAMSize; // Size address of Mac RAM +extern uint8 *RAMBaseHost; // Base address of Mac RAM (host address space) +extern uint8 *ROMBaseHost; // Base address of Mac ROM (host address space) // Mac memory access functions #if EMULATED_PPC @@ -66,6 +68,7 @@ static inline uint32 ReadMacInt32(uint32 static inline void WriteMacInt32(uint32 addr, uint32 v) {vm_write_memory_4(addr, v);} static inline uint64 ReadMacInt64(uint32 addr) {return vm_read_memory_8(addr);} static inline void WriteMacInt64(uint32 addr, uint64 v) {vm_write_memory_8(addr, v);} +static inline uint32 Host2MacAddr(uint8 *addr) {return vm_do_get_virtual_address(addr);} static inline uint8 *Mac2HostAddr(uint32 addr) {return vm_do_get_real_address(addr);} static inline void *Mac_memset(uint32 addr, int c, size_t n) {return vm_memset(addr, c, n);} static inline void *Mac2Host_memcpy(void *dest, uint32 src, size_t n) {return vm_memcpy(dest, src, n);} @@ -80,6 +83,7 @@ static inline uint64 ReadMacInt64(uint32 static inline void WriteMacInt16(uint32 addr, uint32 w) {*(uint16 *)addr = w;} static inline void WriteMacInt32(uint32 addr, uint32 l) {*(uint32 *)addr = l;} static inline void WriteMacInt64(uint32 addr, uint64 ll) {*(uint64 *)addr = ll;} +static inline uint32 Host2MacAddr(uint8 *addr) {return (uint32)addr;} static inline uint8 *Mac2HostAddr(uint32 addr) {return (uint8 *)addr;} static inline void *Mac_memset(uint32 addr, int c, size_t n) {return memset(Mac2HostAddr(addr), c, n);} static inline void *Mac2Host_memcpy(void *dest, uint32 src, size_t n) {return memcpy(dest, Mac2HostAddr(src), n);}