Added a blank line between .include statements and .import/.export statements

[cc65] / libsrc / c64 / mainargs.s

diff --git a/libsrc/c64/mainargs.s b/libsrc/c64/mainargs.s
index ffd396cf99f8d7d591a6c1c71ec64accee804587..a381b49e1505d269ed9eca932e3b43649aa77bf6 100644 (file)
--- a/libsrc/c64/mainargs.s
+++ b/libsrc/c64/mainargs.s
@@ -3,63 +3,66 @@
 ; Ullrich von Bassewitz, 2003-03-07
 ; Based on code from Stefan A. Haubenthal, <polluks@web.de>
 ; 2003-05-18, Greg King
+; 2004-04-28, 2005-02-26, Ullrich von Bassewitz
 ;
 ; Scan a group of arguments that are in BASIC's input-buffer.
 ; Build an array that points to the beginning of each argument.
 ; Send, to main(), that array and the count of the arguments.
-
+;
 ; Command-lines look like these lines:
 ;
 ; run
-; run : rem  no arguments because no comma!
-; run:rem,arg1," arg 2" , arg 3 ,, arg5, ...
+; run : rem
+; run:rem arg1 " arg 2 is quoted "  arg3 "" arg5
+;
+; "run" and "rem" are entokenned; the args. are not.  Leading and trailing
+; spaces outside of quotes are ignored.
 ;
-; "run" and "rem" are entokenned; the args. are not.  Leading spaces are
-; ignored; trailing spaces are included -- unless the argument was quoted.
-
 ; TO-DO:
 ; - The "file-name" might be a path-name; don't copy the directory-components.
 ; - Add a control-character quoting mechanism.
 
-       .constructor    initmainargs, 24
-       .import         __argc, __argv
+        .constructor    initmainargs, 24
+        .import         __argc, __argv
 
-       .include        "c64.inc"
+        .include        "c64.inc"
 
 
+MAXARGS  = 10                   ; Maximum number of arguments allowed
+REM      = $8f                  ; BASIC token-code
+NAME_LEN = 16                   ; Maximum length of command-name
 
-MAXARGS         = 10                   ; Maximum number of arguments allowed
-REM     = $8f                  ; BASIC token-code
-NAME_LEN = 16                  ; maximum length of command-name
+; Get possible command-line arguments. Goes into the special ONCE segment,
+; which may be reused after the startup code is run
+
+.segment        "ONCE"
 
-; Get possible command-line arguments.
-;
 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     FNAM_LEN
-       cpy     #NAME_LEN + 1
-       bcc     L1
-       ldy     #NAME_LEN - 1   ; limit the length
-L0:    lda     (FNAM),y
-       sta     name,y
-L1:    dey
-       bpl     L0
-       inc     __argc          ; argc always is equal to, at least, 1
+
+        lda     #0              ; The terminating NUL character
+        ldy     FNAM_LEN
+        cpy     #NAME_LEN + 1
+        bcc     L1
+        ldy     #NAME_LEN       ; Limit the length
+        bne     L1              ; Branch always
+L0:     lda     (FNAM),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.
-       inx
-       cmp     #REM
-       bne     L2
-       ldy     #1 * 2
+
+        ldx     #0
+L2:     lda     BASIC_BUF,x
+        beq     done            ; No "rem," no args.
+        inx
+        cmp     #REM
+        bne     L2
+        ldy     #1 * 2
 
 ; Find the next argument
 
@@ -67,7 +70,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
@@ -85,11 +88,11 @@ setterm:sta     term            ; Set end of argument marker
 ; necessary.
 
         txa                     ; Get low byte
-       sta     argv,y          ; argv[y]= &arg
-       iny
-       lda     #>BASIC_BUF
-       sta     argv,y
-       iny
+        sta     argv,y          ; argv[y]= &arg
+        iny
+        lda     #>BASIC_BUF
+        sta     argv,y
+        iny
         inc     __argc          ; Found another arg
 
 ; Search for the end of the argument
@@ -116,21 +119,19 @@ argloop:lda     BASIC_BUF,x
 
 ; (The last vector in argv[] already is NULL.)
 
-done:  lda     #<argv
-       ldx     #>argv
-       sta     __argv
-       stx     __argv + 1
-       rts
+done:   lda     #<argv
+        ldx     #>argv
+        sta     __argv
+        stx     __argv + 1
+        rts
 
-; These arrays are zeroed before initmainargs is called.
-; char name[16+1];
-; char* argv[MAXARGS+1]={name};
-;
-.bss
-term:  .res    1
-name:  .res    NAME_LEN + 1
+.segment        "INIT"
+
+term:   .res    1
+name:   .res    NAME_LEN + 1
 
 .data
+
+; char* argv[MAXARGS+1]={name};
 argv:   .addr   name
-        .res           MAXARGS * 2
-                 
+        .res    MAXARGS * 2