LIV2/amitools
1
0
Fork 0
mirror of https://github.com/LIV2/amitools.git synced 2025-12-05 22:22:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

romtool: fixed build with kickety split

Browse Source
This commit is contained in:
Christian Vogelgsang 2024-01-03 08:44:17 +01:00
parent d6c121236b
commit a34565b35a
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amitools/rom/rombuilder.py
View File

@ -52,7 +52,7 @@ class RomEntryRomHdr:
return self.skip + 8 return self.skip + 8
def get_data(self, addr): def get_data(self, addr):
data = chr(0xFF) * self.skip data = b"\x0ff" * self.skip
hdr = struct.pack(">II", 0x11114EF9, self.jmp_addr) hdr = struct.pack(">II", 0x11114EF9, self.jmp_addr)
return data + hdr return data + hdr

30
test/tools/romtool.py
View File

@ -48,6 +48,14 @@ SPLIT_ROM = (
tag_full("amiga-os-3x0-a4000.rom"), tag_full("amiga-os-3x0-a4000.rom"),
) )
KICKETY_SPLIT_ROM = (
tag_full("amiga-os-204.rom"),
"amiga-os-310-a1200.rom",
"amiga-os-310-a3000.rom",
"amiga-os-310-a4000.rom",
"amiga-os-310-a500.rom",
)
SPLIT_EXT = ( SPLIT_EXT = (
"amiga-crt-310-cd32-fmv.rom", "amiga-crt-310-cd32-fmv.rom",
"amiga-os-130-cdtv-ext.rom", "amiga-os-130-cdtv-ext.rom",
@ -69,6 +77,13 @@ def split_rom_file(request, toolrun):
return rom return rom
@pytest.fixture(params=KICKETY_SPLIT_ROM)
def kickety_split_rom_file(request, toolrun):
rom = "roms/" + request.param
toolrun.skip_if_data_file_not_available(rom)
return rom
@pytest.fixture(params=SPLIT_EXT) @pytest.fixture(params=SPLIT_EXT)
def split_ext_file(request, toolrun): def split_ext_file(request, toolrun):
rom = "roms/" + request.param rom = "roms/" + request.param
@ -90,6 +105,21 @@ def romtool_split_build_rom_test(toolrun, split_rom_file, tmpdir):
toolrun.run_checked("romtool", "info", new_rom) toolrun.run_checked("romtool", "info", new_rom)
def romtool_split_build_kickety_rom_test(toolrun, kickety_split_rom_file, tmpdir):
toolrun.run_checked(
"romtool",
"split",
"-o",
str(tmpdir),
"--no-version-dir",
kickety_split_rom_file,
)
index_txt = str(tmpdir / "index.txt")
new_rom = str(tmpdir / "new.rom")
toolrun.run_checked("romtool", "build", "-k", "-o", new_rom, index_txt)
toolrun.run_checked("romtool", "info", new_rom)
def romtool_combine_test(toolrun, tmpdir): def romtool_combine_test(toolrun, tmpdir):
rom = "amiga-os-310-cd32.rom" rom = "amiga-os-310-cd32.rom"
ext = "amiga-os-310-cd32-ext.rom" ext = "amiga-os-310-cd32-ext.rom"