* applied a previous patch from Raphael Neider that wasn't included

in the previous commits, which fixes infinite loops within jumptable
improvements,
* made some fixes that previous patches introduced

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

diff --git a/ChangeLog b/ChangeLog
index ce7289d39f48a8c18e88cbe5a76873b3e5bdd86c..10651a5474e8c248e33c22b575a13847bc98ac2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-22 Vangelis Rokas <vrokas AT otenet.gr>
+
+       * applied a previous patch from Raphael Neider that wasn't included
+       in the previous commits, which fixes infinite loops within jumptable
+       improvements,
+       * made some fixes that previous patches introduced
+
 2004-12-21 Vangelis Rokas <vrokas AT otenet.gr>
 
        * src/pic16/gen.c (pic16_aopGet): applied fix from Raphael Neider

diff --git a/src/pic16/gen.c b/src/pic16/gen.c
index f2781a8ef24187b9ac1170e2a684d87bd9626a7b..3ce98f4676b4db01d35344331b3e2049307e9abc 100644 (file)
--- a/src/pic16/gen.c
+++ b/src/pic16/gen.c
@@ -1933,7 +1933,7 @@ pCodeOp *pic16_popGet (asmop *aop, int offset) //, bool bit16, bool dname)
        
        DEBUGpic16_emitcode(";*+*", "%d\tAOP_REG type = %s\n", __LINE__, dumpPicOptype(pcop->type));
        rs = aop->aopu.aop_reg[offset]->name;
-       DEBUGpic16_emitcode(";","%d regiser idx = %d name = %s",__LINE__,rIdx,rs);
+       DEBUGpic16_emitcode(";","%d register idx = %d name = %s",__LINE__,rIdx,rs);
        return pcop;
       }
 
@@ -12224,16 +12224,6 @@ static void genAssign (iCode *ic)
 //                     sizeof(unsigned long int), sizeof(float));
 
 
