Merge branch 'master' into kbrepeat

libsrc/pet/cputc.s

@@ -7,14 +7,13 @@
 
         .export         _cputcxy, _cputc, cputdirect, putchar
         .export         newline, plot
-        .import         popa, _gotoxy
+        .import         gotoxy
 
         .include        "pet.inc"
 
 _cputcxy:
         pha                     ; Save C
-        jsr     popa            ; Get Y
-        jsr     _gotoxy         ; Set cursor, drop x
+        jsr     gotoxy          ; Set cursor, drop x and y
         pla                     ; Restore C
 
 ; Plot a character - also used as internal function

libsrc/pet/crt0.s

@@ -94,7 +94,7 @@ L2:     lda     zpsave,x
 
 ; ------------------------------------------------------------------------
 
-.segment        "INITBSS"
+.segment        "INIT"
 
 zpsave: .res    zpspace
 

libsrc/pet/irq.s

@@ -9,7 +9,7 @@
 
 ; ------------------------------------------------------------------------
 
-.segment        "INIT"
+.segment        "ONCE"
 
 initirq:
         lda     IRQVec

libsrc/pet/mainargs.s

@@ -16,10 +16,10 @@ NAME_LEN = 16                   ; Maximum length of command-name
 
 
 ;---------------------------------------------------------------------------
-; Get possible command-line arguments. Goes into the special INIT segment,
+; Get possible command-line arguments. Goes into the special ONCE segment,
 ; which may be reused after the startup code is run
 
-.segment        "INIT"
+.segment        "ONCE"
 
 .proc   initmainargs
 
@@ -111,7 +111,7 @@ done:   lda     #<argv
 
 .endproc
 
-.segment        "INITBSS"
+.segment        "INIT"
 
 term:   .res    1
 name:   .res    NAME_LEN + 1