From da59130820815b2971f51407d2988663dac0b493 Mon Sep 17 00:00:00 2001
From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Wed, 17 Nov 2010 12:46:55 +0000
Subject: [PATCH] Changed the startup module and the linker config for the C16
 to use the common loadaddr and exehdr modules.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4871 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 libsrc/c16/crt0.s    | 16 ----------------
 src/ld65/cfg/c16.cfg | 10 +++++++---
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/libsrc/c16/crt0.s b/libsrc/c16/crt0.s
index bbdd4a252..21f31bb68 100644
--- a/libsrc/c16/crt0.s
+++ b/libsrc/c16/crt0.s
@@ -16,22 +16,6 @@
 	.include	"plus4.inc"
 
 
-; ------------------------------------------------------------------------
-; BASIC header with a SYS call
-
-.segment       	"EXEHDR"
-
-        .word   Head            ; Load address
-Head:   .word   @Next
-        .word   .version        ; Line number
-        .byte   $9E             ; SYS token
-        .byte   <(((Start / 1000) .mod 10) + '0')
-        .byte   <(((Start /  100) .mod 10) + '0')
-        .byte   <(((Start /   10) .mod 10) + '0')
-        .byte   <(((Start /    1) .mod 10) + '0')
-        .byte   $00             ; End of BASIC line
-@Next:  .word   0               ; BASIC end marker
-
 ; ------------------------------------------------------------------------
 ; Startup code
 
diff --git a/src/ld65/cfg/c16.cfg b/src/ld65/cfg/c16.cfg
index a015f11fb..80e1e2170 100644
--- a/src/ld65/cfg/c16.cfg
+++ b/src/ld65/cfg/c16.cfg
@@ -1,12 +1,16 @@
 SYMBOLS {
+    __LOADADDR__:  type = import;
+    __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
-    ZP:     file = "", define = yes, start = $0002, size = $001A;
-    HEADER: file = %O,               start = $0FFF, size = $000E;
-    RAM:    file = %O,               start = $100D, size = $6FF3 - __STACKSIZE__;
+    ZP:       file = "", define = yes, start = $0002, size = $001A;
+    LOADADDR: file = %O,               start = $0FFF, size = $0002;
+    HEADER:   file = %O,               start = $1001, size = $000C;
+    RAM:      file = %O,               start = $100D, size = $6FF3 - __STACKSIZE__;
 }
 SEGMENTS {
+    LOADADDR: load = LOADADDR, type = ro;
     EXEHDR:   load = HEADER, type = ro;
     STARTUP:  load = RAM,    type = ro;
     LOWCODE:  load = RAM,    type = ro,                optional = yes;
-- 
2.39.5