Many changes. Started a second pass to the register allocator & true 10bit stack

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

diff --git a/src/ds390/main.c b/src/ds390/main.c
index b1ff65bc770dc8cb4383135c62b529f9ee63989b..f343ebaf3031a7940b2c5de95995f4ddcbd53808 100644 (file)
--- a/src/ds390/main.c
+++ b/src/ds390/main.c
@@ -105,9 +105,9 @@ _ds390_finaliseOptions (void)
     port->s.fptr_size = 3;
     port->s.gptr_size = 4;
 
-    port->stack.isr_overhead++;        /* Will save dpx on ISR entry. */
+    port->stack.isr_overhead += 2;     /* Will save dpx on ISR entry. */
 
-    port->stack.call_overhead++;       /* This acounts for the extra byte 
+    port->stack.call_overhead += 2;    /* This acounts for the extra byte 
                                 * of return addres on the stack.
                                 * but is ugly. There must be a 
                                 * better way.
@@ -121,6 +121,12 @@ _ds390_finaliseOptions (void)
     fprintf (stderr,
             "*** error: ds390 port only supports the 10 bit stack mode.\n");
     }
+    
+    /* generate native code 16*16 mul/div */
+    if (options.useAccelerator) 
+           port->support.muldiv=2;
+    else 
+           port->support.muldiv=1;
 
      /* Fixup the memory map for the stack; it is now in
      * far space and requires a FPOINTER to access it.
@@ -157,6 +163,12 @@ _ds390_genAssemblerPreamble (FILE * of)
       fputs ("dph1 = 0x85\t\t; dph1 register unknown to assembler\n", of);
       fputs ("dpx1 = 0x95\t\t; dpx1 register unknown to assembler\n", of);
       fputs ("ap = 0x9C\t\t; ap register unknown to assembler\n", of);
+      fputs ("mcnt0 = 0xD1\t\t; mcnt0 register unknown to assembler\n", of);
+      fputs ("mcnt1 = 0xD2\t\t; mcnt1 register unknown to assembler\n", of);
+      fputs ("ma = 0xD3\t\t; ma register unknown to assembler\n", of);
+      fputs ("mb = 0xD4\t\t; mb register unknown to assembler\n", of);
+      fputs ("mc = 0xD5\t\t; mc register unknown to assembler\n", of);
+      fputs ("F1 = 0xD1\t\t; F1 user flag unknown to assembler\n", of);
 }
 
 /* Generate interrupt vector table. */
@@ -189,6 +201,31 @@ _ds390_genIVT (FILE * of, symbol ** interrupts, int maxInterrupts)
   return TRUE;
 }
 
+/* Do CSE estimation */
+static bool cseCostEstimation (iCode *ic, iCode *pdic)
+{
+    operand *result = IC_RESULT(ic);
+    operand *right  = IC_RIGHT(ic);
+    operand *left   = IC_LEFT(ic);
+    sym_link *result_type = operandType(result);
+    sym_link *right_type  = (right ? operandType(right) : 0);
+    sym_link *left_type   = (left  ? operandType(left)  : 0);
+    
+    /* 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
@@ -200,9 +237,9 @@ static const char *_linkCmd[] =
   "aslink", "-nf", "$1", NULL
 };
 
-static const char *_asmCmd[] =
+/* $3 is replaced by assembler.debug_opts resp. port->assembler.plain_opts */   static const char *_asmCmd[] =
 {
-  "asx8051", "$l", "-plosgff", "$1.asm", NULL
+  "asx8051", "$l", "$3", "$1.asm", NULL
 };
 
 /* Globals */
@@ -218,6 +255,7 @@ PORT ds390_port =
   },
   {
     _asmCmd,
+    NULL,
     "-plosgffc",               /* Options with debug */
     "-plosgff",                        /* Options without debug */
     0,
@@ -226,6 +264,7 @@ PORT ds390_port =
   {
     _linkCmd,
     NULL,
+    NULL,
     ".rel"
   },
   {
@@ -255,9 +294,9 @@ PORT ds390_port =
   {
     +1, 1, 4, 1, 1, 0
   },
-    /* ds390 has an 8 bit mul */
+    /* ds390 has an 16 bit mul & div */
   {
-    1, -1
+    2, -1
   },
   "_",
   _ds390_init,
@@ -273,6 +312,7 @@ PORT ds390_port =
   _ds390_regparm,
   NULL,
   NULL,
+  NULL,
   FALSE,
   0,                           /* leave lt */
   0,                           /* leave gt */
@@ -281,5 +321,6 @@ PORT ds390_port =
   1,                           /* transform != to !(a == b) */
   0,                           /* leave == */
   TRUE,                         /* we support array initializers. */
+  cseCostEstimation,
   PORT_MAGIC
 };