From a69c00a513256b068df82e2a7d9eabdf122b762f Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Mon, 19 Oct 2020 20:18:08 +0200 Subject: [PATCH] fixed Kernal for CRT memory layout --- Makefile | 10 +++++----- src/kernal/init/e5a0.vicii_init.s | 1 + src/kernal/init/fd50.ramtas.s | 1 + src/kernal/init/fda3.ioinit.s | 1 + src/kernal/tape/load_tape_normal.s | 1 + src/kernal/tape/load_tape_turbo.s | 1 + src/kernal/tape/tape_common.s | 1 + src/kernal/tape/tape_common_autodetect.s | 1 + src/kernal/tape/tape_common_clean_sid.s | 1 + src/kernal/tape/tape_common_ditch_verify.s | 1 + src/kernal/tape/tape_common_get_pulse.s | 1 + src/kernal/tape/tape_common_motor.s | 1 + src/kernal/tape/tape_common_prepare_cia.s | 1 + src/kernal/tape/tape_common_screen.s | 1 + src/kernal/tape/tape_head_align.s | 1 + src/kernal/tape/tape_head_align_gen_code.s | 1 + src/kernal/tape/tape_head_align_get_pulse.s | 1 + src/kernal/tape/tape_head_align_help.s | 1 + src/kernal/tape/tape_head_align_irq.s | 1 + src/kernal/tape/tape_normal_calibrate.s | 1 + src/kernal/tape/tape_normal_get_bit.s | 1 + src/kernal/tape/tape_normal_get_byte.s | 1 + src/kernal/tape/tape_normal_get_data_1.s | 1 + src/kernal/tape/tape_normal_get_data_2.s | 1 + src/kernal/tape/tape_normal_get_marker.s | 1 + src/kernal/tape/tape_normal_get_pilot.s | 1 + src/kernal/tape/tape_normal_sync.s | 1 + src/kernal/tape/tape_normal_update_checksum.s | 1 + src/kernal/tape/tape_turbo_bytestore.s | 1 + src/kernal/tape/tape_turbo_get_bit.s | 1 + src/kernal/tape/tape_turbo_get_byte.s | 1 + src/kernal/tape/tape_turbo_sync.s | 1 + src/kernal/tape/tape_turbo_sync_first.s | 1 + 33 files changed, 37 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 24e402b0..f40814e4 100644 --- a/Makefile +++ b/Makefile @@ -498,13 +498,13 @@ $(DIR_X16)/kernal.seg_0: $(DIR_X16)/OUTx_0.BIN $(DIR_X16)/basic.seg_0: $(DIR_X16)/OUTx_0.BIN @dd if=$(DIR_X16)/OUTx_0.BIN bs=8192 count=1 skip=0 of=$@ status=none -build/kernal0_generic_crt.rom: $(DIR_CRT)/OUTx_0.BIN +build/kernal_generic_crt.rom: $(DIR_CRT)/OUTx_0.BIN @dd if=$(DIR_CRT)/OUTx_0.BIN bs=8192 count=1 skip=2 of=$@ status=none -build/basic0_generic_crt.rom: $(DIR_CRT)/OUTx_0.BIN +build/basic_generic_crt.rom: $(DIR_CRT)/OUTx_0.BIN @dd if=$(DIR_CRT)/OUTx_0.BIN bs=8192 count=1 skip=0 of=$@ status=none -build/symbols0_generic_crt.vs: +build/symbols_generic_crt.vs: @sort $(DIR_CRT)/BASIC_0_combined.vs $(DIR_CRT)/KERNAL_0_combined.vs | uniq | grep -v "__" > $@ build/kernal_hybrid.rom: kernal $(DIR_GEN)/OUTK_x.BIN @@ -602,8 +602,8 @@ test_generic: build/kernal_generic.rom build/basic_generic.rom build/symbols_gen test_generic_x128: build/kernal_generic.rom build/basic_generic.rom build/symbols_generic.vs x128 -go64 -kernal64 build/kernal_generic.rom -basic64 build/basic_generic.rom -moncommands build/symbols_generic.vs -1 $(TESTTAPE) -8 $(TESTDISK) -test_generic_crt: build/kernal0_generic_crt.rom build/basic0_generic_crt.rom build/symbols0_generic_crt.vs - x64 -kernal build/kernal0_generic_crt.rom -basic build/basic0_generic_crt.rom -moncommands build/symbols0_generic_crt.vs -1 $(TESTTAPE) -8 $(TESTDISK) +test_generic_crt: build/kernal_generic_crt.rom build/basic_generic_crt.rom build/symbols_generic_crt.vs + x64 -kernal build/kernal_generic_crt.rom -basic build/basic_generic_crt.rom -moncommands build/symbols_generic_crt.vs -1 $(TESTTAPE) -8 $(TESTDISK) test_testing: build/kernal_testing.rom build/basic_testing.rom build/symbols_testing.vs x64 -kernal build/kernal_testing.rom -basic build/basic_testing.rom -moncommands build/symbols_testing.vs -1 $(TESTTAPE) -8 $(TESTDISK) diff --git a/src/kernal/init/e5a0.vicii_init.s b/src/kernal/init/e5a0.vicii_init.s index 43876303..6a0aa9ee 100644 --- a/src/kernal/init/e5a0.vicii_init.s +++ b/src/kernal/init/e5a0.vicii_init.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT * #TAKE ;; #LAYOUT# M65 KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE-FLOAT ;; #LAYOUT# X16 * #IGNORE diff --git a/src/kernal/init/fd50.ramtas.s b/src/kernal/init/fd50.ramtas.s index d68d3f16..60197f82 100644 --- a/src/kernal/init/fd50.ramtas.s +++ b/src/kernal/init/fd50.ramtas.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE-FLOAT ;; #LAYOUT# X16 KERNAL_0 #TAKE diff --git a/src/kernal/init/fda3.ioinit.s b/src/kernal/init/fda3.ioinit.s index 204b963a..6d03d4d3 100644 --- a/src/kernal/init/fda3.ioinit.s +++ b/src/kernal/init/fda3.ioinit.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE-FLOAT ;; #LAYOUT# X16 * #IGNORE diff --git a/src/kernal/tape/load_tape_normal.s b/src/kernal/tape/load_tape_normal.s index f4478c30..f0fdf8f3 100644 --- a/src/kernal/tape/load_tape_normal.s +++ b/src/kernal/tape/load_tape_normal.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/load_tape_turbo.s b/src/kernal/tape/load_tape_turbo.s index c4f08877..6634b13d 100644 --- a/src/kernal/tape/load_tape_turbo.s +++ b/src/kernal/tape/load_tape_turbo.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_common.s b/src/kernal/tape/tape_common.s index dec74dff..7c5e212b 100644 --- a/src/kernal/tape/tape_common.s +++ b/src/kernal/tape/tape_common.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_common_autodetect.s b/src/kernal/tape/tape_common_autodetect.s index 0a592b5e..f82a33e8 100644 --- a/src/kernal/tape/tape_common_autodetect.s +++ b/src/kernal/tape/tape_common_autodetect.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_common_clean_sid.s b/src/kernal/tape/tape_common_clean_sid.s index 0c44d2bd..0b646f87 100644 --- a/src/kernal/tape/tape_common_clean_sid.s +++ b/src/kernal/tape/tape_common_clean_sid.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_common_ditch_verify.s b/src/kernal/tape/tape_common_ditch_verify.s index 65514982..9552c402 100644 --- a/src/kernal/tape/tape_common_ditch_verify.s +++ b/src/kernal/tape/tape_common_ditch_verify.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_common_get_pulse.s b/src/kernal/tape/tape_common_get_pulse.s index 00591f0e..0e6607aa 100644 --- a/src/kernal/tape/tape_common_get_pulse.s +++ b/src/kernal/tape/tape_common_get_pulse.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_common_motor.s b/src/kernal/tape/tape_common_motor.s index dc6c9171..b4b9d72a 100644 --- a/src/kernal/tape/tape_common_motor.s +++ b/src/kernal/tape/tape_common_motor.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# * KERNAL_0 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_common_prepare_cia.s b/src/kernal/tape/tape_common_prepare_cia.s index d6977c05..b84de264 100644 --- a/src/kernal/tape/tape_common_prepare_cia.s +++ b/src/kernal/tape/tape_common_prepare_cia.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_common_screen.s b/src/kernal/tape/tape_common_screen.s index da8f04fe..b2c538a6 100644 --- a/src/kernal/tape/tape_common_screen.s +++ b/src/kernal/tape/tape_common_screen.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_head_align.s b/src/kernal/tape/tape_head_align.s index 12ce37ab..33692845 100644 --- a/src/kernal/tape/tape_head_align.s +++ b/src/kernal/tape/tape_head_align.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_head_align_gen_code.s b/src/kernal/tape/tape_head_align_gen_code.s index 30e4834a..960864bb 100644 --- a/src/kernal/tape/tape_head_align_gen_code.s +++ b/src/kernal/tape/tape_head_align_gen_code.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_head_align_get_pulse.s b/src/kernal/tape/tape_head_align_get_pulse.s index df1cacd4..2fea2213 100644 --- a/src/kernal/tape/tape_head_align_get_pulse.s +++ b/src/kernal/tape/tape_head_align_get_pulse.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_head_align_help.s b/src/kernal/tape/tape_head_align_help.s index 243dab12..6ece9b0a 100644 --- a/src/kernal/tape/tape_head_align_help.s +++ b/src/kernal/tape/tape_head_align_help.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_head_align_irq.s b/src/kernal/tape/tape_head_align_irq.s index 0ff660c3..e109051e 100644 --- a/src/kernal/tape/tape_head_align_irq.s +++ b/src/kernal/tape/tape_head_align_irq.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_normal_calibrate.s b/src/kernal/tape/tape_normal_calibrate.s index 6dca34dc..63e4e70c 100644 --- a/src/kernal/tape/tape_normal_calibrate.s +++ b/src/kernal/tape/tape_normal_calibrate.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_normal_get_bit.s b/src/kernal/tape/tape_normal_get_bit.s index fd3b175d..4d9cddd0 100644 --- a/src/kernal/tape/tape_normal_get_bit.s +++ b/src/kernal/tape/tape_normal_get_bit.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_normal_get_byte.s b/src/kernal/tape/tape_normal_get_byte.s index 35558dee..e4f40303 100644 --- a/src/kernal/tape/tape_normal_get_byte.s +++ b/src/kernal/tape/tape_normal_get_byte.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_normal_get_data_1.s b/src/kernal/tape/tape_normal_get_data_1.s index 9d3e49fd..eade4958 100644 --- a/src/kernal/tape/tape_normal_get_data_1.s +++ b/src/kernal/tape/tape_normal_get_data_1.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_normal_get_data_2.s b/src/kernal/tape/tape_normal_get_data_2.s index 9f5fffc1..57517a7c 100644 --- a/src/kernal/tape/tape_normal_get_data_2.s +++ b/src/kernal/tape/tape_normal_get_data_2.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_normal_get_marker.s b/src/kernal/tape/tape_normal_get_marker.s index b3f62525..96644c1e 100644 --- a/src/kernal/tape/tape_normal_get_marker.s +++ b/src/kernal/tape/tape_normal_get_marker.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_normal_get_pilot.s b/src/kernal/tape/tape_normal_get_pilot.s index 40be7e60..12103c02 100644 --- a/src/kernal/tape/tape_normal_get_pilot.s +++ b/src/kernal/tape/tape_normal_get_pilot.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_normal_sync.s b/src/kernal/tape/tape_normal_sync.s index 19cc3b83..5b389d05 100644 --- a/src/kernal/tape/tape_normal_sync.s +++ b/src/kernal/tape/tape_normal_sync.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_normal_update_checksum.s b/src/kernal/tape/tape_normal_update_checksum.s index 8f5010ec..9749f6ea 100644 --- a/src/kernal/tape/tape_normal_update_checksum.s +++ b/src/kernal/tape/tape_normal_update_checksum.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_turbo_bytestore.s b/src/kernal/tape/tape_turbo_bytestore.s index e178825f..ab6c6ce2 100644 --- a/src/kernal/tape/tape_turbo_bytestore.s +++ b/src/kernal/tape/tape_turbo_bytestore.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_turbo_get_bit.s b/src/kernal/tape/tape_turbo_get_bit.s index 52416132..26ac038f 100644 --- a/src/kernal/tape/tape_turbo_get_bit.s +++ b/src/kernal/tape/tape_turbo_get_bit.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_turbo_get_byte.s b/src/kernal/tape/tape_turbo_get_byte.s index 584bf9f9..c0a78007 100644 --- a/src/kernal/tape/tape_turbo_get_byte.s +++ b/src/kernal/tape/tape_turbo_get_byte.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_turbo_sync.s b/src/kernal/tape/tape_turbo_sync.s index 788d3b1b..2fd6ca8c 100644 --- a/src/kernal/tape/tape_turbo_sync.s +++ b/src/kernal/tape/tape_turbo_sync.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE diff --git a/src/kernal/tape/tape_turbo_sync_first.s b/src/kernal/tape/tape_turbo_sync_first.s index 6ef93293..f5a42fd7 100644 --- a/src/kernal/tape/tape_turbo_sync_first.s +++ b/src/kernal/tape/tape_turbo_sync_first.s @@ -1,4 +1,5 @@ ;; #LAYOUT# STD * #TAKE +;; #LAYOUT# CRT KERNAL_0 #TAKE ;; #LAYOUT# M65 KERNAL_1 #TAKE ;; #LAYOUT# * * #IGNORE