Define HEADER memory area for the EXEHDR segment for consistency reasons with the...

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

diff --git a/src/ld65/cfg/c128.cfg b/src/ld65/cfg/c128.cfg
index 019e8ea7b288482ca0b8043837386afbebc05dda..71c11cffd9bf40de9d70e7d136877c9c0d2de028 100644 (file)
--- a/src/ld65/cfg/c128.cfg
+++ b/src/ld65/cfg/c128.cfg
@@ -1,19 +1,20 @@
 MEMORY {
-    ZP:  start = $0002, size = $001A, type = rw, define = yes;
-    RAM: start = $1BFF, size = $A401, file = %O, define = yes;
+    ZP:     start = $0002, size = $001A, type = rw, define = yes;
+    HEADER: start = $1BFF, size = $000E, file = %O;
+    RAM:    start = $1C0D, size = $A3F3, file = %O, define = yes;
 }
 SEGMENTS {
-    EXEHDR:   load = RAM, type = ro;
-    STARTUP:  load = RAM, type = ro;
-    LOWCODE:  load = RAM, type = ro,               optional = yes;
-    INIT:     load = RAM, type = ro, define = yes, optional = yes;
-    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;
+    EXEHDR:   load = HEADER, type = ro;
+    STARTUP:  load = RAM,    type = ro;
+    LOWCODE:  load = RAM,    type = ro,               optional = yes;
+    INIT:     load = RAM,    type = ro, define = yes, optional = yes;
+    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;
 }
 FEATURES {
     CONDES: segment = INIT,

diff --git a/src/ld65/cfg/c16.cfg b/src/ld65/cfg/c16.cfg
index cb01599e51ad0a7f2c2aa954282059653ce3019c..d2700fa3771ebcb41ce5bfc46d79dcead1eb659e 100644 (file)
--- a/src/ld65/cfg/c16.cfg
+++ b/src/ld65/cfg/c16.cfg
@@ -1,19 +1,20 @@
 MEMORY {
-    ZP:  start = $0002, size = $001A, type = rw, define = yes;
-    RAM: start = $0FFF, size = $7001, file = %O;
+    ZP:     start = $0002, size = $001A, type = rw, define = yes;
+    HEADER: start = $0FFF, size = $000E, file = %O;
+    RAM:    start = $100D, size = $6FF3, file = %O;
 }
 SEGMENTS {
-    EXEHDR:   load = RAM, type = ro;
-    STARTUP:  load = RAM, type = ro;
-    LOWCODE:  load = RAM, type = ro,               optional = yes;
-    INIT:     load = RAM, type = ro, define = yes, optional = yes;
-    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;
+    EXEHDR:   load = HEADER, type = ro;
+    STARTUP:  load = RAM,    type = ro;
+    LOWCODE:  load = RAM,    type = ro,               optional = yes;
+    INIT:     load = RAM,    type = ro, define = yes, optional = yes;
+    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;
 }
 FEATURES {
     CONDES: segment = INIT,

diff --git a/src/ld65/cfg/c64.cfg b/src/ld65/cfg/c64.cfg
index 91809c1ffe829ee4a67390f9a6a0485790fd1cfe..2ce94b6fe52824237e3172643279acde309059b1 100644 (file)
--- a/src/ld65/cfg/c64.cfg
+++ b/src/ld65/cfg/c64.cfg
@@ -1,19 +1,20 @@
 MEMORY {
-    ZP:  start = $0002, size = $001A, type = rw, define = yes;
-    RAM: start = $07FF, size = $C801, file = %O, define = yes;
+    ZP:     start = $0002, size = $001A, type = rw, define = yes;
+    HEADER: start = $07FF, size = $000E, file = %O;
+    RAM:    start = $080D, size = $C7F3, file = %O, define = yes;
 }
 SEGMENTS {
-    EXEHDR:   load = RAM, type = ro;
-    STARTUP:  load = RAM, type = ro;
-    LOWCODE:  load = RAM, type = ro,               optional = yes;
-    INIT:     load = RAM, type = ro, define = yes, optional = yes;
-    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;
+    EXEHDR:   load = HEADER, type = ro;
+    STARTUP:  load = RAM,    type = ro;
+    LOWCODE:  load = RAM,    type = ro,               optional = yes;
+    INIT:     load = RAM,    type = ro, define = yes, optional = yes;
+    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;
 }
 FEATURES {
     CONDES: segment = INIT,

diff --git a/src/ld65/cfg/pet.cfg b/src/ld65/cfg/pet.cfg
index f95eb42c3e9fc941998383fce74a44c1cc33d5be..04fa262406d2c54dce6aebb5d710c621fdfaf77d 100644 (file)
--- a/src/ld65/cfg/pet.cfg
+++ b/src/ld65/cfg/pet.cfg
@@ -1,19 +1,20 @@
 MEMORY {
-    ZP:  start = $0055, size = $001A, type = rw, define = yes;
-    RAM: start = $03FF, size = $7BFF, file = %O;
+    ZP:     start = $0055, size = $001A, type = rw, define = yes;
+    HEADER: start = $03FF, size = $000E, file = %O;
+    RAM:    start = $040D, size = $7BF1, file = %O;
 }
 SEGMENTS {
-    EXEHDR:   load = RAM, type = ro;
-    STARTUP:  load = RAM, type = ro;
-    LOWCODE:  load = RAM, type = ro,               optional = yes;
-    INIT:     load = RAM, type = ro, define = yes, optional = yes;
-    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;
+    EXEHDR:   load = HEADER, type = ro;
+    STARTUP:  load = RAM,    type = ro;
+    LOWCODE:  load = RAM,    type = ro,               optional = yes;
+    INIT:     load = RAM,    type = ro, define = yes, optional = yes;
+    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;
 }
 FEATURES {
     CONDES: segment = INIT,

diff --git a/src/ld65/cfg/plus4.cfg b/src/ld65/cfg/plus4.cfg
index 2b5a31457c7fa2d67e4ed599e274d4329b2ac90c..4b098cc79d4e78ad5d4611ce83b2c9039efcf35f 100644 (file)
--- a/src/ld65/cfg/plus4.cfg
+++ b/src/ld65/cfg/plus4.cfg
@@ -1,19 +1,20 @@
 MEMORY {
-    ZP:  start = $0002, size = $001A, type = rw, define = yes;
-    RAM: start = $0FFF, size = $ED01, file = %O;
+    ZP:     start = $0002, size = $001A, type = rw, define = yes;
+    HEADER: start = $0FFF, size = $000E, file = %O;
+    RAM:    start = $100D, size = $ECF3, file = %O;
 }
 SEGMENTS {
-    EXEHDR:   load = RAM, type = ro;
-    STARTUP:  load = RAM, type = ro;
-    LOWCODE:  load = RAM, type = ro,               optional = yes;
-    INIT:     load = RAM, type = ro, define = yes, optional = yes;
-    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;
+    EXEHDR:   load = HEADER, type = ro;
+    STARTUP:  load = RAM,    type = ro;
+    LOWCODE:  load = RAM,    type = ro,               optional = yes;
+    INIT:     load = RAM,    type = ro, define = yes, optional = yes;
+    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;
 }
 FEATURES {
     CONDES: segment = INIT,

diff --git a/src/ld65/cfg/vic20-32k.cfg b/src/ld65/cfg/vic20-32k.cfg
index aa333c4dc0f51444df9a0a623d24f008c672bc2f..666cd15ea3f2db020cce4015409e6e9a142434d1 100644 (file)
--- a/src/ld65/cfg/vic20-32k.cfg
+++ b/src/ld65/cfg/vic20-32k.cfg
@@ -1,21 +1,22 @@
 # Memory configuration for the VIC-20 with 32K RAM Cartridge
 # Contributed by Stefan Haubenthal
 MEMORY {
-    ZP: start =  $0002, size = $001A, type = rw, define = yes;
-    RAM: start = $11FF, size = $6E01, define = yes, file = %O;
+    ZP:     start = $0002, size = $001A, type = rw, define = yes;
+    HEADER: start = $11FF, size = $000E, file = %O;
+    RAM:    start = $120D, size = $6DF3, file = %O, define = yes;
 }
 SEGMENTS {
-    EXEHDR:   load = RAM, type = ro;
-    STARTUP:  load = RAM, type = ro;
-    LOWCODE:  load = RAM, type = ro,               optional = yes;
-    INIT:     load = RAM, type = ro, define = yes, optional = yes;
-    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;
+    EXEHDR:   load = HEADER, type = ro;
+    STARTUP:  load = RAM,    type = ro;
+    LOWCODE:  load = RAM,    type = ro,               optional = yes;
+    INIT:     load = RAM,    type = ro, define = yes, optional = yes;
+    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;
 }
 FEATURES {
     CONDES: segment = INIT,

diff --git a/src/ld65/cfg/vic20.cfg b/src/ld65/cfg/vic20.cfg
index 6ab066aa34d36de716bc0e4d2325ae053afa01cb..03eba699d628aa1a084fcc9beeecf0cabe0bc56e 100644 (file)
--- a/src/ld65/cfg/vic20.cfg
+++ b/src/ld65/cfg/vic20.cfg
@@ -1,19 +1,20 @@
 MEMORY {
-    ZP: start =  $0002, size = $001A, type = rw, define = yes;
-    RAM: start = $0FFF, size = $0E01, define = yes, file = %O;
+    ZP:     start = $0002, size = $001A, type = rw, define = yes;
+    HEADER: start = $0FFF, size = $000E, file = %O;
+    RAM:    start = $100D, size = $0DF3, file = %O, define = yes;
 }
 SEGMENTS {
-    EXEHDR:   load = RAM, type = ro;
-    STARTUP:  load = RAM, type = ro;
-    LOWCODE:  load = RAM, type = ro,               optional = yes;
-    INIT:     load = RAM, type = ro, define = yes, optional = yes;
-    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;
+    EXEHDR:   load = HEADER, type = ro;
+    STARTUP:  load = RAM,    type = ro;
+    LOWCODE:  load = RAM,    type = ro,               optional = yes;
+    INIT:     load = RAM,    type = ro, define = yes, optional = yes;
+    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;
 }
 FEATURES {
     CONDES: segment = INIT,