varA = (varB > CONSTANT); Was not compiling correctly.
[fw/sdcc] / src / pic / pcode.c
index 1e80a0547f7a97661377ea9bff35706aa0efed33..808aeaaa81d03cb8a642d5cb42d0e48ae0614eab 100644 (file)
 
 
 #include "pcode.h"
+#include "pcodeflow.h"
 #include "ralloc.h"
+#include "device.h"
+
+#if defined(__BORLANDC__) || defined(_MSC_VER)
+#define STRCASECMP stricmp
+#else
+#define STRCASECMP strcasecmp
+#endif
+
+/****************************************************************/
+/****************************************************************/
+
+peepCommand peepCommands[] = {
+
+  {NOTBITSKIP, "_NOTBITSKIP_"},
+  {BITSKIP, "_BITSKIP_"},
+  {INVERTBITSKIP, "_INVERTBITSKIP_"},
+
+  {-1, NULL}
+};
+
+
+
 // Eventually this will go into device dependent files:
-pCodeOpReg pc_status    = {{PO_STATUS,  "STATUS"}, -1, NULL,NULL};
-pCodeOpReg pc_indf      = {{PO_INDF,    "INDF"}, -1, NULL,NULL};
-pCodeOpReg pc_fsr       = {{PO_FSR,     "FSR"}, -1, NULL,NULL};
+pCodeOpReg pc_status    = {{PO_STATUS,  "_STATUS"}, -1, NULL,0,NULL};
+pCodeOpReg pc_indf      = {{PO_INDF,    "INDF"}, -1, NULL,0,NULL};
+pCodeOpReg pc_fsr       = {{PO_FSR,     "FSR"}, -1, NULL,0,NULL};
+pCodeOpReg pc_intcon    = {{PO_INTCON,  ""}, -1, NULL,0,NULL};
+pCodeOpReg pc_pcl       = {{PO_PCL,     "PCL"}, -1, NULL,0,NULL};
+pCodeOpReg pc_pclath    = {{PO_PCLATH,  "_PCLATH"}, -1, NULL,0,NULL};
+
+pCodeOpReg pc_kzero     = {{PO_GPR_REGISTER,  "KZ"}, -1, NULL,0,NULL};
+pCodeOpReg pc_wsave     = {{PO_GPR_REGISTER,  "WSAVE"}, -1, NULL,0,NULL};
+pCodeOpReg pc_ssave     = {{PO_GPR_REGISTER,  "SSAVE"}, -1, NULL,0,NULL};
 
 static int mnemonics_initialized = 0;
 
-#if 0
-//static char *PIC_mnemonics[] = {
-static char *scpADDLW = "ADDLW";
-static char *scpADDWF = "ADDWF";
-static char *scpANDLW = "ANDLW";
-static char *scpANDWF = "ANDWF";
-static char *scpBCF = "BCF";
-static char *scpBSF = "BSF";
-static char *scpBTFSC = "BTFSC";
-static char *scpBTFSS = "BTFSS";
-static char *scpCALL = "CALL";
-static char *scpCOMF = "COMF";
-static char *scpCLRF = "CLRF";
-static char *scpCLRW = "CLRW";
-static char *scpDECF = "DECF";
-static char *scpDECFSZ = "DECFSZ";
-static char *scpGOTO = "GOTO";
-static char *scpINCF = "INCF";
-static char *scpINCFSZ = "INCFSZ";
-static char *scpIORLW = "IORLW";
-static char *scpIORWF = "IORWF";
-static char *scpMOVF = "MOVF";
-static char *scpMOVLW = "MOVLW";
-static char *scpMOVWF = "MOVWF";
-static char *scpNEGF = "NEGF";
-static char *scpRETLW = "RETLW";
-static char *scpRETURN = "RETURN";
-static char *scpSUBLW = "SUBLW";
-static char *scpSUBWF = "SUBWF";
-static char *scpTRIS = "TRIS";
-static char *scpXORLW = "XORLW";
-static char *scpXORWF = "XORWF";
-#endif
 
 static hTab *pic14MnemonicsHash = NULL;
+static hTab *pic14pCodePeepCommandsHash = NULL;
 
 
 
 static pFile *the_pFile = NULL;
-static int peepOptimizing = 1;
+static pBlock *pb_dead_pcodes = NULL;
+
+/* Hardcoded flags to change the behavior of the PIC port */
+static int peepOptimizing = 1;        /* run the peephole optimizer if nonzero */
+static int functionInlining = 1;      /* inline functions if nonzero */
+int debug_verbose = 1;                /* Set true to inundate .asm file */
+
 static int GpCodeSequenceNumber = 1;
+int GpcFlowSeq = 1;
+
+extern void RemoveUnusedRegisters(void);
+extern void RegsUnMapLiveRanges(void);
+extern void BuildFlowTree(pBlock *pb);
+extern void pCodeRegOptimizeRegUsage(int level);
+extern int picIsInitialized(void);
 
 /****************************************************************/
 /*                      Forward declarations                    */
 /****************************************************************/
 
-static void unlinkPC(pCode *pc);
+void unlinkpCode(pCode *pc);
+#if 0
 static void genericAnalyze(pCode *pc);
 static void AnalyzeGOTO(pCode *pc);
 static void AnalyzeSKIP(pCode *pc);
 static void AnalyzeRETURN(pCode *pc);
+#endif
 
 static void genericDestruct(pCode *pc);
 static void genericPrint(FILE *of,pCode *pc);
@@ -91,573 +104,1047 @@ static void genericPrint(FILE *of,pCode *pc);
 static void pCodePrintLabel(FILE *of, pCode *pc);
 static void pCodePrintFunction(FILE *of, pCode *pc);
 static void pCodeOpPrint(FILE *of, pCodeOp *pcop);
-static char *get_op( pCodeInstruction *pcc);
+static char *get_op_from_instruction( pCodeInstruction *pcc);
+char *get_op( pCodeOp *pcop,char *buff,int buf_size);
 int pCodePeepMatchLine(pCodePeep *peepBlock, pCode *pcs, pCode *pcd);
 int pCodePeepMatchRule(pCode *pc);
+void pBlockStats(FILE *of, pBlock *pb);
+pBlock *newpBlock(void);
+extern void pCodeInsertAfter(pCode *pc1, pCode *pc2);
+extern pCodeOp *popCopyReg(pCodeOpReg *pc);
+pCodeOp *popCopyGPR2Bit(pCodeOp *pc, int bitval);
+void pCodeRegMapLiveRanges(pBlock *pb);
 
 
+/****************************************************************/
+/*                    PIC Instructions                          */
+/****************************************************************/
+
 pCodeInstruction pciADDWF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_ADDWF,
   "ADDWF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   1,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   (PCC_W | PCC_REGISTER),   // inCond
   (PCC_REGISTER | PCC_Z) // outCond
 };
 
 pCodeInstruction pciADDFW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
-  POC_ADDWF,
+  POC_ADDFW,
   "ADDWF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   (PCC_W | PCC_REGISTER),   // inCond
   (PCC_W | PCC_Z) // outCond
 };
 
 pCodeInstruction pciADDLW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_ADDLW,
   "ADDLW",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   1,    // num ops
   0,0,  // dest, bit instruction
-  PCC_W,   // inCond
+  0,0,  // branch, skip
+  POC_NOP,
+  (PCC_W | PCC_LITERAL),   // inCond
   (PCC_W | PCC_Z | PCC_C | PCC_DC) // outCond
 };
 
 pCodeInstruction pciANDLW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_ANDLW,
   "ANDLW",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   1,    // num ops
   0,0,  // dest, bit instruction
-  PCC_W,   // inCond
+  0,0,  // branch, skip
+  POC_NOP,
+  (PCC_W | PCC_LITERAL),   // inCond
   (PCC_W | PCC_Z) // outCond
 };
 
 pCodeInstruction pciANDWF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_ANDWF,
   "ANDWF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   1,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   (PCC_W | PCC_REGISTER),   // inCond
   (PCC_REGISTER | PCC_Z) // outCond
 };
 
 pCodeInstruction pciANDFW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
-  POC_ANDWF,
+  POC_ANDFW,
   "ANDWF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   (PCC_W | PCC_REGISTER),   // inCond
   (PCC_W | PCC_Z) // outCond
 };
 
 pCodeInstruction pciBCF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_BCF,
   "BCF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
-  0,1,  // dest, bit instruction
-  PCC_NONE,   // inCond
-  PCC_EXAMINE_PCOP // outCond
+  1,1,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_BSF,
+  (PCC_REGISTER | PCC_EXAMINE_PCOP),   // inCond
+  PCC_REGISTER // outCond
 };
 
 pCodeInstruction pciBSF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_BSF,
   "BSF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
-  0,1,  // dest, bit instruction
-  PCC_NONE,   // inCond
-  PCC_EXAMINE_PCOP // outCond
+  1,1,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_BCF,
+  (PCC_REGISTER | PCC_EXAMINE_PCOP),   // inCond
+  (PCC_REGISTER | PCC_EXAMINE_PCOP) // outCond
 };
 
 pCodeInstruction pciBTFSC = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   AnalyzeSKIP,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   AnalyzeSKIP,
    genericDestruct,
    genericPrint},
   POC_BTFSC,
   "BTFSC",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,1,  // dest, bit instruction
-  PCC_EXAMINE_PCOP,   // inCond
-  PCC_NONE // outCond
+  1,1,  // branch, skip
+  POC_BTFSS,
+  (PCC_REGISTER | PCC_EXAMINE_PCOP),   // inCond
+  PCC_EXAMINE_PCOP // outCond
 };
 
 pCodeInstruction pciBTFSS = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   AnalyzeSKIP,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   AnalyzeSKIP,
    genericDestruct,
    genericPrint},
   POC_BTFSS,
   "BTFSS",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,1,  // dest, bit instruction
-  PCC_EXAMINE_PCOP,   // inCond
-  PCC_NONE // outCond
+  1,1,  // branch, skip
+  POC_BTFSC,
+  (PCC_REGISTER | PCC_EXAMINE_PCOP),   // inCond
+  PCC_EXAMINE_PCOP // outCond
 };
 
 pCodeInstruction pciCALL = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_CALL,
   "CALL",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   1,    // num ops
   0,0,  // dest, bit instruction
+  1,0,  // branch, skip
+  POC_NOP,
   PCC_NONE, // inCond
   PCC_NONE  // outCond
 };
 
-//fixme - need a COMFW instruction.
 pCodeInstruction pciCOMF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_COMF,
   "COMF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
+  NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
+  2,    // num ops
+  1,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
+  PCC_REGISTER,  // inCond
+  PCC_REGISTER   // outCond
+};
+
+pCodeInstruction pciCOMFW = {
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
+   genericDestruct,
+   genericPrint},
+  POC_COMFW,
+  "COMF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,0,  // dest, bit instruction
-  PCC_NONE, // inCond
-  PCC_NONE  // outCond
+  0,0,  // branch, skip
+  POC_NOP,
+  PCC_REGISTER,  // inCond
+  PCC_W   // outCond
 };
 
 pCodeInstruction pciCLRF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_CLRF,
   "CLRF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   1,    // num ops
   0,0,  // dest, bit instruction
-  PCC_REGISTER, // inCond
+  0,0,  // branch, skip
+  POC_NOP,
+  PCC_NONE, // inCond
   PCC_REGISTER  // outCond
 };
 
 pCodeInstruction pciCLRW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_CLRW,
   "CLRW",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   0,    // num ops
   0,0,  // dest, bit instruction
-  PCC_W, // inCond
+  0,0,  // branch, skip
+  POC_NOP,
+  PCC_NONE, // inCond
   PCC_W  // outCond
 };
 
+pCodeInstruction pciCLRWDT = {
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
+   genericDestruct,
+   genericPrint},
+  POC_CLRWDT,
+  "CLRWDT",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
+  NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
+  0,    // num ops
+  0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
+  PCC_NONE, // inCond
+  PCC_NONE  // outCond
+};
+
 pCodeInstruction pciDECF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_DECF,
   "DECF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   1,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   PCC_REGISTER,   // inCond
   PCC_REGISTER    // outCond
 };
 
 pCodeInstruction pciDECFW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_DECFW,
   "DECF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   PCC_REGISTER,   // inCond
   PCC_W    // outCond
 };
 
 pCodeInstruction pciDECFSZ = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   AnalyzeSKIP,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   AnalyzeSKIP,
    genericDestruct,
    genericPrint},
   POC_DECFSZ,
   "DECFSZ",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   1,0,  // dest, bit instruction
+  1,1,  // branch, skip
+  POC_NOP,
   PCC_REGISTER,   // inCond
   PCC_REGISTER    // outCond
 };
 
 pCodeInstruction pciDECFSZW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   AnalyzeSKIP,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   AnalyzeSKIP,
    genericDestruct,
    genericPrint},
   POC_DECFSZW,
   "DECFSZ",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,0,  // dest, bit instruction
+  1,1,  // branch, skip
+  POC_NOP,
   PCC_REGISTER,   // inCond
   PCC_W           // outCond
 };
 
 pCodeInstruction pciGOTO = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   AnalyzeGOTO,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   AnalyzeGOTO,
    genericDestruct,
    genericPrint},
   POC_GOTO,
   "GOTO",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   1,    // num ops
   0,0,  // dest, bit instruction
+  1,0,  // branch, skip
+  POC_NOP,
   PCC_NONE,   // inCond
   PCC_NONE    // outCond
 };
 
-
 pCodeInstruction pciINCF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_INCF,
   "INCF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   1,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   PCC_REGISTER,   // inCond
   PCC_REGISTER    // outCond
 };
 
 pCodeInstruction pciINCFW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_INCFW,
   "INCF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   PCC_REGISTER,   // inCond
   PCC_W    // outCond
 };
 
 pCodeInstruction pciINCFSZ = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   AnalyzeSKIP,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   AnalyzeSKIP,
    genericDestruct,
    genericPrint},
   POC_INCFSZ,
   "INCFSZ",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   1,0,  // dest, bit instruction
+  1,1,  // branch, skip
+  POC_NOP,
   PCC_REGISTER,   // inCond
   PCC_REGISTER    // outCond
 };
 
 pCodeInstruction pciINCFSZW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   AnalyzeSKIP,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   AnalyzeSKIP,
    genericDestruct,
    genericPrint},
   POC_INCFSZW,
   "INCFSZ",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,0,  // dest, bit instruction
+  1,1,  // branch, skip
+  POC_NOP,
   PCC_REGISTER,   // inCond
   PCC_W           // outCond
 };
 
 pCodeInstruction pciIORWF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_IORWF,
   "IORWF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   1,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   (PCC_W | PCC_REGISTER),   // inCond
   (PCC_REGISTER | PCC_Z) // outCond
 };
 
 pCodeInstruction pciIORFW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
-  POC_IORWF,
+  POC_IORFW,
   "IORWF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   (PCC_W | PCC_REGISTER),   // inCond
   (PCC_W | PCC_Z) // outCond
 };
 
 pCodeInstruction pciIORLW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_IORLW,
   "IORLW",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   1,    // num ops
   0,0,  // dest, bit instruction
-  PCC_W,   // inCond
+  0,0,  // branch, skip
+  POC_NOP,
+  (PCC_W | PCC_LITERAL),   // inCond
   (PCC_W | PCC_Z) // outCond
 };
 
 pCodeInstruction pciMOVF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_MOVF,
   "MOVF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   1,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   PCC_REGISTER,   // inCond
   PCC_Z // outCond
 };
 
 pCodeInstruction pciMOVFW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_MOVFW,
   "MOVF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   PCC_REGISTER,   // inCond
   (PCC_W | PCC_Z) // outCond
 };
 
 pCodeInstruction pciMOVWF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_MOVWF,
   "MOVWF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   1,    // num ops
   0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   PCC_W,   // inCond
-  0 // outCond
+  PCC_REGISTER // outCond
 };
 
 pCodeInstruction pciMOVLW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_MOVLW,
   "MOVLW",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   1,    // num ops
   0,0,  // dest, bit instruction
-  PCC_NONE,   // inCond
+  0,0,  // branch, skip
+  POC_NOP,
+  (PCC_NONE | PCC_LITERAL),   // inCond
   PCC_W // outCond
 };
 
-pCodeInstruction pciNEGF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+pCodeInstruction pciNOP = {
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
    genericDestruct,
    genericPrint},
-  POC_NEGF,
-  "NEGF",
+  POC_NOP,
+  "NOP",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
-  1,    // num ops
+  NULL, // flow block
+  NULL, // C source 
+  0,    // num ops
   0,0,  // dest, bit instruction
-  PCC_REGISTER,   // inCond
+  0,0,  // branch, skip
+  POC_NOP,
+  PCC_NONE,   // inCond
   PCC_NONE // outCond
 };
 
+pCodeInstruction pciRETFIE = {
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   AnalyzeRETURN,
+   genericDestruct,
+   genericPrint},
+  POC_RETFIE,
+  "RETFIE",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
+  NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
+  0,    // num ops
+  0,0,  // dest, bit instruction
+  1,0,  // branch, skip
+  POC_NOP,
+  PCC_NONE,   // inCond
+  PCC_NONE // outCond (not true... affects the GIE bit too)
+};
 
 pCodeInstruction pciRETLW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   AnalyzeRETURN,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   AnalyzeRETURN,
    genericDestruct,
    genericPrint},
   POC_RETLW,
   "RETLW",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   1,    // num ops
   0,0,  // dest, bit instruction
-  PCC_NONE,   // inCond
+  1,0,  // branch, skip
+  POC_NOP,
+  PCC_LITERAL,   // inCond
   PCC_W // outCond
 };
 
 pCodeInstruction pciRETURN = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   AnalyzeRETURN,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   AnalyzeRETURN,
    genericDestruct,
    genericPrint},
-  POC_RETLW,
+  POC_RETURN,
   "RETURN",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   0,    // num ops
   0,0,  // dest, bit instruction
+  1,0,  // branch, skip
+  POC_NOP,
   PCC_NONE,   // inCond
-  PCC_W // outCond
+  PCC_NONE // outCond
+};
+
+pCodeInstruction pciRLF = {
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
+   genericDestruct,
+   genericPrint},
+  POC_RLF,
+  "RLF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
+  NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
+  2,    // num ops
+  1,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
+  (PCC_C | PCC_REGISTER),   // inCond
+  (PCC_REGISTER | PCC_Z | PCC_C | PCC_DC) // outCond
+};
+
+pCodeInstruction pciRLFW = {
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
+   genericDestruct,
+   genericPrint},
+  POC_RLFW,
+  "RLF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
+  NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
+  2,    // num ops
+  0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
+  (PCC_C | PCC_REGISTER),   // inCond
+  (PCC_W | PCC_Z | PCC_C | PCC_DC) // outCond
 };
 
+pCodeInstruction pciRRF = {
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
+   genericDestruct,
+   genericPrint},
+  POC_RRF,
+  "RRF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
+  NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
+  2,    // num ops
+  1,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
+  (PCC_C | PCC_REGISTER),   // inCond
+  (PCC_REGISTER | PCC_Z | PCC_C | PCC_DC) // outCond
+};
+
+pCodeInstruction pciRRFW = {
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
+   genericDestruct,
+   genericPrint},
+  POC_RRFW,
+  "RRF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
+  NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
+  2,    // num ops
+  0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
+  (PCC_C | PCC_REGISTER),   // inCond
+  (PCC_W | PCC_Z | PCC_C | PCC_DC) // outCond
+};
 
 pCodeInstruction pciSUBWF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_SUBWF,
   "SUBWF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   1,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   (PCC_W | PCC_REGISTER),   // inCond
   (PCC_REGISTER | PCC_Z) // outCond
 };
 
 pCodeInstruction pciSUBFW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
-  POC_SUBWF,
+  POC_SUBFW,
   "SUBWF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   (PCC_W | PCC_REGISTER),   // inCond
   (PCC_W | PCC_Z) // outCond
 };
 
 pCodeInstruction pciSUBLW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_SUBLW,
   "SUBLW",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   1,    // num ops
   0,0,  // dest, bit instruction
-  PCC_W,   // inCond
+  0,0,  // branch, skip
+  POC_NOP,
+  (PCC_W | PCC_LITERAL),   // inCond
   (PCC_W | PCC_Z | PCC_C | PCC_DC) // outCond
 };
 
