* src/pic16/device.c (pic16_dump_gsection,

* pic16_groupRegistersInSection): handle symbols declared to be in
access bank differently,
* src/pic16/gen.c (struct _G): added field resDirect,
* (aopForSym): if symbol on stack and iCode is '=' and result exists,
send values read from stack directly to result and don't allocate
temporary values,
* (pic16_sameRegs): fixed bug that allowed MOVFF to move between
same registers,
* (pic16_sameRegsOfs): NEW,
* (freeAsmop): if _G.resDirect is set then do not mark registers as
free because they were not allocated from temporary pool,
* pic16_popRegFromString): workaround to fix a problem with
allocating variables twice or never,
* (genGenPointerGet): using PRODL instead of FSR0H,
* (genGenPointerSet): using POSTDEC1 (that is a stack location)
instead of FSR0H,
* (genAssign): take advantage of the _G.resDirect flag,
* (genCast): around line 11844, use mov2f instead of directly
MOVFF'ing between operands to account for literal values,
* src/pic16/genutils.c: some new debug functions for gpsim have been
added,
* src/pic16/glue.c (pic16_printIvalType): fixed bug that initialized
float with integer part only,
* src/pic16/main.c (_process_pragma): handle pragma udata access to
place variables in access bank
* device/lib/pic16/libsdcc/gptr/gptr*.c: using BRA instead of GOTO,
updated sources to reflect recent changes in gen.c

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

diff --git a/ChangeLog b/ChangeLog
index fd240323f115868d449a6334a22b73382e8e8b25..791801b439ce52c29e624062ead3f133f42e6b2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2004-10-10 Vangelis Rokas <vrokas AT otenet.gr>
+
+       * src/pic16/device.c (pic16_dump_gsection,
+       * pic16_groupRegistersInSection): handle symbols declared to be in
+       access bank differently,
+       * src/pic16/gen.c (struct _G): added field resDirect,
+       * (aopForSym): if symbol on stack and iCode is '=' and result exists,
+       send values read from stack directly to result and don't allocate
+       temporary values,
+       * (pic16_sameRegs): fixed bug that allowed MOVFF to move between
+       same registers,
+       * (pic16_sameRegsOfs): NEW,
+       * (freeAsmop): if _G.resDirect is set then do not mark registers as
+       free because they were not allocated from temporary pool,
+       * pic16_popRegFromString): workaround to fix a problem with
+       allocating variables twice or never,
+       * (genGenPointerGet): using PRODL instead of FSR0H,
+       * (genGenPointerSet): using POSTDEC1 (that is a stack location)
+       instead of FSR0H,
+       * (genAssign): take advantage of the _G.resDirect flag,
+       * (genCast): around line 11844, use mov2f instead of directly
+       MOVFF'ing between operands to account for literal values,
+       * src/pic16/genutils.c: some new debug functions for gpsim have been
+       added,
+       * src/pic16/glue.c (pic16_printIvalType): fixed bug that initialized
+       float with integer part only,
+       * src/pic16/main.c (_process_pragma): handle pragma udata access to
+       place variables in access bank
+       * device/lib/pic16/libsdcc/gptr/gptr*.c: using BRA instead of GOTO,
+       updated sources to reflect recent changes in gen.c
+
 2004-10-06 Vangelis Rokas <vrokas AT otenet.gr>
 
        * device/lib/pic16/libsdcc/Makefile.rules: fixed bug concerning

