From: johanknol <johanknol@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Fri, 23 Feb 2001 18:44:11 +0000 (+0000)
Subject: Filled in some port specific defaults
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=a1957425a628ca8b87817f3dca1c730aefba3091;p=fw%2Fsdcc

Filled in some port specific defaults


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@649 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/src/ds390/main.c b/src/ds390/main.c
index c17631f7..cc688736 100644
--- a/src/ds390/main.c
+++ b/src/ds390/main.c
@@ -89,8 +89,8 @@ _ds390_finaliseOptions (void)
   if (options.model != MODEL_FLAT24)
     {
       fprintf (stderr,
-	       "*** warning: ds390 port only supports the flat24 model.\n");
-      options.model = MODEL_FLAT24;
+	       "*** error: ds390 port only supports the flat24 model.\n");
+      exit (1);
     }
   port->s.fptr_size = 3;
   port->s.gptr_size = 4;
@@ -103,40 +103,27 @@ _ds390_finaliseOptions (void)
 				 */
 #endif
 
-  if (options.model)
-    {
-      port->mem.default_local_map = xdata;
-      port->mem.default_globl_map = xdata;
-    }
-  else
-    {
-      port->mem.default_local_map = data;
-      port->mem.default_globl_map = data;
-    }
+  port->mem.default_local_map = xdata;
+  port->mem.default_globl_map = xdata;
 
-  if (options.stack10bit)
+  if (!options.stack10bit)
     {
-      if (options.model != MODEL_FLAT24)
-	{
-	  fprintf (stderr,
-		   "*** warning: 10 bit stack mode is only supported in flat24 model.\n");
-	  fprintf (stderr, "\t10 bit stack mode disabled.\n");
-	  options.stack10bit = 0;
-	}
-      else
-	{
-	  /* Fixup the memory map for the stack; it is now in
-	   * far space and requires a FPOINTER to access it.
-	   */
-	  istack->fmap = 1;
-	  istack->ptrType = FPOINTER;
-	}
+    fprintf (stderr,
+	     "*** error: ds390 port only supports the 10 bit stack mode.\n");
     }
+
+  /* Fixup the memory map for the stack; it is now in
+   * far space and requires a FPOINTER to access it.
+   */
+  istack->fmap = 1;
+  istack->ptrType = FPOINTER;
 }
 
 static void
 _ds390_setDefaultOptions (void)
 {
+  options.model=MODEL_FLAT24;
+  options.stack10bit=1;
 }
 
 static const char *