+pCodeInstruction pciSWAPF = {
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
+   genericDestruct,
+   genericPrint},
+  POC_SWAPF,
+  "SWAPF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
+  NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
+  2,    // num ops
+  1,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
+  (PCC_REGISTER),   // inCond
+  (PCC_REGISTER) // outCond
+};
+
+pCodeInstruction pciSWAPFW = {
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
+   genericDestruct,
+   genericPrint},
+  POC_SWAPFW,
+  "SWAPF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
+  NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
+  2,    // num ops
+  0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
+  (PCC_REGISTER),   // inCond
+  (PCC_W) // outCond
+};
+
 pCodeInstruction pciTRIS = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_TRIS,
   "TRIS",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   1,    // num ops
   0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   PCC_NONE,   // inCond
-  PCC_NONE
+  PCC_REGISTER // outCond
 };
 
-
 pCodeInstruction pciXORWF = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_XORWF,
   "XORWF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   1,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   (PCC_W | PCC_REGISTER),   // inCond
   (PCC_REGISTER | PCC_Z) // outCond
 };
 
 pCodeInstruction pciXORFW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
-  POC_XORWF,
+  POC_XORFW,
   "XORWF",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   2,    // num ops
   0,0,  // dest, bit instruction
+  0,0,  // branch, skip
+  POC_NOP,
   (PCC_W | PCC_REGISTER),   // inCond
   (PCC_W | PCC_Z) // outCond
 };
 
 pCodeInstruction pciXORLW = {
-  {PC_OPCODE, NULL, NULL, 0, NULL, NULL, NULL, NULL, 
-   genericAnalyze,
+  {PC_OPCODE, NULL, NULL, 0, NULL, 
+   //   genericAnalyze,
    genericDestruct,
    genericPrint},
   POC_XORLW,
   "XORLW",
+  NULL, // from branch
+  NULL, // to branch
+  NULL, // label
   NULL, // operand
+  NULL, // flow block
+  NULL, // C source 
   1,    // num ops
   0,0,  // dest, bit instruction
-  PCC_W,   // inCond
+  0,0,  // branch, skip
+  POC_NOP,
+  (PCC_W | PCC_LITERAL),   // inCond
   (PCC_W | PCC_Z | PCC_C | PCC_DC) // outCond
 };
 
@@ -665,28 +1152,117 @@ pCodeInstruction pciXORLW = {
 #define MAX_PIC14MNEMONICS 100
 pCodeInstruction *pic14Mnemonics[MAX_PIC14MNEMONICS];
 
-char *Safe_strdup(char *str)
+/* This definition needs to be part of configure.in */
+// #define USE_VSNPRINTF
+
+#ifdef USE_VSNPRINTF
+  // Alas, vsnprintf is not ANSI standard, and does not exist
+  // on Solaris (and probably other non-Gnu flavored Unixes).
+
+/*-----------------------------------------------------------------*/
+/* SAFE_snprintf - like snprintf except the string pointer is      */
+/*                 after the string has been printed to. This is   */
+/*                 useful for printing to string as though if it   */
+/*                 were a stream.                                  */
+/*-----------------------------------------------------------------*/
+void SAFE_snprintf(char **str, size_t *size, const  char  *format, ...)
 {
-  char *copy;
+  va_list val;
+  int len;
 
-  if(!str)
-    return NULL;
+  if(!str || !*str)
+    return;
 
-  copy = strdup(str);
-  if(!copy) {
-    fprintf(stderr, "out of memory %s,%d\n",__FUNCTION__,__LINE__);
-    exit(1);
+  va_start(val, format);
+
+  vsnprintf(*str, *size, format, val);
+
+  va_end (val);
+
+  len = strlen(*str);
+  if(len > *size) {
+    fprintf(stderr,"WARNING, it looks like %s has overflowed\n",__FUNCTION__);
+    fprintf(stderr,"len = %d is > str size %d\n",len,*size);
   }
 
-  return copy;
-    
+  *str += len;
+  *size -= len;
+
+}
+
+#else  //  USE_VSNPRINTF
+
+// This version is *not* safe, despite the name.
+
+void SAFE_snprintf(char **str, size_t *size, const  char  *format, ...)
+{
+  va_list val;
+  int len;
+  static char buffer[1024]; /* grossly conservative, but still not inherently safe */
+
+  if(!str || !*str)
+    return;
+
+  va_start(val, format);
+
+  vsprintf(buffer, format, val);
+  va_end (val);
+
+  len = strlen(buffer);
+  if(len > *size) {
+    fprintf(stderr,"WARNING, it looks like %s has overflowed\n",__FUNCTION__);
+    fprintf(stderr,"len = %d is > str size %d\n",len,*size);
+  }
+
+  strcpy(*str, buffer);
+  *str += len;
+  *size -= len;
+
 }
 
+#endif    //  USE_VSNPRINTF
+    
+
+extern  void initStack(int base_address, int size);
+extern regs *allocProcessorRegister(int rIdx, char * name, short po_type, int alias);
+extern regs *allocInternalRegister(int rIdx, char * name, short po_type, int alias);
+extern void init_pic(char *);
+
 void  pCodeInitRegisters(void)
 {
+  static int initialized=0;
+
+  if(initialized)
+    return;
+  initialized = 1;
+
+  initStack(0xfff, 8);
+  init_pic(port->processor);
 
-  pc_fsr.rIdx = 4;
-  pc_fsr.r = pic14_regWithIdx(4);
+  pc_status.r = allocProcessorRegister(IDX_STATUS,"_STATUS", PO_STATUS, 0x80);
+  pc_pcl.r = allocProcessorRegister(IDX_PCL,"PCL", PO_PCL, 0x80);
+  pc_pclath.r = allocProcessorRegister(IDX_PCLATH,"_PCLATH", PO_PCLATH, 0x80);
+  pc_fsr.r = allocProcessorRegister(IDX_FSR,"FSR", PO_FSR, 0x80);
+  pc_indf.r = allocProcessorRegister(IDX_INDF,"INDF", PO_INDF, 0x80);
+  pc_intcon.r = allocProcessorRegister(IDX_INTCON,"INTCON", PO_INTCON, 0x80);
+
+  pc_status.rIdx = IDX_STATUS;
+  pc_fsr.rIdx = IDX_FSR;
+  pc_indf.rIdx = IDX_INDF;
+  pc_intcon.rIdx = IDX_INTCON;
+  pc_pcl.rIdx = IDX_PCL;
+  pc_pclath.rIdx = IDX_PCLATH;
+
+  pc_kzero.r = allocInternalRegister(IDX_KZ,"KZ",PO_GPR_REGISTER,0);
+  pc_ssave.r = allocInternalRegister(IDX_SSAVE,"SSAVE", PO_GPR_REGISTER, 0x80);
+  pc_wsave.r = allocInternalRegister(IDX_WSAVE,"WSAVE", PO_GPR_REGISTER, 0);
+
+  pc_kzero.rIdx = IDX_KZ;
+  pc_wsave.rIdx = IDX_WSAVE;
+  pc_ssave.rIdx = IDX_SSAVE;
+
+  /* probably should put this in a separate initialization routine */
+  pb_dead_pcodes = newpBlock();
 
 }
 
@@ -696,7 +1272,7 @@ void  pCodeInitRegisters(void)
 /*                                                                 */
 /*-----------------------------------------------------------------*/
 
-int mnem2key(char *mnem)
+int mnem2key(char const *mnem)
 {
   int key = 0;
 
@@ -705,7 +1281,7 @@ int mnem2key(char *mnem)
 
   while(*mnem) {
 
-    key += *mnem++ +1;
+    key += toupper(*mnem++) +1;
 
   }
 
@@ -723,6 +1299,9 @@ void pic14initMnemonics(void)
   if(mnemonics_initialized)
     return;
 
+//FIXME - probably should NULL out the array before making the assignments
+//since we check the array contents below this initialization.
+
   pic14Mnemonics[POC_ADDLW] = &pciADDLW;
   pic14Mnemonics[POC_ADDWF] = &pciADDWF;
   pic14Mnemonics[POC_ADDFW] = &pciADDFW;
@@ -735,8 +1314,10 @@ void pic14initMnemonics(void)
   pic14Mnemonics[POC_BTFSS] = &pciBTFSS;
   pic14Mnemonics[POC_CALL] = &pciCALL;
   pic14Mnemonics[POC_COMF] = &pciCOMF;
+  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;
@@ -753,12 +1334,19 @@ void pic14initMnemonics(void)
   pic14Mnemonics[POC_MOVFW] = &pciMOVFW;
   pic14Mnemonics[POC_MOVLW] = &pciMOVLW;
   pic14Mnemonics[POC_MOVWF] = &pciMOVWF;
-  pic14Mnemonics[POC_NEGF] = &pciNEGF;
+  pic14Mnemonics[POC_NOP] = &pciNOP;
+  pic14Mnemonics[POC_RETFIE] = &pciRETFIE;
   pic14Mnemonics[POC_RETLW] = &pciRETLW;
   pic14Mnemonics[POC_RETURN] = &pciRETURN;
+  pic14Mnemonics[POC_RLF] = &pciRLF;
+  pic14Mnemonics[POC_RLFW] = &pciRLFW;
+  pic14Mnemonics[POC_RRF] = &pciRRF;
+  pic14Mnemonics[POC_RRFW] = &pciRRFW;
   pic14Mnemonics[POC_SUBLW] = &pciSUBLW;
   pic14Mnemonics[POC_SUBWF] = &pciSUBWF;
   pic14Mnemonics[POC_SUBFW] = &pciSUBFW;
+  pic14Mnemonics[POC_SWAPF] = &pciSWAPF;
+  pic14Mnemonics[POC_SWAPFW] = &pciSWAPFW;
   pic14Mnemonics[POC_TRIS] = &pciTRIS;
   pic14Mnemonics[POC_XORLW] = &pciXORLW;
   pic14Mnemonics[POC_XORWF] = &pciXORWF;
@@ -767,49 +1355,95 @@ void pic14initMnemonics(void)
   for(i=0; i<MAX_PIC14MNEMONICS; i++)
     if(pic14Mnemonics[i])
       hTabAddItem(&pic14MnemonicsHash, mnem2key(pic14Mnemonics[i]->mnemonic), pic14Mnemonics[i]);
-/*
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpADDLW), scpADDLW);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpADDWF),scpADDWF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpANDLW),scpANDLW);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpANDWF),scpANDWF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpBCF),scpBCF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpBSF),scpBSF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpBTFSC),scpBTFSC);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpBTFSS),scpBTFSS);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpCALL),scpCALL);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpCOMF),scpCOMF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpCLRF),scpCLRF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpCLRW),scpCLRW);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpDECF),scpDECF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpDECFSZ),scpDECFSZ);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpGOTO),scpGOTO);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpINCF),scpINCF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpINCFSZ),scpINCFSZ);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpIORLW),scpIORLW);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpIORWF),scpIORWF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpMOVF),scpMOVF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpMOVLW),scpMOVLW);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpMOVWF),scpMOVWF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpNEGF),scpNEGF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpRETLW),scpRETLW);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpRETURN),scpRETURN);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpSUBLW),scpSUBLW);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpSUBWF),scpSUBWF);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpTRIS),scpTRIS);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpXORLW),scpXORLW);
-  hTabAddItem(&pic14MnemonicsHash, mnem2key(scpXORWF),scpXORWF);
-*/
-
   pci = hTabFirstItem(pic14MnemonicsHash, &key);
 
   while(pci) {
-    fprintf( stderr, "element %d key %d, mnem %s\n",i++,key,pci->mnemonic);
+    DFPRINTF((stderr, "element %d key %d, mnem %s\n",i++,key,pci->mnemonic));
     pci = hTabNextItem(pic14MnemonicsHash, &key);
   }
 
   mnemonics_initialized = 1;
 }
 
+int getpCodePeepCommand(char *cmd);
+
+int getpCode(char *mnem,unsigned dest)
+{
+
+  pCodeInstruction *pci;
+  int key = mnem2key(mnem);
+
+  if(!mnemonics_initialized)
+    pic14initMnemonics();
+
+  pci = hTabFirstItemWK(pic14MnemonicsHash, key);
+
+  while(pci) {
+
+    if(STRCASECMP(pci->mnemonic, mnem) == 0) {
+      if((pci->num_ops <= 1) || (pci->isModReg == dest) || (pci->isBitInst))
+       return(pci->op);
+    }
+
+    pci = hTabNextItemWK (pic14MnemonicsHash);
+  
+  }
+
+  return -1;
+}
+
+/*-----------------------------------------------------------------*
+ * pic14initpCodePeepCommands
+ *
+ *-----------------------------------------------------------------*/
+void pic14initpCodePeepCommands(void)
+{
+
+  int key, i;
+  peepCommand *pcmd;
+
+  i = 0;
+  do {
+    hTabAddItem(&pic14pCodePeepCommandsHash, 
+               mnem2key(peepCommands[i].cmd), &peepCommands[i]);
+    i++;
+  } while (peepCommands[i].cmd);
+
+  pcmd = hTabFirstItem(pic14pCodePeepCommandsHash, &key);
+
+  while(pcmd) {
+    //fprintf(stderr, "peep command %s  key %d\n",pcmd->cmd,pcmd->id);
+    pcmd = hTabNextItem(pic14pCodePeepCommandsHash, &key);
+  }
+
+}
+
+/*-----------------------------------------------------------------
+ *
+ *
+ *-----------------------------------------------------------------*/
+
+int getpCodePeepCommand(char *cmd)
+{
+
+  peepCommand *pcmd;
+  int key = mnem2key(cmd);
+
+
+  pcmd = hTabFirstItemWK(pic14pCodePeepCommandsHash, key);
+
+  while(pcmd) {
+    // fprintf(stderr," comparing %s to %s\n",pcmd->cmd,cmd);
+    if(STRCASECMP(pcmd->cmd, cmd) == 0) {
+      return pcmd->id;
+    }
+
+    pcmd = hTabNextItemWK (pic14pCodePeepCommandsHash);
+  
+  }
+
+  return -1;
+}
 
 char getpBlock_dbName(pBlock *pb)
 {
@@ -821,6 +1455,17 @@ char getpBlock_dbName(pBlock *pb)
 
   return pb->dbName;
 }
+void pBlockConvert2ISR(pBlock *pb)
+{
+  if(!pb)
+    return;
+
+  if(pb->cmemmap)
+    pb->cmemmap = NULL;
+
+  pb->dbName = 'I';
+}
+
 /*-----------------------------------------------------------------*/
 /* movepBlock2Head - given the dbname of a pBlock, move all        */
 /*                   instances to the front of the doubly linked   */
@@ -873,15 +1518,17 @@ void copypCode(FILE *of, char dbName)
     return;
 
   for(pb = the_pFile->pbHead; pb; pb = pb->next) {
-    if(getpBlock_dbName(pb) == dbName)
+    if(getpBlock_dbName(pb) == dbName) {
+      pBlockStats(of,pb);
       printpBlock(of,pb);
+    }
   }
 
 }
 void pcode_test(void)
 {
 
-  printf("pcode is alive!\n");
+  DFPRINTF((stderr,"pcode is alive!\n"));
 
   //initMnemonics();
 
@@ -914,14 +1561,21 @@ void pcode_test(void)
     }
   }
 }
