diff --git a/Makefile b/Makefile index f48d2564..d4751fce 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ SRCDIR_COMMON = c64/aliases SRCDIR_BASIC_COMMON = $(SRCDIR_COMMON) c64/basic -SRCDIR_KERNAL_COMMON = $(SRCDIR_COMMON) c64/kernal c64/kernal/jumptable c64/kernal/iec c64/kernal/interrupts +SRCDIR_KERNAL_COMMON = $(SRCDIR_COMMON) c64/kernal c64/kernal/assets c64/kernal/jumptable c64/kernal/iec c64/kernal/interrupts SRCDIR_BASIC_generic = $(SRCDIR_BASIC_COMMON) c64/basic/,target_generic SRCDIR_BASIC_mega65 = $(SRCDIR_BASIC_COMMON) c64/basic/,target_mega65 @@ -127,9 +127,9 @@ build/basic_generic.rom: build/target_generic/newrom build/basic_mega65.rom: build/target_mega65/newrom build/basic_ultimate64.rom: build/target_ultimate64/newrom -build/symbols_generic.vs: build/target_generic/BASIC_combined.vs build/target_generic/KERNAL_combined.vs -build/symbols_mega65.vs: build/target_generic/BASIC_mega65.vs build/target_generic/KERNAL_mega65.vs -build/symbols_ultimate64.vs: build/target_ultimate64/BASIC_combined.vs build/target_ultimate64/KERNAL_combined.vs +build/symbols_generic.vs: build/target_generic/BASIC_combined.vs build/target_generic/KERNAL_combined.vs +build/symbols_mega65.vs: build/target_mega65/BASIC_combined.vs build/target_mega65/KERNAL_combined.vs +build/symbols_ultimate64.vs: build/target_ultimate64/BASIC_combined.vs build/target_ultimate64/KERNAL_combined.vs # Rules - BASIC and KERNAL diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom index e201428e..fb2f7c19 100644 Binary files a/bin/basic_generic.rom and b/bin/basic_generic.rom differ diff --git a/bin/basic_ultimate64.rom b/bin/basic_ultimate64.rom index 28f7f46c..bbeab1f3 100644 Binary files a/bin/basic_ultimate64.rom and b/bin/basic_ultimate64.rom differ diff --git a/bin/kernal_generic.rom b/bin/kernal_generic.rom index bed9f709..8868de5b 100644 Binary files a/bin/kernal_generic.rom and b/bin/kernal_generic.rom differ diff --git a/bin/kernal_mega65.rom b/bin/kernal_mega65.rom index de9a054c..312e66d1 100644 Binary files a/bin/kernal_mega65.rom and b/bin/kernal_mega65.rom differ diff --git a/bin/kernal_ultimate64.rom b/bin/kernal_ultimate64.rom index 9e443ee8..571c7efb 100644 Binary files a/bin/kernal_ultimate64.rom and b/bin/kernal_ultimate64.rom differ diff --git a/c64/aliases/,aliases_ram_lowmem.s b/c64/aliases/,aliases_ram_lowmem.s index fa96322b..00d19059 100644 --- a/c64/aliases/,aliases_ram_lowmem.s +++ b/c64/aliases/,aliases_ram_lowmem.s @@ -39,7 +39,7 @@ .label STREND = $31 // $31-$32 -- NOT IMPLEMENTED -- .label FRETOP = $33 // $33-$34 -- NOT IMPLEMENTED -- .label FRESPC = $35 // $35-$36 [!] our implementation might be different XXX give more details - .label MEMSIZ = $37 // $37-$38 -- NOT IMPLEMENTED -- highest address of BASIC memory + .label MEMSIZ = $37 // $37-$38 highest address of BASIC memory + 1 .label CURLIN = $39 // $39-$3A current BASIC line number .label OLDLIN = $3B // $3B-$3C previous BASIC line number .label OLDTXT = $3D // $3D-$3E current BASIC line pointer diff --git a/c64/basic/cmd_new.s b/c64/basic/cmd_new.s index a7fbd49e..8fbcb727 100644 --- a/c64/basic/cmd_new.s +++ b/c64/basic/cmd_new.s @@ -47,21 +47,21 @@ basic_do_new: #if CONFIG_MEMORY_MODEL_60K lda #>$F7FF #else // CONFIG_MEMORY_MODEL_38K - lda #>$9FFF + lda #>$A000 #endif .byte $2C !: #if CONFIG_MEMORY_MODEL_60K lda #>$F7FF #else // CONFIG_MEMORY_MODEL_38K - lda #>$9FFF + lda #>$A000 #endif sta basic_top_of_memory_ptr+1 sta basic_start_of_strings_ptr+1 #if CONFIG_MEMORY_MODEL_60K lda #<$F7FF #else // CONFIG_MEMORY_MODEL_38K - lda #<$9FFF + lda #<$A000 #endif sta basic_top_of_memory_ptr+0 sta basic_start_of_strings_ptr+0 diff --git a/c64/kernal/cartridge_signature.s b/c64/kernal/assets/cartridge_signature.s similarity index 100% rename from c64/kernal/cartridge_signature.s rename to c64/kernal/assets/cartridge_signature.s diff --git a/c64/kernal/colour_codes.s b/c64/kernal/assets/colour_codes.s similarity index 100% rename from c64/kernal/colour_codes.s rename to c64/kernal/assets/colour_codes.s diff --git a/c64/kernal/fd30.interop b/c64/kernal/assets/fd30.interop similarity index 100% rename from c64/kernal/fd30.interop rename to c64/kernal/assets/fd30.interop diff --git a/c64/kernal/fd30.vector_defaults.s b/c64/kernal/assets/fd30.vector_defaults.s similarity index 100% rename from c64/kernal/fd30.vector_defaults.s rename to c64/kernal/assets/fd30.vector_defaults.s diff --git a/c64/kernal/keyboard_matrix.s b/c64/kernal/assets/keyboard_matrix.s similarity index 100% rename from c64/kernal/keyboard_matrix.s rename to c64/kernal/assets/keyboard_matrix.s