From d71dcebf3a7e09992f64cf962973cb659d191db5 Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Fri, 10 Jan 2020 22:21:41 +0100 Subject: [PATCH] compilation fix --- Makefile | 6 +++--- c64/kernal/iostack/load_save_common.s | 4 +++- c64/kernal/jumptable/4000.internal_jumptable.s | 9 +++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 c64/kernal/jumptable/4000.internal_jumptable.s diff --git a/Makefile b/Makefile index c5a6c117..a6b3bbc0 100644 --- a/Makefile +++ b/Makefile @@ -265,11 +265,11 @@ build/symbols_hybrid.vs: build/target_generic/KERNAL_combined.vs # Rules - platform 'Mega 65' specific -build/mega65.rom: build/kernal_0_mega65.rom build/target_mega65/OUTK_1.BIN build/basic_mega65.rom build/chargen.rom - cat build/target_mega65/OUTK_1.BIN > build/mega65.rom +build/mega65.rom: build/kernal_mega65.rom_0 build/kernal_mega65.rom_1 build/basic_mega65.rom_0 build/chargen.rom + cat build/kernal_mega65.rom_1 > build/mega65.rom dd if=/dev/zero bs=4096 count=6 of=build/padding1 cat build/padding1 >> build/mega65.rom - cat build/basic_mega65.rom build/chargen.rom build/chargen.rom build/kernal_0_mega65.rom >> build/mega65.rom + cat build/basic_mega65.rom_0 build/chargen.rom build/chargen.rom build/kernal_mega65.rom_0 >> build/mega65.rom dd if=/dev/zero bs=4096 count=16 of=build/padding2 cat build/padding2 >> build/mega65.rom rm -f build/padding* diff --git a/c64/kernal/iostack/load_save_common.s b/c64/kernal/iostack/load_save_common.s index 95fc9ff2..e5562158 100644 --- a/c64/kernal/iostack/load_save_common.s +++ b/c64/kernal/iostack/load_save_common.s @@ -104,6 +104,7 @@ lvs_advance_MEMUSS: #endif + lvs_check_EAL: lda MEMUSS+1 @@ -224,7 +225,6 @@ lvs_display_saving: !: rts - lvs_error_end: sec @@ -243,6 +243,8 @@ lvs_success_end: clc rts +#endif // XXX is this endif in propeer place? + lvs_device_not_found_error: jsr kernalstatus_DEVICE_NOT_FOUND diff --git a/c64/kernal/jumptable/4000.internal_jumptable.s b/c64/kernal/jumptable/4000.internal_jumptable.s new file mode 100644 index 00000000..ad6e41d8 --- /dev/null +++ b/c64/kernal/jumptable/4000.internal_jumptable.s @@ -0,0 +1,9 @@ +#if (ROM_LAYOUT_M65 && SEGMENT_KERNAL_1) + +// XXX this is for testing only + + sed + sed + rts + +#endif // ROM layout