diff --git a/src/pic16/device.c b/src/pic16/device.c
index 3f730a81984b03e050341fed666b7006040e5672..904e5f65b1355e92316175f7e025fcad5cd9ac3c 100644 (file)
--- a/src/pic16/device.c
+++ b/src/pic16/device.c
@@ -625,6 +625,7 @@ void pic16_dump_gsection(FILE *of, set *sections)
   sectName *sname;
 
        for(sname = setFirstItem(sections); sname; sname = setNextItem(sections)) {
+               if(!strcmp(sname->name, "access"))continue;
                fprintf(of, "\n\n%s\tudata\n", sname->name);
 
                for(r=setFirstItem(sname->regsSet); r; r=setNextItem(sname->regsSet)) {
@@ -1020,8 +1021,15 @@ void pic16_groupRegistersInSection(set *regset)
                                if(!strcmp(ssym->name, reg->name)) {
 //                                     fprintf(stderr, "%s:%d section found %s (%p) with var %s\n",
 //                                                     __FILE__, __LINE__, ssym->section->name, ssym->section, ssym->name);
-                                       addSet(&ssym->section->regsSet, reg);
-                                       docontinue=1;
+                                       if(strcmp(ssym->section->name, "access")) {
+                                               addSet(&ssym->section->regsSet, reg);
+                                               docontinue=1;
+                                               break;
+                                       } else {
+                                               docontinue=0;
+                                               reg->accessBank = 1;
+                                               break;
+                                       }
                                }
                        }
 
@@ -1040,7 +1048,8 @@ void pic16_groupRegistersInSection(set *regset)
                                        checkAddReg(&pic16_int_regs, reg);
                                else {
                                        if(reg->accessBank) {
-                                               checkAddReg(&pic16_acs_udata, reg);
+                                               if(reg->alias != 0x40)
+                                                       checkAddReg(&pic16_acs_udata, reg);
                                        } else
                                                checkAddReg(&pic16_rel_udata, reg);
                                }

diff --git a/src/pic16/gen.c b/src/pic16/gen.c
index 2d130bc34f275ad83e3c45522da2fab4cfe305cf..efc10964894e0fccf037dba2e32ea089b2e88cbd 100644 (file)
--- a/src/pic16/gen.c
+++ b/src/pic16/gen.c
@@ -60,6 +60,8 @@ extern pCode *pic16_newpCodeAsmDir(char *asdir, char *argfmt, ...);
 static void mov2w (asmop *aop, int offset);
 static void mov2f(asmop *dst, asmop *src, int offset);
 static void mov2fp(pCodeOp *dst, asmop *src, int offset);
+static pCodeOp *pic16_popRegFromIdx(int rIdx);
+
 //static int aopIdx (asmop *aop, int offset);
 
 int pic16_labelOffset=0;
@@ -78,7 +80,6 @@ static int max_key=0;
 static int GpsuedoStkPtr=0;
 
 pCodeOp *pic16_popGetImmd(char *name, unsigned int offset, int index);
-pCodeOp *pic16_popGet2p(pCodeOp *src, pCodeOp *dst);
 
 unsigned int pic16aopLiteral (value *val, int offset);
 const char *pic16_AopType(short type);
@@ -137,6 +138,7 @@ static struct {
     int usefastretfie;
     bitVect *fregsUsed;
     int stack_lat;                     /* stack offset latency */
+    int resDirect;
 } _G;
 
 /* Resolved ifx structure. This structure stores information
@@ -595,6 +597,8 @@ static asmop *aopForSym (iCode *ic, operand *op, bool result)
 
     DEBUGpic16_emitcode("; ***","%s %d",__FUNCTION__,__LINE__);
 
+    _G.resDirect = 0;  /* clear flag that instructs the result is loaded directly from aopForSym */
+    
 //    sym = OP_SYMBOL(op);
 
     /* if already has one */
@@ -628,10 +632,21 @@ static asmop *aopForSym (iCode *ic, operand *op, bool result)
         aop->aopu.stk.stk = sym->stack;
         aop->size = getSize(sym->type);
 
-        for(i=0;i<aop->size;i++) {
-          aop->aopu.stk.pop[i] = pcop[i] = pic16_popGetTempRegCond( _G.fregsUsed, 0 );
-          _G.fregsUsed = bitVectSetBit(_G.fregsUsed, PCOR(pcop[i])->r->rIdx);
-        }
+
+        DEBUGpic16_emitcode("; +++", "%s:%d", __FILE__, __LINE__);
+        pic16_DumpAop("aopForSym", AOP( IC_RESULT(ic) ));
+        if((ic->op == '=') && IC_RESULT(ic) && AOP( IC_RESULT(ic) )
+          && (AOP_TYPE(IC_RESULT(ic)) == AOP_REG) ) {
+          
+          for(i=0;i<aop->size;i++)
+            aop->aopu.stk.pop[i] = pcop[i] = pic16_popRegFromIdx( AOP(IC_RESULT(ic))->aopu.aop_reg[i]->rIdx);
+            _G.resDirect = 1;  /* notify that result will be loaded directly from aopForSym */
+        } else
+          for(i=0;i<aop->size;i++) {
+            aop->aopu.stk.pop[i] = pcop[i] = pic16_popGetTempRegCond( _G.fregsUsed, 0 );
+            _G.fregsUsed = bitVectSetBit(_G.fregsUsed, PCOR(pcop[i])->r->rIdx);
+          }
+
 
 //        fprintf(stderr, "%s:%d\t%s\tsym size %d\n", __FILE__, __LINE__, __FUNCTION__, aop->size);
 
@@ -814,6 +829,7 @@ static asmop *aopForSym (iCode *ic, operand *op, bool result)
 static asmop *aopForRemat (operand *op) // x symbol *sym)
 {
   symbol *sym = OP_SYMBOL(op);
+  operand *refop;
   iCode *ic = NULL, *oldic;
   asmop *aop = newAsmop(AOP_PCODE);
   int val = 0;
@@ -845,14 +861,15 @@ static asmop *aopForRemat (operand *op) // x symbol *sym)
        }
 
        offset = OP_SYMBOL(IC_LEFT(ic))->offset;
+       refop = IC_LEFT(ic);
 
        if(!op->isaddr)viaimmd++; else viaimmd=0;
                
 /* set the following if to 1 to revert to good old immediate code */
-       if(IN_CODESPACE( SPEC_OCLS( OP_SYM_ETYPE(op)))
+       if(IN_CODESPACE( SPEC_OCLS( OP_SYM_ETYPE(refop)))
                || viaimmd) {
 
-               DEBUGpic16_emitcode("%s:%d immediate", __FILE__, __LINE__);
+               DEBUGpic16_emitcode(";", "%s:%d immediate", __FILE__, __LINE__);
 
                aop->aopu.pcop = pic16_popGetImmd(OP_SYMBOL(IC_LEFT(ic))->rname, 0, val);
 
@@ -864,7 +881,7 @@ static asmop *aopForRemat (operand *op) // x symbol *sym)
 
                PCOI(aop->aopu.pcop)->index = val;
        } else {
-               DEBUGpic16_emitcode("%s:%d dir", __FILE__, __LINE__);
+               DEBUGpic16_emitcode(";", "%s:%d dir", __FILE__, __LINE__);
 
                aop->aopu.pcop = pic16_popRegFromString(OP_SYMBOL(IC_LEFT(ic))->rname,
                                getSize( OP_SYMBOL( IC_LEFT(ic))->type), val, op);
@@ -1000,23 +1017,38 @@ bool pic16_sameRegs (asmop *aop1, asmop *aop2 )
 
     if(aop1->type == AOP_ACC && aop2->type == AOP_ACC)return TRUE;
 
-#if 0
     if (aop1->type != AOP_REG ||
         aop2->type != AOP_REG )
         return FALSE ;
-#endif
 
     if (aop1->size != aop2->size )
         return FALSE ;
 
-    for (i = 0 ; i < aop1->size ; i++ )
-        if (aop1->aopu.aop_reg[i] !=
-            aop2->aopu.aop_reg[i] )
+    for (i = 0 ; i < aop1->size ; i++ ) {
+//        if(aop1->aopu.aop_reg[i]->type != aop2->aopu.aop_reg[i]->type)return FALSE;
+
+//        if(aop1->aopu.aop_reg[i]->type == AOP_REG)
+        if (strcmp(aop1->aopu.aop_reg[i]->name, aop2->aopu.aop_reg[i]->name ))
             return FALSE ;
+    }
 
     return TRUE ;
 }
 
+bool pic16_sameRegsOfs(asmop *aop1, asmop *aop2, int offset)
+{
+    DEBUGpic16_emitcode(";***", "%s aop1->type = %s\taop2->type = %s (offset = %d)\n", __FUNCTION__,
+               pic16_AopType(aop1->type), pic16_AopType(aop2->type), offset);
+
+    if(aop1 == aop2)return TRUE;
+    if(aop1->type != AOP_REG || aop2->type != AOP_REG)return FALSE;
+      
+      if(strcmp(aop1->aopu.aop_reg[offset]->name, aop2->aopu.aop_reg[offset]->name))return FALSE;
+    
+  return TRUE;
+}
+
+
 /*-----------------------------------------------------------------*/
 /* pic16_aopOp - allocates an asmop for an operand  :                    */
 /*-----------------------------------------------------------------*/
@@ -1094,8 +1126,7 @@ void pic16_aopOp (operand *op, iCode *ic, bool result)
         /* rematerialize it NOW */
         if (sym->remat) {
 
-            sym->aop = op->aop = aop =
-                                      aopForRemat (op);
+            sym->aop = op->aop = aop = aopForRemat (op);
             aop->size = getSize(sym->type);
            //DEBUGpic16_emitcode(";"," %d: size %d, %s\n",__LINE__,aop->size,aop->aopu.aop_immd);
             return;
@@ -1255,8 +1286,11 @@ void pic16_freeAsmop (operand *op, asmop *aaop, iCode *ic, bool pop)
                 if(_G.accInUse)pic16_poppCodeOp( pic16_popCopyReg(&pic16_pc_wreg) );
               }
 
-              for(i=0;i<aop->size;i++)
-                PCOR(aop->aopu.stk.pop[i] )->r->isFree = 1;
+              if(!_G.resDirect) {
+                for(i=0;i<aop->size;i++)
+                  PCOR(aop->aopu.stk.pop[i] )->r->isFree = 1;
+              }
+              _G.resDirect = 0;
           }
           break;
 #if 0
@@ -1669,9 +1703,11 @@ static pCodeOp *pic16_popRegFromString(char *str, int size, int offset, operand
   PCOR(pcop)->r = pic16_dirregWithName(pcop->name);
 
   /* make sure that register doesn't exist,
-   * and operand isn't NULL */
+   * and operand isn't NULL
+   * and symbol isn't in codespace (codespace symbols are handled elsewhere) */
   if((PCOR(pcop)->r == NULL) 
-    && (op)) {
+    && (op)
+    && !IN_CODESPACE(SPEC_OCLS(OP_SYM_ETYPE(op)))) {
 //     fprintf(stderr, "%s:%d - couldn't find %s in allocated regsters, size= %d ofs= %d\n",
 //             __FUNCTION__, __LINE__, str, size, offset);
 
@@ -2167,6 +2203,7 @@ static void mov2f(asmop *dst, asmop *src, int offset)
     pic16_emitpcode(POC_MOVLW, pic16_popGet(src, offset));
     pic16_emitpcode(POC_MOVWF, pic16_popGet(dst, offset));
   } else {
+    if(pic16_sameRegsOfs(src, dst, offset))return;
     pic16_emitpcode(POC_MOVFF, pic16_popGet2p( pic16_popGet(src, offset),
                       pic16_popGet(dst, offset)));
   }
@@ -2991,6 +3028,7 @@ static void genCall (iCode *ic)
   sym_link *ftype;   
   int stackParms=0;
   int use_wreg=0;
+  char *fname;
   
     DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
 
@@ -3002,6 +3040,11 @@ static void genCall (iCode *ic)
        /* initialise stackParms for IPUSH pushes */
 //     stackParms = psuedoStkPtr;
 //     fprintf(stderr, "%s:%d ic parmBytes = %d\n", __FILE__, __LINE__, ic->parmBytes);
+    fname = OP_SYMBOL(IC_LEFT(ic))->rname[0]?OP_SYMBOL(IC_LEFT(ic))->rname:OP_SYMBOL(IC_LEFT(ic))->name;
+
+#if 0
+    gpsimDebug_StackDump(__FILE__, __LINE__, fname );
+#endif
 
     /* if send set is not empty the assign */
     if (_G.sendSet) {
@@ -3026,9 +3069,11 @@ static void genCall (iCode *ic)
         }
 */
 
+
 //        stackParms = psuedoStkPtr;
         stackParms = 0;
-
+        use_wreg = 0;
+        
         for (sic = setFirstItem(_G.sendSet) ; sic ; sic = setNextItem(_G.sendSet)) {
           int size, offset = 0;
 
@@ -3062,56 +3107,56 @@ static void genCall (iCode *ic)
           }
 
           /* save last parameter to stack if functions has varargs */
-          if(IFFUNC_HASVARARGS(ftype))
-                  pushw();
-          else
-            use_wreg = 1;              /* last parameter in WREG */
+          if(IFFUNC_HASVARARGS(ftype))pushw();
+          else use_wreg = 1;           /* last parameter in WREG */
           
           _G.stackRegSet = _G.sendSet;
           _G.sendSet = NULL;
-      }
+    }
 
