Cleaned up warnings

[fw/sdcc] / src / mcs51 / main.c

diff --git a/src/mcs51/main.c b/src/mcs51/main.c
index 2e85421e4d71e1c6a64c46fab69bcadc8cef2925..bbe4921c6319352360ddfebce789653669531596 100644 (file)
--- a/src/mcs51/main.c
+++ b/src/mcs51/main.c
@@ -39,6 +39,7 @@ static char *_mcs51_keywords[] =
   "_xdata",
   "_pdata",
   "_idata",
+  "_naked",
   NULL
 };
 
@@ -83,8 +84,7 @@ _mcs51_parseOptions (int *pargc, char **argv, int *i)
 static void
 _mcs51_finaliseOptions (void)
 {
-  if (options.model == MODEL_LARGE)
-    {
+  if (options.model == MODEL_LARGE) {
       port->mem.default_local_map = xdata;
       port->mem.default_globl_map = xdata;
     }
@@ -120,6 +120,28 @@ _mcs51_genIVT (FILE * of, symbol ** interrupts, int maxInterrupts)
   return FALSE;
 }
 
+/* Do CSE estimation */
+static bool cseCostEstimation (iCode *ic, iCode *pdic)
+{
+    operand *result = IC_RESULT(ic);
+    sym_link *result_type = operandType(result);
+
+    /* if it is a pointer then return ok for now */
+    if (IC_RESULT(ic) && IS_PTR(result_type)) return 1;
+    
+    /* if bitwise | add & subtract then no since mcs51 is pretty good at it 
+       so we will cse only if they are local (i.e. both ic & pdic belong to
+       the same basic block */
+    if (IS_BITWISE_OP(ic) || ic->op == '+' || ic->op == '-') {
+       /* then if they are the same Basic block then ok */
+       if (ic->eBBlockNum == pdic->eBBlockNum) return 1;
+       else return 0;
+    }
+       
+    /* for others it is cheaper to do the cse */
+    return 1;
+}
+
 /** $1 is always the basename.
     $2 is always the output file.
     $3 varies
@@ -128,12 +150,13 @@ _mcs51_genIVT (FILE * of, symbol ** interrupts, int maxInterrupts)
 */
 static const char *_linkCmd[] =
 {
-  "aslink", "-nf", "$1", NULL
+  "{bindir}{sep}aslink", "-nf", "$1", NULL
 };
 
+/* $3 is replaced by assembler.debug_opts resp. port->assembler.plain_opts */
 static const char *_asmCmd[] =
 {
-  "asx8051", "-plosgffc", "$1.asm", NULL
+  "asx8051", "$l", "$3", "$1.asm", NULL
 };
 
 /* Globals */
@@ -149,13 +172,16 @@ PORT mcs51_port =
   },
   {
     _asmCmd,
+    NULL,
     "-plosgffc",               /* Options with debug */
     "-plosgff",                        /* Options without debug */
-    0
+    0,
+    ".asm"
   },
   {
     _linkCmd,
     NULL,
+    NULL,
     ".rel"
   },
   {
@@ -163,7 +189,7 @@ PORT mcs51_port =
   },
   {
        /* Sizes: char, short, int, long, ptr, fptr, gptr, bit, float, max */
-    1, 1, 2, 4, 1, 2, 3, 1, 4, 4
+    1, 2, 2, 4, 1, 2, 3, 1, 4, 4
   },
   {
     "XSEG    (XDATA)",
@@ -187,7 +213,7 @@ PORT mcs51_port =
   },
     /* mcs51 has an 8 bit mul */
   {
-    1, 0
+    1, -1
   },
   "_",
   _mcs51_init,
@@ -202,6 +228,8 @@ PORT mcs51_port =
   _mcs51_reset_regparm,
   _mcs51_regparm,
   NULL,
+  NULL,
+  NULL,
   FALSE,
   0,                           /* leave lt */
   0,                           /* leave gt */
@@ -209,5 +237,8 @@ PORT mcs51_port =
   1,                           /* transform >= to ! < */
   1,                           /* transform != to !(a == b) */
   0,                           /* leave == */
+  FALSE,                        /* No array initializer support. */
+  cseCostEstimation,
+  NULL,                        /* no builtin functions */
   PORT_MAGIC
 };