From: Oliver Schmidt <ol.sc@web.de>
Date: Wed, 16 Mar 2016 15:28:32 +0000 (+0100)
Subject: Adjusted constructors.
X-Git-Tag: V2.16~160
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1d1ba3ed3bf0b0b31e34601b7f40201589887537;p=cc65

Adjusted constructors.

The constructors are _NOT_ allowed anymore to access the BSS. Rather they must use the DATA segment or the INIT segment. The latter isn't cleared at any point so the constructors may use it to expose values to the main program. However they must make sure to always write the values as they are not pre-initialized.
---

diff --git a/cfg/atmos.cfg b/cfg/atmos.cfg
index e5a574f0a..bb79a1e8a 100644
--- a/cfg/atmos.cfg
+++ b/cfg/atmos.cfg
@@ -8,10 +8,10 @@ SYMBOLS {
     __RAMEND__:    type = weak, value = $9800 + $1C00 * __GRAB__;
 }
 MEMORY {
-    ZP:      file = "", define = yes, start = $00E2, size = $001A;
-    TAPEHDR: file = %O, type   = ro,  start = $0000, size = $001F;
-    BASHEAD: file = %O, define = yes, start = $0501, size = $000D;
-    MAIN:    file = %O, define = yes, start = __BASHEAD_LAST__, size = __RAMEND__ - __RAM_START__ - __STACKSIZE__;
+    ZP:      file = "", define = yes, start = $00E2,            size = $001A;
+    TAPEHDR: file = %O, type   = ro,  start = $0000,            size = $001F;
+    BASHEAD: file = %O, define = yes, start = $0501,            size = $000D;
+    MAIN:    file = %O, define = yes, start = __BASHEAD_LAST__, size = __RAMEND__ - __MAIN_START__ - __STACKSIZE__;
 }
 SEGMENTS {
     ZEROPAGE: load = ZP,      type = zp;
@@ -21,8 +21,9 @@ SEGMENTS {
     LOWCODE:  load = MAIN,    type = ro,                optional = yes;
     CODE:     load = MAIN,    type = ro;
     RODATA:   load = MAIN,    type = ro;
-    ONCE:     load = MAIN,    type = ro,  define = yes, optional = yes;
+    ONCE:     load = MAIN,    type = ro,                optional = yes;
     DATA:     load = MAIN,    type = rw;
+    INIT:     load = MAIN,    type = rw,                optional = yes;
     ZPSAVE1:  load = MAIN,    type = rw,  define = yes; # ZPSAVE1, ZPSAVE2 must be together
     ZPSAVE2:  load = MAIN,    type = bss;               # see "libsrc/atmos/crt0.s"
     BSS:      load = MAIN,    type = bss, define = yes;
diff --git a/cfg/geos-apple.cfg b/cfg/geos-apple.cfg
index 9fc7024e1..b39cf1ebe 100644
--- a/cfg/geos-apple.cfg
+++ b/cfg/geos-apple.cfg
@@ -44,6 +44,7 @@ SEGMENTS {
     CODE:      type = ro,  run  = VLIR0,  load = CVT;
     RODATA:    type = ro,  run  = VLIR0,  load = CVT;
     DATA:      type = rw,  run  = VLIR0,  load = CVT;
+    INIT:      type = bss, load = VLIR0,                                 optional = yes;
     BSS:       type = bss, load = VLIR0,              define     = yes;
     VLIRIDX1:  type = ro,                 load = CVT, align      = $200, optional = yes;
     OVERLAY1:  type = ro,  run  = VLIR1,  load = CVT, align_load = $200, optional = yes;
diff --git a/cfg/geos-cbm.cfg b/cfg/geos-cbm.cfg
index f9bea76a0..0269dbacb 100644
--- a/cfg/geos-cbm.cfg
+++ b/cfg/geos-cbm.cfg
@@ -41,6 +41,7 @@ SEGMENTS {
     CODE:      type = ro,  run  = VLIR0,  load = CVT;
     RODATA:    type = ro,  run  = VLIR0,  load = CVT;
     DATA:      type = rw,  run  = VLIR0,  load = CVT;
+    INIT:      type = bss, load = VLIR0,                                optional = yes;
     BSS:       type = bss, load = VLIR0,              define     = yes;
     OVERLAY1:  type = ro,  run  = VLIR1,  load = CVT, align_load = $FE, optional = yes;
     OVERLAY2:  type = ro,  run  = VLIR2,  load = CVT, align_load = $FE, optional = yes;
diff --git a/libsrc/apple2/dosdetect.s b/libsrc/apple2/dosdetect.s
index cedb1f3e3..46fbb5484 100644
--- a/libsrc/apple2/dosdetect.s
+++ b/libsrc/apple2/dosdetect.s
@@ -43,6 +43,6 @@ initdostype:
 :       sta     __dos_type
 done:   rts
 
-        .bss
+        .data
 
-__dos_type:     .res    1
+__dos_type:     .byte   $00
diff --git a/libsrc/apple2/extra/iobuf-0800.s b/libsrc/apple2/extra/iobuf-0800.s
index 2e5d1927e..0ad7a751f 100644
--- a/libsrc/apple2/extra/iobuf-0800.s
+++ b/libsrc/apple2/extra/iobuf-0800.s
@@ -90,6 +90,6 @@ iobuf_free:
 
 ; ------------------------------------------------------------------------
 
-        .bss
+        .data
 
 table:  .res    MAX_FDS
diff --git a/libsrc/apple2/get_ostype.s b/libsrc/apple2/get_ostype.s
index cff6af9a3..b54e38d63 100644
--- a/libsrc/apple2/get_ostype.s
+++ b/libsrc/apple2/get_ostype.s
@@ -65,6 +65,6 @@ _get_ostype:
         ldx     #$00
         rts
 
-        .bss
+        .segment        "INIT"
 
 ostype: .res    1
diff --git a/libsrc/apple2/mainargs.s b/libsrc/apple2/mainargs.s
index e3db8bb10..de2f385f1 100644
--- a/libsrc/apple2/mainargs.s
+++ b/libsrc/apple2/mainargs.s
@@ -83,6 +83,7 @@ initmainargs:
 ; destroyed.
 
         ldy     #$00
+        sty     buffer + BUF_LEN - 1
 :       lda     BASIC_BUF,x
         sta     buffer,y
         inx
@@ -166,14 +167,13 @@ done:   lda     #<argv
         stx     __argv+1
         rts
 
-; This array is zeroed before initmainargs is called.
-; char* argv[MAXARGS+1] = {FNAM};
-
         .data
 
+; char* argv[MAXARGS+1] = {FNAM};
+
 argv:   .addr   FNAM
         .res    MAXARGS * 2
 
-        .bss
+        .segment        "INIT"
 
 buffer: .res    BUF_LEN
diff --git a/libsrc/atari/dosdetect.s b/libsrc/atari/dosdetect.s
index cac9a6536..c2888d888 100644
--- a/libsrc/atari/dosdetect.s
+++ b/libsrc/atari/dosdetect.s
@@ -48,6 +48,6 @@ done:   rts
 ; ------------------------------------------------------------------------
 ; Data
 
-        .bss
+        .data
 
-__dos_type:     .res    1       ; default to ATARIDOS
+__dos_type:     .byte   0       ; default to ATARIDOS
diff --git a/libsrc/atari/getargs.s b/libsrc/atari/getargs.s
index d32c0a268..e3b18b2f9 100644
--- a/libsrc/atari/getargs.s
+++ b/libsrc/atari/getargs.s
@@ -23,12 +23,6 @@ SPACE   = 32            ; SPACE char.
 .segment        "ONCE"
 
 initmainargs:
-        lda     #0
-        sta     __argc
-        sta     __argc+1
-        sta     __argv
-        sta     __argv+1
-
         lda     __dos_type      ; which DOS?
         cmp     #ATARIDOS
         beq     nargdos         ; DOS does not support arguments
@@ -120,7 +114,7 @@ eopar:
 
 finargs:
         lda     __argc
-        asl           
+        asl
         tax
         lda     #0
         sta     argv,x
@@ -134,7 +128,7 @@ finargs:
 ; --------------------------------------------------------------------------
 ; Data
 
-.bss
+.segment        "INIT"
 
 argv:   .res    (1 + MAXARGS) * 2
 
diff --git a/libsrc/atmos/capslock.s b/libsrc/atmos/capslock.s
index 91c484250..0260b3f9f 100644
--- a/libsrc/atmos/capslock.s
+++ b/libsrc/atmos/capslock.s
@@ -43,7 +43,7 @@ restore_caps:
 
 ;--------------------------------------------------------------------------
 
-.bss
+.segment        "INIT"
 
 capsave:
         .res    1
diff --git a/libsrc/atmos/mainargs.s b/libsrc/atmos/mainargs.s
index 8b57d9855..3ab353c15 100644
--- a/libsrc/atmos/mainargs.s
+++ b/libsrc/atmos/mainargs.s
@@ -13,7 +13,7 @@
         .macpack        generic
 
 MAXARGS  = 10                   ; Maximum number of arguments allowed
-REM      = $9d                  ; BASIC token-code
+REM      = $9D                  ; BASIC token-code
 
 
 ;---------------------------------------------------------------------------
@@ -26,21 +26,21 @@ REM      = $9d                  ; BASIC token-code
 
 ; 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,7 +79,7 @@ setterm:sta     term            ; Set end of argument marker
 
         txa                     ; Get low byte
         add     #<args
-        sta     argv,y          ; argv[y]= &arg
+        sta     argv,y          ; argv[y]=&arg
         lda     #>$0000
         adc     #>args
         sta     argv+1,y
@@ -99,7 +99,7 @@ argloop:lda     BASIC_BUF,x
 ; A contains the terminating character. To make the argument a valid C string,
 ; replace the terminating character by a zero.
 
-        lda     #$00
+        lda     #0
         sta     args-1,x
 
 ; Check if the maximum number of command line arguments is reached. If not,
@@ -120,14 +120,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
+
+; char* argv[MAXARGS+1]={name};
+
 argv:   .addr   name
-        .res    MAXARGS * 2, $00
+        .res    MAXARGS * 2
diff --git a/libsrc/atmos/read.s b/libsrc/atmos/read.s
index edf9d161d..c44dc8584 100644
--- a/libsrc/atmos/read.s
+++ b/libsrc/atmos/read.s
@@ -79,8 +79,7 @@ initstdin:
 
 ;--------------------------------------------------------------------------
 
-.bss
+.segment        "INIT"
 
 text_count:
         .res    1
-
diff --git a/libsrc/c128/cgetc.s b/libsrc/c128/cgetc.s
index 7cb4c159e..bc9d8da7f 100644
--- a/libsrc/c128/cgetc.s
+++ b/libsrc/c128/cgetc.s
@@ -39,7 +39,7 @@ L2:     jsr     KBDREAD         ; Read char and return in A
 ;--------------------------------------------------------------------------
 ; Module constructor/destructor
 
-.bss
+.segment        "INIT"
 keyvec: .res    2
 
 .segment        "ONCE"
@@ -48,9 +48,9 @@ initcgetc:
 ; Save the old vector
 
         lda     KeyStoreVec
+        ldx     KeyStoreVec+1
         sta     keyvec
-        lda     KeyStoreVec+1
-        sta     keyvec+1
+        stx     keyvec+1
 
 ; Set the new vector. I can only hope that this works for other C128
 ; versions...
@@ -68,5 +68,3 @@ SetVec: sei
         stx     KeyStoreVec+1
         cli
         rts
-
-
diff --git a/libsrc/common/_environ.s b/libsrc/common/_environ.s
index 6a53f80a8..f9a349e67 100644
--- a/libsrc/common/_environ.s
+++ b/libsrc/common/_environ.s
@@ -15,10 +15,10 @@
         .export         __environ, __envcount, __envsize
         .import         initenv
         .constructor    env_init
-        
+
         env_init := initenv
-                           
-.bss
+
+.data
 
 __environ:
         .addr   0
@@ -26,5 +26,3 @@ __envcount:
         .byte   0
 __envsize:
         .byte   0
-
-
diff --git a/libsrc/geos-common/conio/_scrsize.s b/libsrc/geos-common/conio/_scrsize.s
index dded4ca42..494182b9d 100644
--- a/libsrc/geos-common/conio/_scrsize.s
+++ b/libsrc/geos-common/conio/_scrsize.s
@@ -43,7 +43,7 @@ screensize:
         ldy ysize
         rts
 
-.bss
+.segment        "INIT"
 
 xsize:
         .res 1
diff --git a/libsrc/geos-common/system/mainargs.s b/libsrc/geos-common/system/mainargs.s
index 14c624759..f38beab34 100644
--- a/libsrc/geos-common/system/mainargs.s
+++ b/libsrc/geos-common/system/mainargs.s
@@ -5,7 +5,7 @@
 ; Setup arguments for main
 ;
 ; There is always either 1 or 3 arguments:
-; <program name>,0
+; <program name>, 0
 ; or
 ; <program name>, <data file name>, <data disk name>, 0
 ; the 2nd case is when using DeskTop user drags an icon of a file and drops it
@@ -71,7 +71,7 @@ argv:
         .word dataDiskName      ; dataDiskName
         .word $0000             ; last one must be NULL
 
-.bss
+.segment        "INIT"
 
 argv0:
         .res 17                 ; Program name