-      /* make the call */
-      pic16_emitpcode(POC_CALL,pic16_popGetWithString(OP_SYMBOL(IC_LEFT(ic))->rname[0] ?
-                      OP_SYMBOL(IC_LEFT(ic))->rname :
-                      OP_SYMBOL(IC_LEFT(ic))->name));
+    /* make the call */
+    pic16_emitpcode(POC_CALL,pic16_popGetWithString(fname));
 
-      GpsuedoStkPtr=0;
-      /* if we need to assign a result value */
-      if ((IS_ITEMP(IC_RESULT(ic))
-            && (OP_SYMBOL(IC_RESULT(ic))->nRegs
-                || OP_SYMBOL(IC_RESULT(ic))->spildir ))
-          || IS_TRUE_SYMOP(IC_RESULT(ic)) ) {
+    GpsuedoStkPtr=0;
+    /* if we need to assign a result value */
+    if ((IS_ITEMP(IC_RESULT(ic))
+          && (OP_SYMBOL(IC_RESULT(ic))->nRegs
+              || OP_SYMBOL(IC_RESULT(ic))->spildir ))
+        || IS_TRUE_SYMOP(IC_RESULT(ic)) ) {
 
-        _G.accInUse++;
-        pic16_aopOp(IC_RESULT(ic),ic,FALSE);
-        _G.accInUse--;
+      _G.accInUse++;
+      pic16_aopOp(IC_RESULT(ic),ic,FALSE);
+      _G.accInUse--;
 
-        assignResultValue(IC_RESULT(ic), 1);
+      assignResultValue(IC_RESULT(ic), 1);
 
-        DEBUGpic16_emitcode ("; ","%d left %s",__LINE__,
-                  pic16_AopType(AOP_TYPE(IC_RESULT(ic))));
+      DEBUGpic16_emitcode ("; ","%d left %s",__LINE__,
+                pic16_AopType(AOP_TYPE(IC_RESULT(ic))));
                
-        pic16_freeAsmop(IC_RESULT(ic),NULL, ic,TRUE);
-      }
+      pic16_freeAsmop(IC_RESULT(ic),NULL, ic,TRUE);
+    }
 
