* as/asx8051.dsp: added mcs51/strcmpi.h

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

diff --git a/src/pic16/main.c b/src/pic16/main.c
index e630439c3bf6e4dd35f5bfda2b052ed6fbf4864e..c9515fbb23c18e202c063425956da6d63ccb6ccc 100644 (file)
--- a/src/pic16/main.c
+++ b/src/pic16/main.c
@@ -62,6 +62,9 @@ static char *_pic16_keywords[] =
   "_naked",
   "shadowregs",
   "wparam",
+  "prodlp",
+  "prodhp",
+  "fsr0lp",
   "fixed16x16",
   
 //  "bit",
@@ -76,6 +79,8 @@ static char *_pic16_keywords[] =
 
 pic16_sectioninfo_t pic16_sectioninfo;
 
+int xinst=0;
+
 
 extern char *pic16_processor_base_name(void);
 
@@ -95,7 +100,6 @@ extern set *libFilesSet;
 /* for an unknowned reason. - EEP */
 void pic16_emitDebuggerSymbol (char *);
  
-extern regs* newReg(short type, short pc_type, int rIdx, char *name, int size, int alias, operand *refop);
 extern void pic16_emitConfigRegs(FILE *of);
 extern void pic16_emitIDRegs(FILE *of);
 
@@ -206,14 +210,10 @@ _process_pragma(const char *sz)
         stackLen = 64;
         fprintf(stderr, "%s:%d: warning: setting stack to default size %d (0x%04x)\n",
                 filename, lineno-1, stackLen, stackLen);
-                        
-//      fprintf(stderr, "%s:%d setting stack to default size %d\n", __FILE__, __LINE__, stackLen);
       }
 
-//      fprintf(stderr, "Initializing stack pointer at 0x%x len 0x%x\n", stackPos, stackLen);
-
       /* check sanity of stack */
-      if ((stackPos >> 8) != ((stackPos+stackLen) >> 8)) {
+      if ((stackPos >> 8) != ((stackPos+stackLen-1) >> 8)) {
         fprintf (stderr, "%s:%u: warning: stack [0x%03X,0x%03X] crosses memory bank boundaries (not fully tested)\n",
                filename,lineno-1, stackPos, stackPos+stackLen-1);
       }
@@ -477,6 +477,10 @@ OPTION pic16_optionsTable[]= {
        { 0,    OPTIMIZE_GOTO,  NULL,                   "try to use (conditional) BRA instead of GOTO"},
        { 0,    OPTIMIZE_CMP,   NULL,                   "try to optimize some compares"},
        { 0,    OPTIMIZE_DF,    NULL,                   "thoroughly analyze data flow (memory and time intensive!)"},
+       { 0,    "--num-func-alloc-regs", &pic16_options.CATregs, "dump number of temporary registers allocated for each function"},
+#if XINST
+       { 'y',  "--extended",   &xinst, "enable Extended Instruction Set/Literal Offset Addressing mode"},
+#endif
        { 0,    NULL,           NULL,   NULL}
        };
 
@@ -648,9 +652,9 @@ extern set *asmOptionsSet;
 static void _pic16_linkEdit(void)
 {
   hTab *linkValues=NULL;
-  char lfrm[256];
+  char lfrm[1024];
   char *lcmd;
-  char temp[128];
+  char temp[1024];
   set *tSet=NULL;
   int ret;
   
@@ -659,7 +663,6 @@ static void _pic16_linkEdit(void)
         * {linker} {incdirs} {lflags} -o {outfile} {spec_ofiles} {ofiles} {libs}
         *
         */
-        
        sprintf(lfrm, "{linker} {incdirs} {lflags} -o {outfile} {user_ofile} {ofiles} {spec_ofiles} {libs}");
 
        shash_add(&linkValues, "linker", pic16_linkCmd[0]);
@@ -826,6 +829,7 @@ _pic16_setDefaultOptions (void)
   pic16_options.ip_stack = 1;          /* set to 1 to enable ipop/ipush for stack */
   pic16_options.gstack = 0;
   pic16_options.debgen = 0;
+  pic16_options.CATregs = 0;
 }
 
 static const char *
@@ -915,13 +919,17 @@ static bool _hasNativeMulFor (iCode *ic, sym_link *left, sym_link *right)
        /* multiplication is fixed */
        /* support mul for char/int/long */
        if((ic->op == '*')
-         && (getSize(OP_SYMBOL(IC_LEFT(ic))->type ) < 2))return TRUE;
+         && (IS_SYMOP(IC_LEFT(ic)))
+         && (getSize(OP_SYMBOL(IC_LEFT(ic))->type ) < 2))
+           return TRUE;
 #endif
 
 #if 0
        /* support div for char/int/long */
-       if((getSize(OP_SYMBOL(IC_LEFT(ic))->type ) < 0)
-               && (ic->op == '/'))return TRUE;
+       if((ic->op == '/')
+         && (IS_SYMOP(IC_LEFT(ic)))
+         && (getSize(OP_SYMBOL(IC_LEFT(ic))->type ) < 0))
+           return TRUE;
 #endif
        
   return FALSE;