Replaced whole bunch for Makefiles with a single generic Makefile.

[cc65] / libsrc / plus4 / crt0.s

diff --git a/libsrc/plus4/crt0.s b/libsrc/plus4/crt0.s
index b962abd967cc70a66a1e6e09b604982444bd303e..73460d82b367d08ef5cbcd946ecc8db6ed8a2850 100644 (file)
--- a/libsrc/plus4/crt0.s
+++ b/libsrc/plus4/crt0.s
@@ -1,15 +1,17 @@
 ;
 ; Startup code for cc65 (Plus/4 version)
-;
-; This must be the *first* file on the linker command line
 ;
 
        .export         _exit
         .export         brk_jmp
+        .export         __STARTUP__ : absolute = 1      ; Mark as startup
 
-       .import         condes, initlib, donelib
-       .import         push0, callmain, zerobss
-       .import         __IRQFUNC_TABLE__, __IRQFUNC_COUNT__
+       .import         callirq_y, initlib, donelib
+       .import         callmain, zerobss
+       .import         __INTERRUPTOR_COUNT__
+       .import         __RAM_START__, __RAM_SIZE__     ; Linker generated
+       .import         __STACKSIZE__                   ; Linker generated
+       .importzp       ST
 
         .include        "zeropage.inc"
        .include        "plus4.inc"
@@ -21,35 +23,24 @@
 IRQInd                 = $500  ; JMP $0000 - used as indirect IRQ vector
 
 ; ------------------------------------------------------------------------
-; Place the startup code in a special segment to cope with the quirks of
-; plus/4 banking.
+; Startup code
 
 .segment               "STARTUP"
 
-        .word   Head            ; Load address
-Head:   .word   @Next
-        .word   .version        ; Line number
-        .byte   $9E,"4109"     ; SYS 4109
-        .byte   $00             ; End of BASIC line
-@Next:  .word   0               ; BASIC end marker
+Start:
 
-; ------------------------------------------------------------------------
-; Actual code
+; Save the zero page locations we need
 
         sei                     ; No interrupts since we're banking out the ROM
         sta     ENABLE_RAM
                ldx     #zpspace-1
 L1:    lda     sp,x
-       sta     zpsave,x        ; save the zero page locations we need
+       sta     zpsave,x
        dex
                bpl     L1
         sta     ENABLE_ROM
         cli
 
-; Close open files
-
-       jsr     $FFCC           ; CLRCH
-
 ; Switch to second charset
 
        lda     #14
@@ -59,11 +50,11 @@ L1: lda     sp,x
 ; usable RAM.
 
                tsx
-               stx     spsave          ; save system stk ptr
+               stx     spsave          ; save system stk ptr
 
-        lda     #<$FD00
+        lda     #<(__RAM_START__ + __RAM_SIZE__ + __STACKSIZE__)
         sta     sp
-        lda     #>$FD00
+        lda     #>(__RAM_START__ + __RAM_SIZE__ + __STACKSIZE__)
         sta     sp+1
 
 ; Setup the IRQ vector in the banked RAM and switch off the ROM
@@ -80,26 +71,29 @@ L1: lda     sp,x
 
        jsr     zerobss
 
-; Call module constructors
-
-       jsr     initlib
-
 ; Initialize irqcount, which means that from now own custom linked in IRQ
 ; handlers (via condes) will be called.
 
-        lda     #.lobyte(__IRQFUNC_COUNT__*2)
+        lda     #.lobyte(__INTERRUPTOR_COUNT__*2)
         sta     irqcount
 
+; Call module constructors
+
+       jsr     initlib
+
 ; Push arguments and call main()
 
        jsr     callmain
 
 ; Back from main (this is also the _exit entry). Run module destructors.
 
-_exit:         pha                     ; Save the return code
+_exit:         pha                     ; Save the return code
+        jsr    donelib         ; Run module destructors
+
+; Disable chained IRQ handlers
+
        lda     #0
         sta     irqcount        ; Disable custom IRQ handlers
-        jsr    donelib         ; Run module destructors
 
 ; Copy back the zero page stuff
 
@@ -119,11 +113,10 @@ L2:       lda     zpsave,x
                ldx     spsave
                txs
 
-; Enable the ROM, reset changed vectors and return to BASIC
+; Enable the ROM and return to BASIC
 
         sta     ENABLE_ROM
-       jmp     $FF8A           ; RESTOR
-
+               rts
 
 ; ------------------------------------------------------------------------
 ; IRQ handler. The handler in the ROM enables the kernal and jumps to
@@ -147,15 +140,13 @@ IRQ:    cld                       ; Just to be sure
         bne     dobreak
 
 ; It's an IRQ and RAM is enabled. If we have handlers, call them. We will use
-; a flag here instead of loading __IRQFUNC_COUNT__ directly, since the condes
-; function is not reentrant. The irqcount flag will be set/reset from the main
-; code, to avoid races.
+; a flag here instead of loading __INTERRUPTOR_COUNT__ directly, since the
+; condes function is not reentrant. The irqcount flag will be set/reset from
+; the main code, to avoid races.
 
        ldy     irqcount
        beq     @L1
-               lda     #<__IRQFUNC_TABLE__
-       ldx     #>__IRQFUNC_TABLE__
-       jsr     condes                  ; Call the IRQ functions
+        jsr     callirq_y       ; Call the IRQ functions
 
 ; Since the ROM handler will end with an RTI, we have to fake an IRQ return
 ; on stack, so we get control of the CPU after the ROM handler and can switch
@@ -165,10 +156,10 @@ IRQ:    cld                       ; Just to be sure
         pha
         lda     #<irq_ret
         pha
-               php                     ; Push faked IRQ frame on stack
-       pha                     ; Push faked A register
-       pha                     ; Push faked X register
-       pha                     ; Push faked Y register
+               php                     ; Push faked IRQ frame on stack
+       pha                     ; Push faked A register
+       pha                     ; Push faked X register
+       pha                     ; Push faked Y register
         sta     ENABLE_ROM      ; Switch to ROM
         jmp     (IRQVec)        ; Jump indirect to kernal irq handler
 
@@ -196,13 +187,16 @@ nohandler:
 ; Data
 
 .data
-zpsave:                .res    zpspace
 
 ; BRK handling
 brk_jmp:        jmp     $0000
 
 spsave:                .res    1
 
-.bss
 irqcount:       .byte   0
 
+.segment        "ZPSAVE"
+
+zpsave:                .res    zpspace
+
+