-      if(!stackParms && ic->parmBytes) {
-        stackParms = ic->parmBytes;
-      }
+    if(!stackParms && ic->parmBytes) {
+      stackParms = ic->parmBytes;
+    }
       
-      stackParms -= use_wreg;
+    stackParms -= use_wreg;
       
-      if(stackParms>0) {
-        pic16_emitpcode(POC_MOVLW, pic16_popGetLit(stackParms));
-        pic16_emitpcode(POC_ADDWF, pic16_popCopyReg( &pic16_pc_fsr1l ));
-        if(STACK_MODEL_LARGE) {
-          emitSKPNC;
-          pic16_emitpcode(POC_INCF, pic16_popCopyReg( &pic16_pc_fsr1h ));
-        }
+    if(stackParms>0) {
+      pic16_emitpcode(POC_MOVLW, pic16_popGetLit(stackParms));
+      pic16_emitpcode(POC_ADDWF, pic16_popCopyReg( &pic16_pc_fsr1l ));
+      if(STACK_MODEL_LARGE) {
+        emitSKPNC;
+        pic16_emitpcode(POC_INCF, pic16_popCopyReg( &pic16_pc_fsr1h ));
       }
+    }
 
-      /* adjust the stack for parameters if required */
-//      fprintf(stderr, "%s:%d: %s ic->parmBytes= %d\n", __FILE__, __LINE__, OP_SYMBOL(IC_LEFT(ic))->name, ic->parmBytes);
+#if 0
+    gpsimDebug_StackDump(__FILE__, __LINE__, fname);
+#endif
+
+    /* adjust the stack for parameters if required */
+//    fprintf(stderr, "%s:%d: %s ic->parmBytes= %d\n", __FILE__, __LINE__, OP_SYMBOL(IC_LEFT(ic))->name, ic->parmBytes);
 
 #if 0
       /* if register bank was saved then pop them */
@@ -10016,9 +10061,9 @@ static void genGenPointerGet (operand *left,
 
     } else { /* we need to get it byte by byte */
 
-      /* set up WREG:FSR0H:FSR0L with address from left */
+      /* set up WREG:PRODL:FSR0L with address from left */
       pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(left),0), pic16_popCopyReg(&pic16_pc_fsr0l)));
