--- SheepShaver/src/rom_patches.cpp 2003/10/06 21:00:48 1.14 +++ SheepShaver/src/rom_patches.cpp 2003/10/07 19:28:09 1.17 @@ -58,10 +58,10 @@ // Other ROM addresses -const uint32 CHECK_LOAD_PATCH_SPACE = 0x2f7f00; -const uint32 PUT_SCRAP_PATCH_SPACE = 0x2f7f80; -const uint32 GET_SCRAP_PATCH_SPACE = 0x2f7fc0; -const uint32 ADDR_MAP_PATCH_SPACE = 0x2f8000; +const uint32 CHECK_LOAD_PATCH_SPACE = 0x2fcf00; +const uint32 PUT_SCRAP_PATCH_SPACE = 0x2fcf80; +const uint32 GET_SCRAP_PATCH_SPACE = 0x2fcfc0; +const uint32 ADDR_MAP_PATCH_SPACE = 0x2fd000; // Global variables int ROMType; // ROM type @@ -131,7 +131,7 @@ void decode_parcels(const uint8 *src, ui (parcel_type >> 8) & 0xff, parcel_type & 0xff, &parcel_data[6])); if (parcel_type == FOURCC('r','o','m',' ')) { uint32 lzss_offset = ntohl(parcel_data[2]); - uint32 lzss_size = ((uint32)src + parcel_offset) - ((uint32)parcel_data + lzss_offset); + uint32 lzss_size = ((uintptr)src + next_offset) - ((uintptr)parcel_data + lzss_offset); decode_lzss((uint8 *)parcel_data + lzss_offset, dest, lzss_size); } parcel_offset = next_offset; @@ -726,7 +726,6 @@ bool PatchROM(void) return false; // Check that other ROM addresses point to really free regions - printf("%08x\n", ntohl(*(uint32 *)(ROM_BASE + CHECK_LOAD_PATCH_SPACE))); if (ntohl(*(uint32 *)(ROM_BASE + CHECK_LOAD_PATCH_SPACE)) != 0x6b636b63) return false; if (ntohl(*(uint32 *)(ROM_BASE + PUT_SCRAP_PATCH_SPACE)) != 0x6b636b63)