-  if (AOP_TYPE(right) == AOP_REG) {
-    DEBUGpic16_emitcode(";   ", "%s:%d assign from register\n", __FUNCTION__, __LINE__);
-    while (size--) {
-      
-      pic16_emitpcode (POC_MOVFF, pic16_popGet2(AOP(right), AOP(result), offset++));
-    } // while
-    goto release;
-  }
-
-
   if (AOP_TYPE(right) == AOP_REG) {
     DEBUGpic16_emitcode(";   ", "%s:%d assign from register\n", __FUNCTION__, __LINE__);
     while (size--) {
@@ -12857,7 +12847,6 @@ static void genCast (iCode *ic)
       mov2f(AOP(result), AOP(right), offset);
       offset++;
     }
-    pic16_emitpinfo (INF_OPTIMIZATION, pic16_newpCodeOpOpt (OPT_JUMPTABLE_END, ""));
 
     /* now depending on the sign of the destination */
     size = AOP_SIZE(result) - AOP_SIZE(right);

diff --git a/src/pic16/pcode.c b/src/pic16/pcode.c
index 9f5522b2b27e69a1a8c3c2b1ecfd0f2ea069e048..085d7e94e303fbdf8933d807fe5e431052799151 100644 (file)
--- a/src/pic16/pcode.c
+++ b/src/pic16/pcode.c
@@ -4657,7 +4657,7 @@ const char *immdmod[3]={"LOW", "HIGH", "UPPER"};
 char *pic16_get_op(pCodeOp *pcop,char *buffer, size_t size)
 {
   regs *r;
-  static char b[50];
+  static char b[128];
   char *s;
   int use_buffer = 1;    // copy the string to the passed buffer pointer
 
@@ -7106,9 +7106,10 @@ pCode *getNegatedBcc (pCode *bcc, pCodeOp *pcop)
   return newBcc;
 }
 
-#define MAX_DIST_GOTO 0x7FFFFFFF
-#define MAX_DIST_BRA 1020
-#define MAX_DIST_BCC 120
+#define MAX_DIST_GOTO         0x7FFFFFFF
+#define MAX_DIST_BRA                1020       // maximum offset (in bytes) possible with BRA
+#define MAX_DIST_BCC                 120       // maximum offset (in bytes) possible with Bcc
+#define MAX_JUMPCHAIN_DEPTH           16       // number of GOTOs to follow in resolveJumpChain() (to prevent endless loops)
 #define IS_GOTO(arg) ((arg) && isPCI(arg) && (PCI(arg)->op == POC_GOTO || PCI(arg)->op == POC_BRA))
 
 /* Follows GOTO/BRA instructions to their target instructions, stores the
@@ -7116,37 +7117,46 @@ pCode *getNegatedBcc (pCode *bcc, pCodeOp *pcop)
  * the distance from the original pc to *target.
  */
 int resolveJumpChain (pCode *pc, pCode **target, pCodeOp **pcop) {
-  pCode *curr = pc;
-  pCode *last = NULL;
-  pCodeOp *lastPCOP = NULL;
-  int dist = 0;
-
-  /* only follow unconditional branches, except for the initial pCode (which may be a conditional branch) */
-  while (curr && isPCI(curr) && (PCI(curr)->op == POC_GOTO || PCI(curr)->op == POC_BRA
-                                || (curr == pc && isConditionalBranch(curr)))) {
-    last = curr;
-    lastPCOP = PCI(curr)->pcop;
-    dist = findpCodeLabel (pc, PCI(curr)->pcop->name, MAX_DIST_GOTO, &curr);
-  } // while
-  
-  if (target) *target = last;
-  if (pcop) *pcop = lastPCOP;
-  return dist;
+       pCode *curr = pc;
+       pCode *last = NULL;
+       pCodeOp *lastPCOP = NULL;
+       int dist = 0;
+       int depth = 0;
+
+       //fprintf (stderr, "%s:%d: -=-", __FUNCTION__, __LINE__);
+
+       /* only follow unconditional branches, except for the initial pCode (which may be a conditional branch) */
+       while (curr && (last != curr) && (depth++ < MAX_JUMPCHAIN_DEPTH) && isPCI(curr)
+                       && (PCI(curr)->op == POC_GOTO || PCI(curr)->op == POC_BRA || (curr == pc && isConditionalBranch(curr)))) {
+               last = curr;
+               lastPCOP = PCI(curr)->pcop;
+               dist = findpCodeLabel (pc, PCI(curr)->pcop->name, MAX_DIST_GOTO, &curr);
+               //fprintf (stderr, "last:%p, curr:%p, label:%s\n", last, curr, PCI(last)->pcop->name);
+       } // while
+
+       if (target) *target = last;
+       if (pcop) *pcop = lastPCOP;
+       return dist;
 }
 
 /* Returns pc if it is not a OPT_JUMPTABLE_BEGIN INFO pCode.
  * Otherwise the first pCode after the jumptable (after
  * the OPT_JUMPTABLE_END tag) is returned.
  */
-pCode *skipJumptables (pCode *pc)
+pCode *skipJumptables (pCode *pc, int *isJumptable)
 {
+  *isJumptable = 0;
   if (!pc) return NULL;
-
+  
   while (pc->type == PC_INFO && PCINF(pc)->type == INF_OPTIMIZATION && PCOO(PCINF(pc)->oper1)->type == OPT_JUMPTABLE_BEGIN) {
+    *isJumptable = 1;
+    //fprintf (stderr, "SKIPPING jumptable\n");
     do {
+      //pc->print(stderr, pc);
       pc = pc->next;
     } while (pc && (pc->type != PC_INFO || PCINF(pc)->type != INF_OPTIMIZATION
                    || PCOO(PCINF(pc)->oper1)->type != OPT_JUMPTABLE_END));
+    //fprintf (stderr, "<<JUMPTAB:\n");
     // skip OPT_END as well
     if (pc) pc = pc->next;
   } // while
@@ -7154,10 +7164,20 @@ pCode *skipJumptables (pCode *pc)
   return pc;
 }
 
-pCode *pic16_findNextInstructionSkipJumptables (pCode *pc)
+pCode *pic16_findNextInstructionSkipJumptables (pCode *pc, int *isJumptable)
 {
+  int isJumptab;
+  *isJumptable = 0;
   while (pc && !isPCI(pc) && !isPCAD(pc) && !isPCW(pc)) {
-    pc = skipJumptables (pc->next);
+    // set pc to the first pCode after a jumptable, leave pc untouched otherwise
+    pc = skipJumptables (pc, &isJumptab);
+    if (isJumptab) {
+        // pc is the first pCode after the jumptable
+       *isJumptable = 1;
+    } else {
+        // pc has not been changed by skipJumptables()
+       pc = pc->next;
+    }
   } // while
   
   return pc;
@@ -7177,7 +7197,7 @@ void pic16_OptimizeJumps ()
   pCode *pc_next = NULL;
   pBlock *pb;
   pCode *target;
-  int change, iteration;
+  int change, iteration, isJumptab;
   int isHandled = 0;
   char *label;
   int opt=0, toofar=0, opt_cond = 0, cond_toofar=0, opt_reorder = 0, opt_gotonext = 0, opt_gotochain = 0;
@@ -7195,8 +7215,13 @@ void pic16_OptimizeJumps ()
       pc = pic16_findNextInstruction (pb->pcHead);
     
       while (pc) {
-       pc_next = pic16_findNextInstructionSkipJumptables (pc->next);
-       
+       pc_next = pic16_findNextInstructionSkipJumptables (pc->next, &isJumptab);
+       if (isJumptab) {
+               // skip jumptable, i.e. start over with no pc_prev!     
+               pc_prev = NULL;
+               pc = pc_next;
+               continue;
+       } // if
 
        /* (1) resolve chained jumps
         * Do not perform this until pattern (4) is no longer present! Otherwise we will
@@ -7370,9 +7395,11 @@ void pic16_OptimizeJumps ()
             "\t%5d chained GOTOs resolved\n",
             opt, toofar, opt_cond, cond_toofar, opt_reorder, opt_gotonext, opt_gotochain);
   } // if
+  //fprintf (stderr, "%s:%d: %s\n", __FILE__, __LINE__, __FUNCTION__);
 }
 
 #undef IS_GOTO
+#undef MAX_JUMPCHAIN_DEPTH
 #undef MAX_DIST_GOTO
 #undef MAX_DIST_BRA
 #undef MAX_DIST_BCC

diff --git a/src/pic16/pcodepeep.c b/src/pic16/pcodepeep.c
index 6660a28efebeb01bb6fb90ca297eb7dddac6d1ee..dbd3558aa5074fc3dcca2631dab81641dee2a186 100644 (file)
--- a/src/pic16/pcodepeep.c
+++ b/src/pic16/pcodepeep.c
@@ -1739,7 +1739,7 @@ int pic16_pCodeSearchCondition(pCode *pc, unsigned int cond)
  *-----------------------------------------------------------------*/
 static int pCodeOpCompare(pCodeOp *pcops, pCodeOp *pcopd)
 {
-  char b[50], *n2;
+  char b[128], *n2;
 
   if(!pcops || !pcopd)
     return 0;
@@ -1766,7 +1766,7 @@ static int pCodeOpCompare(pCodeOp *pcops, pCodeOp *pcopd)
   }
 
   b[0]=0;
-  pic16_get_op(pcops,b,50);
+  pic16_get_op(pcops,b,128);
 
   n2 = pic16_get_op(pcopd,NULL,0);