-      pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(left),1), pic16_popCopyReg(&pic16_pc_fsr0h)));
+      pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(left),1), pic16_popCopyReg(&pic16_pc_prodl)));
       pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 2));
       
       switch( size ) {
@@ -10041,6 +10086,7 @@ static void genGenPointerGet (operand *left,
           sym = newSymbol( fgptrget, 0 );
           strcpy(sym->rname, fgptrget);
           checkAddSym(&externs, sym);
+
 //          fprintf(stderr, "%s:%d adding extern symbol %s in externs\n", __FILE__, __LINE__, fgptrget);
       }
               
@@ -10875,7 +10921,7 @@ static void genGenPointerSet (operand *right,
 
 
     /* load value to write in TBLPTRH:TBLPTRL:PRODH:PRODL */
-    mov2fp(pic16_popCopyReg(&pic16_pc_prodl), AOP(right), 0);
+    mov2fp(pic16_popCopyReg(&pic16_pc_gptrreg), AOP(right), 0);
     if(size>1)mov2fp(pic16_popCopyReg(&pic16_pc_prodh), AOP(right), 1);
     if(size>2)mov2fp(pic16_popCopyReg(&pic16_pc_tblptrl), AOP(right), 2);
     if(size>3)mov2fp(pic16_popCopyReg(&pic16_pc_tblptrh), AOP(right), 3);
@@ -10884,7 +10930,7 @@ static void genGenPointerSet (operand *right,
     pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(result), 0),
                                 pic16_popCopyReg(&pic16_pc_fsr0l)));
     pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(result), 1),
-                                pic16_popCopyReg(&pic16_pc_fsr0h)));
+                                pic16_popCopyReg(&pic16_pc_prodl)));
     pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(result), 2));
     
 
