diff --git a/ac6502/ac6502.cfg b/ac6502/ac6502.cfg index a99b312d..40536ad7 100644 --- a/ac6502/ac6502.cfg +++ b/ac6502/ac6502.cfg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022-2026 Willis Blackburn +# SPDX-FileCopyrightText: 2022-2026 Willis Blackburn / 2026 A.C. Wright # # SPDX-License-Identifier: MIT # diff --git a/ac6502/ac6502.inc b/ac6502/ac6502.inc index ecd81457..a7dc405b 100644 --- a/ac6502/ac6502.inc +++ b/ac6502/ac6502.inc @@ -1,4 +1,4 @@ -; SPDX-FileCopyrightText: 2022-2026 Willis Blackburn +; SPDX-FileCopyrightText: 2022-2026 Willis Blackburn / 2026 A.C. Wright ; ; SPDX-License-Identifier: MIT ; diff --git a/ac6502/ac6502_extension.s b/ac6502/ac6502_extension.s index 96ecf0ae..aa6cff0a 100644 --- a/ac6502/ac6502_extension.s +++ b/ac6502/ac6502_extension.s @@ -1,4 +1,4 @@ -; SPDX-FileCopyrightText: 2022-2026 Willis Blackburn +; SPDX-FileCopyrightText: 2022-2026 Willis Blackburn / 2026 A.C. Wright ; ; SPDX-License-Identifier: MIT ; @@ -48,16 +48,10 @@ ex_statement_name_table: ; Helper PVM fragments for 3- and 4-argument statements. -ex_pvm_arg_3: - CALL pvm_expression - ARGSEP - CALL pvm_expression - ARGSEP - JUMP pvm_expression - ex_pvm_arg_4: CALL pvm_expression ARGSEP +ex_pvm_arg_3: CALL pvm_expression ARGSEP CALL pvm_expression diff --git a/ac6502/ac6502_init.s b/ac6502/ac6502_init.s index a890248b..1097a954 100644 --- a/ac6502/ac6502_init.s +++ b/ac6502/ac6502_init.s @@ -1,12 +1,11 @@ -; SPDX-FileCopyrightText: 2022-2026 Willis Blackburn +; SPDX-FileCopyrightText: 2022-2026 Willis Blackburn / 2026 A.C. Wright ; ; SPDX-License-Identifier: MIT ; -; ac6502 BASIC workspace (buffers and interpreter stacks) and the -; target-specific one-time initialization hook. All mutable storage is -; placed in the BSS segment so __BSS_SIZE__ correctly reflects how much -; RAM is consumed before the user program area. BASIC's program_ptr is -; computed from __BSS_RUN__ + __BSS_SIZE__ (see program.s). +; ac6502 BASIC workspace (buffers and interpreter stacks). All mutable +; storage is placed in the BSS segment so __BSS_SIZE__ correctly reflects +; how much RAM is consumed before the user program area. BASIC's +; program_ptr is computed from __BSS_RUN__ + __BSS_SIZE__ (see program.s). ; ; See https://github.com/acwright/6502 for more info @@ -26,14 +25,4 @@ line_buffer: .res BUFFER_SIZE stack: .res PRIMARY_STACK_SIZE op_stack: .res OP_STACK_SIZE -.segment "ONCE" - -; initialize_target is invoked from the cartridge startup after BIOS -; hardware has been initialized and interrupts have been enabled. All -; we need to do here is display the BASIC banner; I/O goes through the -; BIOS via Chrout / Chrin. - -initialize_target: - jmp display_startup_banner - .code diff --git a/ac6502/ac6502_io.s b/ac6502/ac6502_io.s index 5203ccd8..5f865667 100644 --- a/ac6502/ac6502_io.s +++ b/ac6502/ac6502_io.s @@ -1,4 +1,4 @@ -; SPDX-FileCopyrightText: 2022-2026 Willis Blackburn +; SPDX-FileCopyrightText: 2022-2026 Willis Blackburn / 2026 A.C. Wright ; ; SPDX-License-Identifier: MIT diff --git a/ac6502/ac6502_startup.s b/ac6502/ac6502_startup.s index 36215b0a..879965f3 100644 --- a/ac6502/ac6502_startup.s +++ b/ac6502/ac6502_startup.s @@ -1,4 +1,4 @@ -; SPDX-FileCopyrightText: 2022-2026 Willis Blackburn +; SPDX-FileCopyrightText: 2022-2026 Willis Blackburn / 2026 A.C. Wright ; ; SPDX-License-Identifier: MIT ; @@ -23,7 +23,7 @@ startup: ; Leaves interrupts disabled; caller must CLI. jsr Beep ; Play the startup beep cli ; Enable interrupts (keyboard, serial RX) - jsr initialize_target ; BASIC-side target init (banner, etc.) + jsr display_startup_banner ; Display the BASIC banner jmp main ; Enter the BASIC REPL (never returns) ; IRQ / NMI trampolines -- dispatch through the RAM vectors that