Minor comment adjustment.

[cc65] / libsrc / c16 / crt0.s

diff --git a/libsrc/c16/crt0.s b/libsrc/c16/crt0.s
index 7f38719f08dc3f66a0c7f8f3fcb53e96dd29921b..bbdd4a2520f3cfa639f8b14fb61c565a355ae396 100644 (file)
--- a/libsrc/c16/crt0.s
+++ b/libsrc/c16/crt0.s
@@ -1,47 +1,51 @@
 ;
 ; Startup code for cc65 (C16 version)
 ;
-; This must be the *first* file on the linker command line
-;
 ; Note: The C16 is actually the Plus/4 with just 16KB of memory. So many
 ; things are similar here, and we even use the plus4.inc include file.
 ;
 
        .export         _exit
-       .import         initlib, donelib
-       .import         push0, callmain, zerobss
+        .export         __STARTUP__ : absolute = 1      ; Mark as startup
+       .import         initlib, donelib, callirq
+       .import         callmain, zerobss
         .import         MEMTOP, RESTOR, BSOUT, CLRCH
+       .import         __INTERRUPTOR_COUNT__
 
         .include        "zeropage.inc"
-       .include        "../plus4/plus4.inc"
+       .include        "plus4.inc"
 
 
 ; ------------------------------------------------------------------------
-; Place the startup code in a special segment.
-
-.segment               "STARTUP"
-
 ; BASIC header with a SYS call
 
+.segment               "EXEHDR"
+
         .word   Head            ; Load address
 Head:   .word   @Next
         .word   .version        ; Line number
-        .byte   $9E,"4109"     ; SYS 4109
+        .byte   $9E             ; SYS token
+        .byte   <(((Start / 1000) .mod 10) + '0')
+        .byte   <(((Start /  100) .mod 10) + '0')
+        .byte   <(((Start /   10) .mod 10) + '0')
+        .byte   <(((Start /    1) .mod 10) + '0')
         .byte   $00             ; End of BASIC line
 @Next:  .word   0               ; BASIC end marker
 
 ; ------------------------------------------------------------------------
-; Actual code
+; Startup code
 
-               ldx     #zpspace-1
-L1:    lda     sp,x
-       sta     zpsave,x        ; save the zero page locations we need
-       dex
-               bpl     L1
+.segment               "STARTUP"
 
-; Close open files
+Start:
 
-       jsr     CLRCH
+; Save the zero page locations we need
+
+        ldx    #zpspace-1
+L1:    lda     sp,x
+       sta     zpsave,x
+       dex
+               bpl     L1
 
 ; Switch to second charset
 
@@ -66,9 +70,24 @@ L1:  lda     sp,x
 MemOk: stx     sp
        sty     sp+1            ; set argument stack ptr
 
+; If we have IRQ functions, chain our stub into the IRQ vector
+
+        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 module constructors
 
-       jsr     initlib
+NoIRQ1: jsr     initlib
 
 ; Push arguments and call main()
 
@@ -79,9 +98,21 @@ MemOk:       stx     sp
 _exit:         pha                     ; Save the return code on stack
        jsr     donelib         ; Run module destructors
 
+; Reset the IRQ vector if we chained it.
+
+        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
+
 ; Copy back the zero page stuff
 
-       ldx     #zpspace-1
+NoIRQ2: ldx     #zpspace-1
 L2:    lda     zpsave,x
        sta     sp,x
        dex
@@ -101,11 +132,27 @@ L2:       lda     zpsave,x
 
        jmp     RESTOR
 
+; ------------------------------------------------------------------------
+; 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
 
 .data
+
+IRQInd: jmp     $0000
+
+.segment        "ZPSAVE"
+
 zpsave:        .res    zpspace
 
 .bss
+
 spsave:        .res    1