+/*-----------------------------------------------------------------*/
+/* int RegCond(pCodeOp *pcop) - if pcop points to the STATUS reg-  */
+/*      ister, RegCond will return the bit being referenced.       */
+/*                                                                 */
+/* fixme - why not just OR in the pcop bit field                   */
+/*-----------------------------------------------------------------*/
+
 static int RegCond(pCodeOp *pcop)
 {
 
   if(!pcop)
     return 0;
 
-  if(pcop->type == PO_BIT  && !strcmp(pcop->name, pc_status.pcop.name)) {
-    switch(PCOB(pcop)->bit) {
+  if(pcop->type == PO_GPR_BIT  && !strcmp(pcop->name, pc_status.pcop.name)) {
+    switch(PCORB(pcop)->bit) {
     case PIC_C_BIT:
       return PCC_C;
     case PIC_DC_BIT:
@@ -965,16 +1619,17 @@ pCode *newpCode (PIC_OPCODE op, pCodeOp *pcop)
     
   pci = Safe_calloc(1, sizeof(pCodeInstruction));
 
-  if((op < MAX_PIC14MNEMONICS) && pic14Mnemonics[op]) {
+  if((op>=0) && (op < MAX_PIC14MNEMONICS) && pic14Mnemonics[op]) {
     memcpy(pci, pic14Mnemonics[op], sizeof(pCodeInstruction));
     pci->pcop = pcop;
 
-    if(pci->inCond == PCC_EXAMINE_PCOP)
-      pci->inCond   = RegCond(pcop);
+    if(pci->inCond & PCC_EXAMINE_PCOP)
+      pci->inCond  |= RegCond(pcop);
 
-    if(pci->outCond == PCC_EXAMINE_PCOP)
-      pci->outCond   = RegCond(pcop);
+    if(pci->outCond & PCC_EXAMINE_PCOP)
+      pci->outCond  |= RegCond(pcop);
 
+    pci->pc.prev = pci->pc.next = NULL;
     return (pCode *)pci;
   }
 
@@ -995,6 +1650,10 @@ pCode *newpCode (PIC_OPCODE op, pCodeOp *pcop)
 /* line (of assembly code) is declared matched. Note that the      */
 /* operand may be wild too.                                        */
 /*                                                                 */
+/*   Note, a wild instruction is specified just like a wild var:   */
+/*      %4     ; A wild instruction,                               */
+/*  See the peeph.def file for additional examples                 */
+/*                                                                 */
 /*-----------------------------------------------------------------*/
 
 pCode *newpCodeWild(int pCodeID, pCodeOp *optional_operand, pCodeOp *optional_label)
@@ -1004,21 +1663,55 @@ pCode *newpCodeWild(int pCodeID, pCodeOp *optional_operand, pCodeOp *optional_la
     
   pcw = Safe_calloc(1,sizeof(pCodeWild));
 
-  pcw->pc.type = PC_WILD;
-  pcw->pc.prev = pcw->pc.next = NULL;
-  pcw->pc.from = pcw->pc.to = pcw->pc.label = NULL;
-  pcw->pc.pb = NULL;
+  pcw->pci.pc.type = PC_WILD;
+  pcw->pci.pc.prev = pcw->pci.pc.next = NULL;
+  pcw->pci.from = pcw->pci.to = pcw->pci.label = NULL;
+  pcw->pci.pc.pb = NULL;
 
-  pcw->pc.analyze = genericAnalyze;
-  pcw->pc.destruct = genericDestruct;
-  pcw->pc.print = genericPrint;
+  //  pcw->pci.pc.analyze = genericAnalyze;
+  pcw->pci.pc.destruct = genericDestruct;
+  pcw->pci.pc.print = genericPrint;
 
-  pcw->id = pCodeID;
+  pcw->id = pCodeID;              // this is the 'n' in %n
   pcw->operand = optional_operand;
   pcw->label   = optional_label;
 
+  pcw->mustBeBitSkipInst = 0;
+  pcw->mustNotBeBitSkipInst = 0;
+  pcw->invertBitSkipInst = 0;
+
   return ( (pCode *)pcw);
   
+}
+
+ /*-----------------------------------------------------------------*/
+/* newPcodeInlineP - create a new pCode from a char string           */
+/*-----------------------------------------------------------------*/
+
+
+pCode *newpCodeInlineP(char *cP)
+{
+
+  pCodeComment *pcc ;
+    
+  pcc = Safe_calloc(1,sizeof(pCodeComment));
+
+  pcc->pc.type = PC_INLINE;
+  pcc->pc.prev = pcc->pc.next = NULL;
+  //pcc->pc.from = pcc->pc.to = pcc->pc.label = NULL;
+  pcc->pc.pb = NULL;
+
+  //  pcc->pc.analyze = genericAnalyze;
+  pcc->pc.destruct = genericDestruct;
+  pcc->pc.print = genericPrint;
+
+  if(cP)
+    pcc->comment = Safe_strdup(cP);
+  else
+    pcc->comment = NULL;
+
+  return ( (pCode *)pcc);
+
 }
 
 /*-----------------------------------------------------------------*/
@@ -1034,21 +1727,24 @@ pCode *newpCodeCharP(char *cP)
 
   pcc->pc.type = PC_COMMENT;
   pcc->pc.prev = pcc->pc.next = NULL;
-  pcc->pc.from = pcc->pc.to = pcc->pc.label = NULL;
+  //pcc->pc.from = pcc->pc.to = pcc->pc.label = NULL;
   pcc->pc.pb = NULL;
 
-  pcc->pc.analyze = genericAnalyze;
+  //  pcc->pc.analyze = genericAnalyze;
   pcc->pc.destruct = genericDestruct;
   pcc->pc.print = genericPrint;
 
-  pcc->comment = Safe_strdup(cP);
+  if(cP)
+    pcc->comment = Safe_strdup(cP);
+  else
+    pcc->comment = NULL;
 
   return ( (pCode *)pcc);
 
 }
 
 /*-----------------------------------------------------------------*/
-/* newpCodeGLabel - create a new global label                      */
+/* newpCodeFunction -                                              */
 /*-----------------------------------------------------------------*/
 
 
@@ -1056,25 +1752,30 @@ pCode *newpCodeFunction(char *mod,char *f)
 {
   pCodeFunction *pcf;
 
-  _ALLOC(pcf,sizeof(pCodeFunction));
+  pcf = Safe_calloc(1,sizeof(pCodeFunction));
+  //_ALLOC(pcf,sizeof(pCodeFunction));
 
   pcf->pc.type = PC_FUNCTION;
   pcf->pc.prev = pcf->pc.next = NULL;
-  pcf->pc.from = pcf->pc.to = pcf->pc.label = NULL;
+  //pcf->pc.from = pcf->pc.to = pcf->pc.label = NULL;
   pcf->pc.pb = NULL;
 
-  pcf->pc.analyze = genericAnalyze;
+  //  pcf->pc.analyze = genericAnalyze;
   pcf->pc.destruct = genericDestruct;
   pcf->pc.print = pCodePrintFunction;
 
+  pcf->ncalled = 0;
+
   if(mod) {
-    _ALLOC_ATOMIC(pcf->modname,strlen(mod)+1);
+    //_ALLOC_ATOMIC(pcf->modname,strlen(mod)+1);
+    pcf->modname = Safe_calloc(1,strlen(mod)+1);
     strcpy(pcf->modname,mod);
   } else
     pcf->modname = NULL;
 
   if(f) {
-    _ALLOC_ATOMIC(pcf->fname,strlen(f)+1);
+    //_ALLOC_ATOMIC(pcf->fname,strlen(f)+1);
+    pcf->fname = Safe_calloc(1,strlen(f)+1);
     strcpy(pcf->fname,f);
   } else
     pcf->fname = NULL;
@@ -1083,8 +1784,126 @@ pCode *newpCodeFunction(char *mod,char *f)
 
 }
 
-
-pCode *newpCodeLabel(int key)
+/*-----------------------------------------------------------------*/
+/* newpCodeFlow                                                    */
+/*-----------------------------------------------------------------*/
+void destructpCodeFlow(pCode *pc)
+{
+  if(!pc || !isPCFL(pc))
+    return;
+
+/*
+  if(PCFL(pc)->from)
+  if(PCFL(pc)->to)
+*/
+  unlinkpCode(pc);
+
+  deleteSet(&PCFL(pc)->registers);
+  deleteSet(&PCFL(pc)->from);
+  deleteSet(&PCFL(pc)->to);
+  free(pc);
+
+}
+
+pCode *newpCodeFlow(void )
+{
+  pCodeFlow *pcflow;
+
+  //_ALLOC(pcflow,sizeof(pCodeFlow));
+  pcflow = Safe_calloc(1,sizeof(pCodeFlow));
+
+  pcflow->pc.type = PC_FLOW;
+  pcflow->pc.prev = pcflow->pc.next = NULL;
+  pcflow->pc.pb = NULL;
+
+  //  pcflow->pc.analyze = genericAnalyze;
+  pcflow->pc.destruct = destructpCodeFlow;
+  pcflow->pc.print = genericPrint;
+
+  pcflow->pc.seq = GpcFlowSeq++;
+
+  pcflow->from = pcflow->to = NULL;
+
+  pcflow->inCond = PCC_NONE;
+  pcflow->outCond = PCC_NONE;
+
+  pcflow->firstBank = -1;
+  pcflow->lastBank = -1;
+
+  pcflow->FromConflicts = 0;
+  pcflow->ToConflicts = 0;
+
+  pcflow->end = NULL;
+
+  pcflow->registers = newSet();
+
+  return ( (pCode *)pcflow);
+
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+pCodeFlowLink *newpCodeFlowLink(pCodeFlow *pcflow)
+{
+  pCodeFlowLink *pcflowLink;
+
+  pcflowLink = Safe_calloc(1,sizeof(pCodeFlowLink));
+
+  pcflowLink->pcflow = pcflow;
+  pcflowLink->bank_conflict = 0;
+
+  return pcflowLink;
+}
+
+/*-----------------------------------------------------------------*/
+/* newpCodeCSource - create a new pCode Source Symbol              */
+/*-----------------------------------------------------------------*/
+
+pCode *newpCodeCSource(int ln, char *f, char *l)
+{
+
+  pCodeCSource *pccs;
+    
+  pccs = Safe_calloc(1,sizeof(pCodeCSource));
+
+  pccs->pc.type = PC_CSOURCE;
+  pccs->pc.prev = pccs->pc.next = NULL;
+  pccs->pc.pb = NULL;
+
+  pccs->pc.destruct = genericDestruct;
+  pccs->pc.print = genericPrint;
+
+  pccs->line_number = ln;
+  if(l)
+    pccs->line = Safe_strdup(l);
+  else
+    pccs->line = NULL;
+
+  if(f)
+    pccs->file_name = Safe_strdup(f);
+  else
+    pccs->file_name = NULL;
+
+  return ( (pCode *)pccs);
+
+}
+/*-----------------------------------------------------------------*/
+/* pCodeLabelDestruct - free memory used by a label.               */
+/*-----------------------------------------------------------------*/
+static void pCodeLabelDestruct(pCode *pc)
+{
+
+  if(!pc)
+    return;
+
+  if((pc->type == PC_LABEL) && PCL(pc)->label)
+    free(PCL(pc)->label);
+
+  free(pc);
+
+}
+
+pCode *newpCodeLabel(char *name, int key)
 {
 
   char *s = buffer;
@@ -1094,33 +1913,30 @@ pCode *newpCodeLabel(int key)
 
   pcl->pc.type = PC_LABEL;
   pcl->pc.prev = pcl->pc.next = NULL;
-  pcl->pc.from = pcl->pc.to = pcl->pc.label = NULL;
+  //pcl->pc.from = pcl->pc.to = pcl->pc.label = NULL;
   pcl->pc.pb = NULL;
 
-  pcl->pc.analyze = genericAnalyze;
-  pcl->pc.destruct = genericDestruct;
+  //  pcl->pc.analyze = genericAnalyze;
+  pcl->pc.destruct = pCodeLabelDestruct;
   pcl->pc.print = pCodePrintLabel;
 
   pcl->key = key;
 
+  pcl->label = NULL;
   if(key>0) {
     sprintf(s,"_%05d_DS_",key);
-    pcl->label = Safe_strdup(s);
   } else
-    pcl->label = NULL;
+    s = name;
 
-  return ( (pCode *)pcl);
+  if(s)
+    pcl->label = Safe_strdup(s);
 
-}
-pCode *newpCodeLabelStr(char *str)
-{
-  pCode *pc = newpCodeLabel(-1);
 
-  PCL(pc)->label = Safe_strdup(str);
+  return ( (pCode *)pcl);
 
-  return pc;
 }
 
+
 /*-----------------------------------------------------------------*/
 /* newpBlock - create and return a pointer to a new pBlock         */
 /*-----------------------------------------------------------------*/
@@ -1129,12 +1945,13 @@ pBlock *newpBlock(void)
 
   pBlock *PpB;
 
-  _ALLOC(PpB,sizeof(pBlock));
+  PpB = Safe_calloc(1,sizeof(pBlock) );
   PpB->next = PpB->prev = NULL;
 
   PpB->function_entries = PpB->function_exits = PpB->function_calls = NULL;
-  PpB->registers = NULL;
+  PpB->tregisters = NULL;
   PpB->visited = 0;
+  PpB->FlowTree = NULL;
 
   return PpB;
 
@@ -1161,20 +1978,6 @@ pBlock *newpCodeChain(memmap *cm,char c, pCode *pc)
   return pB;
 }
 
-/*-----------------------------------------------------------------*/
-/*-----------------------------------------------------------------*/
-
-pCodeOp *newpCodeOp(char *name, PIC_OPTYPE type)
-{
-  pCodeOp *pcop;
-
-  pcop = Safe_calloc(1,sizeof(pCodeOp) );
-  pcop->type = type;
-  pcop->name = Safe_strdup(name);   
-
-  return pcop;
-}
-
 /*-----------------------------------------------------------------*/
 /* newpCodeOpLabel - Create a new label given the key              */
 /*  Note, a negative key means that the label is part of wild card */
@@ -1182,48 +1985,94 @@ pCodeOp *newpCodeOp(char *name, PIC_OPTYPE type)
 /*   optimizations).                                               */
 /*-----------------------------------------------------------------*/
 
-pCodeOp *newpCodeOpLabel(int key)
+pCodeOp *newpCodeOpLabel(char *name, int key)
 {
-  char *s = buffer;
+  char *s=NULL;
+  static int label_key=-1;
+
   pCodeOp *pcop;
 
   pcop = Safe_calloc(1,sizeof(pCodeOpLabel) );
   pcop->type = PO_LABEL;
 
-  if(key>0) {
-    sprintf(s,"_%05d_DS_",key);
+  pcop->name = NULL;
+
+  if(key>0)
+    sprintf(s=buffer,"_%05d_DS_",key);
+  else 
+    s = name, key = label_key--;
+
+  if(s)
     pcop->name = Safe_strdup(s);
-  } else
-    pcop->name = NULL;
 
   ((pCodeOpLabel *)pcop)->key = key;
 
   return pcop;
 }
 
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
 pCodeOp *newpCodeOpLit(int lit)
 {
   char *s = buffer;
   pCodeOp *pcop;
 
 
-  _ALLOC(pcop,sizeof(pCodeOpLit) );
+  pcop = Safe_calloc(1,sizeof(pCodeOpLit) );
   pcop->type = PO_LITERAL;
-  sprintf(s,"0x%02x",lit);
-  _ALLOC_ATOMIC(pcop->name,strlen(s)+1);
-  strcpy(pcop->name,s);
+
+  pcop->name = NULL;
+  if(lit>=0) {
+    sprintf(s,"0x%02x",lit);
+    if(s)
+      pcop->name = Safe_strdup(s);
+  }
+
   ((pCodeOpLit *)pcop)->lit = lit;
 
   return pcop;
 }
 
-pCodeOp *newpCodeOpWild(int id, pCodePeep *pcp, pCodeOp *subtype)
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+pCodeOp *newpCodeOpImmd(char *name, int offset, int index, int code_space)
+{
+  pCodeOp *pcop;
+
+  pcop = Safe_calloc(1,sizeof(pCodeOpImmd) );
+  pcop->type = PO_IMMEDIATE;
+  if(name) {
+    regs *r = dirregWithName(name);
+    pcop->name = Safe_strdup(name);
+    PCOI(pcop)->r = r;
+    if(r) {
+      //fprintf(stderr, " newpCodeOpImmd reg %s exists\n",name);
+      PCOI(pcop)->rIdx = r->rIdx;
+    } else {
+      //fprintf(stderr, " newpCodeOpImmd reg %s doesn't exist\n",name);
+      PCOI(pcop)->rIdx = -1;
+    }
+    //fprintf(stderr,"%s %s %d\n",__FUNCTION__,name,offset);
+  } else {
+    pcop->name = NULL;
+  }
+
+  PCOI(pcop)->index = index;
+  PCOI(pcop)->offset = offset;
+  PCOI(pcop)->_const = code_space;
+
+  return pcop;
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+pCodeOp *newpCodeOpWild(int id, pCodeWildBlock *pcwb, pCodeOp *subtype)
 {
   char *s = buffer;
   pCodeOp *pcop;
 
 
-  if(!pcp || !subtype) {
+  if(!pcwb || !subtype) {
     fprintf(stderr, "Wild opcode declaration error: %s-%d\n",__FILE__,__LINE__);
     exit(1);
   }
@@ -1234,40 +2083,197 @@ pCodeOp *newpCodeOpWild(int id, pCodePeep *pcp, pCodeOp *subtype)
   pcop->name = Safe_strdup(s);
 
   PCOW(pcop)->id = id;
-  PCOW(pcop)->pcp = pcp;
+  PCOW(pcop)->pcwb = pcwb;
   PCOW(pcop)->subtype = subtype;
   PCOW(pcop)->matched = NULL;
 
   return pcop;
 }
 
-pCodeOp *newpCodeOpBit(char *s, int bit)
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+pCodeOp *newpCodeOpBit(char *s, int bit, int inBitSpace)
 {
   pCodeOp *pcop;
 
-  _ALLOC(pcop,sizeof(pCodeOpBit) );
-  pcop->type = PO_BIT;
-  pcop->name = Safe_strdup(s);   
-  PCOB(pcop)->bit = bit;
-  if(bit>=0)
-    PCOB(pcop)->inBitSpace = 1;
+  pcop = Safe_calloc(1,sizeof(pCodeOpRegBit) );
+  pcop->type = PO_GPR_BIT;
+  if(s)
+    pcop->name = Safe_strdup(s);   
   else
-    PCOB(pcop)->inBitSpace = 0;
+    pcop->name = NULL;
+
+  PCORB(pcop)->bit = bit;
+  PCORB(pcop)->inBitSpace = inBitSpace;
+
+  /* pCodeOpBit is derived from pCodeOpReg. We need to init this too */
+  PCOR(pcop)->r = NULL;
+  PCOR(pcop)->rIdx = 0;
+  return pcop;
+}
+
+/*-----------------------------------------------------------------*
+ * pCodeOp *newpCodeOpReg(int rIdx) - allocate a new register
+ *
+ * If rIdx >=0 then a specific register from the set of registers
+ * will be selected. If rIdx <0, then a new register will be searched
+ * for.
+ *-----------------------------------------------------------------*/
+
+pCodeOp *newpCodeOpReg(int rIdx)
+{
+  pCodeOp *pcop;
+
+  pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
+
+  pcop->name = NULL;
+
+  if(rIdx >= 0) {
+    PCOR(pcop)->rIdx = rIdx;
+    PCOR(pcop)->r = pic14_regWithIdx(rIdx);
+  } else {
+    PCOR(pcop)->r = pic14_findFreeReg(REG_GPR);
+
+    if(PCOR(pcop)->r)
+      PCOR(pcop)->rIdx = PCOR(pcop)->r->rIdx;
+  }
+
+  pcop->type = PCOR(pcop)->r->pc_type;
+
+  return pcop;
+}
+
+pCodeOp *newpCodeOpRegFromStr(char *name)
+{
+  pCodeOp *pcop;
+
+  pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
+  PCOR(pcop)->r = allocRegByName(name, 1);
+  PCOR(pcop)->rIdx = PCOR(pcop)->r->rIdx;
+  pcop->type = PCOR(pcop)->r->pc_type;
+  pcop->name = PCOR(pcop)->r->name;
+
+  return pcop;
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+
+pCodeOp *newpCodeOp(char *name, PIC_OPTYPE type)
+{
+  pCodeOp *pcop;
+
+  switch(type) {
+  case PO_BIT:
+  case PO_GPR_BIT:
+    pcop = newpCodeOpBit(name, -1,0);
+    break;
+
+  case PO_LITERAL:
+    pcop = newpCodeOpLit(-1);
+    break;
+
+  case PO_LABEL:
+    pcop = newpCodeOpLabel(NULL,-1);
+    break;
+  case PO_GPR_TEMP:
+    pcop = newpCodeOpReg(-1);
+    break;
+
+  case PO_GPR_REGISTER:
+    if(name)
+      pcop = newpCodeOpRegFromStr(name);
+    else
+      pcop = newpCodeOpReg(-1);
+    break;
+
+  default:
+    pcop = Safe_calloc(1,sizeof(pCodeOp) );
+    pcop->type = type;
+    if(name)
+      pcop->name = Safe_strdup(name);   
+    else
+      pcop->name = NULL;
+  }
 
   return pcop;
 }
 
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void pCodeConstString(char *name, char *value)
+{
+  pBlock *pb;
+
+  //  fprintf(stderr, " %s  %s  %s\n",__FUNCTION__,name,value);
+
+  if(!name || !value)
+    return;
+
+  pb = newpCodeChain(NULL, 'P',newpCodeCharP("; Starting pCode block"));
+
+  addpBlock(pb);
+
+  sprintf(buffer,"; %s = %s",name,value);
+  
+  addpCode2pBlock(pb,newpCodeCharP(buffer));
+  addpCode2pBlock(pb,newpCodeLabel(name,-1));
+
+  do {
+    addpCode2pBlock(pb,newpCode(POC_RETLW,newpCodeOpLit(*value)));
+  }while (*value++);
+
+
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void pCodeReadCodeTable(void)
+{
+  pBlock *pb;
+
+  fprintf(stderr, " %s\n",__FUNCTION__);
+
+  pb = newpCodeChain(NULL, 'P',newpCodeCharP("; Starting pCode block"));
+
+  addpBlock(pb);
+
+  addpCode2pBlock(pb,newpCodeCharP("; ReadCodeTable - built in function"));
+  addpCode2pBlock(pb,newpCodeCharP("; Inputs: temp1,temp2 = code pointer"));
+  addpCode2pBlock(pb,newpCodeCharP("; Outpus: W (from RETLW at temp2:temp1)"));
+  addpCode2pBlock(pb,newpCodeLabel("ReadCodeTable:",-1));
+
+  addpCode2pBlock(pb,newpCode(POC_MOVFW,newpCodeOpRegFromStr("temp2")));
+  addpCode2pBlock(pb,newpCode(POC_MOVWF,newpCodeOpRegFromStr("PCLATH")));
+  addpCode2pBlock(pb,newpCode(POC_MOVFW,newpCodeOpRegFromStr("temp1")));
+  addpCode2pBlock(pb,newpCode(POC_MOVWF,newpCodeOpRegFromStr("PCL")));
+
+
+}
+
 /*-----------------------------------------------------------------*/
 /* addpCode2pBlock - place the pCode into the pBlock linked list   */
 /*-----------------------------------------------------------------*/
 void addpCode2pBlock(pBlock *pb, pCode *pc)
 {
 
-  pb->pcTail->next = pc;
-  pc->prev = pb->pcTail;
-  pc->next = NULL;
-  pc->pb = pb;
-  pb->pcTail = pc;
+  if(!pc)
+    return;
+
+  if(!pb->pcHead) {
+    /* If this is the first pcode to be added to a block that
+     * was initialized with a NULL pcode, then go ahead and
+     * make this pcode the head and tail */
+    pb->pcHead  = pb->pcTail = pc;
+  } else {
+    //    if(pb->pcTail)
+    pb->pcTail->next = pc;
+
+    pc->prev = pb->pcTail;
+    pc->pb = pb;
+
+    pb->pcTail = pc;
+  }
 }
 
 /*-----------------------------------------------------------------*/
@@ -1275,10 +2281,12 @@ void addpCode2pBlock(pBlock *pb, pCode *pc)
 /*-----------------------------------------------------------------*/
 void addpBlock(pBlock *pb)
 {
+  // fprintf(stderr," Adding pBlock: dbName =%c\n",getpBlock_dbName(pb));
 
   if(!the_pFile) {
     /* First time called, we'll pass through here. */
-    _ALLOC(the_pFile,sizeof(the_pFile));
+    //_ALLOC(the_pFile,sizeof(pFile));
+    the_pFile = Safe_calloc(1,sizeof(pFile));
     the_pFile->pbHead = the_pFile->pbTail = pb;
     the_pFile->functions = NULL;
     return;
@@ -1290,6 +2298,43 @@ void addpBlock(pBlock *pb)
   the_pFile->pbTail = pb;
 }
 
+/*-----------------------------------------------------------------*/
+/* removepBlock - remove a pBlock from the pFile                   */
+/*-----------------------------------------------------------------*/
+void removepBlock(pBlock *pb)
+{
+  pBlock *pbs;
+
+  if(!the_pFile)
+    return;
+
+
+  //fprintf(stderr," Removing pBlock: dbName =%c\n",getpBlock_dbName(pb));
+
+  for(pbs = the_pFile->pbHead; pbs; pbs = pbs->next) {
+    if(pbs == pb) {
+
+      if(pbs == the_pFile->pbHead)
+       the_pFile->pbHead = pbs->next;
+
+      if (pbs == the_pFile->pbTail) 
+       the_pFile->pbTail = pbs->prev;
+
+      if(pbs->next)
+       pbs->next->prev = pbs->prev;
+
+      if(pbs->prev)
+       pbs->prev->next = pbs->next;
+
+      return;
+
+    }
+  }
+
+  fprintf(stderr, "Warning: call to %s:%s didn't find pBlock\n",__FILE__,__FUNCTION__);
+
+}
+
 /*-----------------------------------------------------------------*/
 /* printpCode - write the contents of a pCode to a file            */
 /*-----------------------------------------------------------------*/
@@ -1333,69 +2378,257 @@ void printpBlock(FILE *of, pBlock *pb)
 /*                                                                 */
 /*-----------------------------------------------------------------*/
 
-static void unlinkPC(pCode *pc)
+void unlinkpCode(pCode *pc)
 {
-  if(pc  && pc->prev && pc->next) {
 
-    pc->prev->next = pc->next;
-    pc->next->prev = pc->prev;
+
+  if(pc) {
+#ifdef PCODE_DEBUG
+    fprintf(stderr,"Unlinking: ");
+    printpCode(stderr, pc);
+#endif
+    if(pc->prev) 
+      pc->prev->next = pc->next;
+    if(pc->next)
+      pc->next->prev = pc->prev;
+
+    pc->prev = pc->next = NULL;
   }
 }
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+
 static void genericDestruct(pCode *pc)
 {
-  unlinkPC(pc);
 
-  fprintf(stderr,"warning, calling default pCode destructor\n");
-  free(pc);
+  unlinkpCode(pc);
+
+  if(isPCI(pc)) {
+    /* For instructions, tell the register (if there's one used)
+     * that it's no longer needed */
+    regs *reg = getRegFromInstruction(pc);
+    if(reg)
+      deleteSetItem (&(reg->reglives.usedpCodes),pc);
+  }
+
+  /* Instead of deleting the memory used by this pCode, mark
+   * the object as bad so that if there's a pointer to this pCode
+   * dangling around somewhere then (hopefully) when the type is
+   * checked we'll catch it.
+   */
+
+  pc->type = PC_BAD;
+
+  addpCode2pBlock(pb_dead_pcodes, pc);
+
+  //free(pc);
+
 }
 
 
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
 void pBlockRegs(FILE *of, pBlock *pb)
 {
 
   regs  *r;
 
-  r = setFirstItem(pb->registers);
+  r = setFirstItem(pb->tregisters);
   while (r) {
-    fprintf(of,"   %s\n",r->name);
-    r = setNextItem(pb->registers);
+    r = setNextItem(pb->tregisters);
   }
 }
 
 
-static char *get_op( pCodeInstruction *pcc)
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+char *get_op(pCodeOp *pcop,char *buffer, int size)
 {
   regs *r;
+  static char b[50];
+  char *s;
+  int use_buffer = 1;    // copy the string to the passed buffer pointer
+
+  if(!buffer) {
+    buffer = b;
+    size = sizeof(b);
+    use_buffer = 0;     // Don't bother copying the string to the buffer.
+  } 
+
+  if(pcop) {
+    switch(pcop->type) {
+    case PO_INDF:
+    case PO_FSR:
+      if(use_buffer) {
+       SAFE_snprintf(&buffer,&size,"%s",PCOR(pcop)->r->name);
+       return buffer;
+      }
+      return PCOR(pcop)->r->name;
+      break;
+    case PO_GPR_TEMP:
+      r = pic14_regWithIdx(PCOR(pcop)->r->rIdx);
+
+      if(use_buffer) {
+       SAFE_snprintf(&buffer,&size,"%s",r->name);
+       return buffer;
+      }
 
-  if(pcc && pcc->pcop) {
+      return r->name;
 
 
-    switch(pcc->pcop->type) {
+    case PO_IMMEDIATE:
+      s = buffer;
 
-    case PO_FSR:
-    case PO_GPR_TEMP:
-      r = pic14_regWithIdx(PCOR(pcc->pcop)->r->rIdx);
-      fprintf(stderr,"getop: getting %s\nfrom:\n",r->name); //pcc->pcop->name);
-      pBlockRegs(stderr,pcc->pc.pb);
-      return r->name;
+      if(PCOI(pcop)->_const) {
+
+       if( PCOI(pcop)->offset && PCOI(pcop)->offset<4) {
+         SAFE_snprintf(&s,&size,"(((%s+%d) >> %d)&0xff)",
+                       pcop->name,
+                       PCOI(pcop)->index,
+                       8 * PCOI(pcop)->offset );
+       } else
+         SAFE_snprintf(&s,&size,"LOW(%s+%d)",pcop->name,PCOI(pcop)->index);
+      } else {
+      
+       if( PCOI(pcop)->index) { // && PCOI(pcc->pcop)->offset<4) {
+         SAFE_snprintf(&s,&size,"(%s + %d)",
+                       pcop->name,
+                       PCOI(pcop)->index );
+       } else
+         SAFE_snprintf(&s,&size,"%s",pcop->name);
+      }
+
+      return buffer;
+
+    case PO_DIR:
+      s = buffer;
+      //size = sizeof(buffer);
+      if( PCOR(pcop)->instance) {
+       SAFE_snprintf(&s,&size,"(%s + %d)",
+                     pcop->name,
+                     PCOR(pcop)->instance );
+       //fprintf(stderr,"PO_DIR %s\n",buffer);
+      } else
+       SAFE_snprintf(&s,&size,"%s",pcop->name);
+      return buffer;
 
     default:
-      if  (pcc->pcop->name)
-       return pcc->pcop->name;
+      if  (pcop->name) {
+       if(use_buffer) {
+         SAFE_snprintf(&buffer,&size,"%s",pcop->name);
+         return buffer;
+       }
+       return pcop->name;
+      }
 
     }
   }
 
   return "NO operand";
+
 }
 
 /*-----------------------------------------------------------------*/
 /*-----------------------------------------------------------------*/
-static void pCodeOpPrint(FILE *of, pCodeOp *pcop)
+static char *get_op_from_instruction( pCodeInstruction *pcc)
 {
 
-  fprintf(of,"pcodeopprint\n");
-}
+  if(pcc )
+    return get_op(pcc->pcop,NULL,0);
+  
+  return ("ERROR Null: "__FUNCTION__);
+
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+static void pCodeOpPrint(FILE *of, pCodeOp *pcop)
+{
+
+  fprintf(of,"pcodeopprint- not implemented\n");
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+char *pCode2str(char *str, int size, pCode *pc)
+{
+  char *s = str;
+
+  switch(pc->type) {
+
+  case PC_OPCODE:
+
+    SAFE_snprintf(&s,&size, "\t%s\t", PCI(pc)->mnemonic);
+
+    if( (PCI(pc)->num_ops >= 1) && (PCI(pc)->pcop)) {
+
+      if(PCI(pc)->isBitInst) {
+       if(PCI(pc)->pcop->type == PO_GPR_BIT) {
+         if( (((pCodeOpRegBit *)(PCI(pc)->pcop))->inBitSpace) )
+           SAFE_snprintf(&s,&size,"(%s >> 3), (%s & 7)", 
+                         PCI(pc)->pcop->name ,
+                         PCI(pc)->pcop->name );
+         else
+           SAFE_snprintf(&s,&size,"%s,%d", get_op_from_instruction(PCI(pc)), 
+                         (((pCodeOpRegBit *)(PCI(pc)->pcop))->bit ));
+       } else if(PCI(pc)->pcop->type == PO_GPR_BIT) {
+         SAFE_snprintf(&s,&size,"%s,%d", get_op_from_instruction(PCI(pc)),PCORB(PCI(pc)->pcop)->bit);
+       }else
+         SAFE_snprintf(&s,&size,"%s,0 ; ?bug", get_op_from_instruction(PCI(pc)));
+       //PCI(pc)->pcop->t.bit );
+      } else {
+
+       if(PCI(pc)->pcop->type == PO_GPR_BIT) {
+         if( PCI(pc)->num_ops == 2)
+           SAFE_snprintf(&s,&size,"(%s >> 3),%c",get_op_from_instruction(PCI(pc)),((PCI(pc)->isModReg) ? 'F':'W'));
+         else
+           SAFE_snprintf(&s,&size,"(1 << (%s & 7))",get_op_from_instruction(PCI(pc)));
+
+       }else {
+         SAFE_snprintf(&s,&size,"%s",get_op_from_instruction(PCI(pc)));
+
+         if( PCI(pc)->num_ops == 2)
+           SAFE_snprintf(&s,&size,",%c", ( (PCI(pc)->isModReg) ? 'F':'W'));
+       }
+      }
+
+    }
+    break;
+
+  case PC_COMMENT:
+    /* assuming that comment ends with a \n */
+    SAFE_snprintf(&s,&size,";%s", ((pCodeComment *)pc)->comment);
+    break;
+
+  case PC_INLINE:
+    /* assuming that inline code ends with a \n */
+    SAFE_snprintf(&s,&size,"%s", ((pCodeComment *)pc)->comment);
+    break;
+
+  case PC_LABEL:
+    SAFE_snprintf(&s,&size,";label=%s, key=%d\n",PCL(pc)->label,PCL(pc)->key);
+    break;
+  case PC_FUNCTION:
+    SAFE_snprintf(&s,&size,";modname=%s,function=%s: id=%d\n",PCF(pc)->modname,PCF(pc)->fname);
+    break;
+  case PC_WILD:
+    SAFE_snprintf(&s,&size,";\tWild opcode: id=%d\n",PCW(pc)->id);
+    break;
+  case PC_FLOW:
+    SAFE_snprintf(&s,&size,";\t--FLOW change\n");
+    break;
+  case PC_CSOURCE:
+    SAFE_snprintf(&s,&size,";#CSRC\t%s %d\n; %s\n", PCCS(pc)->file_name, PCCS(pc)->line_number, PCCS(pc)->line);
+    break;
+
+  case PC_BAD:
+    SAFE_snprintf(&s,&size,";A bad pCode is being used\n");
+  }
+
+  return str;
+
+}
 
 /*-----------------------------------------------------------------*/
 /* genericPrint - the contents of a pCode to a file                */
@@ -1411,54 +2644,39 @@ static void genericPrint(FILE *of, pCode *pc)
     fprintf(of,";%s\n", ((pCodeComment *)pc)->comment);
     break;
 
+  case PC_INLINE:
+    fprintf(of,"%s\n", ((pCodeComment *)pc)->comment);
+     break;
+
   case PC_OPCODE:
     // If the opcode has a label, print that first
     {
-      pBranch *pbl = pc->label;
-      while(pbl) {
+      pBranch *pbl = PCI(pc)->label;
+      while(pbl && pbl->pc) {
        if(pbl->pc->type == PC_LABEL)
          pCodePrintLabel(of, pbl->pc);
        pbl = pbl->next;
       }
     }
 
-    fprintf(of, "\t%s\t", PCI(pc)->mnemonic);
-    if( (PCI(pc)->num_ops >= 1) && (PCI(pc)->pcop)) {
-
-      if(PCI(pc)->bit_inst) {
-       if(PCI(pc)->pcop->type == PO_BIT) {
-         if( (((pCodeOpBit *)(PCI(pc)->pcop))->inBitSpace) )
-           fprintf(of,"(%s >> 3), (%s & 7)", 
-                   PCI(pc)->pcop->name ,
-                   PCI(pc)->pcop->name );
-         else
-           fprintf(of,"%s,%d", get_op(PCI(pc)), (((pCodeOpBit *)(PCI(pc)->pcop))->bit ));
-       } else
-         fprintf(of,"%s,0 ; ?bug", get_op(PCI(pc)));
-       //PCI(pc)->pcop->t.bit );
-      } else {
+    if(PCI(pc)->cline) 
+      genericPrint(of,PCODE(PCI(pc)->cline));
 
-       if(PCI(pc)->pcop->type == PO_BIT) {
-         if( PCI(pc)->num_ops == 2)
-           fprintf(of,"(%s >> 3),%c",get_op(PCI(pc)),((PCI(pc)->dest) ? 'F':'W'));
-         else
-           fprintf(of,"(1 << (%s & 7))",get_op(PCI(pc)));
+    {
+      char str[256];
+      
+      pCode2str(str, 256, pc);
 
-/*
-         if( PCI(pc)->num_ops == 2)
-           fprintf(of,"(%s >> 3),%c",PCI(pc)->pcop->name,((PCI(pc)->dest) ? 'F':'W'));
-         else
-           fprintf(of,"(1 << (%s & 7))",PCI(pc)->pcop->name);
-*/
-       }else {
-         fprintf(of,"%s",get_op(PCI(pc)));
+      fprintf(of,"%s",str);
 
-         if( PCI(pc)->num_ops == 2)
-           fprintf(of,",%c", ( (PCI(pc)->dest) ? 'F':'W'));
-       }
+      /* Debug */
+      if(debug_verbose) {
+       fprintf(of, "\t;key=%03x",pc->seq);
+       if(PCI(pc)->pcflow)
+         fprintf(of,",flow seq=%03x",PCI(pc)->pcflow->pc.seq);
       }
     }
-
+#if 0
     {
       pBranch *dpb = pc->to;   // debug
       while(dpb) {
@@ -1472,25 +2690,44 @@ static void genericPrint(FILE *of, pCode *pc)
        case PC_FUNCTION:
          fprintf(of, "\t;function %s", ( (PCF(dpb->pc)->fname) ? (PCF(dpb->pc)->fname) : "[END]"));
          break;
+       case PC_FLOW:
+         fprintf(of, "\t;flow");
+         break;
        case PC_COMMENT:
        case PC_WILD:
          break;
        }
        dpb = dpb->next;
       }
-      fprintf(of,"\n");
     }
-
+#endif
+    fprintf(of,"\n");
     break;
 
   case PC_WILD:
     fprintf(of,";\tWild opcode: id=%d\n",PCW(pc)->id);
+    if(PCW(pc)->pci.label)
+      pCodePrintLabel(of, PCW(pc)->pci.label->pc);
+
     if(PCW(pc)->operand) {
       fprintf(of,";\toperand  ");
       pCodeOpPrint(of,PCW(pc)->operand );
     }
     break;
 
+  case PC_FLOW:
+    if(debug_verbose) {
+      fprintf(of,";<>Start of new flow, seq=0x%x",pc->seq);
+      if(PCFL(pc)->ancestor)
+       fprintf(of," ancestor = 0x%x", PCODE(PCFL(pc)->ancestor)->seq);
+      fprintf(of,"\n");
+
+    }
+    break;
+
+  case PC_CSOURCE:
+    fprintf(of,";#CSRC\t%s %d\n;  %s\n", PCCS(pc)->file_name, PCCS(pc)->line_number, PCCS(pc)->line);
+    break;
   case PC_LABEL:
   default:
     fprintf(of,"unknown pCode type %d\n",pc->type);
@@ -1512,7 +2749,7 @@ static void pCodePrintFunction(FILE *of, pCode *pc)
     fprintf(of,"F_%s",((pCodeFunction *)pc)->modname);
 
   if(PCF(pc)->fname) {
-    pBranch *exits = pc->to;
+    pBranch *exits = PCF(pc)->to;
     int i=0;
     fprintf(of,"%s\t;Function start\n",PCF(pc)->fname);
     while(exits) {
@@ -1523,10 +2760,10 @@ static void pCodePrintFunction(FILE *of, pCode *pc)
     fprintf(of,"; %d exit point%c\n",i, ((i==1) ? ' ':'s'));
     
   }else {
-    if(pc->from && 
-       pc->from->pc->type == PC_FUNCTION &&
-       PCF(pc->from->pc)->fname) 
-      fprintf(of,"; exit point of %s\n",PCF(pc->from->pc)->fname);
+    if((PCF(pc)->from && 
+       PCF(pc)->from->pc->type == PC_FUNCTION &&
+       PCF(PCF(pc)->from->pc)->fname) )
+      fprintf(of,"; exit point of %s\n",PCF(PCF(pc)->from->pc)->fname);
     else
       fprintf(of,"; exit point [can't find entry point]\n");
   }
@@ -1546,18 +2783,64 @@ static void pCodePrintLabel(FILE *of, pCode *pc)
   else if (PCL(pc)->key >=0) 
     fprintf(of,"_%05d_DS_:\n",PCL(pc)->key);
   else
-    fprintf(of,";wild card label\n");
+    fprintf(of,";wild card label: id=%d\n",-PCL(pc)->key);
 
 }
 /*-----------------------------------------------------------------*/
+/* unlinkpCodeFromBranch - Search for a label in a pBranch and     */
+/*                         remove it if it is found.               */
+/*-----------------------------------------------------------------*/
+static void unlinkpCodeFromBranch(pCode *pcl , pCode *pc)
+{
+  pBranch *b, *bprev;
+
+
+  bprev = NULL;
+
+  if(pcl->type == PC_OPCODE)
+    b = PCI(pcl)->label;
+  else {
+    fprintf(stderr, "LINE %d. can't unlink from non opcode\n",__LINE__);
+    exit(1);
+
+  }
+
+  //fprintf (stderr, "%s \n",__FUNCTION__);
+  //pcl->print(stderr,pcl);
+  //pc->print(stderr,pc);
+  while(b) {
+    if(b->pc == pc) {
+      //fprintf (stderr, "found label\n");
+
+      /* Found a label */
+      if(bprev) {
+       bprev->next = b->next;  /* Not first pCode in chain */
+       free(b);
+      } else {
+       pc->destruct(pc);
+       PCI(pcl)->label = b->next;   /* First pCode in chain */
+       free(b);
+      }
+      return;  /* A label can't occur more than once */
+    }
+    bprev = b;
+    b = b->next;
+  }
 
-static pBranch * pBranchAppend(pBranch *h, pBranch *n)
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+pBranch * pBranchAppend(pBranch *h, pBranch *n)
 {
   pBranch *b;
 
   if(!h)
     return n;
 
+  if(h == n)
+    return n;
+
   b = h;
   while(b->next)
     b = b->next;
@@ -1571,22 +2854,24 @@ static pBranch * pBranchAppend(pBranch *h, pBranch *n)
 /* pBranchLink - given two pcodes, this function will link them    */
 /*               together through their pBranches                  */
 /*-----------------------------------------------------------------*/
-static void pBranchLink(pCode *f, pCode *t)
+static void pBranchLink(pCodeFunction *f, pCodeFunction *t)
 {
   pBranch *b;
 
   // Declare a new branch object for the 'from' pCode.
 
-  _ALLOC(b,sizeof(pBranch));
-  b->pc = t;                    // The link to the 'to' pCode.
+  //_ALLOC(b,sizeof(pBranch));
+  b = Safe_calloc(1,sizeof(pBranch));
+  b->pc = PCODE(t);             // The link to the 'to' pCode.
   b->next = NULL;
 
   f->to = pBranchAppend(f->to,b);
 
   // Now do the same for the 'to' pCode.
 
-  _ALLOC(b,sizeof(pBranch));
-  b->pc = f;
+  //_ALLOC(b,sizeof(pBranch));
+  b = Safe_calloc(1,sizeof(pBranch));
+  b->pc = PCODE(f);
   b->next = NULL;
 
   t->from = pBranchAppend(t->from,b);
@@ -1657,6 +2942,7 @@ static void pCodeUnlink(pCode *pc)
 #endif
 /*-----------------------------------------------------------------*/
 /*-----------------------------------------------------------------*/
+#if 0
 static void genericAnalyze(pCode *pc)
 {
   switch(pc->type) {
@@ -1681,8 +2967,79 @@ static void genericAnalyze(pCode *pc)
        } else
          npc = npc->next;
       }
+      /* reached the end of the pcode chain without finding
+       * an instruction we could link to. */
+    }
+    break;
+  case PC_FLOW:
+    fprintf(stderr,"analyze PC_FLOW\n");
+
+    return;
+  case PC_BAD:
+    fprintf(stderr,,";A bad pCode is being used\n");
+
+  }
+}
+#endif
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+int compareLabel(pCode *pc, pCodeOpLabel *pcop_label)
+{
+  pBranch *pbr;
+
+  if(pc->type == PC_LABEL) {
+    if( ((pCodeLabel *)pc)->key ==  pcop_label->key)
+      return TRUE;
+  }
+  if(pc->type == PC_OPCODE) {
+    pbr = PCI(pc)->label;
+    while(pbr) {
+      if(pbr->pc->type == PC_LABEL) {
+       if( ((pCodeLabel *)(pbr->pc))->key ==  pcop_label->key)
+         return TRUE;
+      }
+      pbr = pbr->next;
+    }
+  }
+
+  return FALSE;
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+int checkLabel(pCode *pc)
+{
+  pBranch *pbr;
+
+  if(pc && isPCI(pc)) {
+    pbr = PCI(pc)->label;
+    while(pbr) {
+      if(isPCL(pbr->pc) && (PCL(pbr->pc)->key >= 0))
+       return TRUE;
+
+      pbr = pbr->next;
     }
   }
+
+  return FALSE;
+}
+
+/*-----------------------------------------------------------------*/
+/* findLabelinpBlock - Search the pCode for a particular label     */
+/*-----------------------------------------------------------------*/
+pCode * findLabelinpBlock(pBlock *pb,pCodeOpLabel *pcop_label)
+{
+  pCode  *pc;
+
+  if(!pb)
+    return NULL;
+
+  for(pc = pb->pcHead; pc; pc = pc->next) 
+    if(compareLabel(pc,pcop_label))
+      return pc;
+    
+  return NULL;
 }
 
 /*-----------------------------------------------------------------*/
@@ -1692,56 +3049,87 @@ pCode * findLabel(pCodeOpLabel *pcop_label)
 {
   pBlock *pb;
   pCode  *pc;
-  pBranch *pbr;
 
   if(!the_pFile)
     return NULL;
 
   for(pb = the_pFile->pbHead; pb; pb = pb->next) {
-    for(pc = pb->pcHead; pc; pc = pc->next) {
-      if(pc->type == PC_LABEL) {
-       if( ((pCodeLabel *)pc)->key ==  pcop_label->key)
-         return pc;
-      }
-      if(pc->type == PC_OPCODE) {
-       pbr = pc->label;
-       while(pbr) {
-         if(pbr->pc->type == PC_LABEL) {
-           if( ((pCodeLabel *)(pbr->pc))->key ==  pcop_label->key)
-             return pc;
-         }
-         pbr = pbr->next;
-       }
-      }
-
-    }
+    if( (pc = findLabelinpBlock(pb,pcop_label)) != NULL)
+      return pc;
   }
 
   fprintf(stderr,"Couldn't find label %s", pcop_label->pcop.name);
   return NULL;
 }
 
+/*-----------------------------------------------------------------*/
+/* findNextpCode - given a pCode, find the next of type 'pct'      */
+/*                 in the linked list                              */
+/*-----------------------------------------------------------------*/
+pCode * findNextpCode(pCode *pc, PC_TYPE pct)
+{
+
+  while(pc) {
+    if(pc->type == pct)
+      return pc;
+
+    pc = pc->next;
+  }
+
+  return NULL;
+}
+
+/*-----------------------------------------------------------------*/
+/* findPrevpCode - given a pCode, find the previous of type 'pct'  */
+/*                 in the linked list                              */
+/*-----------------------------------------------------------------*/
+pCode * findPrevpCode(pCode *pc, PC_TYPE pct)
+{
+
+  while(pc) {
+    if(pc->type == pct)
+      return pc;
+
+    pc = pc->prev;
+  }
+
+  return NULL;
+}
 /*-----------------------------------------------------------------*/
 /* findNextInstruction - given a pCode, find the next instruction  */
 /*                       in the linked list                        */
 /*-----------------------------------------------------------------*/
-pCode * findNextInstruction(pCode *pc)
+pCode * findNextInstruction(pCode *pci)
 {
+  pCode *pc = pci;
 
   while(pc) {
-    if(pc->type == PC_OPCODE)
+    if((pc->type == PC_OPCODE) || (pc->type == PC_WILD))
       return pc;
 
+#ifdef PCODE_DEBUG
+    fprintf(stderr,"findNextInstruction:  ");
+    printpCode(stderr, pc);
+#endif
     pc = pc->next;
   }
 
-  fprintf(stderr,"Couldn't find instruction\n");
+  //fprintf(stderr,"Couldn't find instruction\n");
   return NULL;
 }
 
+/*-----------------------------------------------------------------*/
+/* findNextInstruction - given a pCode, find the next instruction  */
+/*                       in the linked list                        */
+/*-----------------------------------------------------------------*/
+pCode * findPrevInstruction(pCode *pci)
+{
+  return findPrevpCode(pci, PC_OPCODE);
+}
+
 /*-----------------------------------------------------------------*/
 /* findFunctionEnd - given a pCode find the end of the function    */
-/*                   that contains it     t                        */
+/*                   that contains it                              */
 /*-----------------------------------------------------------------*/
 pCode * findFunctionEnd(pCode *pc)
 {
@@ -1770,6 +3158,7 @@ static void AnalyzeLabel(pCode *pc)
 }
 #endif
 
+#if 0
 static void AnalyzeGOTO(pCode *pc)
 {
 
@@ -1792,6 +3181,61 @@ static void AnalyzeRETURN(pCode *pc)
 
 }
 
+#endif
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+regs * getRegFromInstruction(pCode *pc)
+{
+
+  if(!pc                   || 
+     !isPCI(pc)            ||
+     !PCI(pc)->pcop        ||
+     PCI(pc)->num_ops == 0 )
+    return NULL;
+
+  switch(PCI(pc)->pcop->type) {
+  case PO_INDF:
+  case PO_FSR:
+    return PCOR(PCI(pc)->pcop)->r;
+
+    //    return typeRegWithIdx (PCOR(PCI(pc)->pcop)->rIdx, REG_SFR, 0);
+
+  case PO_BIT:
+  case PO_GPR_TEMP:
+    //fprintf(stderr, "getRegFromInstruction - bit or temp\n");
+    return PCOR(PCI(pc)->pcop)->r;
+
+  case PO_IMMEDIATE:
+    if(PCOI(PCI(pc)->pcop)->r)
+      return (PCOI(PCI(pc)->pcop)->r);
+
+    //fprintf(stderr, "getRegFromInstruction - immediate\n");
+    return dirregWithName(PCI(pc)->pcop->name);
+    //return NULL; // PCOR(PCI(pc)->pcop)->r;
+
+  case PO_GPR_BIT:
+    return PCOR(PCI(pc)->pcop)->r;
+
+  case PO_DIR:
+    //fprintf(stderr, "getRegFromInstruction - dir\n");
+    return PCOR(PCI(pc)->pcop)->r;
+  case PO_LITERAL:
+    //fprintf(stderr, "getRegFromInstruction - literal\n");
+    break;
+
+  default:
+    //fprintf(stderr, "getRegFromInstruction - unknown reg type %d\n",PCI(pc)->pcop->type);
+    //genericPrint(stderr, pc);
+    break;
+  }
+
+  return NULL;
+
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
 
 void AnalyzepBlock(pBlock *pb)
 {
@@ -1800,153 +3244,1566 @@ void AnalyzepBlock(pBlock *pb)
   if(!pb)
     return;
 
-  /* Find all of the registers used in this pBlock */
+  /* Find all of the registers used in this pBlock 
+   * by looking at each instruction and examining it's
+   * operands
+   */
   for(pc = pb->pcHead; pc; pc = pc->next) {
-    if(pc->type == PC_OPCODE) {
-      if(PCI(pc)->pcop && PCI(pc)->pcop->type == PO_GPR_TEMP) {
+
+    /* Is this an instruction with operands? */
+    if(pc->type == PC_OPCODE && PCI(pc)->pcop) {
+
+      if(PCI(pc)->pcop->type == PO_GPR_TEMP) {
 
        /* Loop through all of the registers declared so far in
-          this block and see if we find this new there */
+          this block and see if we find this one there */
 
-       regs *r = setFirstItem(pb->registers);
+       regs *r = setFirstItem(pb->tregisters);
 
        while(r) {
          if(r->rIdx == PCOR(PCI(pc)->pcop)->r->rIdx) {
            PCOR(PCI(pc)->pcop)->r = r;
            break;
          }
-         r = setNextItem(pb->registers);
+         r = setNextItem(pb->tregisters);
        }
 
        if(!r) {
          /* register wasn't found */
-         r = Safe_calloc(1, sizeof(regs));
-         memcpy(r,PCOR(PCI(pc)->pcop)->r, sizeof(regs));
-         addSet(&pb->registers, r);
-         PCOR(PCI(pc)->pcop)->r = r;
-         fprintf(stderr,"added register to pblock: reg %d\n",r->rIdx);
-       } else 
+         //r = Safe_calloc(1, sizeof(regs));
+         //memcpy(r,PCOR(PCI(pc)->pcop)->r, sizeof(regs));
+         //addSet(&pb->tregisters, r);
+         addSet(&pb->tregisters, PCOR(PCI(pc)->pcop)->r);
+         //PCOR(PCI(pc)->pcop)->r = r;
+         //fprintf(stderr,"added register to pblock: reg %d\n",r->rIdx);
+       }/* else 
          fprintf(stderr,"found register in pblock: reg %d\n",r->rIdx);
+        */
+      }
+      if(PCI(pc)->pcop->type == PO_GPR_REGISTER) {
+       if(PCOR(PCI(pc)->pcop)->r) {
+         pic14_allocWithIdx (PCOR(PCI(pc)->pcop)->r->rIdx);
+         DFPRINTF((stderr,"found register in pblock: reg 0x%x\n",PCOR(PCI(pc)->pcop)->r->rIdx));
+       } else {
+         if(PCI(pc)->pcop->name)
+           fprintf(stderr,"ERROR: %s is a NULL register\n",PCI(pc)->pcop->name );
+         else
+           fprintf(stderr,"ERROR: NULL register\n");
+       }
       }
     }
+
+
   }
 }
 
-int OptimizepBlock(pBlock *pb)
+/*-----------------------------------------------------------------*/
+/* */
+/*-----------------------------------------------------------------*/
+#define PCI_HAS_LABEL(x) ((x) && (PCI(x)->label != NULL))
+
+void InsertpFlow(pCode *pc, pCode **pflow)
+{
+  if(*pflow)
+    PCFL(*pflow)->end = pc;
+
+  if(!pc || !pc->next)
+    return;
+
+  *pflow = newpCodeFlow();
+  pCodeInsertAfter(pc, *pflow);
+}
+
+/*-----------------------------------------------------------------*/
+/* BuildFlow(pBlock *pb) - examine the code in a pBlock and build  */
+/*                         the flow blocks.                        */
+/*
+ * BuildFlow inserts pCodeFlow objects into the pCode chain at each
+ * point the instruction flow changes. 
+ */
+/*-----------------------------------------------------------------*/
+void BuildFlow(pBlock *pb)
 {
   pCode *pc;
-  int matches =0;
+  pCode *last_pci=NULL;
+  pCode *pflow=NULL;
+  int seq = 0;
 
-  if(!pb || !peepOptimizing)
-    return 0;
+  if(!pb)
+    return;
 
-  fprintf(stderr," Optimizing pBlock\n");
+  //fprintf (stderr,"build flow start seq %d  ",GpcFlowSeq);
+  /* Insert a pCodeFlow object at the beginning of a pBlock */
 
-  for(pc = pb->pcHead; pc; pc = pc->next)
-    matches += pCodePeepMatchRule(pc);
+  InsertpFlow(pb->pcHead, &pflow);
+
+  //pflow = newpCodeFlow();    /* Create a new Flow object */
+  //pflow->next = pb->pcHead;  /* Make the current head the next object */
+  //pb->pcHead->prev = pflow;  /* let the current head point back to the flow object */
+  //pb->pcHead = pflow;        /* Make the Flow object the head */
+  //pflow->pb = pb;
+
+  for( pc = findNextInstruction(pb->pcHead);
+       pc != NULL;
+       pc=findNextInstruction(pc)) { 
+
+    pc->seq = seq++;
+    PCI(pc)->pcflow = PCFL(pflow);
+
+    //fprintf(stderr," build: ");
+    //pflow->print(stderr,pflow);
+
+    if( PCI(pc)->isSkip) {
+
+      /* The two instructions immediately following this one 
+       * mark the beginning of a new flow segment */
+
+      while(pc && PCI(pc)->isSkip) {
+
+       PCI(pc)->pcflow = PCFL(pflow);
+       pc->seq = seq-1;
+       seq = 1;
+
+       InsertpFlow(pc, &pflow);
+       pc=findNextInstruction(pc->next);
+      }
+
+      seq = 0;
+
+      if(!pc)
+       break;
+
+      PCI(pc)->pcflow = PCFL(pflow);
+      pc->seq = 0;
+      InsertpFlow(pc, &pflow);
+
+    } else if ( PCI(pc)->isBranch && !checkLabel(findNextInstruction(pc->next)))  {
+
+      InsertpFlow(pc, &pflow);
+      seq = 0;
+
+    } else if (checkLabel(pc)) { 
+
+      /* This instruction marks the beginning of a
+       * new flow segment */
+
+      pc->seq = 0;
+      seq = 1;
+
+      /* If the previous pCode is not a flow object, then 
+       * insert a new flow object. (This check prevents 
+       * two consecutive flow objects from being insert in
+       * the case where a skip instruction preceeds an
+       * instruction containing a label.) */
+
+      if(last_pci && (PCI(last_pci)->pcflow == PCFL(pflow)))
+       InsertpFlow(findPrevInstruction(pc->prev), &pflow);
+
+      PCI(pc)->pcflow = PCFL(pflow);
+      
+    }
+    last_pci = pc;
+    pc = pc->next;
+  }
+
+  //fprintf (stderr,",end seq %d",GpcFlowSeq);
+  if(pflow)
+    PCFL(pflow)->end = pb->pcTail;
+}
+
+/*-------------------------------------------------------------------*/
+/* unBuildFlow(pBlock *pb) - examine the code in a pBlock and build  */
+/*                           the flow blocks.                        */
+/*
+ * unBuildFlow removes pCodeFlow objects from a pCode chain
+ */
+/*-----------------------------------------------------------------*/
+void unBuildFlow(pBlock *pb)
+{
+  pCode *pc,*pcnext;
+
+  if(!pb)
+    return;
+
+  pc = pb->pcHead;
+
+  while(pc) {
+    pcnext = pc->next;
+
+    if(isPCI(pc)) {
+
+      pc->seq = 0;
+      if(PCI(pc)->pcflow) {
+       //free(PCI(pc)->pcflow);
+       PCI(pc)->pcflow = NULL;
+      }
+
+    } else if(isPCFL(pc) )
+      pc->destruct(pc);
+
+    pc = pcnext;
+  }
+
+
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void dumpCond(int cond)
+{
+
+  static char *pcc_str[] = {
+    //"PCC_NONE",
+    "PCC_REGISTER",
+    "PCC_C",
+    "PCC_Z",
+    "PCC_DC",
+    "PCC_W",
+    "PCC_EXAMINE_PCOP",
+    "PCC_REG_BANK0",
+    "PCC_REG_BANK1",
+    "PCC_REG_BANK2",
+    "PCC_REG_BANK3"
+  };
+
+  int ncond = sizeof(pcc_str) / sizeof(char *);
+  int i,j;
+
+  fprintf(stderr, "0x%04X\n",cond);
+
+  for(i=0,j=1; i<ncond; i++, j<<=1)
+    if(cond & j)
+      fprintf(stderr, "  %s\n",pcc_str[i]);
+
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void FlowStats(pCodeFlow *pcflow)
+{
+
+  pCode *pc;
+
+  if(!isPCFL(pcflow))
+    return;
+
+  fprintf(stderr, " FlowStats - flow block (seq=%d)\n", pcflow->pc.seq);
+
+  pc = findNextpCode(PCODE(pcflow), PC_OPCODE); 
+
+  if(!pc) {
+    fprintf(stderr, " FlowStats - empty flow (seq=%d)\n", pcflow->pc.seq);
+    return;
+  }
+
+
+  fprintf(stderr, "  FlowStats inCond: ");
+  dumpCond(pcflow->inCond);
+  fprintf(stderr, "  FlowStats outCond: ");
+  dumpCond(pcflow->outCond);
+
+}
+
+/*-----------------------------------------------------------------*
+ * int isBankInstruction(pCode *pc) - examine the pCode *pc to determine
+ *    if it affects the banking bits. 
+ * 
+ * return: -1 == Banking bits are unaffected by this pCode.
+ *
+ * return: > 0 == Banking bits are affected.
+ *
+ *  If the banking bits are affected, then the returned value describes
+ * which bits are affected and how they're affected. The lower half
+ * of the integer maps to the bits that are affected, the upper half
+ * to whether they're set or cleared.
+ *
+ *-----------------------------------------------------------------*/
+#define SET_BANK_BIT (1 << 16)
+#define CLR_BANK_BIT 0
+
+int isBankInstruction(pCode *pc)
+{
+  regs *reg;
+  int bank = -1;
+
+  if(!isPCI(pc))
+    return -1;
+
+  if( ( (reg = getRegFromInstruction(pc)) != NULL) && isSTATUS_REG(reg)) {
+
+    /* Check to see if the register banks are changing */
+    if(PCI(pc)->isModReg) {
+
+      pCodeOp *pcop = PCI(pc)->pcop;
+      switch(PCI(pc)->op) {
+
+      case POC_BSF:
+       if(PCORB(pcop)->bit == PIC_RP0_BIT) {
+         //fprintf(stderr, "  isBankInstruction - Set RP0\n");
+         return  SET_BANK_BIT | PIC_RP0_BIT;
+       }
+
+       if(PCORB(pcop)->bit == PIC_RP1_BIT) {
+         //fprintf(stderr, "  isBankInstruction - Set RP1\n");
+         return  CLR_BANK_BIT | PIC_RP0_BIT;
+       }
+       break;
+
+      case POC_BCF:
+       if(PCORB(pcop)->bit == PIC_RP0_BIT) {
+         //fprintf(stderr, "  isBankInstruction - Clr RP0\n");
+         return  CLR_BANK_BIT | PIC_RP1_BIT;
+       }
+       if(PCORB(pcop)->bit == PIC_RP1_BIT) {
+         //fprintf(stderr, "  isBankInstruction - Clr RP1\n");
+         return  CLR_BANK_BIT | PIC_RP1_BIT;
+       }
+       break;
+      default:
+       //fprintf(stderr, "  isBankInstruction - Status register is getting Modified by:\n");
+       //genericPrint(stderr, pc);
+       ;
+      }
+    }
+
+  }
+
+  return bank;
+}
+
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void FillFlow(pCodeFlow *pcflow)
+{
+
+  pCode *pc;
+  int cur_bank;
+
+  if(!isPCFL(pcflow))
+    return;
+
+  //  fprintf(stderr, " FillFlow - flow block (seq=%d)\n", pcflow->pc.seq);
+
+  pc = findNextpCode(PCODE(pcflow), PC_OPCODE); 
+
+  if(!pc) {
+    //fprintf(stderr, " FillFlow - empty flow (seq=%d)\n", pcflow->pc.seq);
+    return;
+  }
+
+  cur_bank = -1;
+
+  do {
+    isBankInstruction(pc);
+    pc = pc->next;
+  } while (pc && (pc != pcflow->end) && !isPCFL(pc));
+
+/*
+  if(!pc ) {
+    fprintf(stderr, "  FillFlow - Bad end of flow\n");
+  } else {
+    fprintf(stderr, "  FillFlow - Ending flow with\n  ");
+    pc->print(stderr,pc);
+  }
+
+  fprintf(stderr, "  FillFlow inCond: ");
+  dumpCond(pcflow->inCond);
+  fprintf(stderr, "  FillFlow outCond: ");
+  dumpCond(pcflow->outCond);
+*/
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void LinkFlow_pCode(pCodeInstruction *from, pCodeInstruction *to)
+{
+  pCodeFlowLink *fromLink, *toLink;
+
+  if(!from || !to || !to->pcflow || !from->pcflow)
+    return;
+
+  fromLink = newpCodeFlowLink(from->pcflow);
+  toLink   = newpCodeFlowLink(to->pcflow);
+
+  addSetIfnotP(&(from->pcflow->to), toLink);   //to->pcflow);
+  addSetIfnotP(&(to->pcflow->from), fromLink); //from->pcflow);
+
+}
+
+/*-----------------------------------------------------------------*
+ * void LinkFlow(pBlock *pb)
+ *
+ * In BuildFlow, the PIC code has been partitioned into contiguous
+ * non-branching segments. In LinkFlow, we determine the execution
+ * order of these segments. For example, if one of the segments ends
+ * with a skip, then we know that there are two possible flow segments
+ * to which control may be passed.
+ *-----------------------------------------------------------------*/
+void LinkFlow(pBlock *pb)
+{
+  pCode *pc=NULL;
+  pCode *pcflow;
+  pCode *pct;
+
+  //fprintf(stderr,"linkflow \n");
+
+  for( pcflow = findNextpCode(pb->pcHead, PC_FLOW); 
+       pcflow != NULL;
+       pcflow = findNextpCode(pcflow->next, PC_FLOW) ) {
+
+    if(!isPCFL(pcflow))
+      fprintf(stderr, "LinkFlow - pcflow is not a flow object ");
+
+    //fprintf(stderr," link: ");
+    //pcflow->print(stderr,pcflow);
+
+    //FillFlow(PCFL(pcflow));
+
+    pc = PCFL(pcflow)->end;
+
+    //fprintf(stderr, "LinkFlow - flow block (seq=%d) ", pcflow->seq);
+    if(isPCI_SKIP(pc)) {
+      //fprintf(stderr, "ends with skip\n");
+      //pc->print(stderr,pc);
+      pct=findNextInstruction(pc->next);
+      LinkFlow_pCode(PCI(pc),PCI(pct));
+      pct=findNextInstruction(pct->next);
+      LinkFlow_pCode(PCI(pc),PCI(pct));
+      continue;
+    }
+
+    if(isPCI_BRANCH(pc)) {
+      pCodeOpLabel *pcol = PCOLAB(PCI(pc)->pcop);
+
+      //fprintf(stderr, "ends with branch\n  ");
+      //pc->print(stderr,pc);
+
+      if(!(pcol && isPCOLAB(pcol))) {
+       if((PCI(pc)->op != POC_RETLW) && (PCI(pc)->op != POC_RETURN) && (PCI(pc)->op != POC_CALL) && (PCI(pc)->op != POC_RETFIE) ) {
+         pc->print(stderr,pc);
+         fprintf(stderr, "ERROR: %s, branch instruction doesn't have label\n",__FUNCTION__);
+       }
+       continue;
+      }
+
+      if( (pct = findLabelinpBlock(pb,pcol)) != NULL)
+       LinkFlow_pCode(PCI(pc),PCI(pct));
+      else
+       fprintf(stderr, "ERROR: %s, couldn't find label\n",__FUNCTION__);
+
+      continue;
+    }
+
+    if(isPCI(pc)) {
+      //fprintf(stderr, "ends with non-branching instruction:\n");
+      //pc->print(stderr,pc);
+
+      LinkFlow_pCode(PCI(pc),PCI(findNextInstruction(pc->next)));
+
+      continue;
+    }
+
+    if(pc) {
+      //fprintf(stderr, "ends with unknown\n");
+      //pc->print(stderr,pc);
+      continue;
+    }
+
+    //fprintf(stderr, "ends with nothing: ERROR\n");
+    
+  }
+}
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+int isPCinFlow(pCode *pc, pCode *pcflow)
+{
+
+  if(!pc || !pcflow)
+    return 0;
+
+  if(!isPCI(pc) || !PCI(pc)->pcflow || !isPCFL(pcflow) )
+    return 0;
+
+  if( PCI(pc)->pcflow->pc.seq == pcflow->seq)
+    return 1;
+
+  return 0;
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void BanksUsedFlow2(pCode *pcflow)
+{
+  pCode *pc=NULL;
+
+  int bank = -1;
+  bool RegUsed = 0;
+
+  regs *reg;
+
+  if(!isPCFL(pcflow)) {
+    fprintf(stderr, "BanksUsed - pcflow is not a flow object ");
+    return;
+  }
+
+  pc = findNextInstruction(pcflow->next);
+
+  PCFL(pcflow)->lastBank = -1;
+
+  while(isPCinFlow(pc,pcflow)) {
+
+    int bank_selected = isBankInstruction(pc);
+
+    //if(PCI(pc)->pcflow) 
+    //fprintf(stderr,"BanksUsedFlow2, looking at seq %d\n",PCI(pc)->pcflow->pc.seq);
+
+    if(bank_selected > 0) {
+      //fprintf(stderr,"BanksUsed - mucking with bank %d\n",bank_selected);
+
+      /* This instruction is modifying banking bits before accessing registers */
+      if(!RegUsed)
+       PCFL(pcflow)->firstBank = -1;
+
+      if(PCFL(pcflow)->lastBank == -1)
+       PCFL(pcflow)->lastBank = 0;
+
+      bank = (1 << (bank_selected & (PIC_RP0_BIT | PIC_RP1_BIT)));
+      if(bank_selected & SET_BANK_BIT)
+       PCFL(pcflow)->lastBank |= bank;
+                                
+
+    } else { 
+      reg = getRegFromInstruction(pc);
+
+      if(reg && !isREGinBank(reg, bank)) {
+       int allbanks = REGallBanks(reg);
+       if(bank == -1)
+         PCFL(pcflow)->firstBank = allbanks;
+
+       PCFL(pcflow)->lastBank = allbanks;
+
+       bank = allbanks;
+      }
+      RegUsed = 1;
+    }
+
+    pc = findNextInstruction(pc->next);
+  }
+
+//  fprintf(stderr,"BanksUsedFlow2 flow seq=%3d, first bank = 0x%03x, Last bank 0x%03x\n",
+//       pcflow->seq,PCFL(pcflow)->firstBank,PCFL(pcflow)->lastBank);
+
+
+
+}
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void BanksUsedFlow(pBlock *pb)
+{
+  pCode *pcflow;
+
+
+  //pb->pcHead->print(stderr, pb->pcHead);
+
+  pcflow = findNextpCode(pb->pcHead, PC_FLOW);
+  //pcflow->print(stderr,pcflow);
+
+  for( pcflow = findNextpCode(pb->pcHead, PC_FLOW); 
+       pcflow != NULL;
+       pcflow = findNextpCode(pcflow->next, PC_FLOW) ) {
+
+    BanksUsedFlow2(pcflow);
+  }
+
+}
+
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void insertBankSwitch(pCode *pc, int Set_Clear, int RP_BankBit)
+{
+  pCode *new_pc;
+
+  if(!pc)
+    return;
+
+  if(RP_BankBit < 0) 
+    new_pc = newpCode(POC_CLRF, popCopyReg(&pc_status));
+  else
+    new_pc = newpCode((Set_Clear ? POC_BSF : POC_BCF),
+                     popCopyGPR2Bit(PCOP(&pc_status),RP_BankBit));
+
+  pCodeInsertAfter(pc->prev, new_pc);
+
+  /* Move the label, if there is one */
+
+  if(PCI(pc)->label) {
+    PCI(new_pc)->label = PCI(pc)->label;
+    PCI(pc)->label = NULL;
+  }
+
+  /* The new instruction has the same pcflow block */
+  PCI(new_pc)->pcflow = PCI(pc)->pcflow;
+
+}
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void FixRegisterBankingInFlow(pCodeFlow *pcfl, int cur_bank)
+{
+  pCode *pc=NULL;
+  pCode *pcprev=NULL;
+  pCode *new_pc;
+
+  regs *reg;
+
+  if(!pcfl)
+    return;
+
+  pc = findNextInstruction(pcfl->pc.next);
+
+  while(isPCinFlow(pc,PCODE(pcfl))) {
+
+
+    reg = getRegFromInstruction(pc);
+#if 0
+    if(reg) {
+      fprintf(stderr, "  %s  ",reg->name);
+      fprintf(stderr, "addr = 0x%03x, bank = %d\n",reg->address,REG_BANK(reg));
+
+    }
+#endif
+
+    if(reg && REG_BANK(reg)!=cur_bank) {
+      /* Examine the instruction before this one to make sure it is
+       * not a skip type instruction */
+      pcprev = findPrevpCode(pc->prev, PC_OPCODE);
+      if(!pcprev || (pcprev && !isPCI_SKIP(pcprev))) {
+       int b = cur_bank ^ REG_BANK(reg);
+
+       //fprintf(stderr, "Cool! can switch banks\n");
+       cur_bank = REG_BANK(reg);
+       switch(b & 3) {
+       case 0:
+         break;
+       case 1:
+         insertBankSwitch(pc, cur_bank&1, PIC_RP0_BIT);
+         break;
+       case 2:
+         insertBankSwitch(pc, cur_bank&2, PIC_RP1_BIT);
+         insertBankSwitch(pc, cur_bank&2, PIC_RP1_BIT);
+         break;
+       case 3:
+         if(cur_bank & 3) {
+           insertBankSwitch(pc, cur_bank&1, PIC_RP0_BIT);
+           insertBankSwitch(pc, cur_bank&2, PIC_RP1_BIT);
+         } else
+           insertBankSwitch(pc, -1, -1);
+         break;
+         /*
+           new_pc = newpCode(((cur_bank&1) ? POC_BSF : POC_BCF),
+           popCopyGPR2Bit(PCOP(&pc_status),PIC_RP0_BIT));
+           pCodeInsertAfter(pc->prev, new_pc);
+           if(PCI(pc)->label) { 
+           PCI(new_pc)->label = PCI(pc)->label;
+           PCI(pc)->label = NULL;
+           }
+         */
+         /*
+           new_pc = newpCode(((cur_bank&1) ? POC_BCF : POC_BSF),
+           popCopyGPR2Bit(PCOP(&pc_status),PIC_RP0_BIT));
+           pCodeInsertAfter(pc, new_pc);
+         */
+
+       }
+
+      } else {
+       //fprintf(stderr, "Bummer can't switch banks\n");
+       ;
+      }
+    }
+
+    pcprev = pc;
+    pc = findNextInstruction(pc->next);
+
+  }
+
+  if(pcprev && cur_bank) {
+    /* Brute force - make sure that we point to bank 0 at the
+     * end of each flow block */
+    new_pc = newpCode(POC_BCF,
+                     popCopyGPR2Bit(PCOP(&pc_status),PIC_RP0_BIT));
+    pCodeInsertAfter(pcprev, new_pc);
+      cur_bank = 0;
+  }
+
+}
+
+/*-----------------------------------------------------------------*/
+/*int compareBankFlow - compare the banking requirements between   */
+/*  flow objects. */
+/*-----------------------------------------------------------------*/
+int compareBankFlow(pCodeFlow *pcflow, pCodeFlowLink *pcflowLink, int toORfrom)
+{
+
+  if(!pcflow || !pcflowLink || !pcflowLink->pcflow)
+    return 0;
+
+  if(!isPCFL(pcflow) || !isPCFL(pcflowLink->pcflow))
+    return 0;
+
+  if(pcflow->firstBank == -1)
+    return 0;
+
+
+  if(pcflowLink->pcflow->firstBank == -1) {
+    pCodeFlowLink *pctl = setFirstItem( toORfrom ? 
+                                       pcflowLink->pcflow->to : 
+                                       pcflowLink->pcflow->from);
+    return compareBankFlow(pcflow, pctl, toORfrom);
+  }
+
+  if(toORfrom) {
+    if(pcflow->lastBank == pcflowLink->pcflow->firstBank)
+      return 0;
+
+    pcflowLink->bank_conflict++;
+    pcflowLink->pcflow->FromConflicts++;
+    pcflow->ToConflicts++;
+  } else {
+    
+    if(pcflow->firstBank == pcflowLink->pcflow->lastBank)
+      return 0;
+
+    pcflowLink->bank_conflict++;
+    pcflowLink->pcflow->ToConflicts++;
+    pcflow->FromConflicts++;
+
+  }
+  /*
+  fprintf(stderr,"compare flow found conflict: seq %d from conflicts %d, to conflicts %d\n",
+         pcflowLink->pcflow->pc.seq,
+         pcflowLink->pcflow->FromConflicts,
+         pcflowLink->pcflow->ToConflicts);
+  */
+  return 1;
+
+}
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void FixBankFlow(pBlock *pb)
+{
+  pCode *pc=NULL;
+  pCode *pcflow;
+  pCodeFlowLink *pcfl;
+
+  pCode *pcflow_max_To=NULL;
+  pCode *pcflow_max_From=NULL;
+  int max_ToConflicts=0;
+  int max_FromConflicts=0;
+
+  //fprintf(stderr,"Fix Bank flow \n");
+  pcflow = findNextpCode(pb->pcHead, PC_FLOW);
+
+
+  /*
+    First loop through all of the flow objects in this pcode block
+    and fix the ones that have banking conflicts between the 
+    entry and exit.
+  */
+
+  //fprintf(stderr, "FixBankFlow - Phase 1\n");
+
+  for( pcflow = findNextpCode(pb->pcHead, PC_FLOW); 
+       pcflow != NULL;
+       pcflow = findNextpCode(pcflow->next, PC_FLOW) ) {
+
+    if(!isPCFL(pcflow)) {
+      fprintf(stderr, "FixBankFlow - pcflow is not a flow object ");
+      continue;
+    }
+
+    if(PCFL(pcflow)->firstBank != PCFL(pcflow)->lastBank  &&
+       PCFL(pcflow)->firstBank >= 0 &&
+       PCFL(pcflow)->lastBank >= 0 ) {
+
+      int cur_bank = (PCFL(pcflow)->firstBank < PCFL(pcflow)->lastBank) ?
+       PCFL(pcflow)->firstBank : PCFL(pcflow)->lastBank;
+
+      FixRegisterBankingInFlow(PCFL(pcflow),cur_bank);
+      BanksUsedFlow2(pcflow);
+
+    }
+  }
+
+  //fprintf(stderr, "FixBankFlow - Phase 2\n");
+
+  for( pcflow = findNextpCode(pb->pcHead, PC_FLOW); 
+       pcflow != NULL;
+       pcflow = findNextpCode(pcflow->next, PC_FLOW) ) {
+
+    int nFlows;
+    int nConflicts;
+
+    if(!isPCFL(pcflow)) {
+      fprintf(stderr, "FixBankFlow - pcflow is not a flow object ");
+      continue;
+    }
+
+    PCFL(pcflow)->FromConflicts = 0;
+    PCFL(pcflow)->ToConflicts = 0;
+
+    nFlows = 0;
+    nConflicts = 0;
+
+    //fprintf(stderr, " FixBankFlow flow seq %d\n",pcflow->seq);
+    pcfl = setFirstItem(PCFL(pcflow)->from);
+    while (pcfl) {
+
+      pc = PCODE(pcfl->pcflow);
+
+      if(!isPCFL(pc)) {
+       fprintf(stderr,"oops dumpflow - to is not a pcflow\n");
+       pc->print(stderr,pc);
+      }
+
+      nConflicts += compareBankFlow(PCFL(pcflow), pcfl, 0);
+      nFlows++;
+
+      pcfl=setNextItem(PCFL(pcflow)->from);
+    }
+
+    if((nFlows >= 2) && nConflicts && (PCFL(pcflow)->firstBank>0)) {
+      //fprintf(stderr, " From conflicts flow seq %d, nflows %d ,nconflicts %d\n",pcflow->seq,nFlows, nConflicts);
+
+      FixRegisterBankingInFlow(PCFL(pcflow),0);
+      BanksUsedFlow2(pcflow);
+
+      continue;  /* Don't need to check the flow from here - it's already been fixed */
+
+    }
+
+    nFlows = 0;
+    nConflicts = 0;
+
+    pcfl = setFirstItem(PCFL(pcflow)->to);
+    while (pcfl) {
+
+      pc = PCODE(pcfl->pcflow);
+      if(!isPCFL(pc)) {
+       fprintf(stderr,"oops dumpflow - to is not a pcflow\n");
+       pc->print(stderr,pc);
+      }
+
+      nConflicts += compareBankFlow(PCFL(pcflow), pcfl, 1);
+      nFlows++;
+
+      pcfl=setNextItem(PCFL(pcflow)->to);
+    }
+
+    if((nFlows >= 2) && nConflicts &&(nConflicts != nFlows) && (PCFL(pcflow)->lastBank>0)) {
+      //fprintf(stderr, " To conflicts flow seq %d, nflows %d ,nconflicts %d\n",pcflow->seq,nFlows, nConflicts);
+
+      FixRegisterBankingInFlow(PCFL(pcflow),0);
+      BanksUsedFlow2(pcflow);
+    }
+  }
+
+  /*
+    Loop through the flow objects again and find the ones with the 
+    maximum conflicts
+  */
+
+  for( pcflow = findNextpCode(pb->pcHead, PC_FLOW); 
+       pcflow != NULL;
+       pcflow = findNextpCode(pcflow->next, PC_FLOW) ) {
+
+    if(PCFL(pcflow)->ToConflicts > max_ToConflicts)
+      pcflow_max_To = pcflow;
+
+    if(PCFL(pcflow)->FromConflicts > max_FromConflicts)
+      pcflow_max_From = pcflow;
+  }
+/*
+  if(pcflow_max_To)
+    fprintf(stderr,"compare flow Max To conflicts: seq %d conflicts %d\n",
+           PCFL(pcflow_max_To)->pc.seq,
+           PCFL(pcflow_max_To)->ToConflicts);
+
+  if(pcflow_max_From)
+    fprintf(stderr,"compare flow Max From conflicts: seq %d conflicts %d\n",
+           PCFL(pcflow_max_From)->pc.seq,
+           PCFL(pcflow_max_From)->FromConflicts);
+*/
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void DumpFlow(pBlock *pb)
+{
+  pCode *pc=NULL;
+  pCode *pcflow;
+  pCodeFlowLink *pcfl;
+
+
+  fprintf(stderr,"Dump flow \n");
+  pb->pcHead->print(stderr, pb->pcHead);
+
+  pcflow = findNextpCode(pb->pcHead, PC_FLOW);
+  pcflow->print(stderr,pcflow);
+
+  for( pcflow = findNextpCode(pb->pcHead, PC_FLOW); 
+       pcflow != NULL;
+       pcflow = findNextpCode(pcflow->next, PC_FLOW) ) {
+
+    if(!isPCFL(pcflow)) {
+      fprintf(stderr, "DumpFlow - pcflow is not a flow object ");
+      continue;
+    }
+    fprintf(stderr,"dumping: ");
+    pcflow->print(stderr,pcflow);
+    FlowStats(PCFL(pcflow));
+
+    for(pcfl = setFirstItem(PCFL(pcflow)->to); pcfl; pcfl=setNextItem(PCFL(pcflow)->to)) {
+
+      pc = PCODE(pcfl->pcflow);
+
+      fprintf(stderr, "    from seq %d:\n",pc->seq);
+      if(!isPCFL(pc)) {
+       fprintf(stderr,"oops dumpflow - from is not a pcflow\n");
+       pc->print(stderr,pc);
+      }
+
+    }
+
+    for(pcfl = setFirstItem(PCFL(pcflow)->to); pcfl; pcfl=setNextItem(PCFL(pcflow)->to)) {
+
+      pc = PCODE(pcfl->pcflow);
+
+      fprintf(stderr, "    to seq %d:\n",pc->seq);
+      if(!isPCFL(pc)) {
+       fprintf(stderr,"oops dumpflow - to is not a pcflow\n");
+       pc->print(stderr,pc);
+      }
+
+    }
+
+  }
+
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+int OptimizepBlock(pBlock *pb)
+{
+  pCode *pc, *pcprev;
+  int matches =0;
+
+  if(!pb || !peepOptimizing)
+    return 0;
+
+  DFPRINTF((stderr," Optimizing pBlock: %c\n",getpBlock_dbName(pb)));
+/*
+  for(pc = pb->pcHead; pc; pc = pc->next)
+    matches += pCodePeepMatchRule(pc);
+*/
+
+  pc = findNextInstruction(pb->pcHead);
+  if(!pc)
+    return 0;
+
+  pcprev = pc->prev;
+  do {
+
+
+    if(pCodePeepMatchRule(pc)) {
+
+      matches++;
+
+      if(pcprev)
+       pc = findNextInstruction(pcprev->next);
+      else 
+       pc = findNextInstruction(pb->pcHead);
+    } else
+      pc = findNextInstruction(pc->next);
+  } while(pc);
+
+  if(matches)
+    DFPRINTF((stderr," Optimizing pBlock: %c - matches=%d\n",getpBlock_dbName(pb),matches));
+  return matches;
+
+}
+
+/*-----------------------------------------------------------------*/
+/* pBlockRemoveUnusedLabels - remove the pCode labels from the     */
+/*-----------------------------------------------------------------*/
+pCode * findInstructionUsingLabel(pCodeLabel *pcl, pCode *pcs)
+{
+  pCode *pc;
+
+  for(pc = pcs; pc; pc = pc->next) {
+
+    if((pc->type == PC_OPCODE) && 
+       (PCI(pc)->pcop) && 
+       (PCI(pc)->pcop->type == PO_LABEL) &&
+       (PCOLAB(PCI(pc)->pcop)->key == pcl->key))
+      return pc;
+  }
+
+  return NULL;
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void exchangeLabels(pCodeLabel *pcl, pCode *pc)
+{
+
+  if(isPCI(pc) && 
+     (PCI(pc)->pcop) && 
+     (PCI(pc)->pcop->type == PO_LABEL)) {
+
+    pCodeOpLabel *pcol = PCOLAB(PCI(pc)->pcop);
+
+    //fprintf(stderr,"changing label key from %d to %d\n",pcol->key, pcl->key);
+    if(pcol->pcop.name)
+      free(pcol->pcop.name);
+
+    sprintf(buffer,"_%05d_DS_",pcl->key);
+
+    pcol->pcop.name = Safe_strdup(buffer);
+    pcol->key = pcl->key;
+    //pc->print(stderr,pc);
+
+  }
+
+
+}
+
+/*-----------------------------------------------------------------*/
+/* pBlockRemoveUnusedLabels - remove the pCode labels from the     */
+/*                            pCode chain if they're not used.     */
+/*-----------------------------------------------------------------*/
+void pBlockRemoveUnusedLabels(pBlock *pb)
+{
+  pCode *pc; pCodeLabel *pcl;
+
+  if(!pb)
+    return;
+
+  for(pc = pb->pcHead; (pc=findNextInstruction(pc->next)) != NULL; ) {
+
+    pBranch *pbr = PCI(pc)->label;
+    if(pbr && pbr->next) {
+      pCode *pcd = pb->pcHead;
+
+      //fprintf(stderr, "multiple labels\n");
+      //pc->print(stderr,pc);
+
+      pbr = pbr->next;
+      while(pbr) {
+
+       while ( (pcd = findInstructionUsingLabel(PCL(PCI(pc)->label->pc), pcd)) != NULL) {
+         //fprintf(stderr,"Used by:\n");
+         //pcd->print(stderr,pcd);
+
+         exchangeLabels(PCL(pbr->pc),pcd);
+
+         pcd = pcd->next;
+       }
+       pbr = pbr->next;
+      }
+    }
+  }
+
+  for(pc = pb->pcHead; pc; pc = pc->next) {
+
+    if(isPCL(pc)) // pc->type == PC_LABEL)
+      pcl = PCL(pc);
+    else if (isPCI(pc) && PCI(pc)->label) //((pc->type == PC_OPCODE) && PCI(pc)->label)
+      pcl = PCL(PCI(pc)->label->pc);
+    else continue;
+
+    //fprintf(stderr," found  A LABEL !!! key = %d, %s\n", pcl->key,pcl->label);
+
+    /* This pCode is a label, so search the pBlock to see if anyone
+     * refers to it */
+
+    if( (pcl->key>0) && (!findInstructionUsingLabel(pcl, pb->pcHead))) {
+    //if( !findInstructionUsingLabel(pcl, pb->pcHead)) {
+      /* Couldn't find an instruction that refers to this label
+       * So, unlink the pCode label from it's pCode chain
+       * and destroy the label */
+      //fprintf(stderr," removed  A LABEL !!! key = %d, %s\n", pcl->key,pcl->label);
+
+      DFPRINTF((stderr," !!! REMOVED A LABEL !!! key = %d, %s\n", pcl->key,pcl->label));
+      if(pc->type == PC_LABEL) {
+       unlinkpCode(pc);
+       pCodeLabelDestruct(pc);
+      } else {
+       unlinkpCodeFromBranch(pc, PCODE(pcl));
+       /*if(pc->label->next == NULL && pc->label->pc == NULL) {
+         free(pc->label);
+       }*/
+      }
+
+    }
+  }
+
+}
+
+
+/*-----------------------------------------------------------------*/
+/* pBlockMergeLabels - remove the pCode labels from the pCode      */
+/*                     chain and put them into pBranches that are  */
+/*                     associated with the appropriate pCode       */
+/*                     instructions.                               */
+/*-----------------------------------------------------------------*/
+void pBlockMergeLabels(pBlock *pb)
+{
+  pBranch *pbr;
+  pCode *pc, *pcnext=NULL;
+
+  if(!pb)
+    return;
+
+  /* First, Try to remove any unused labels */
+  //pBlockRemoveUnusedLabels(pb);
+
+  /* Now loop through the pBlock and merge the labels with the opcodes */
+
+  pc = pb->pcHead;
+  //  for(pc = pb->pcHead; pc; pc = pc->next) {
+
+  while(pc) {
+    pCode *pcn = pc->next;
+
+    if(pc->type == PC_LABEL) {
+
+      //fprintf(stderr," checking merging label %s\n",PCL(pc)->label);
+      //fprintf(stderr,"Checking label key = %d\n",PCL(pc)->key);
+      if((pcnext = findNextInstruction(pc) )) {
+
+       // Unlink the pCode label from it's pCode chain
+       unlinkpCode(pc);
+       
+       //fprintf(stderr,"Merged label key = %d\n",PCL(pc)->key);
+       // And link it into the instruction's pBranch labels. (Note, since
+       // it's possible to have multiple labels associated with one instruction
+       // we must provide a means to accomodate the additional labels. Thus
+       // the labels are placed into the singly-linked list "label" as 
+       // opposed to being a single member of the pCodeInstruction.)
+
+       //_ALLOC(pbr,sizeof(pBranch));
+       pbr = Safe_calloc(1,sizeof(pBranch));
+       pbr->pc = pc;
+       pbr->next = NULL;
+
+       PCI(pcnext)->label = pBranchAppend(PCI(pcnext)->label,pbr);
+
+      } else {
+       fprintf(stderr, "WARNING: couldn't associate label %s with an instruction\n",PCL(pc)->label);
+      }
+    } else if(pc->type == PC_CSOURCE) {
+
+      /* merge the source line symbolic info into the next instruction */
+      if((pcnext = findNextInstruction(pc) )) {
+
+       // Unlink the pCode label from it's pCode chain
+       unlinkpCode(pc);
+       PCI(pcnext)->cline = PCCS(pc);
+       //fprintf(stderr, "merging CSRC\n");
+       //genericPrint(stderr,pcnext);
+      }
+
+    }
+    pc = pcn;
+  }
+  pBlockRemoveUnusedLabels(pb);
+
+}
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+int OptimizepCode(char dbName)
+{
+#define MAX_PASSES 4
+
+  int matches = 0;
+  int passes = 0;
+  pBlock *pb;
+
+  if(!the_pFile)
+    return 0;
+
+  DFPRINTF((stderr," Optimizing pCode\n"));
+
+  do {
+    matches = 0;
+    for(pb = the_pFile->pbHead; pb; pb = pb->next) {
+      if('*' == dbName || getpBlock_dbName(pb) == dbName)
+       matches += OptimizepBlock(pb);
+    }
+  }
+  while(matches && ++passes < MAX_PASSES);
+
+  return matches;
+}
+
+/*-----------------------------------------------------------------*/
+/* popCopyGPR2Bit - copy a pcode operator                          */
+/*-----------------------------------------------------------------*/
+
+pCodeOp *popCopyGPR2Bit(pCodeOp *pc, int bitval)
+{
+  pCodeOp *pcop;
+
+  pcop = newpCodeOpBit(pc->name, bitval, 0);
+
+  if( !( (pcop->type == PO_LABEL) ||
+        (pcop->type == PO_LITERAL) ||
+        (pcop->type == PO_STR) ))
+    PCOR(pcop)->r = PCOR(pc)->r;  /* This is dangerous... */
+
+  return pcop;
+}
+
+
+
+#if 0
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+int InstructionRegBank(pCode *pc)
+{
+  regs *reg;
+
+  if( (reg = getRegFromInstruction(pc)) == NULL)
+    return -1;
+
+  return REG_BANK(reg);
+
+}
+#endif
+
+/*-----------------------------------------------------------------*/
+/*-----------------------------------------------------------------*/
+void FixRegisterBanking(pBlock *pb)
+{
+  pCode *pc=NULL;
+  pCode *pcprev=NULL;
+  pCode *new_pc;
+
+  int cur_bank;
+  regs *reg;
+  //  return;
+  if(!pb)
+    return;
+
+  //pc = findNextpCode(pb->pcHead, PC_FLOW);
+  pc = findNextpCode(pb->pcHead, PC_OPCODE);
+  if(!pc)
+    return;
+  /* loop through all of the flow blocks with in one pblock */
+
+  //fprintf(stderr,"Register banking\n");
+  cur_bank = 0;
+  do {
+    /* at this point, pc should point to a PC_FLOW object */
+
+
+    /* for each flow block, determine the register banking 
+       requirements */
+
+    //    do {
+      if(isPCI(pc)) {
+       //genericPrint(stderr, pc);
+
+       reg = getRegFromInstruction(pc);
+       #if 0
+       if(reg) {
+         fprintf(stderr, "  %s  ",reg->name);
+         fprintf(stderr, "addr = 0x%03x, bank = %d\n",reg->address,REG_BANK(reg));
+
+       }
+       #endif
+       if(reg && REG_BANK(reg)!=cur_bank) {
+         /* Examine the instruction before this one to make sure it is
+          * not a skip type instruction */
+         pcprev = findPrevpCode(pc->prev, PC_OPCODE);
+         if(!pcprev || (pcprev && !isPCI_SKIP(pcprev))) {
+           int b = cur_bank ^ REG_BANK(reg);
+
+           //fprintf(stderr, "Cool! can switch banks\n");
+           cur_bank = REG_BANK(reg);
+           if(b & 1) {
+             new_pc = newpCode(((cur_bank&1) ? POC_BSF : POC_BCF),
+                               popCopyGPR2Bit(PCOP(&pc_status),PIC_RP0_BIT));
+             pCodeInsertAfter(pc->prev, new_pc);
+             if(PCI(pc)->label) { 
+               PCI(new_pc)->label = PCI(pc)->label;
+               PCI(pc)->label = NULL;
+             }
+             /*
+               new_pc = newpCode(((cur_bank&1) ? POC_BCF : POC_BSF),
+               popCopyGPR2Bit(PCOP(&pc_status),PIC_RP0_BIT));
+               pCodeInsertAfter(pc, new_pc);
+             */
+
+           }
+
+         } else {
+           //fprintf(stderr, "Bummer can't switch banks\n");
+           ;
+         }
+       }
+      }
+
+      pcprev = pc;
+      pc = pc->next;
+      // } while(pc && !(isPCFL(pc))); 
+
+
+  }while (pc);
+
+    if(pcprev && cur_bank) {
+      /* Brute force - make sure that we point to bank 0 at the
+       * end of each flow block */
+      new_pc = newpCode(POC_BCF,
+                       popCopyGPR2Bit(PCOP(&pc_status),PIC_RP0_BIT));
+      pCodeInsertAfter(pcprev, new_pc);
+      cur_bank = 0;
+    }
+
+}
+
+void pBlockDestruct(pBlock *pb)
+{
+
+  if(!pb)
+    return;
+
+
+  free(pb);
+
+}
+
+/*-----------------------------------------------------------------*/
+/* void mergepBlocks(char dbName) - Search for all pBlocks with the*/
+/*                                  name dbName and combine them   */
+/*                                  into one block                 */
+/*-----------------------------------------------------------------*/
+void mergepBlocks(char dbName)
+{
+
+  pBlock *pb, *pbmerged = NULL,*pbn;
+
+  pb = the_pFile->pbHead;
+
+  //fprintf(stderr," merging blocks named %c\n",dbName);
+  while(pb) {
+
+    pbn = pb->next;
+    //fprintf(stderr,"looking at %c\n",getpBlock_dbName(pb));
+    if( getpBlock_dbName(pb) == dbName) {
+
+      //fprintf(stderr," merged block %c\n",dbName);
+
+      if(!pbmerged) {
+       pbmerged = pb;
+      } else {
+       addpCode2pBlock(pbmerged, pb->pcHead);
+       /* addpCode2pBlock doesn't handle the tail: */
+       pbmerged->pcTail = pb->pcTail;
+
+       pb->prev->next = pbn;
+       if(pbn) 
+         pbn->prev = pb->prev;
+
+
+       pBlockDestruct(pb);
+      }
+      //printpBlock(stderr, pbmerged);
+    } 
+    pb = pbn;
+  }
+
+}
+
+/*-----------------------------------------------------------------*/
+/* AnalyzeFlow - Examine the flow of the code and optimize         */
+/*                                                                 */
+/* level 0 == minimal optimization                                 */
+/*   optimize registers that are used only by two instructions     */
+/* level 1 == maximal optimization                                 */
+/*   optimize by looking at pairs of instructions that use the     */
+/*   register.                                                     */
+/*-----------------------------------------------------------------*/
+
+void AnalyzeFlow(int level)
+{
+  static int times_called=0;
+
+  pBlock *pb;
+
+  if(!the_pFile)
+    return;
+
+
+  /* if this is not the first time this function has been called,
+     then clean up old flow information */
+  if(times_called++) {
+    for(pb = the_pFile->pbHead; pb; pb = pb->next)
+      unBuildFlow(pb);
+
+    RegsUnMapLiveRanges();
+
+  }
+
+  GpcFlowSeq = 1;
+
+  /* Phase 2 - Flow Analysis - Register Banking
+   *
+   * In this phase, the individual flow blocks are examined
+   * and register banking is fixed.
+   */
+
+  //for(pb = the_pFile->pbHead; pb; pb = pb->next)
+  //FixRegisterBanking(pb);
+
+  /* Phase 2 - Flow Analysis
+   *
+   * In this phase, the pCode is partition into pCodeFlow 
+   * blocks. The flow blocks mark the points where a continuous
+   * stream of instructions changes flow (e.g. because of
+   * a call or goto or whatever).
+   */
+
+  for(pb = the_pFile->pbHead; pb; pb = pb->next)
+    BuildFlow(pb);
+
+
+  /* Phase 2 - Flow Analysis - linking flow blocks
+   *
+   * In this phase, the individual flow blocks are examined
+   * to determine their order of excution.
+   */
+
+  for(pb = the_pFile->pbHead; pb; pb = pb->next)
+    LinkFlow(pb);
+
+  /* Phase 3 - Flow Analysis - Flow Tree
+   *
+   * In this phase, the individual flow blocks are examined
+   * to determine their order of excution.
+   */
+
+  for(pb = the_pFile->pbHead; pb; pb = pb->next)
+    BuildFlowTree(pb);
+
+
+  /* Phase x - Flow Analysis - Used Banks
+   *
+   * In this phase, the individual flow blocks are examined
+   * to determine the Register Banks they use
+   */
+
+  for(pb = the_pFile->pbHead; pb; pb = pb->next)
+    FixBankFlow(pb);
+
+
+  for(pb = the_pFile->pbHead; pb; pb = pb->next)
+    pCodeRegMapLiveRanges(pb);
 
-  return matches;
+  RemoveUnusedRegisters();
 
-}
-/*-----------------------------------------------------------------*/
-/* pBlockMergeLabels - remove the pCode labels from the pCode      */
-/*                     chain and put them into pBranches that are  */
-/*                     associated with the appropriate pCode       */
-/*                     instructions.                               */
-/*-----------------------------------------------------------------*/
-void pBlockMergeLabels(pBlock *pb)
-{
-  pBranch *pbr;
-  pCode *pc, *pcnext=NULL;
+  //  for(pb = the_pFile->pbHead; pb; pb = pb->next)
+  pCodeRegOptimizeRegUsage(level);
 
-  if(!pb)
-    return;
+  OptimizepCode('*');
 
-  for(pc = pb->pcHead; pc; pc = pc->next) {
 
-    if(pc->type == PC_LABEL) {
-      if( !(pcnext = findNextInstruction(pc)) ) 
-       return;  // Couldn't find an instruction associated with this label
-
-      // Unlink the pCode label from it's pCode chain
-      if(pc->prev) 
-       pc->prev->next = pc->next;
-      if(pc->next)
-       pc->next->prev = pc->prev;
-
-      // And link it into the instruction's pBranch labels. (Note, since
-      // it's possible to have multiple labels associated with one instruction
-      // we must provide a means to accomodate the additional labels. Thus
-      // the labels are placed into the singly-linked list "label" as 
-      // opposed to being a single member of the pCodeInstruction.)
-
-      _ALLOC(pbr,sizeof(pBranch));
-      pbr->pc = pc;
-      pbr->next = NULL;
-
-      pcnext->label = pBranchAppend(pcnext->label,pbr);
-    }
+/*
+  for(pb = the_pFile->pbHead; pb; pb = pb->next)
+    DumpFlow(pb);
+*/
+  /* debug stuff */ 
+  for(pb = the_pFile->pbHead; pb; pb = pb->next) {
+    pCode *pcflow;
+    for( pcflow = findNextpCode(pb->pcHead, PC_FLOW); 
+        (pcflow = findNextpCode(pcflow, PC_FLOW)) != NULL;
+        pcflow = pcflow->next) {
 
+      FillFlow(PCFL(pcflow));
+    }
   }
 
+/*
+  for(pb = the_pFile->pbHead; pb; pb = pb->next) {
+    pCode *pcflow;
+    for( pcflow = findNextpCode(pb->pcHead, PC_FLOW); 
+        (pcflow = findNextpCode(pcflow, PC_FLOW)) != NULL;
+        pcflow = pcflow->next) {
+
+      FlowStats(PCFL(pcflow));
+    }
+  }
+*/
 }
 
 /*-----------------------------------------------------------------*/
+/* AnalyzeBanking - Called after the memory addresses have been    */
+/*                  assigned to the registers.                     */
+/*                                                                 */
 /*-----------------------------------------------------------------*/
-void OptimizepCode(char dbName)
+
+void AnalyzeBanking(void)
 {
-#define MAX_PASSES 4
+  pBlock  *pb;
 
-  int matches = 0;
-  int passes = 0;
-  pBlock *pb;
+  if(!picIsInitialized()) {
+    fprintf(stderr,"Temporary ERROR: at the moment you have to use\n");
+    fprintf(stderr,"an include file create by inc2h.pl. See SDCC source:\n");
+    fprintf(stderr,"support/scripts/inc2h.pl\n");
+    fprintf(stderr,"this is a nuisance bug that will be fixed shortly\n");
 
-  if(!the_pFile)
-    return;
+    exit(1);
+  }
 
-  fprintf(stderr," Optimizing pCode\n");
+  /* Phase x - Flow Analysis - Used Banks
+   *
+   * In this phase, the individual flow blocks are examined
+   * to determine the Register Banks they use
+   */
 
-  do {
-    for(pb = the_pFile->pbHead; pb; pb = pb->next) {
-      if('*' == dbName || getpBlock_dbName(pb) == dbName)
-       matches += OptimizepBlock(pb);
-    }
-  }
-  while(matches && ++passes < MAX_PASSES);
+  AnalyzeFlow(0);
+  AnalyzeFlow(1);
+
+  for(pb = the_pFile->pbHead; pb; pb = pb->next)
+    BanksUsedFlow(pb);
+  for(pb = the_pFile->pbHead; pb; pb = pb->next)
+    FixRegisterBanking(pb);
 
 }
 
 /*-----------------------------------------------------------------*/
-/* AnalyzepCode - parse the pCode that has been generated and form */
-/*                all of the logical connections.                  */
+/* buildCallTree - look at the flow and extract all of the calls   */
 /*                                                                 */
-/* Essentially what's done here is that the pCode flow is          */
-/* determined.                                                     */
 /*-----------------------------------------------------------------*/
+set *register_usage(pBlock *pb);
 
-void AnalyzepCode(char dbName)
+void buildCallTree(void    )
 {
-  pBlock *pb;
-  pCode *pc;
   pBranch *pbr;
+  pBlock  *pb;
+  pCode   *pc;
 
   if(!the_pFile)
     return;
 
-  fprintf(stderr," Analyzing pCode");
 
-  /* First, merge the labels with the instructions */
-  for(pb = the_pFile->pbHead; pb; pb = pb->next) {
-    if('*' == dbName || getpBlock_dbName(pb) == dbName) {
-      pBlockMergeLabels(pb);
-      AnalyzepBlock(pb);
-    }
-  }
-
-  for(pb = the_pFile->pbHead; pb; pb = pb->next) {
-    if('*' == dbName || getpBlock_dbName(pb) == dbName)
-      OptimizepBlock(pb);
-  }
 
   /* Now build the call tree.
      First we examine all of the pCodes for functions.
@@ -1975,36 +4832,107 @@ void AnalyzepCode(char dbName)
 
    */
   for(pb = the_pFile->pbHead; pb; pb = pb->next) {
-    if('*' == dbName || getpBlock_dbName(pb) == dbName) {
-      pCode *pc_fstart=NULL;
-      for(pc = pb->pcHead; pc; pc = pc->next) {
-       if(pc->type == PC_FUNCTION) {
-         if (PCF(pc)->fname) {
-           // I'm not liking this....
-           // Found the beginning of a function.
-           _ALLOC(pbr,sizeof(pBranch));
-           pbr->pc = pc_fstart = pc;
-           pbr->next = NULL;
-
-           the_pFile->functions = pBranchAppend(the_pFile->functions,pbr);
-
-           // Here's a better way of doing the same:
-           addSet(&pb->function_entries, pc);
-
-         } else {
-           // Found an exit point in a function, e.g. return
-           // (Note, there may be more than one return per function)
-           if(pc_fstart)
-             pBranchLink(pc_fstart, pc);
+    pCode *pc_fstart=NULL;
+    for(pc = pb->pcHead; pc; pc = pc->next) {
+      if(isPCF(pc)) {
+       if (PCF(pc)->fname) {
 
-           addSet(&pb->function_exits, pc);
+         if(STRCASECMP(PCF(pc)->fname, "_main") == 0) {
+           //fprintf(stderr," found main \n");
+           pb->cmemmap = NULL;  /* FIXME do we need to free ? */
+           pb->dbName = 'M';
          }
-       } else  if(pc->type == PC_OPCODE && PCI(pc)->op == POC_CALL) {
-         addSet(&pb->function_calls,pc);
+
+         pbr = Safe_calloc(1,sizeof(pBranch));
+         pbr->pc = pc_fstart = pc;
+         pbr->next = NULL;
+
+         the_pFile->functions = pBranchAppend(the_pFile->functions,pbr);
+
+         // Here's a better way of doing the same:
+         addSet(&pb->function_entries, pc);
+
+       } else {
+         // Found an exit point in a function, e.g. return
+         // (Note, there may be more than one return per function)
+         if(pc_fstart)
+           pBranchLink(PCF(pc_fstart), PCF(pc));
+
+         addSet(&pb->function_exits, pc);
        }
+      } else if(isCALL(pc)) {
+       addSet(&pb->function_calls,pc);
       }
     }
   }
+
+  /* Re-allocate the registers so that there are no collisions
+   * between local variables when one function call another */
+
+  // this is weird...
+  //  pic14_deallocateAllRegs();
+
+  for(pb = the_pFile->pbHead; pb; pb = pb->next) {
+    if(!pb->visited)
+      register_usage(pb);
+  }
+
+}
+
+/*-----------------------------------------------------------------*/
+/* AnalyzepCode - parse the pCode that has been generated and form */
+/*                all of the logical connections.                  */
+/*                                                                 */
+/* Essentially what's done here is that the pCode flow is          */
+/* determined.                                                     */
+/*-----------------------------------------------------------------*/
+
+void AnalyzepCode(char dbName)
+{
+  pBlock *pb;
+  int i,changes;
+
+  if(!the_pFile)
+    return;
+
+  mergepBlocks('D');
+
+
+  /* Phase 1 - Register allocation and peep hole optimization
+   *
+   * The first part of the analysis is to determine the registers
+   * that are used in the pCode. Once that is done, the peep rules
+   * are applied to the code. We continue to loop until no more
+   * peep rule optimizations are found (or until we exceed the
+   * MAX_PASSES threshold). 
+   *
+   * When done, the required registers will be determined.
+   *
+   */
+  i = 0;
+  do {
+
+    DFPRINTF((stderr," Analyzing pCode: PASS #%d\n",i+1));
+    //fprintf(stderr," Analyzing pCode: PASS #%d\n",i+1);
+
+    /* First, merge the labels with the instructions */
+    for(pb = the_pFile->pbHead; pb; pb = pb->next) {
+      if('*' == dbName || getpBlock_dbName(pb) == dbName) {
+
+       DFPRINTF((stderr," analyze and merging block %c\n",dbName));
+       //fprintf(stderr," analyze and merging block %c\n",dbName);
+       pBlockMergeLabels(pb);
+       AnalyzepBlock(pb);
+      } else {
+       DFPRINTF((stderr," skipping block analysis dbName=%c blockname=%c\n",dbName,getpBlock_dbName));
+      }
+    }
+
+    changes = OptimizepCode(dbName);
+
+  } while(changes && (i++ < MAX_PASSES));
+
+  buildCallTree();
 }
 
 /*-----------------------------------------------------------------*/
@@ -2069,46 +4997,49 @@ void pBlockStats(FILE *of, pBlock *pb)
   pCode *pc;
   regs  *r;
 
-  fprintf(of,"***\n  pBlock Stats\n***\n");
+  fprintf(of,";***\n;  pBlock Stats: dbName = %c\n;***\n",getpBlock_dbName(pb));
 
   // for now just print the first element of each set
   pc = setFirstItem(pb->function_entries);
   if(pc) {
-    fprintf(of,"entry\n");
+    fprintf(of,";entry:  ");
     pc->print(of,pc);
   }
   pc = setFirstItem(pb->function_exits);
   if(pc) {
-    fprintf(of,"has an exit\n");
-    pc->print(of,pc);
+    fprintf(of,";has an exit\n");
+    //pc->print(of,pc);
   }
 
   pc = setFirstItem(pb->function_calls);
   if(pc) {
-    fprintf(of,"functions called\n");
+    fprintf(of,";functions called:\n");
 
     while(pc) {
-      pc->print(of,pc);
+      if(pc->type == PC_OPCODE && PCI(pc)->op == POC_CALL) {
+       fprintf(of,";   %s\n",get_op_from_instruction(PCI(pc)));
+      }
       pc = setNextItem(pb->function_calls);
     }
   }
 
-  r = setFirstItem(pb->registers);
+  r = setFirstItem(pb->tregisters);
   if(r) {
-    int n = elementsInSet(pb->registers);
+    int n = elementsInSet(pb->tregisters);
 
-    fprintf(of,"%d compiler assigned register%c:\n",n, ( (n!=1) ? 's' : ' '));
+    fprintf(of,";%d compiler assigned register%c:\n",n, ( (n!=1) ? 's' : ' '));
 
     while (r) {
-      fprintf(of,"   %s\n",r->name);
-      r = setNextItem(pb->registers);
+      fprintf(of,";   %s\n",r->name);
+      r = setNextItem(pb->tregisters);
     }
   }
 }
 
 /*-----------------------------------------------------------------*/
 /*-----------------------------------------------------------------*/
-void sequencepCode(void)
+#if 0
+static void sequencepCode(void)
 {
   pBlock *pb;
   pCode *pc;
@@ -2123,6 +5054,7 @@ void sequencepCode(void)
   }
 
 }
+#endif
 
 /*-----------------------------------------------------------------*/
 /*-----------------------------------------------------------------*/
@@ -2148,7 +5080,7 @@ set *register_usage(pBlock *pb)
   for( ; pc; pc = setNextItem(pb->function_calls)) {
 
     if(pc->type == PC_OPCODE && PCI(pc)->op == POC_CALL) {
-      char *dest = get_op(PCI(pc));
+      char *dest = get_op_from_instruction(PCI(pc));
 
       pcn = findFunction(dest);
       if(pcn) 
@@ -2158,8 +5090,13 @@ set *register_usage(pBlock *pb)
 
   }
 
-
+#ifdef PCODE_DEBUG
   pBlockStats(stderr,pb);  // debug
+#endif
+
+  // Mark the registers in this block as used.
+
+  MarkUsedRegisters(pb->tregisters);
   if(registersInCallPath) {
     /* registers were used in the functions this pBlock has called */
     /* so now, we need to see if these collide with the ones we are */
@@ -2167,33 +5104,36 @@ set *register_usage(pBlock *pb)
 
     regs *r1,*r2, *newreg;
 
-    fprintf(stderr,"comparing registers\n");
+    DFPRINTF((stderr,"comparing registers\n"));
 
     r1 = setFirstItem(registersInCallPath);
     while(r1) {
 
-      r2 = setFirstItem(pb->registers);
+      r2 = setFirstItem(pb->tregisters);
 
-      while(r2) {
+      while(r2 && (r1->type != REG_STK)) {
 
        if(r2->rIdx == r1->rIdx) {
-         newreg = pic14_findFreeReg();
+         newreg = pic14_findFreeReg(REG_GPR);
 
 
          if(!newreg) {
-           fprintf(stderr,"Bummer, no more registers.\n");
+           DFPRINTF((stderr,"Bummer, no more registers.\n"));
            exit(1);
          }
 
-         fprintf(stderr,"Cool found register collision nIdx=%d moving to %d\n",
-                 r1->rIdx, newreg->rIdx);
+         DFPRINTF((stderr,"Cool found register collision nIdx=%d moving to %d\n",
+                 r1->rIdx, newreg->rIdx));
          r2->rIdx = newreg->rIdx;
          //if(r2->name) free(r2->name);
-         r2->name = Safe_strdup(newreg->name);
+         if(newreg->name)
+           r2->name = Safe_strdup(newreg->name);
+         else
+           r2->name = NULL;
          newreg->isFree = 0;
          newreg->wasUsed = 1;
        }
-       r2 = setNextItem(pb->registers);
+       r2 = setNextItem(pb->tregisters);
       }
 
       r1 = setNextItem(registersInCallPath);
@@ -2202,24 +5142,26 @@ set *register_usage(pBlock *pb)
     /* Collisions have been resolved. Now free the registers in the call path */
     r1 = setFirstItem(registersInCallPath);
     while(r1) {
-      newreg = pic14_regWithIdx(r1->rIdx);
-      newreg->isFree = 1;
+      if(r1->type != REG_STK) {
+       newreg = pic14_regWithIdx(r1->rIdx);
+       newreg->isFree = 1;
+      }
       r1 = setNextItem(registersInCallPath);
     }
 
-  } else
-    MarkUsedRegisters(pb->registers);
-
-  registers = unionSets(pb->registers, registersInCallPath, THROW_NONE);
+  }// else
+  //    MarkUsedRegisters(pb->registers);
 
+  registers = unionSets(pb->tregisters, registersInCallPath, THROW_NONE);
+#ifdef PCODE_DEBUG
   if(registers) 
-    fprintf(stderr,"returning regs\n");
+    DFPRINTF((stderr,"returning regs\n"));
   else
-    fprintf(stderr,"not returning regs\n");
+    DFPRINTF((stderr,"not returning regs\n"));
 
-  fprintf(stderr,"pBlock after register optim.\n");
+  DFPRINTF((stderr,"pBlock after register optim.\n"));
   pBlockStats(stderr,pb);  // debug
-
+#endif
 
   return registers;
 }
@@ -2235,10 +5177,10 @@ void pct2(FILE *of,pBlock *pb,int indent)
   //  set *registersInCallPath = NULL;
 
   if(!of)
-    return;// registers;
+    return;
 
   if(indent > 10)
-    return; // registers;   //recursion ?
+    return; //recursion ?
 
   pc = setFirstItem(pb->function_entries);
 
@@ -2260,7 +5202,7 @@ void pct2(FILE *of,pBlock *pb,int indent)
   for( ; pc; pc = setNextItem(pb->function_calls)) {
 
     if(pc->type == PC_OPCODE && PCI(pc)->op == POC_CALL) {
-      char *dest = get_op(PCI(pc));
+      char *dest = get_op_from_instruction(PCI(pc));
 
       pcn = findFunction(dest);
       if(pcn) 
@@ -2273,74 +5215,6 @@ void pct2(FILE *of,pBlock *pb,int indent)
 
 }
 
-#if 0
-  fprintf(stderr,"pBlock before register optim.\n");
-  pBlockStats(stderr,pb);  // debug
-
-  if(registersInCallPath) {
-    /* registers were used in the functions this pBlock has called */
-    /* so now, we need to see if these collide with the ones we are using here */
-
-    regs *r1,*r2, *newreg;
-
-    fprintf(stderr,"comparing registers\n");
-
-    r1 = setFirstItem(registersInCallPath);
-    while(r1) {
-
-      r2 = setFirstItem(pb->registers);
-
-      while(r2) {
-
-       if(r2->rIdx == r1->rIdx) {
-         newreg = pic14_findFreeReg();
-
-
-         if(!newreg) {
-           fprintf(stderr,"Bummer, no more registers.\n");
-           exit(1);
-         }
-
-         fprintf(stderr,"Cool found register collision nIdx=%d moving to %d\n",
-                 r1->rIdx, newreg->rIdx);
-         r2->rIdx = newreg->rIdx;
-         //if(r2->name) free(r2->name);
-         r2->name = Safe_strdup(newreg->name);
-         newreg->isFree = 0;
-         newreg->wasUsed = 1;
-       }
-       r2 = setNextItem(pb->registers);
-      }
-
-      r1 = setNextItem(registersInCallPath);
-    }
-
-    /* Collisions have been resolved. Now free the registers in the call path */
-    r1 = setFirstItem(registersInCallPath);
-    while(r1) {
-      newreg = pic14_regWithIdx(r1->rIdx);
-      newreg->isFree = 1;
-      r1 = setNextItem(registersInCallPath);
-    }
-
-  } else
-    MarkUsedRegisters(pb->registers);
-
-  registers = unionSets(pb->registers, registersInCallPath, THROW_NONE);
-
-  if(registers) 
-    fprintf(stderr,"returning regs\n");
-  else
-    fprintf(stderr,"not returning regs\n");
-
-  fprintf(stderr,"pBlock after register optim.\n");
-  pBlockStats(stderr,pb);  // debug
-
-
-  return registers;
-
-#endif
-
 
 /*-----------------------------------------------------------------*/
 /* printCallTree - writes the call tree to a file                  */
@@ -2361,7 +5235,7 @@ void printCallTree(FILE *of)
 
   fprintf(of, "\npBlock statistics\n");
   for(pb = the_pFile->pbHead; pb;  pb = pb->next )
-    pBlockStats(stderr,pb);
+    pBlockStats(of,pb);
 
 
 
@@ -2379,7 +5253,7 @@ void printCallTree(FILE *of)
       while(pc->next && !ispCodeFunction(pc->next)) {
        pc = pc->next;
        if(pc->type == PC_OPCODE && PCI(pc)->op == POC_CALL)
-         fprintf(of,"\t%s\n",get_op(PCI(pc)));
+         fprintf(of,"\t%s\n",get_op_from_instruction(PCI(pc)));
       }
     }
 
@@ -2387,16 +5261,6 @@ void printCallTree(FILE *of)
   }
 
 
-  /* Re-allocate the registers so that there are no collisions
-   * between local variables when one function call another */
-
-  pic14_deallocateAllRegs();
-
-  for(pb = the_pFile->pbHead; pb; pb = pb->next) {
-    if(!pb->visited)
-      register_usage(pb);
-  }
-
   fprintf(of,"\n**************\n\na better call tree\n");
   for(pb = the_pFile->pbHead; pb; pb = pb->next) {
     if(pb->visited)
@@ -2407,3 +5271,156 @@ void printCallTree(FILE *of)
     fprintf(of,"block dbname: %c\n", getpBlock_dbName(pb));
   }
 }
+
+
+
+/*-----------------------------------------------------------------*/
+/*                                                                 */
+/*-----------------------------------------------------------------*/
+
+void InlineFunction(pBlock *pb)
+{
+  pCode *pc;
+  pCode *pc_call;
+
+  if(!pb)
+    return;
+
+  pc = setFirstItem(pb->function_calls);
+
+  for( ; pc; pc = setNextItem(pb->function_calls)) {
+
+    if(isCALL(pc)) {
+      pCode *pcn = findFunction(get_op_from_instruction(PCI(pc)));
+      pCode *pct;
+      pCode *pce;
+
+      pBranch *pbr;
+
+      if(pcn && isPCF(pcn) && (PCF(pcn)->ncalled == 1)) {
+       
+       //fprintf(stderr,"Cool can inline:\n");
+       //pcn->print(stderr,pcn);
+
+       //fprintf(stderr,"recursive call Inline\n");
+       InlineFunction(pcn->pb);
+       //fprintf(stderr,"return from recursive call Inline\n");
+
+       /*
+         At this point, *pc points to a CALL mnemonic, and
+         *pcn points to the function that is being called.
+
+         To in-line this call, we need to remove the CALL
+         and RETURN(s), and link the function pCode in with
+         the CALLee pCode.
+
+       */
+
+
+       /* Remove the CALL */
+       pc_call = pc;
+       pc = pc->prev;
+
+       /* remove callee pBlock from the pBlock linked list */
+       removepBlock(pcn->pb);
+
+       pce = pcn;
+       while(pce) {
+         pce->pb = pb;
+         pce = pce->next;
+       }
+
+       /* Remove the Function pCode */
+       pct = findNextInstruction(pcn->next);
+
+       /* Link the function with the callee */
+       pc->next = pcn->next;
+       pcn->next->prev = pc;
+       
+       /* Convert the function name into a label */
+
+       pbr = Safe_calloc(1,sizeof(pBranch));
+       pbr->pc = newpCodeLabel(PCF(pcn)->fname, -1);
+       pbr->next = NULL;
+       PCI(pct)->label = pBranchAppend(PCI(pct)->label,pbr);
+       PCI(pct)->label = pBranchAppend(PCI(pct)->label,PCI(pc_call)->label);
+
+       /* turn all of the return's except the last into goto's */
+       /* check case for 2 instruction pBlocks */
+       pce = findNextInstruction(pcn->next);
+       while(pce) {
+         pCode *pce_next = findNextInstruction(pce->next);
+
+         if(pce_next == NULL) {
+           /* found the last return */
+           pCode *pc_call_next =  findNextInstruction(pc_call->next);
+
+           //fprintf(stderr,"found last return\n");
+           //pce->print(stderr,pce);
+           pce->prev->next = pc_call->next;
+           pc_call->next->prev = pce->prev;
+           PCI(pc_call_next)->label = pBranchAppend(PCI(pc_call_next)->label,
+                                                     PCI(pce)->label);
+         }
+
+         pce = pce_next;
+       }
+
+
+      }
+    } else
+      fprintf(stderr,"BUG? pCode isn't a POC_CALL %d\n",__LINE__);
+
+  }
+
+}
+
+/*-----------------------------------------------------------------*/
+/*                                                                 */
+/*-----------------------------------------------------------------*/
+
+void InlinepCode(void)
+{
+
+  pBlock  *pb;
+  pCode   *pc;
+
+  if(!the_pFile)
+    return;
+
+  if(!functionInlining)
+    return;
+
+  /* Loop through all of the function definitions and count the
+   * number of times each one is called */
+  //fprintf(stderr,"inlining %d\n",__LINE__);
+
+  for(pb = the_pFile->pbHead; pb; pb = pb->next) {
+
+    pc = setFirstItem(pb->function_calls);
+
+    for( ; pc; pc = setNextItem(pb->function_calls)) {
+
+      if(isCALL(pc)) {
+       pCode *pcn = findFunction(get_op_from_instruction(PCI(pc)));
+       if(pcn && isPCF(pcn)) {
+         PCF(pcn)->ncalled++;
+       }
+      } else
+       fprintf(stderr,"BUG? pCode isn't a POC_CALL %d\n",__LINE__);
+
+    }
+  }
+
+  //fprintf(stderr,"inlining %d\n",__LINE__);
+
+  /* Now, Loop through the function definitions again, but this
+   * time inline those functions that have only been called once. */
+  
+  InlineFunction(the_pFile->pbHead);
+  //fprintf(stderr,"inlining %d\n",__LINE__);
+
+  for(pb = the_pFile->pbHead; pb; pb = pb->next)
+    unBuildFlow(pb);
+
+}