@@ -10892,6 +10938,7 @@ static void genGenPointerSet (operand *right,
     switch (size) {
       case 1: strcpy(fgptrput, "__gptrput1"); break;
       case 2: strcpy(fgptrput, "__gptrput2"); break;
+      case 3: strcpy(fgptrput, "__gptrput3"); break;
       case 4: strcpy(fgptrput, "__gptrput4"); break;
       default:
         werror(W_POSSBUG2, __FILE__, __LINE__);
@@ -10906,6 +10953,11 @@ static void genGenPointerSet (operand *right,
         sym = newSymbol( fgptrput, 0 );
         strcpy(sym->rname, fgptrput);
         checkAddSym(&externs, sym);
+
+       sym = newSymbol("__GPTRREG", 0);
+        strcpy(sym->rname, "__GPTRREG");
+        checkAddSym(&externs, sym);
+
 //          fprintf(stderr, "%s:%d adding extern symbol %s in externs\n", __FILE__, __LINE__, fgptrget);
     }
 
@@ -11149,8 +11201,11 @@ static void genAssign (iCode *ic)
   if (operandsEqu (IC_RESULT(ic),IC_RIGHT(ic)))
     return ;
 
-  pic16_aopOp(right,ic,FALSE);
+  /* reversed order operands are aopOp'ed so that result operand
+   * is effective in case right is a stack symbol. This maneauver
+   * allows to use the _G.resDirect flag later */
   pic16_aopOp(result,ic,TRUE);
+  pic16_aopOp(right,ic,FALSE);
 
   DEBUGpic16_pic16_AopType(__LINE__,NULL,right,result);
 
@@ -11317,32 +11372,15 @@ static void genAssign (iCode *ic)
        pic16_emitpcode(POC_MOVLW, pic16_popGet(AOP(right),offset));
        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offset));
     } else {
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+      DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
 
-#if 1
-       /* This is a hack to turn MOVFW/MOVWF pairs to MOVFF command. It
-          normally should work, but mind that the W register live range
-          is not checked, so if the code generator assumes that the W
-          is already loaded after such a pair, wrong code will be generated.
-          
-          Checking the live range is the next step.
-          This is experimental code yet and has not been fully tested yet.
-          USE WITH CARE. Revert to old code by setting 0 to the condition above.
-          Vangelis Rokas 030603 (vrokas@otenet.gr) */
-          
-       pic16_emitpcode(POC_MOVFF, pic16_popGet2(AOP(right), AOP(result), offset));
-#else  
-       /* This is the old code, which is assumed(?!) that works fine(!?) */
-
-       pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(right),offset));
-       pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offset));
-#endif
+      if(!_G.resDirect)                /* use this aopForSym feature */
+        pic16_emitpcode(POC_MOVFF, pic16_popGet2(AOP(right), AOP(result), offset));
     }
            
     offset++;
   }
-
-    
+  
  release:
   pic16_freeAsmop (right,NULL,ic,FALSE);
   pic16_freeAsmop (result,NULL,ic,TRUE);
@@ -11800,9 +11838,7 @@ static void genCast (iCode *ic)
     size = AOP_SIZE(right);
     offset = 0 ;
     while (size--) {
-      pic16_emitpcode(POC_MOVFF, pic16_popGet2(AOP(right), AOP(result), offset));
-//      pic16_emitpcode(POC_MOVFW,   pic16_popGet(AOP(right),offset));
-//      pic16_emitpcode(POC_MOVWF,   pic16_popGet(AOP(result),offset));
+      mov2f(AOP(result), AOP(right), offset);
       offset++;
     }
 

diff --git a/src/pic16/gen.h b/src/pic16/gen.h
index 7d4b058a613ca5e9b0fc16736e224cb5f379355e..72f700d18d0e6bee726913124620bbc35aa43700 100644 (file)
--- a/src/pic16/gen.h
+++ b/src/pic16/gen.h
@@ -173,6 +173,8 @@ void pic16_addSign(operand *result, int offset, int sign);
 void pic16_genMinusBits (iCode *ic);
 void pic16_genMinus (iCode *ic);
 
+pCodeOp *pic16_popGet2p(pCodeOp *src, pCodeOp *dst);
+void pic16_emitpcomment (char *fmt, ...);
 
 pCodeOp *pic16_popGetLabel(unsigned int key);
 pCodeOp *pic16_popCopyReg(pCodeOpReg *pc);

diff --git a/src/pic16/genutils.c b/src/pic16/genutils.c
index ab5f75be5a57e5d2bfe6f5eb5c0ccdcf5ef499a8..284d60ce65abac46384733d48f8685a21ca12b2c 100644 (file)
--- a/src/pic16/genutils.c
+++ b/src/pic16/genutils.c
@@ -417,3 +417,39 @@ void pic16_DumpOp(char *prefix, operand *op)
        }
 
 }
+
+
+void gpsimio2_pcop(pCodeOp *pcop)
+{
+  pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pcop, pic16_popCopyReg(&pic16_pc_gpsimio2)));
+}
+
+void gpsimio2_lit(unsigned char lit)
+{
+  pic16_emitpcode(POC_MOVLW, pic16_popGetLit(lit));
+  pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(&pic16_pc_wreg), pic16_popCopyReg(&pic16_pc_gpsimio2)));
+}
+
+void gpsimio2_str(char *buf)
+{
+  while(*buf) {
+    gpsimio2_lit(*buf);
+    buf++;
+  }
+}
+
+void gpsimDebug_StackDump(char *fname, int line, char *info)
+{
+  pic16_emitpcomment("; gpsim debug stack dump; %s @ %d\tinfo: ", fname, line, info);
+  
+  gpsimio2_str("&c[S:");
+  gpsimio2_str(info);
+  gpsimio2_str("] &h");
+  
+  pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(&pic16_pc_fsr1h),
+                pic16_popCopyReg(&pic16_pc_gpsimio2)));
+  pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(&pic16_pc_fsr1l),
+                pic16_popCopyReg(&pic16_pc_gpsimio2)));
+
+  gpsimio2_lit('\n');
+}

