From 6edf57324e4e233fa350c74d98263ef1cb4f4309 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stephan=20M=C3=BChlstrasser?= <stephan.muehlstrasser@web.de>
Date: Sun, 16 Nov 2014 20:07:59 +0100
Subject: [PATCH] Set default start address to 0x300. Make start address
 configurable via --start-addr.

---
 cfg/c1p.cfg      | 24 +++++++++++++-----------
 src/c1p65/main.c |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/cfg/c1p.cfg b/cfg/c1p.cfg
index f1d739215..d4c248c4f 100644
--- a/cfg/c1p.cfg
+++ b/cfg/c1p.cfg
@@ -1,9 +1,21 @@
+FEATURES {
+    CONDES: type    = constructor,
+            label   = __CONSTRUCTOR_TABLE__,
+            count   = __CONSTRUCTOR_COUNT__,
+            segment = INIT;
+    CONDES: type    = destructor,
+            label   = __DESTRUCTOR_TABLE__,
+            count   = __DESTRUCTOR_COUNT__,
+            segment = RODATA;
+    STARTADDRESS: default = $0300;
+}
 SYMBOLS {
     __STACKSIZE__: type = weak, value = $0400; # 1k stack
+    __HIMEM__:     type = weak, value = $2000; # Presumed RAM end
 }
 MEMORY {
     ZP:       file = "", define = yes, start = $0002, size = $001A;
-    RAM:      file = %O, define = yes, start = $0400, size = $2000 - __STACKSIZE__;
+    RAM:      file = %O, define = yes, start = %S, size = __HIMEM__ - __STACKSIZE__ - %S;
 }
 SEGMENTS {
     STARTUP:  load = RAM, type = ro;
@@ -15,13 +27,3 @@ SEGMENTS {
     BSS:      load = RAM, type = bss, define = yes;
     ZEROPAGE: load = ZP,  type = zp;
 }
-FEATURES {
-    CONDES: type    = constructor,
-            label   = __CONSTRUCTOR_TABLE__,
-            count   = __CONSTRUCTOR_COUNT__,
-            segment = INIT;
-    CONDES: type    = destructor,
-            label   = __DESTRUCTOR_TABLE__,
-            count   = __DESTRUCTOR_COUNT__,
-            segment = RODATA;
-}
diff --git a/src/c1p65/main.c b/src/c1p65/main.c
index 467953c57..e4358ddcd 100644
--- a/src/c1p65/main.c
+++ b/src/c1p65/main.c
@@ -133,7 +133,7 @@ int main (int argc, char *argv[])
 	FILE *OutputFileFp = 0;
 
 	/* Initialize with default start address defined in c1p.cfg */
-	unsigned long StartAddr = 0x400;
+	unsigned long StartAddr = 0x300;
 
     unsigned int I;
 
-- 
2.39.5