Moved the data that keeps a copy of the used zero page locations in its own

segment to reduce the executable size.

git-svn-id: svn://svn.cc65.org/cc65/trunk@3849 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/atari/crt0.s b/libsrc/atari/crt0.s
index f930f470ca5236562bccc74a23a2b38ebeb0905a..2f60f2076d5138cec516704cfe611bc710a5bf2a 100644 (file)
--- a/libsrc/atari/crt0.s
+++ b/libsrc/atari/crt0.s
@@ -174,7 +174,7 @@ initsp:
        sta     sp+1
        rts
 
-       .data         
+.segment        "ZPSAVE"
 
 zpsave:        .res    zpspace
 

diff --git a/libsrc/atmos/crt0.s b/libsrc/atmos/crt0.s
index 4bbebbc74db1a7a3d1444d7eb0ed0fa36b2bc1cf..677dee84e68bfe9232bd85472805420f8128f1ba 100644 (file)
--- a/libsrc/atmos/crt0.s
+++ b/libsrc/atmos/crt0.s
@@ -27,7 +27,7 @@
         .byte   $00                             ; $2AF
         .byte   $80                             ; $2AE Machine code flag
         .byte   $C7                             ; $2AD Autoload flag
-        .dbyt   __BSS_LOAD__                    ; $2AB           
+        .dbyt   __BSS_LOAD__                    ; $2AB
         .dbyt   __RAM_START__                   ; $2A9
         .byte   $00                             ; $2A8
         .byte   $00                             ; Zero terminated name
@@ -100,7 +100,7 @@ L2: lda     zpsave,x
 ; ------------------------------------------------------------------------
 ; Data
 
-.data
+.segment        "ZPSAVE"
 
 zpsave:        .res    zpspace
 

diff --git a/libsrc/c128/crt0.s b/libsrc/c128/crt0.s
index 83ae66c581118eab3f2c8ca06bde50a318bd3ecb..83598c127d26739b50d6bb72c101edf17ba1c58e 100644 (file)
--- a/libsrc/c128/crt0.s
+++ b/libsrc/c128/crt0.s
@@ -182,7 +182,8 @@ IRQStub:
 ; ------------------------------------------------------------------------
 ; Data
 
-.data
+.segment        "ZPSAVE"
+
 zpsave:        .res    zpspace
 
 .bss

diff --git a/libsrc/c16/crt0.s b/libsrc/c16/crt0.s
index 7f38719f08dc3f66a0c7f8f3fcb53e96dd29921b..1541d7675e23f561ed45a88e191a295f5c3e2303 100644 (file)
--- a/libsrc/c16/crt0.s
+++ b/libsrc/c16/crt0.s
@@ -102,10 +102,12 @@ L2:       lda     zpsave,x
        jmp     RESTOR
 
 
-.data
+.segment        "ZPSAVE"
+
 zpsave:        .res    zpspace
 
 .bss
+
 spsave:        .res    1
 
 

diff --git a/libsrc/c64/crt0.s b/libsrc/c64/crt0.s
index d79d64bf6723a4a069e2a321fe91376480ca66fa..9c6464523cb806ffb414d36f99a98486ec16b14d 100644 (file)
--- a/libsrc/c64/crt0.s
+++ b/libsrc/c64/crt0.s
@@ -150,9 +150,12 @@ IRQStub:
 
 .data
 
-zpsave:        .res    zpspace
 IRQInd: jmp     $0000
 
+.segment        "ZPSAVE"
+
+zpsave:        .res    zpspace
+
 .bss
 
 spsave:        .res    1

diff --git a/libsrc/pet/crt0.s b/libsrc/pet/crt0.s
index faf32924c3dd64ae991e87112e3ee378425fee07..89582885e26403f013bb24d11caa4b3a8287e289 100644 (file)
--- a/libsrc/pet/crt0.s
+++ b/libsrc/pet/crt0.s
@@ -136,9 +136,12 @@ IRQStub:
 
 .data
 
-zpsave:        .res    zpspace
 IRQInd: jmp    $0000
 
+.segment        "ZPSAVE"
+
+zpsave:        .res    zpspace
+
 .bss
 
 spsave:        .res    1