diff --git a/src/pic16/genutils.h b/src/pic16/genutils.h
index 6c94e8baa6165af43d6f87abd5e8f82877027e70..07914e33cc66d3f98e06190a0d910938080e120b 100644 (file)
--- a/src/pic16/genutils.h
+++ b/src/pic16/genutils.h
@@ -33,6 +33,9 @@ void pic16_DumpAop(char *prefix, asmop *aop);
 void pic16_DumpSymbol(char *prefix, symbol *sym);
 void pic16_DumpOp(char *prefix, operand *op);
 
+void gpsimio2_pcop(pCodeOp *pcop);
+void gpsimio2_lit(unsigned char lit);
 
+void gpsimDebug_StackDump(char *fname, int line, char *info);
 
 #endif /* __GENUTILS_H__ */

diff --git a/src/pic16/glue.c b/src/pic16/glue.c
index b0d2886611199684b8bb6f4b66399a5bef55ee71..ac5172e262670eec461d8687f2f7bbde697c950b 100644 (file)
--- a/src/pic16/glue.c
+++ b/src/pic16/glue.c
@@ -200,7 +200,11 @@ pic16emitRegularMap (memmap * map, bool addPublics, bool arFlag)
                                        }
 #endif
 
-                                       if(!found)checkAddReg(&pic16_rel_udata, reg);
+                                       if(!found)
+                                               checkAddReg(&pic16_rel_udata, reg);
+                                       else
+                                               checkAddSym(&publics, sym);
+
                                }
                        }
 
@@ -592,7 +596,6 @@ static void
 pic16_printIvalType (symbol *sym, sym_link * type, initList * ilist, char ptype, void *p)
 {
   value *val;
-  unsigned long ulval;
 
 //  fprintf(stderr, "%s for symbol %s\n",__FUNCTION__, sym->rname);
 
@@ -618,26 +621,24 @@ pic16_printIvalType (symbol *sym, sym_link * type, initList * ilist, char ptype,
     val = valCastLiteral(type, floatFromVal(val));
   }
 
-  if(val) 
-    ulval = (unsigned long) floatFromVal (val);
-  else
-    ulval =0;
-
   switch (getSize (type)) {
   case 1:
-    pic16_emitDB(BYTE_IN_LONG(ulval,0), ptype, p);
+    pic16_emitDB(pic16aopLiteral(val, 0), ptype, p);
     break;
 
   case 2:
-    pic16_emitDB(BYTE_IN_LONG(ulval,0), ptype, p);
-    pic16_emitDB(BYTE_IN_LONG(ulval,1), ptype, p);
+    pic16_emitDB(pic16aopLiteral(val, 0), ptype, p);
+    pic16_emitDB(pic16aopLiteral(val, 1), ptype, p);
     break;
-
+  case 3:
+    pic16_emitDB(pic16aopLiteral(val, 0), ptype, p);
+    pic16_emitDB(pic16aopLiteral(val, 1), ptype, p);
+    pic16_emitDB(pic16aopLiteral(val, 2), ptype, p);
   case 4:
-    pic16_emitDB(BYTE_IN_LONG(ulval,0), ptype, p);
-    pic16_emitDB(BYTE_IN_LONG(ulval,1), ptype, p);
-    pic16_emitDB(BYTE_IN_LONG(ulval,2), ptype, p);
-    pic16_emitDB(BYTE_IN_LONG(ulval,3), ptype, p);
+    pic16_emitDB(pic16aopLiteral(val, 0), ptype, p);
+    pic16_emitDB(pic16aopLiteral(val, 1), ptype, p);
+    pic16_emitDB(pic16aopLiteral(val, 2), ptype, p);
+    pic16_emitDB(pic16aopLiteral(val, 3), ptype, p);
     break;
   }
 }

