diff --git a/Makefile b/Makefile index cadc7677..ca8a7df0 100644 --- a/Makefile +++ b/Makefile @@ -3,15 +3,15 @@ SRC_COMMON = $(wildcard c64/aliases/*.s) SRC_BASIC_COMMON = $(SRC_COMMON) $(wildcard c64/basic/*.s) -SRC_KERNAL_COMMON = $(SRC_COMMON) $(wildcard c64/kernal/*.s) +SRC_KERNAL_COMMON = $(SRC_COMMON) $(wildcard c64/kernal/*.s c64/kernal/jumptable/*.s c64/kernal/iec/*.s) -SRC_BASIC_generic = $(SRC_BASIC_COMMON) $(wildcard c64/basic/,platform_generic/*.s) -SRC_BASIC_mega65 = $(SRC_BASIC_COMMON) $(wildcard c64/basic/,platform_mega65/*.s) -SRC_BASIC_ultimate64 = $(SRC_BASIC_COMMON) $(wildcard c64/basic/,platform_ultimate64/*.s) +SRC_BASIC_generic = $(SRC_BASIC_COMMON) $(wildcard c64/basic/,target_generic/*.s) +SRC_BASIC_mega65 = $(SRC_BASIC_COMMON) $(wildcard c64/basic/,target_mega65/*.s) +SRC_BASIC_ultimate64 = $(SRC_BASIC_COMMON) $(wildcard c64/basic/,target_ultimate64/*.s) -SRC_KERNAL_generic = $(SRC_KERNAL_COMMON) $(wildcard c64/kernal/,platform_generic/*.s) -SRC_KERNAL_mega65 = $(SRC_KERNAL_COMMON) $(wildcard c64/kernal/,platform_mega65/*.s) -SRC_KERNAL_ultimate64 = $(SRC_KERNAL_COMMON) $(wildcard c64/kernal/,platform_ultimate64/*.s) +SRC_KERNAL_generic = $(SRC_KERNAL_COMMON) $(wildcard c64/kernal/,target_generic/*.s) +SRC_KERNAL_mega65 = $(SRC_KERNAL_COMMON) $(wildcard c64/kernal/,target_mega65/*.s) +SRC_KERNAL_ultimate64 = $(SRC_KERNAL_COMMON) $(wildcard c64/kernal/,target_ultimate64/*.s) # List of tools @@ -68,22 +68,22 @@ build/chargen: $(TOOL_PNGPREPARE) assets/8x8font.png # Dependencies - XXX, why they need to be stated separately? -build/basic_generic/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_BASIC_generic) build/basic/packed_messages.s +build/basic_generic/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_BASIC_generic) build/basic/packed_messages.s build/kernal_generic/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_KERNAL_generic) -build/newrom_generic: build/basic_generic/OUT.BIN build/kernal_generic/OUT.BIN -build/newkern_generic: build/newrom_generic Makefile +build/newrom_generic: build/basic_generic/OUT.BIN build/kernal_generic/OUT.BIN +build/newkern_generic: build/newrom_generic Makefile build/newbasic_generic: build/newrom_generic Makefile -build/basic_mega65/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_BASIC_mega65) build/basic/packed_messages.s +build/basic_mega65/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_BASIC_mega65) build/basic/packed_messages.s build/kernal_mega65/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_KERNAL_mega65) -build/newrom_mega65: build/basic_mega65/OUT.BIN build/kernal_mega65/OUT.BIN -build/newkern_mega65: build/newrom_mega65 Makefile +build/newrom_mega65: build/basic_mega65/OUT.BIN build/kernal_mega65/OUT.BIN +build/newkern_mega65: build/newrom_mega65 Makefile build/newbasic_mega65: build/newrom_mega65 Makefile -build/basic_ultimate64/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_BASIC_ultimate64) build/basic/packed_messages.s +build/basic_ultimate64/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_BASIC_ultimate64) build/basic/packed_messages.s build/kernal_ultimate64/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_KERNAL_ultimate64) -build/newrom_ultimate64: build/basic_ultimate64/OUT.BIN build/kernal_ultimate64/OUT.BIN -build/newkern_ultimate64: build/newrom_ultimate64 Makefile +build/newrom_ultimate64: build/basic_ultimate64/OUT.BIN build/kernal_ultimate64/OUT.BIN +build/newkern_ultimate64: build/newrom_ultimate64 Makefile build/newbasic_ultimate64: build/newrom_ultimate64 Makefile diff --git a/c64/basic/,platform_generic/,hooks_generic.s b/c64/basic/,platform_generic/,hooks_generic.s deleted file mode 100644 index 4f743e84..00000000 --- a/c64/basic/,platform_generic/,hooks_generic.s +++ /dev/null @@ -1,9 +0,0 @@ - -;; Platform-specific hooks - - -.macro PLATFORM_HOOK_BANNER - - .byte $05, " OPEN ROMS, ", $00 - -.macend diff --git a/c64/basic/,target_generic/,hooks_generic.s b/c64/basic/,target_generic/,hooks_generic.s new file mode 100644 index 00000000..186b29d0 --- /dev/null +++ b/c64/basic/,target_generic/,hooks_generic.s @@ -0,0 +1,9 @@ + +;; Target-specific hooks + + +.macro TARGET_HOOK_BANNER + + .byte $05, " OPEN ROMS, ", $00 + +.macend diff --git a/c64/basic/,platform_mega65/,hooks_mega65.s b/c64/basic/,target_mega65/,hooks_mega65.s similarity index 97% rename from c64/basic/,platform_mega65/,hooks_mega65.s rename to c64/basic/,target_mega65/,hooks_mega65.s index d8eecbaf..97c859e5 100644 --- a/c64/basic/,platform_mega65/,hooks_mega65.s +++ b/c64/basic/,target_mega65/,hooks_mega65.s @@ -1,8 +1,8 @@ -;; Platform-specific hooks +;; Target-specific hooks -.macro PLATFORM_HOOK_BANNER +.macro TARGET_HOOK_BANNER ;; New banner from Retrofan .byte $9a, $12, $20, $20, $7f, $a9, $20, $20, $1f, $20, $9a, $20, $20, $20 diff --git a/c64/basic/,platform_ultimate64/,hooks_ultimate64.s b/c64/basic/,target_ultimate64/,hooks_ultimate64.s similarity index 58% rename from c64/basic/,platform_ultimate64/,hooks_ultimate64.s rename to c64/basic/,target_ultimate64/,hooks_ultimate64.s index 717d70bc..519d07e9 100644 --- a/c64/basic/,platform_ultimate64/,hooks_ultimate64.s +++ b/c64/basic/,target_ultimate64/,hooks_ultimate64.s @@ -1,8 +1,8 @@ -;; Platform-specific hooks +;; Target-specific hooks -.macro PLATFORM_HOOK_BANNER +.macro TARGET_HOOK_BANNER .byte $05, " OPEN ROMS FOR ULTIMATE 64", $0D, $0D, " ", $00 diff --git a/c64/basic/basic_cold_start.s b/c64/basic/basic_cold_start.s index de4faf76..341e0909 100644 --- a/c64/basic/basic_cold_start.s +++ b/c64/basic/basic_cold_start.s @@ -15,7 +15,7 @@ basic_cold_start: ; Used 217 bytes startup_banner: - `PLATFORM_HOOK_BANNER + `TARGET_HOOK_BANNER ;; Work out free bytes, and display jsr basic_do_new diff --git a/c64/kernal/,platform_generic/,hooks_generic.s b/c64/kernal/,platform_generic/,hooks_generic.s deleted file mode 100644 index 7de47686..00000000 --- a/c64/kernal/,platform_generic/,hooks_generic.s +++ /dev/null @@ -1,6 +0,0 @@ - -;; Platform-specific hooks - - -.macro PLATFORM_HOOK_LOAD -.macend diff --git a/c64/kernal/,platform_mega65/,hooks_mega65.s b/c64/kernal/,platform_mega65/,hooks_mega65.s deleted file mode 100644 index 7de47686..00000000 --- a/c64/kernal/,platform_mega65/,hooks_mega65.s +++ /dev/null @@ -1,6 +0,0 @@ - -;; Platform-specific hooks - - -.macro PLATFORM_HOOK_LOAD -.macend diff --git a/c64/kernal/,target_generic/,hooks_generic.s b/c64/kernal/,target_generic/,hooks_generic.s new file mode 100644 index 00000000..a2c8c1a6 --- /dev/null +++ b/c64/kernal/,target_generic/,hooks_generic.s @@ -0,0 +1,6 @@ + +;; Target-specific hooks + + +.macro TARGET_HOOK_LOAD +.macend diff --git a/c64/kernal/,target_mega65/,hooks_mega65.s b/c64/kernal/,target_mega65/,hooks_mega65.s new file mode 100644 index 00000000..a2c8c1a6 --- /dev/null +++ b/c64/kernal/,target_mega65/,hooks_mega65.s @@ -0,0 +1,6 @@ + +;; Target-specific hooks + + +.macro TARGET_HOOK_LOAD +.macend diff --git a/c64/kernal/,platform_ultimate64/,aliases_ultimate64.s b/c64/kernal/,target_ultimate64/,aliases_ultimate64.s similarity index 100% rename from c64/kernal/,platform_ultimate64/,aliases_ultimate64.s rename to c64/kernal/,target_ultimate64/,aliases_ultimate64.s diff --git a/c64/kernal/,platform_ultimate64/,hooks_ultimate64.s b/c64/kernal/,target_ultimate64/,hooks_ultimate64.s similarity index 72% rename from c64/kernal/,platform_ultimate64/,hooks_ultimate64.s rename to c64/kernal/,target_ultimate64/,hooks_ultimate64.s index 2c092fc0..03f6eeb8 100644 --- a/c64/kernal/,platform_ultimate64/,hooks_ultimate64.s +++ b/c64/kernal/,target_ultimate64/,hooks_ultimate64.s @@ -1,8 +1,8 @@ -;; Platform-specific hooks +;; Target-specific hooks -.macro PLATFORM_HOOK_LOAD +.macro TARGET_HOOK_LOAD ;; XXX disabled for now - the current file opening API is not ;; really suitable for easy usage from Kernal ;; jsr u64_load diff --git a/c64/kernal/,platform_ultimate64/u64_load.s.disabled b/c64/kernal/,target_ultimate64/u64_load.s.disabled similarity index 100% rename from c64/kernal/,platform_ultimate64/u64_load.s.disabled rename to c64/kernal/,target_ultimate64/u64_load.s.disabled diff --git a/c64/kernal/iec_devnum_check.s b/c64/kernal/iec/iec_devnum_check.s similarity index 100% rename from c64/kernal/iec_devnum_check.s rename to c64/kernal/iec/iec_devnum_check.s diff --git a/c64/kernal/iec_pull_atn_clk_release_data.s b/c64/kernal/iec/iec_pull_atn_clk_release_data.s similarity index 100% rename from c64/kernal/iec_pull_atn_clk_release_data.s rename to c64/kernal/iec/iec_pull_atn_clk_release_data.s diff --git a/c64/kernal/iec_pull_clk_release_data.s b/c64/kernal/iec/iec_pull_clk_release_data.s similarity index 100% rename from c64/kernal/iec_pull_clk_release_data.s rename to c64/kernal/iec/iec_pull_clk_release_data.s diff --git a/c64/kernal/iec_pull_data_release_atn_clk.s b/c64/kernal/iec/iec_pull_data_release_atn_clk.s similarity index 100% rename from c64/kernal/iec_pull_data_release_atn_clk.s rename to c64/kernal/iec/iec_pull_data_release_atn_clk.s diff --git a/c64/kernal/iec_release_atn.s b/c64/kernal/iec/iec_release_atn.s similarity index 100% rename from c64/kernal/iec_release_atn.s rename to c64/kernal/iec/iec_release_atn.s diff --git a/c64/kernal/iec_release_atn_clk_data.s b/c64/kernal/iec/iec_release_atn_clk_data.s similarity index 100% rename from c64/kernal/iec_release_atn_clk_data.s rename to c64/kernal/iec/iec_release_atn_clk_data.s diff --git a/c64/kernal/iec_release_clk_data.s b/c64/kernal/iec/iec_release_clk_data.s similarity index 100% rename from c64/kernal/iec_release_clk_data.s rename to c64/kernal/iec/iec_release_clk_data.s diff --git a/c64/kernal/iec_release_clk_pull_data.s b/c64/kernal/iec/iec_release_clk_pull_data.s similarity index 100% rename from c64/kernal/iec_release_clk_pull_data.s rename to c64/kernal/iec/iec_release_clk_pull_data.s diff --git a/c64/kernal/iec_return.s b/c64/kernal/iec/iec_return.s similarity index 100% rename from c64/kernal/iec_return.s rename to c64/kernal/iec/iec_return.s diff --git a/c64/kernal/iec_rx_byte.s b/c64/kernal/iec/iec_rx_byte.s similarity index 100% rename from c64/kernal/iec_rx_byte.s rename to c64/kernal/iec/iec_rx_byte.s diff --git a/c64/kernal/iec_set_idle.s b/c64/kernal/iec/iec_set_idle.s similarity index 100% rename from c64/kernal/iec_set_idle.s rename to c64/kernal/iec/iec_set_idle.s diff --git a/c64/kernal/iec_turnaround_to_listen.s b/c64/kernal/iec/iec_turnaround_to_listen.s similarity index 100% rename from c64/kernal/iec_turnaround_to_listen.s rename to c64/kernal/iec/iec_turnaround_to_listen.s diff --git a/c64/kernal/iec_turnaround_to_talk.s b/c64/kernal/iec/iec_turnaround_to_talk.s similarity index 100% rename from c64/kernal/iec_turnaround_to_talk.s rename to c64/kernal/iec/iec_turnaround_to_talk.s diff --git a/c64/kernal/iec_tx_byte.s b/c64/kernal/iec/iec_tx_byte.s similarity index 100% rename from c64/kernal/iec_tx_byte.s rename to c64/kernal/iec/iec_tx_byte.s diff --git a/c64/kernal/iec_tx_command.s b/c64/kernal/iec/iec_tx_command.s similarity index 100% rename from c64/kernal/iec_tx_command.s rename to c64/kernal/iec/iec_tx_command.s diff --git a/c64/kernal/iec_tx_common.s b/c64/kernal/iec/iec_tx_common.s similarity index 100% rename from c64/kernal/iec_tx_common.s rename to c64/kernal/iec/iec_tx_common.s diff --git a/c64/kernal/iec_wait100us.s b/c64/kernal/iec/iec_wait100us.s similarity index 100% rename from c64/kernal/iec_wait100us.s rename to c64/kernal/iec/iec_wait100us.s diff --git a/c64/kernal/iec_wait20us.s b/c64/kernal/iec/iec_wait20us.s similarity index 100% rename from c64/kernal/iec_wait20us.s rename to c64/kernal/iec/iec_wait20us.s diff --git a/c64/kernal/iec_wait60us.s b/c64/kernal/iec/iec_wait60us.s similarity index 100% rename from c64/kernal/iec_wait60us.s rename to c64/kernal/iec/iec_wait60us.s diff --git a/c64/kernal/iec_wait_for_clk_release.s b/c64/kernal/iec/iec_wait_for_clk_release.s similarity index 100% rename from c64/kernal/iec_wait_for_clk_release.s rename to c64/kernal/iec/iec_wait_for_clk_release.s diff --git a/c64/kernal/iec_wait_for_data_pull.s b/c64/kernal/iec/iec_wait_for_data_pull.s similarity index 100% rename from c64/kernal/iec_wait_for_data_pull.s rename to c64/kernal/iec/iec_wait_for_data_pull.s diff --git a/c64/kernal/iec_wait_for_data_release.s b/c64/kernal/iec/iec_wait_for_data_release.s similarity index 100% rename from c64/kernal/iec_wait_for_data_release.s rename to c64/kernal/iec/iec_wait_for_data_release.s diff --git a/c64/kernal/ff81.jcint.s b/c64/kernal/jumptable/ff81.jcint.s similarity index 100% rename from c64/kernal/ff81.jcint.s rename to c64/kernal/jumptable/ff81.jcint.s diff --git a/c64/kernal/ff84.jioinit.s b/c64/kernal/jumptable/ff84.jioinit.s similarity index 100% rename from c64/kernal/ff84.jioinit.s rename to c64/kernal/jumptable/ff84.jioinit.s diff --git a/c64/kernal/ff87.jramtas.s b/c64/kernal/jumptable/ff87.jramtas.s similarity index 100% rename from c64/kernal/ff87.jramtas.s rename to c64/kernal/jumptable/ff87.jramtas.s diff --git a/c64/kernal/ff8a.jrestor.s b/c64/kernal/jumptable/ff8a.jrestor.s similarity index 100% rename from c64/kernal/ff8a.jrestor.s rename to c64/kernal/jumptable/ff8a.jrestor.s diff --git a/c64/kernal/ff8d.jvector.s b/c64/kernal/jumptable/ff8d.jvector.s similarity index 100% rename from c64/kernal/ff8d.jvector.s rename to c64/kernal/jumptable/ff8d.jvector.s diff --git a/c64/kernal/ff90.jsetmsg.s b/c64/kernal/jumptable/ff90.jsetmsg.s similarity index 100% rename from c64/kernal/ff90.jsetmsg.s rename to c64/kernal/jumptable/ff90.jsetmsg.s diff --git a/c64/kernal/ff93.jsecond.s b/c64/kernal/jumptable/ff93.jsecond.s similarity index 100% rename from c64/kernal/ff93.jsecond.s rename to c64/kernal/jumptable/ff93.jsecond.s diff --git a/c64/kernal/ff96.jtksa.s b/c64/kernal/jumptable/ff96.jtksa.s similarity index 100% rename from c64/kernal/ff96.jtksa.s rename to c64/kernal/jumptable/ff96.jtksa.s diff --git a/c64/kernal/ff99.jmemtop.s b/c64/kernal/jumptable/ff99.jmemtop.s similarity index 100% rename from c64/kernal/ff99.jmemtop.s rename to c64/kernal/jumptable/ff99.jmemtop.s diff --git a/c64/kernal/ff9c.jmembot.s b/c64/kernal/jumptable/ff9c.jmembot.s similarity index 100% rename from c64/kernal/ff9c.jmembot.s rename to c64/kernal/jumptable/ff9c.jmembot.s diff --git a/c64/kernal/ff9f.jscnkey.s b/c64/kernal/jumptable/ff9f.jscnkey.s similarity index 100% rename from c64/kernal/ff9f.jscnkey.s rename to c64/kernal/jumptable/ff9f.jscnkey.s diff --git a/c64/kernal/ffa2.jsettmo.s b/c64/kernal/jumptable/ffa2.jsettmo.s similarity index 100% rename from c64/kernal/ffa2.jsettmo.s rename to c64/kernal/jumptable/ffa2.jsettmo.s diff --git a/c64/kernal/ffa5.jacptr.s b/c64/kernal/jumptable/ffa5.jacptr.s similarity index 100% rename from c64/kernal/ffa5.jacptr.s rename to c64/kernal/jumptable/ffa5.jacptr.s diff --git a/c64/kernal/ffa8.jciout.s b/c64/kernal/jumptable/ffa8.jciout.s similarity index 100% rename from c64/kernal/ffa8.jciout.s rename to c64/kernal/jumptable/ffa8.jciout.s diff --git a/c64/kernal/ffab.juntlk.s b/c64/kernal/jumptable/ffab.juntlk.s similarity index 100% rename from c64/kernal/ffab.juntlk.s rename to c64/kernal/jumptable/ffab.juntlk.s diff --git a/c64/kernal/ffae.junlsn.s b/c64/kernal/jumptable/ffae.junlsn.s similarity index 100% rename from c64/kernal/ffae.junlsn.s rename to c64/kernal/jumptable/ffae.junlsn.s diff --git a/c64/kernal/ffb1.jlisten.s b/c64/kernal/jumptable/ffb1.jlisten.s similarity index 100% rename from c64/kernal/ffb1.jlisten.s rename to c64/kernal/jumptable/ffb1.jlisten.s diff --git a/c64/kernal/ffb4.jtalk.s b/c64/kernal/jumptable/ffb4.jtalk.s similarity index 100% rename from c64/kernal/ffb4.jtalk.s rename to c64/kernal/jumptable/ffb4.jtalk.s diff --git a/c64/kernal/ffb7.jreadst.s b/c64/kernal/jumptable/ffb7.jreadst.s similarity index 100% rename from c64/kernal/ffb7.jreadst.s rename to c64/kernal/jumptable/ffb7.jreadst.s diff --git a/c64/kernal/ffba.jsetfls.s b/c64/kernal/jumptable/ffba.jsetfls.s similarity index 100% rename from c64/kernal/ffba.jsetfls.s rename to c64/kernal/jumptable/ffba.jsetfls.s diff --git a/c64/kernal/ffbd.setnam.s b/c64/kernal/jumptable/ffbd.jsetnam.s similarity index 100% rename from c64/kernal/ffbd.setnam.s rename to c64/kernal/jumptable/ffbd.jsetnam.s diff --git a/c64/kernal/ffc0.jopen.s b/c64/kernal/jumptable/ffc0.jopen.s similarity index 100% rename from c64/kernal/ffc0.jopen.s rename to c64/kernal/jumptable/ffc0.jopen.s diff --git a/c64/kernal/ffc3.jclose.s b/c64/kernal/jumptable/ffc3.jclose.s similarity index 100% rename from c64/kernal/ffc3.jclose.s rename to c64/kernal/jumptable/ffc3.jclose.s diff --git a/c64/kernal/ffc6.jchkin.s b/c64/kernal/jumptable/ffc6.jchkin.s similarity index 100% rename from c64/kernal/ffc6.jchkin.s rename to c64/kernal/jumptable/ffc6.jchkin.s diff --git a/c64/kernal/ffc9.jchkout.s b/c64/kernal/jumptable/ffc9.jchkout.s similarity index 100% rename from c64/kernal/ffc9.jchkout.s rename to c64/kernal/jumptable/ffc9.jchkout.s diff --git a/c64/kernal/ffcc.jclrchn.s b/c64/kernal/jumptable/ffcc.jclrchn.s similarity index 100% rename from c64/kernal/ffcc.jclrchn.s rename to c64/kernal/jumptable/ffcc.jclrchn.s diff --git a/c64/kernal/ffcf.jchrin.s b/c64/kernal/jumptable/ffcf.jchrin.s similarity index 100% rename from c64/kernal/ffcf.jchrin.s rename to c64/kernal/jumptable/ffcf.jchrin.s diff --git a/c64/kernal/ffd2.jchrout.s b/c64/kernal/jumptable/ffd2.jchrout.s similarity index 100% rename from c64/kernal/ffd2.jchrout.s rename to c64/kernal/jumptable/ffd2.jchrout.s diff --git a/c64/kernal/ffd5.jload.s b/c64/kernal/jumptable/ffd5.jload.s similarity index 100% rename from c64/kernal/ffd5.jload.s rename to c64/kernal/jumptable/ffd5.jload.s diff --git a/c64/kernal/ffd8.jsave.s b/c64/kernal/jumptable/ffd8.jsave.s similarity index 100% rename from c64/kernal/ffd8.jsave.s rename to c64/kernal/jumptable/ffd8.jsave.s diff --git a/c64/kernal/ffdb.jsettim.s b/c64/kernal/jumptable/ffdb.jsettim.s similarity index 100% rename from c64/kernal/ffdb.jsettim.s rename to c64/kernal/jumptable/ffdb.jsettim.s diff --git a/c64/kernal/ffde.jrdtim.s b/c64/kernal/jumptable/ffde.jrdtim.s similarity index 100% rename from c64/kernal/ffde.jrdtim.s rename to c64/kernal/jumptable/ffde.jrdtim.s diff --git a/c64/kernal/ffe1.jstop.s b/c64/kernal/jumptable/ffe1.jstop.s similarity index 100% rename from c64/kernal/ffe1.jstop.s rename to c64/kernal/jumptable/ffe1.jstop.s diff --git a/c64/kernal/ffe4.jgetin.s b/c64/kernal/jumptable/ffe4.jgetin.s similarity index 100% rename from c64/kernal/ffe4.jgetin.s rename to c64/kernal/jumptable/ffe4.jgetin.s diff --git a/c64/kernal/ffe7.jclall.s b/c64/kernal/jumptable/ffe7.jclall.s similarity index 100% rename from c64/kernal/ffe7.jclall.s rename to c64/kernal/jumptable/ffe7.jclall.s diff --git a/c64/kernal/ffea.judtim.s b/c64/kernal/jumptable/ffea.judtim.s similarity index 100% rename from c64/kernal/ffea.judtim.s rename to c64/kernal/jumptable/ffea.judtim.s diff --git a/c64/kernal/ffed.jscreen.s b/c64/kernal/jumptable/ffed.jscreen.s similarity index 100% rename from c64/kernal/ffed.jscreen.s rename to c64/kernal/jumptable/ffed.jscreen.s diff --git a/c64/kernal/fff0.jplot.s b/c64/kernal/jumptable/fff0.jplot.s similarity index 100% rename from c64/kernal/fff0.jplot.s rename to c64/kernal/jumptable/fff0.jplot.s diff --git a/c64/kernal/fff3.jiobase.s b/c64/kernal/jumptable/fff3.jiobase.s similarity index 100% rename from c64/kernal/fff3.jiobase.s rename to c64/kernal/jumptable/fff3.jiobase.s diff --git a/c64/kernal/load.s b/c64/kernal/load.s index 4a946263..9675f2df 100644 --- a/c64/kernal/load.s +++ b/c64/kernal/load.s @@ -36,7 +36,7 @@ load: jsr install_ram_routines ;; Allow platform-specific routine to takeover the flow - `PLATFORM_HOOK_LOAD + `TARGET_HOOK_LOAD ;; Check whether we support the requested device lda current_device_number