diff --git a/libsrc/plus4/crt0.s b/libsrc/plus4/crt0.s
index 3b75860095fb3dfb1974b04f23b83a12d4f6acef..032ad7947027003eaa3b588349815de1ed17f9a1 100644 (file)
--- a/libsrc/plus4/crt0.s
+++ b/libsrc/plus4/crt0.s
@@ -147,8 +147,8 @@ 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 __INTERRUPTOR_COUNT__ directly, since the 
-; condes function is not reentrant. The irqcount flag will be set/reset from 
+; 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
@@ -194,13 +194,16 @@ nohandler:
 ; Data
 
 .data
-zpsave:                .res    zpspace
 
 ; BRK handling
 brk_jmp:        jmp     $0000
 
 spsave:                .res    1
 
+.segment        "ZPSAVE"
+
+zpsave:                .res    zpspace
+
 .bss
 irqcount:       .byte   0
 

diff --git a/libsrc/vic20/crt0.s b/libsrc/vic20/crt0.s
index 5864382bbfc206e9f22d9bf51e0acc10b1156535..a0f61c06ac0a6821f56147badeb0cf5c7a6b9abf 100644 (file)
--- a/libsrc/vic20/crt0.s
+++ b/libsrc/vic20/crt0.s
@@ -142,9 +142,12 @@ IRQStub:
 
 .data
 
-zpsave:        .res    zpspace
 IRQInd: jmp     $0000
 
+.segment        "ZPSAVE"
+
+zpsave:        .res    zpspace
+
 .bss
 
 spsave:        .res    1

