Replace hard returns with an "else", add an error for non-IDENT tokens, and test...

[cc65] / libsrc / vic20 / crt0.s

diff --git a/libsrc/vic20/crt0.s b/libsrc/vic20/crt0.s
index a0f61c06ac0a6821f56147badeb0cf5c7a6b9abf..68ab3ed122f973018bb8431fc1b4dc4965c4b784 100644 (file)
--- a/libsrc/vic20/crt0.s
+++ b/libsrc/vic20/crt0.s
@@ -1,153 +1,97 @@
 ;
 ; Startup code for cc65 (Vic20 version)
-;
-; This must be the *first* file on the linker command line
 ;
 
-       .export         _exit
-       .import         initlib, donelib, callirq
-               .import         zerobss, push0
-       .import         callmain
+        .export         _exit
+        .export         __STARTUP__ : absolute = 1      ; Mark as startup
+        .import         initlib, donelib
+        .import         zerobss, push0
+        .import         callmain
         .import         RESTOR, BSOUT, CLRCH
-       .import         __INTERRUPTOR_COUNT__
-       .import         __RAM_START__, __RAM_SIZE__     ; Linker generated
+        .import         __MAIN_START__, __MAIN_SIZE__   ; Linker generated
+        .import         __STACKSIZE__                   ; Linker generated
+        .importzp       ST
 
         .include        "zeropage.inc"
-       .include        "vic20.inc"
-
-; ------------------------------------------------------------------------
-; Place the startup code in a special segment.
-
-.segment               "STARTUP"
-
-; BASIC header with a SYS call
-
-        .word   Head            ; Load address
-Head:   .word   @Next
-        .word   .version        ; Line number
-        .byte   $9E             ; SYS token
-        .byte   <(((@Start / 1000) .mod 10) + $30)
-        .byte   <(((@Start /  100) .mod 10) + $30)
-        .byte   <(((@Start /   10) .mod 10) + $30)
-        .byte   <(((@Start /    1) .mod 10) + $30)
-        .byte   $00             ; End of BASIC line
-@Next:  .word   0               ; BASIC end marker
-@Start:
+        .include        "vic20.inc"
 
 ; ------------------------------------------------------------------------
-; Actual code
-
-       ldx     #zpspace-1
-L1:    lda     sp,x
-       sta     zpsave,x        ; Save the zero page locations we need
-       dex
-               bpl     L1
-
-; Close open files
+; Startup code
 
-       jsr     CLRCH
+.segment        "STARTUP"
 
-; Switch to second charset
+Start:
 
-       lda     #14
-       jsr     BSOUT
+; Save the zero-page locations that we need.
 
-; Clear the BSS data
+        ldx     #zpspace-1
+L1:     lda     sp,x
+        sta     zpsave,x
+        dex
+        bpl     L1
 
-       jsr     zerobss
+; Switch to the second charset.
 
-; Save system stuff and setup the stack
+        lda     #14
+        jsr     BSOUT
 
-               tsx
-               stx     spsave          ; Save the system stack ptr
+; Clear the BSS data.
 
-       lda     #<(__RAM_START__ + __RAM_SIZE__)
-       sta     sp
-       lda     #>(__RAM_START__ + __RAM_SIZE__)
-               sta     sp+1            ; Set argument stack ptr
+        jsr     zerobss
 
-; Call module constructors
+; Save some system stuff; and, set up the stack.
 
-       jsr     initlib
+        tsx
+        stx     spsave          ; Save the system stack ptr
 
-; If we have IRQ functions, chain our stub into the IRQ vector
+        lda     #<(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
+        ldx     #>(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__)
+        sta     sp
+        stx     sp+1            ; Set argument stack ptr
 
-        lda     #<__INTERRUPTOR_COUNT__
-       beq     NoIRQ1
-       lda     IRQVec
-               ldx     IRQVec+1
-       sta     IRQInd+1
-       stx     IRQInd+2
-       lda     #<IRQStub
-       ldx     #>IRQStub
-       sei
-       sta     IRQVec
-       stx     IRQVec+1
-       cli
+; Call the module constructors.
 
-; Push arguments and call main()
+        jsr     initlib
 
-NoIRQ1: jsr     callmain
+; Push the command-line arguments; and, call main().
 
-; Back from main (This is also the _exit entry). Reset the IRQ vector if we
-; chained it.
+        jsr     callmain
 
-_exit:         pha                     ; Save the return code on stack
-       lda     #<__INTERRUPTOR_COUNT__
-       beq     NoIRQ2
-       lda     IRQInd+1
-       ldx     IRQInd+2
-       sei
-       sta     IRQVec
-       stx     IRQVec+1
-       cli
+; Back from main() [this is also the exit() entry]. Run the module destructors.
 
-; Run module destructors
+_exit:  pha                     ; Save the return code on stack
+        jsr     donelib
 
-NoIRQ2: jsr    donelib
+; Copy back the zero-page stuff.
 
-; Copy back the zero page stuff
+        ldx     #zpspace-1
+L2:     lda     zpsave,x
+        sta     sp,x
+        dex
+        bpl     L2
 
-               ldx     #zpspace-1
-L2:    lda     zpsave,x
-       sta     sp,x
-       dex
-               bpl     L2
+; Place the program return code into BASIC's status variable.
 
-; Place the program return code into ST
+        pla
+        sta     ST
 
-       pla
-       sta     ST
+; Restore the stack pointer.
 
-; Restore the stack pointer
+        ldx     spsave
+        txs
 
-       ldx     spsave
-       txs
-
-; Reset changed vectors, back to basic
-
-       jmp     RESTOR
+; Back to BASIC.
 
+        rts
 
 ; ------------------------------------------------------------------------
-; The IRQ vector jumps here, if condes routines are defined with type 2.
 
-IRQStub:
-       cld                             ; Just to be sure
-               jsr     callirq                 ; Call the functions
-               jmp     IRQInd                  ; Jump to the saved IRQ vector
-
-; ------------------------------------------------------------------------
-; Data
+.segment        "INIT"
 
-.data
+zpsave: .res    zpspace
 
-IRQInd: jmp     $0000
-
-.segment        "ZPSAVE"
-
-zpsave:        .res    zpspace
+; ------------------------------------------------------------------------
 
 .bss
 
-spsave:        .res    1
+spsave: .res    1