diff --git a/src/pic16/main.c b/src/pic16/main.c
index 82904a1e5572351972719f6fe4a4fd17cbddb166..dcd664f9dea2ba7fd519b574721cf4b49baefde9 100644 (file)
--- a/src/pic16/main.c
+++ b/src/pic16/main.c
@@ -225,12 +225,12 @@ _process_pragma(const char *sz)
        if(startsWith(ptr, "udata")) {
          char *sectname = strtok((char *)NULL, WHITE);
          char *symname = strtok((char *)NULL, WHITE);
+         symbol *nsym;
          sectSym *ssym;
          sectName *snam;
          int found=0;
          
                while(symname) {
-
                        ssym = Safe_calloc(1, sizeof(sectSyms));
                        ssym->name = Safe_calloc(1, strlen(symname)+2);
                        sprintf(ssym->name, "_%s", symname);
@@ -238,6 +238,10 @@ _process_pragma(const char *sz)
 
                        addSet(&sectSyms, ssym);
 
+                        nsym = newSymbol(symname, 0);
+                        strcpy(nsym->rname, ssym->name);
+                       checkAddSym(&publics, nsym);
+
                        found = 0;
                        for(snam=setFirstItem(sectNames);snam;snam=setNextItem(sectNames)) {
                                if(!strcmp(sectname, snam->name)){ found=1; break; }

diff --git a/src/pic16/pcode.c b/src/pic16/pcode.c
index 66c8d0f82b29ad4e7470cb96685eaf23b7ad9cc5..f3e9ca0e15e0912029cad13a8352a45535109ad7 100644 (file)
--- a/src/pic16/pcode.c
+++ b/src/pic16/pcode.c
@@ -112,6 +112,12 @@ pCodeOpReg pic16_pc_kzero     = {{PO_GPR_REGISTER,  "KZ"}, -1, NULL,0,NULL};
 pCodeOpReg pic16_pc_wsave     = {{PO_GPR_REGISTER,  "WSAVE"}, -1, NULL,0,NULL};
 pCodeOpReg pic16_pc_ssave     = {{PO_GPR_REGISTER,  "SSAVE"}, -1, NULL,0,NULL};
 
+pCodeOpReg pic16_pc_gptrreg     = {{PO_GPR_REGISTER,  "__GPTRREG"}, -1, NULL,0,NULL};
+
+pCodeOpReg pic16_pc_gpsimio   = {{PO_GPR_REGISTER, "GPSIMIO"}, -1, NULL, 0, NULL};
+pCodeOpReg pic16_pc_gpsimio2  = {{PO_GPR_REGISTER, "GPSIMIO2"}, -1, NULL, 0, NULL};
+
+
 static int mnemonics_initialized = 0;
 
 
@@ -2817,6 +2823,7 @@ void SAFE_snprintf(char **str, size_t *size, const  char  *format, ...)
 #endif    //  USE_VSNPRINTF
 #endif
 
+extern set *externs;
 extern  void pic16_initStack(int base_address, int size);
 extern regs *pic16_allocProcessorRegister(int rIdx, char * name, short po_type, int alias);
 extern regs *pic16_allocInternalRegister(int rIdx, char * name, short po_type, int alias);
@@ -2940,6 +2947,15 @@ void  pic16_pCodeInitRegisters(void)
        pic16_pc_eedata.rIdx = IDX_EEDATA;
        pic16_pc_eeadr.rIdx = IDX_EEADR;
        
+       
+       pic16_pc_gpsimio.r = pic16_allocProcessorRegister(IDX_GPSIMIO, "GPSIMIO", PO_GPR_REGISTER, 0x80);
+       pic16_pc_gpsimio2.r = pic16_allocProcessorRegister(IDX_GPSIMIO2, "GPSIMIO2", PO_GPR_REGISTER, 0x80);
+
+       pic16_pc_gpsimio.rIdx = IDX_GPSIMIO;
+       pic16_pc_gpsimio2.rIdx = IDX_GPSIMIO2;
+
+       pic16_pc_gptrreg.r = newReg(REG_SFR, PO_GPR_REGISTER, 0, "__GPTRREG", 1, 0x40, NULL);   //PO_GPR_REGISTER, 0x00);
+       pic16_pc_gptrreg.rIdx = 0;
 
        /* probably should put this in a separate initialization routine */
        pb_dead_pcodes = newpBlock();

diff --git a/src/pic16/pcode.h b/src/pic16/pcode.h
index c290d3ad42dff4f25220a83536e401e59a64684f..7059deae1cc58464f4b100092caf57a39f010578 100644 (file)
--- a/src/pic16/pcode.h
+++ b/src/pic16/pcode.h
@@ -1049,5 +1049,8 @@ extern pCodeOpReg pic16_pc_kzero;
 extern pCodeOpReg pic16_pc_wsave;     /* wsave and ssave are used to save W and the Status */
 extern pCodeOpReg pic16_pc_ssave;     /* registers during an interrupt */
 
+extern pCodeOpReg pic16_pc_gpsimio;
+extern pCodeOpReg pic16_pc_gpsimio2;
+extern pCodeOpReg pic16_pc_gptrreg;
 
 #endif // __PCODE_H__

diff --git a/src/pic16/ralloc.h b/src/pic16/ralloc.h
index f41ebc244b16d753a0ae7d0c0ae5c7d51d20e08d..0f9574b849c1d63a6cc7b224bf7ebb77f9082c1b 100644 (file)
--- a/src/pic16/ralloc.h
+++ b/src/pic16/ralloc.h
@@ -187,4 +187,7 @@ regs* newReg(short type, short pc_type, int rIdx, char *name, int size, int alia
 #define IDX_WSAVE   0x7ffe
 #define IDX_SSAVE   0x7ffd
 
+#define IDX_GPSIMIO    0xf7f
+#define IDX_GPSIMIO2   0xf7e
+
 #endif