Pointers - Applied function ptr patch from Steve Tell. Fixed bugs with

[fw/sdcc] / src / pic / pcodepeep.c

diff --git a/src/pic/pcodepeep.c b/src/pic/pcodepeep.c
index e6eea82256cf4ad87a8b60c6d9f5e940915a7515..9acc689f5fb095c0a8e3efdec21c7e529ad370e1 100644 (file)
--- a/src/pic/pcodepeep.c
+++ b/src/pic/pcodepeep.c
@@ -1712,7 +1712,8 @@ int pCodePeepMatchLine(pCodePeep *peepBlock, pCode *pcs, pCode *pcd)
            case PO_GPR_TEMP:
            case PO_FSR:
              //case PO_INDF:
-             n = PCOR(PCI(pcs)->pcop)->r->name;
+             //n = PCOR(PCI(pcs)->pcop)->r->name;
+             n = PCI(pcs)->pcop->name;
 
              break;
            default:
@@ -1863,6 +1864,26 @@ void pCodeInsertAfter(pCode *pc1, pCode *pc2)
 
 }
 
+/*------------------------------------------------------------------*/
+/*  pCodeInsertBefore - splice in the pCode chain starting with pc2 */
+/*                      into the pCode chain containing pc1         */
+/*------------------------------------------------------------------*/
+void pCodeInsertBefore(pCode *pc1, pCode *pc2)
+{
+
+  if(!pc1 || !pc2)
+    return;
+
+  pc2->prev = pc1->prev;
+  if(pc1->prev)
+    pc1->prev->next = pc2;
+
+  pc2->pb = pc1->pb;
+  pc2->next = pc1;
+  pc1->prev = pc2;
+
+}
+
 /*-----------------------------------------------------------------*/
 /* pCodeOpCopy - copy a pcode operator                             */
 /*-----------------------------------------------------------------*/
@@ -1927,6 +1948,7 @@ pCodeOp *pCodeOpCopy(pCodeOp *pcop)
     return pcopnew;
     break;
 
+  case PO_GPR_POINTER:
   case PO_GPR_REGISTER:
   case PO_GPR_TEMP:
   case PO_FSR: