Added "popptr1" which is of common use to save some bytes.

[cc65] / libsrc / atmos / mainargs.s

diff --git a/libsrc/atmos/mainargs.s b/libsrc/atmos/mainargs.s
index 639b1304a15863504ad3b30379750425952c62e6..b8d19dccc80b9792f3109c2e8f13efc5dfa3266e 100644 (file)
--- a/libsrc/atmos/mainargs.s
+++ b/libsrc/atmos/mainargs.s
@@ -1,9 +1,9 @@
 ;
 ; 2003-03-07, Ullrich von Bassewitz
 ; 2011-01-28, Stefan Haubenthal
-; 2013-12-22, Greg King
+; 2014-09-10, Greg King
 ;
-; Setup arguments for main
+; Set up arguments for main
 ;
 
         .constructor    initmainargs, 24
@@ -13,34 +13,34 @@
         .macpack        generic
 
 MAXARGS  = 10                   ; Maximum number of arguments allowed
-REM      = $9d                  ; BASIC token-code
+REM      = $9D                  ; BASIC token-code
 
 
 ;---------------------------------------------------------------------------
-; Get possible command-line arguments. Goes into the special INIT segment,
-; which may be reused after the startup code is run
+; Get possible command-line arguments. Goes into the special ONCE segment,
+; which will be reused after the startup code is run.
 
-.segment        "INIT"
+.segment        "ONCE"
 
 .proc   initmainargs
 
 ; Assume that the program was loaded, a moment ago, by the traditional LOAD
 ; statement.  Save the "most-recent filename" as argument #0.
-; Because the buffer, that we're copying into, was zeroed out,
-; we don't need to add a NUL character.
-;
-        ldy     #FNAME_LEN - 1  ; limit the length
+
+        ldy     #FNAME_LEN      ; Limit the length
+        lda     #0              ; The terminating NUL character
+        beq     L1              ; Branch always
 L0:     lda     CFOUND_NAME,y
-        sta     name,y
+L1:     sta     name,y
         dey
         bpl     L0
         inc     __argc          ; argc always is equal to, at least, 1
 
 ; Find the "rem" token.
-;
+
         ldx     #0
 L2:     lda     BASIC_BUF,x
-        beq     done            ; no "rem", no args.
+        beq     done            ; No "rem", no args.
         inx
         cmp     #REM
         bne     L2
@@ -62,7 +62,7 @@ next:   lda     BASIC_BUF,x
         beq     done            ; End of line reached
         inx
         cmp     #' '            ; Skip leading spaces
-        beq     next            ;
+        beq     next
 
 ; Found start of next argument. We've incremented the pointer in X already, so
 ; it points to the second character of the argument. This is useful since we
@@ -79,8 +79,8 @@ setterm:sta     term            ; Set end of argument marker
 
         txa                     ; Get low byte
         add     #<args
-        sta     argv,y          ; argv[y]= &arg
-        lda     #>0
+        sta     argv,y          ; argv[y]=&arg
+        lda     #>$0000
         adc     #>args
         sta     argv+1,y
         iny
@@ -119,15 +119,16 @@ done:   lda     #<argv
 
 .endproc
 
-; These arrays are zeroed before initmainargs is called.
-; char  name[16+1];
-; char* argv[MAXARGS+1]={name};
-;
-.bss
+.segment        "INIT"
+
 term:   .res    1
 name:   .res    FNAME_LEN + 1
 args:   .res    SCREEN_XSIZE * 2 - 1
 
 .data
+
+; This array has zeroes when initmainargs starts.
+; char* argv[MAXARGS+1]={name};
+
 argv:   .addr   name
-        .res    MAXARGS * 2, 0
+        .res    MAXARGS * 2