diff --git a/src/ld65/cfg/atari.cfg b/src/ld65/cfg/atari.cfg
index f311f4de1bc26129fa8d216bda7b2c5def8dffbf..f6b0eb675a67cdacb13db9137a558d18994cedf9 100644 (file)
--- a/src/ld65/cfg/atari.cfg
+++ b/src/ld65/cfg/atari.cfg
@@ -18,6 +18,7 @@ SEGMENTS {
     CODE:     load = RAM,     type = ro, define = yes;
     RODATA:   load = RAM,     type = ro;
     DATA:     load = RAM,     type = rw;
+    ZPSAVE:   load = RAM,     type = bss;
     BSS:      load = RAM,     type = bss, define = yes;
     HEAP:     load = RAM,     type = bss, optional = yes; # must sit just below stack
     ZEROPAGE: load = ZP,      type = zp;

diff --git a/src/ld65/cfg/atmos.cfg b/src/ld65/cfg/atmos.cfg
index 15ef471d54beffa32f69194796f55745135b5e6e..5ab8702dd9a935a86c9076c110add68fc4bd0db6 100644 (file)
--- a/src/ld65/cfg/atmos.cfg
+++ b/src/ld65/cfg/atmos.cfg
@@ -11,6 +11,7 @@ SEGMENTS {
     CODE:     load = RAM,     type = ro;
     RODATA:   load = RAM,     type = ro;
     DATA:     load = RAM,     type = rw;
+    ZPSAVE:   load = RAM,     type = bss;
     BSS:      load = RAM,     type = bss, define = yes;
     HEAP:     load = RAM,     type = bss, optional = yes; # must sit just below stack
     ZEROPAGE: load = ZP,      type = zp;

diff --git a/src/ld65/cfg/c128.cfg b/src/ld65/cfg/c128.cfg
index 295c0b1c5afd72d335037286e8ce9fb164852936..e659300b3475d7f5ce2c7e92f07879ac090a22ee 100644 (file)
--- a/src/ld65/cfg/c128.cfg
+++ b/src/ld65/cfg/c128.cfg
@@ -9,6 +9,7 @@ SEGMENTS {
     CODE:     load = RAM, type = ro;
     RODATA:   load = RAM, type = ro;
     DATA:     load = RAM, type = rw;
+    ZPSAVE:   load = RAM, type = bss;
     BSS:      load = RAM, type = bss, define = yes;
     HEAP:     load = RAM, type = bss, optional = yes; # must sit just below stack
     ZEROPAGE: load = ZP,  type = zp;

diff --git a/src/ld65/cfg/c16.cfg b/src/ld65/cfg/c16.cfg
index 0f1b35d5b56d48e7c77e9c42e6e4d248d415ce62..9f77f6a83cf826c9163ef810cab2d0a378b1fba6 100644 (file)
--- a/src/ld65/cfg/c16.cfg
+++ b/src/ld65/cfg/c16.cfg
@@ -9,6 +9,7 @@ SEGMENTS {
     CODE:     load = RAM, type = ro;
     RODATA:   load = RAM, type = ro;
     DATA:     load = RAM, type = rw;
+    ZPSAVE:   load = RAM, type = bss;
     BSS:      load = RAM, type = bss, define = yes;
     HEAP:     load = RAM, type = bss, optional = yes; # must sit just below stack
     ZEROPAGE: load = ZP,  type = zp;

diff --git a/src/ld65/cfg/c64.cfg b/src/ld65/cfg/c64.cfg
index 2ed1ede15ae8ac4faf23431376cef8901cc0181c..1e8983ffdb23de5cb6eaac39dc61439cd6e23d51 100644 (file)
--- a/src/ld65/cfg/c64.cfg
+++ b/src/ld65/cfg/c64.cfg
@@ -9,6 +9,7 @@ SEGMENTS {
     CODE:     load = RAM, type = ro;
     RODATA:   load = RAM, type = ro;
     DATA:     load = RAM, type = rw;
+    ZPSAVE:   load = RAM, type = bss;
     BSS:      load = RAM, type = bss, define = yes;
     HEAP:     load = RAM, type = bss, optional = yes; # must sit just below stack
     ZEROPAGE: load = ZP,  type = zp;

diff --git a/src/ld65/cfg/pet.cfg b/src/ld65/cfg/pet.cfg
index 45727dcbaec20fc94ee5f39b551f781d25d2c626..2c4ab0b4d136b6895f96889fe57bcdb0379a12b7 100644 (file)
--- a/src/ld65/cfg/pet.cfg
+++ b/src/ld65/cfg/pet.cfg
@@ -9,6 +9,7 @@ SEGMENTS {
     CODE:     load = RAM, type = ro;
     RODATA:   load = RAM, type = ro;
     DATA:     load = RAM, type = rw;
+    ZPSAVE:   load = RAM, type = bss;
     BSS:      load = RAM, type = bss, define = yes;
     HEAP:     load = RAM, type = bss, optional = yes; # must sit just below stack
     ZEROPAGE: load = ZP,  type = zp;

diff --git a/src/ld65/cfg/plus4.cfg b/src/ld65/cfg/plus4.cfg
index 9c434b714d8a13b3c8945eb98a4c6244893717f7..607185e614b4fbafeba8a5f6546334751c1d6e9a 100644 (file)
--- a/src/ld65/cfg/plus4.cfg
+++ b/src/ld65/cfg/plus4.cfg
@@ -9,6 +9,7 @@ SEGMENTS {
     CODE:     load = RAM, type = ro;
     RODATA:   load = RAM, type = ro;
     DATA:     load = RAM, type = rw;
+    ZPSAVE:   load = RAM, type = bss;
     BSS:      load = RAM, type = bss, define = yes;
     HEAP:     load = RAM, type = bss, optional = yes; # must sit just below stack
     ZEROPAGE: load = ZP,  type = zp;

diff --git a/src/ld65/cfg/vic20.cfg b/src/ld65/cfg/vic20.cfg
index a31f936b9737fa89a37f7ec395ae1296937fe270..1afac90cd6120cc4626285799e5e808e80004e5a 100644 (file)
--- a/src/ld65/cfg/vic20.cfg
+++ b/src/ld65/cfg/vic20.cfg
@@ -9,6 +9,7 @@ SEGMENTS {
     CODE:     load = RAM, type = ro;
     RODATA:   load = RAM, type = ro;
     DATA:     load = RAM, type = rw;
+    ZPSAVE:   load = RAM, type = bss;
     BSS:      load = RAM, type = bss, define = yes;
     HEAP:     load = RAM, type = bss, optional = yes; # must sit just below stack
     ZEROPAGE: load = ZP,  type = zp;