diff --git a/BasiliskII/src/uae_cpu/memory.cpp b/BasiliskII/src/uae_cpu/memory.cpp index df6d0905..78687233 100644 --- a/BasiliskII/src/uae_cpu/memory.cpp +++ b/BasiliskII/src/uae_cpu/memory.cpp @@ -71,7 +71,6 @@ static uae_u32 REGPARAM2 dummy_bget (uaecptr) REGPARAM; static void REGPARAM2 dummy_lput (uaecptr, uae_u32) REGPARAM; static void REGPARAM2 dummy_wput (uaecptr, uae_u32) REGPARAM; static void REGPARAM2 dummy_bput (uaecptr, uae_u32) REGPARAM; -static int REGPARAM2 dummy_check (uaecptr addr, uae_u32 size) REGPARAM; uae_u32 REGPARAM2 dummy_lget (uaecptr addr) { @@ -113,14 +112,6 @@ void REGPARAM2 dummy_bput (uaecptr addr, uae_u32 b) write_log ("Illegal bput at %08lx\n", addr); } -int REGPARAM2 dummy_check (uaecptr addr, uae_u32 size) -{ - if (illegal_mem) - write_log ("Illegal check at %08lx\n", addr); - - return 0; -} - /* Mac RAM (32 bit addressing) */ static uae_u32 REGPARAM2 ram_lget(uaecptr) REGPARAM; @@ -129,7 +120,6 @@ static uae_u32 REGPARAM2 ram_bget(uaecptr) REGPARAM; static void REGPARAM2 ram_lput(uaecptr, uae_u32) REGPARAM; static void REGPARAM2 ram_wput(uaecptr, uae_u32) REGPARAM; static void REGPARAM2 ram_bput(uaecptr, uae_u32) REGPARAM; -static int REGPARAM2 ram_check(uaecptr addr, uae_u32 size) REGPARAM; static uae_u8 *REGPARAM2 ram_xlate(uaecptr addr) REGPARAM; static uintptr RAMBaseDiff; // RAMBaseHost - RAMBaseMac @@ -172,11 +162,6 @@ void REGPARAM2 ram_bput(uaecptr addr, uae_u32 b) *(uae_u8 *)(RAMBaseDiff + addr) = b; } -int REGPARAM2 ram_check(uaecptr addr, uae_u32 size) -{ - return (addr - RAMBaseMac + size) < RAMSize; -} - uae_u8 *REGPARAM2 ram_xlate(uaecptr addr) { return (uae_u8 *)(RAMBaseDiff + addr); @@ -190,7 +175,6 @@ static uae_u32 REGPARAM2 ram24_bget(uaecptr) REGPARAM; static void REGPARAM2 ram24_lput(uaecptr, uae_u32) REGPARAM; static void REGPARAM2 ram24_wput(uaecptr, uae_u32) REGPARAM; static void REGPARAM2 ram24_bput(uaecptr, uae_u32) REGPARAM; -static int REGPARAM2 ram24_check(uaecptr addr, uae_u32 size) REGPARAM; static uae_u8 *REGPARAM2 ram24_xlate(uaecptr addr) REGPARAM; uae_u32 REGPARAM2 ram24_lget(uaecptr addr) @@ -231,11 +215,6 @@ void REGPARAM2 ram24_bput(uaecptr addr, uae_u32 b) *(uae_u8 *)(RAMBaseDiff + (addr & 0xffffff)) = b; } -int REGPARAM2 ram24_check(uaecptr addr, uae_u32 size) -{ - return ((addr & 0xffffff) - RAMBaseMac + size) < RAMSize; -} - uae_u8 *REGPARAM2 ram24_xlate(uaecptr addr) { return (uae_u8 *)(RAMBaseDiff + (addr & 0xffffff)); @@ -249,7 +228,6 @@ static uae_u32 REGPARAM2 rom_bget(uaecptr) REGPARAM; static void REGPARAM2 rom_lput(uaecptr, uae_u32) REGPARAM; static void REGPARAM2 rom_wput(uaecptr, uae_u32) REGPARAM; static void REGPARAM2 rom_bput(uaecptr, uae_u32) REGPARAM; -static int REGPARAM2 rom_check(uaecptr addr, uae_u32 size) REGPARAM; static uae_u8 *REGPARAM2 rom_xlate(uaecptr addr) REGPARAM; static uintptr ROMBaseDiff; // ROMBaseHost - ROMBaseMac @@ -291,11 +269,6 @@ void REGPARAM2 rom_bput(uaecptr addr, uae_u32 b) write_log ("Illegal ROM bput at %08lx\n", addr); } -int REGPARAM2 rom_check(uaecptr addr, uae_u32 size) -{ - return (addr - ROMBaseMac + size) < ROMSize; -} - uae_u8 *REGPARAM2 rom_xlate(uaecptr addr) { return (uae_u8 *)(ROMBaseDiff + addr); @@ -306,7 +279,6 @@ uae_u8 *REGPARAM2 rom_xlate(uaecptr addr) static uae_u32 REGPARAM2 rom24_lget(uaecptr) REGPARAM; static uae_u32 REGPARAM2 rom24_wget(uaecptr) REGPARAM; static uae_u32 REGPARAM2 rom24_bget(uaecptr) REGPARAM; -static int REGPARAM2 rom24_check(uaecptr addr, uae_u32 size) REGPARAM; static uae_u8 *REGPARAM2 rom24_xlate(uaecptr addr) REGPARAM; uae_u32 REGPARAM2 rom24_lget(uaecptr addr) @@ -328,11 +300,6 @@ uae_u32 REGPARAM2 rom24_bget(uaecptr addr) return (uae_u32)*(uae_u8 *)(ROMBaseDiff + (addr & 0xffffff)); } -int REGPARAM2 rom24_check(uaecptr addr, uae_u32 size) -{ - return ((addr & 0xffffff) - ROMBaseMac + size) < ROMSize; -} - uae_u8 *REGPARAM2 rom24_xlate(uaecptr addr) { return (uae_u8 *)(ROMBaseDiff + (addr & 0xffffff)); @@ -360,7 +327,6 @@ static void REGPARAM2 frame_host_565_wput(uaecptr, uae_u32) REGPARAM; static uae_u32 REGPARAM2 frame_host_888_lget(uaecptr) REGPARAM; static void REGPARAM2 frame_host_888_lput(uaecptr, uae_u32) REGPARAM; -static int REGPARAM2 frame_check(uaecptr addr, uae_u32 size) REGPARAM; static uae_u8 *REGPARAM2 frame_xlate(uaecptr addr) REGPARAM; static uintptr FrameBaseDiff; // MacFrameBaseHost - MacFrameBaseMac @@ -478,11 +444,6 @@ void REGPARAM2 frame_host_888_lput(uaecptr addr, uae_u32 l) *m = l; } -int REGPARAM2 frame_check(uaecptr addr, uae_u32 size) -{ - return (addr - MacFrameBaseMac + size) < MacFrameSize; -} - uae_u8 *REGPARAM2 frame_xlate(uaecptr addr) { return (uae_u8 *)(FrameBaseDiff + addr); @@ -490,11 +451,6 @@ uae_u8 *REGPARAM2 frame_xlate(uaecptr addr) /* Default memory access functions */ -int REGPARAM2 default_check (uaecptr a, uae_u32 b) -{ - return 0; -} - uae_u8 *REGPARAM2 default_xlate (uaecptr a) { write_log("Your Mac program just did something terribly stupid\n"); @@ -506,55 +462,55 @@ uae_u8 *REGPARAM2 default_xlate (uaecptr a) addrbank dummy_bank = { dummy_lget, dummy_wget, dummy_bget, dummy_lput, dummy_wput, dummy_bput, - default_xlate, dummy_check + default_xlate }; addrbank ram_bank = { ram_lget, ram_wget, ram_bget, ram_lput, ram_wput, ram_bput, - ram_xlate, ram_check + ram_xlate }; addrbank ram24_bank = { ram24_lget, ram24_wget, ram24_bget, ram24_lput, ram24_wput, ram24_bput, - ram24_xlate, ram24_check + ram24_xlate }; addrbank rom_bank = { rom_lget, rom_wget, rom_bget, rom_lput, rom_wput, rom_bput, - rom_xlate, rom_check + rom_xlate }; addrbank rom24_bank = { rom24_lget, rom24_wget, rom24_bget, rom_lput, rom_wput, rom_bput, - rom24_xlate, rom24_check + rom24_xlate }; addrbank frame_direct_bank = { frame_direct_lget, frame_direct_wget, frame_direct_bget, frame_direct_lput, frame_direct_wput, frame_direct_bput, - frame_xlate, frame_check + frame_xlate }; addrbank frame_host_555_bank = { frame_host_555_lget, frame_host_555_wget, frame_direct_bget, frame_host_555_lput, frame_host_555_wput, frame_direct_bput, - frame_xlate, frame_check + frame_xlate }; addrbank frame_host_565_bank = { frame_host_565_lget, frame_host_565_wget, frame_direct_bget, frame_host_565_lput, frame_host_565_wput, frame_direct_bput, - frame_xlate, frame_check + frame_xlate }; addrbank frame_host_888_bank = { frame_host_888_lget, frame_direct_wget, frame_direct_bget, frame_host_888_lput, frame_direct_wput, frame_direct_bput, - frame_xlate, frame_check + frame_xlate }; void memory_init(void) diff --git a/BasiliskII/src/uae_cpu/memory.h b/BasiliskII/src/uae_cpu/memory.h index 558c5c26..61d740be 100644 --- a/BasiliskII/src/uae_cpu/memory.h +++ b/BasiliskII/src/uae_cpu/memory.h @@ -23,7 +23,6 @@ typedef uae_u32 (REGPARAM2 *mem_get_func)(uaecptr) REGPARAM; typedef void (REGPARAM2 *mem_put_func)(uaecptr, uae_u32) REGPARAM; typedef uae_u8 *(REGPARAM2 *xlate_func)(uaecptr) REGPARAM; -typedef int (REGPARAM2 *check_func)(uaecptr, uae_u32) REGPARAM; #undef DIRECT_MEMFUNCS_SUCCESSFUL @@ -44,11 +43,6 @@ typedef struct { * This doesn't work for all memory banks, so this function may call * abort(). */ xlate_func xlateaddr; - /* To prevent calls to abort(), use check before calling xlateaddr. - * It checks not only that the memory bank can do xlateaddr, but also - * that the pointer points to an area of at least the specified size. - * This is used for example to translate bitplane pointers in custom.c */ - check_func check; } addrbank; extern uae_u8 filesysory[65536]; @@ -59,7 +53,6 @@ extern addrbank frame_bank; // Frame buffer /* Default memory access functions */ -extern int REGPARAM2 default_check(uaecptr addr, uae_u32 size) REGPARAM; extern uae_u8 *REGPARAM2 default_xlate(uaecptr addr) REGPARAM; #define bankindex(addr) (((uaecptr)(addr)) >> 16) @@ -164,10 +157,6 @@ static __inline__ uae_u32 get_virtual_address(uae_u8 *addr) { return do_get_virtual_address(addr); } -static __inline__ int valid_address(uaecptr addr, uae_u32 size) -{ - return 1; -} #else static __inline__ uae_u32 get_long(uaecptr addr) { @@ -199,10 +188,6 @@ static __inline__ uae_u8 *get_real_address(uaecptr addr) } /* gb-- deliberately not implemented since it shall not be used... */ extern uae_u32 get_virtual_address(uae_u8 *addr); -static __inline__ int valid_address(uaecptr addr, uae_u32 size) -{ - return get_mem_bank(addr).check(addr, size); -} #endif /* DIRECT_ADDRESSING || REAL_ADDRESSING */ #endif /* MEMORY_H */