updated to reflect changes in the port structure

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

diff --git a/src/mcs51/main.c b/src/mcs51/main.c
index b23a03d0e15ad7db0455d61a16b8fa466d401014..b91a622c9c9b773258744fcf2de2f431a2fcddac 100644 (file)
--- a/src/mcs51/main.c
+++ b/src/mcs51/main.c
@@ -40,6 +40,7 @@ static char *_mcs51_keywords[] =
   "_pdata",
   "_idata",
   "_naked",
+  "_overlay",
   NULL
 };
 
@@ -120,6 +121,60 @@ _mcs51_genIVT (FILE * of, symbol ** interrupts, int maxInterrupts)
   return FALSE;
 }
 
+/* Generate code to copy XINIT to XISEG */
+static void _mcs51_genXINIT (FILE * of) {
+  fprintf (of, ";      _mcs51_genXINIT() start\n");
+  fprintf (of, "       mov     a,#l_XINIT\n");
+  fprintf (of, "       orl     a,#l_XINIT>>8\n");
+  fprintf (of, "       jz      00003$\n");
+  fprintf (of, "       mov     a,#s_XINIT\n");
+  fprintf (of, "       add     a,#l_XINIT\n");
+  fprintf (of, "       mov     r1,a\n");
+  fprintf (of, "       mov     a,#s_XINIT>>8\n");
+  fprintf (of, "       addc    a,#l_XINIT>>8\n");
+  fprintf (of, "       mov     r2,a\n");
+  fprintf (of, "       mov     dptr,#s_XINIT\n");
+  fprintf (of, "       mov     r0,#s_XISEG\n");
+  fprintf (of, "       mov     p2,#(s_XISEG >> 8)\n");
+  fprintf (of, "00001$:        clr     a\n");
+  fprintf (of, "       movc    a,@a+dptr\n");
+  fprintf (of, "       movx    @r0,a\n");
+  fprintf (of, "       inc     dptr\n");
+  fprintf (of, "       inc     r0\n");
+  fprintf (of, "       cjne    r0,#0,00002$\n");
+  fprintf (of, "       inc     p2\n");
+  fprintf (of, "00002$:        mov     a,dpl\n");
+  fprintf (of, "       cjne    a,ar1,00001$\n");
+  fprintf (of, "       mov     a,dph\n");
+  fprintf (of, "       cjne    a,ar2,00001$\n");
+  fprintf (of, "       mov     p2,#0xFF\n");
+  fprintf (of, "00003$:\n");
+  fprintf (of, ";      _mcs51_genXINIT() end\n");
+}
+
+
+/* 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,7 +183,7 @@ _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 */
@@ -154,7 +209,8 @@ PORT mcs51_port =
     "-plosgffc",               /* Options with debug */
     "-plosgff",                        /* Options without debug */
     0,
-    ".asm"
+    ".asm",
+    NULL                       /* no do_assemble function */
   },
   {
     _linkCmd,
@@ -181,7 +237,9 @@ PORT mcs51_port =
     "GSINIT  (CODE)",
     "OSEG    (OVR,DATA)",
     "GSFINAL (CODE)",
-    "HOME       (CODE)",
+    "HOME    (CODE)",
+    "XISEG   (XDATA)", // initialized xdata
+    "XINIT   (CODE)", // a code copy of xiseg
     NULL,
     NULL,
     1
@@ -202,11 +260,14 @@ PORT mcs51_port =
   _mcs51_getRegName,
   _mcs51_keywords,
   _mcs51_genAssemblerPreamble,
+  NULL,                                /* no genAssemblerEnd */
   _mcs51_genIVT,
+  _mcs51_genXINIT,
   _mcs51_reset_regparm,
   _mcs51_regparm,
   NULL,
   NULL,
+  NULL,
   FALSE,
   0,                           /* leave lt */
   0,                           /* leave gt */
@@ -215,5 +276,10 @@ PORT mcs51_port =
   1,                           /* transform != to !(a == b) */
   0,                           /* leave == */
   FALSE,                        /* No array initializer support. */
+  cseCostEstimation,
+  NULL,                        /* no builtin functions */
+  GPOINTER,                    /* treat unqualified pointers as "generic" pointers */
+  1,                           /* reset labelKey to 1 */
+  1,                           /* globals & local static allowed */
   PORT_MAGIC
 };