Added CLRWDT instruction again (this time correctly).

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

diff --git a/src/pic/pcode.c b/src/pic/pcode.c
index 41c8f80dc410da1183a16ac61a8472048b9fb7d4..31f5fda3168e8bdf46a27bf261abf40fb6bb9b5c 100644 (file)
--- a/src/pic/pcode.c
+++ b/src/pic/pcode.c
@@ -1317,6 +1317,7 @@ void pic14initMnemonics(void)
   pic14Mnemonics[POC_COMFW] = &pciCOMFW;
   pic14Mnemonics[POC_CLRF] = &pciCLRF;
   pic14Mnemonics[POC_CLRW] = &pciCLRW;
+  pic14Mnemonics[POC_CLRWDT] = &pciCLRWDT;
   pic14Mnemonics[POC_DECF] = &pciDECF;
   pic14Mnemonics[POC_DECFW] = &pciDECFW;
   pic14Mnemonics[POC_DECFSZ] = &pciDECFSZ;
@@ -4679,6 +4680,7 @@ void AnalyzeFlow(int level)
   /*
   for(pb = the_pFile->pbHead; pb; pb = pb->next)
     BuildFlowTree(pb);
+
   */
 
   /* Phase x - Flow Analysis - Used Banks

diff --git a/src/pic/pcode.h b/src/pic/pcode.h
index f25e0c3f714af000bbab9de485a839a22c8d39b8..7d5e57f586c43e5f57c84e8c86cd908aa8637d3b 100644 (file)
--- a/src/pic/pcode.h
+++ b/src/pic/pcode.h
@@ -450,6 +450,9 @@ typedef struct pCodeFlow
 
   set *from;    /* flow blocks that can send control to this flow block */
   set *to;      /* flow blocks to which this one can send control */
+  struct pCodeFlow *ancestor; /* The most immediate "single" pCodeFlow object that
+                              * executes prior to this one. In many cases, this 
+                              * will be just the previous */
 
   int inCond;   /* Input conditions - stuff assumed defined at entry */
   int outCond;  /* Output conditions - stuff modified by flow block */

diff --git a/src/pic/pcodeflow.c b/src/pic/pcodeflow.c
index 3cce0d5b13d68e0613f5baee8a317ff10039e34a..e3e47e0d4fc1035208010779c0f9d42b139b5c4c 100644 (file)
--- a/src/pic/pcodeflow.c
+++ b/src/pic/pcodeflow.c
@@ -156,7 +156,7 @@ void BuildFlowTree(pBlock *pb)
 }
 #endif
 
-void BuildFlowAncestry(pBlock *pb)
+void BuildFlowTree(pBlock *pb)
 {
   pCode *pc=NULL;
   pCode *pcflow;

diff --git a/src/pic/pcodeflow.h b/src/pic/pcodeflow.h
index c8b53199895582965ec5c8b11bb4c65392af919c..d7c3b57e914692a2fcc4c44e62adc328c911ddd3 100644 (file)
--- a/src/pic/pcodeflow.h
+++ b/src/pic/pcodeflow.h
@@ -19,8 +19,8 @@
    
 -------------------------------------------------------------------------*/
 
-#ifndef __PCODE_FLOW_H__
-#define __PCODE_FLOW_H__
+#ifndef __PCODEFLOW_H__
+#define __PCODEFLOW_H__
 
 /*************************************************
  * pCode conditions:
@@ -60,4 +60,6 @@
 
 /*------------------------------------------------------------*/
 
-#endif // __PCODE_H__
+void BuildFlowAncestry(pBlock *pb);
+
+#endif // __PCODEFLOW_H__