X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fds390%2Fgen.c;h=875b591389b8869ee9958b3323805402eedd6951;hb=a37b0639252a14b7741f4fadf9f601835c702cf9;hp=0abcefab80d9667d2727a06e2407dd697df38437;hpb=599e22008460e89814f7d5dd8a92d41a3f281cd2;p=fw%2Fsdcc

diff --git a/src/ds390/gen.c b/src/ds390/gen.c
index 0abcefab..875b5913 100644
--- a/src/ds390/gen.c
+++ b/src/ds390/gen.c
@@ -62,8 +62,8 @@ char *aopLiteral (value * val, int offset);
    CODE GENERATION for a specific MCU . some of the
    routines may be reusable, will have to see */
 
-static char *zero = "#0x00";
-static char *one = "#0x01";
+static char *zero = "#0";
+static char *one = "#1";
 static char *spname;
 
 #define D(x) x
@@ -79,7 +79,7 @@ static char *fReturn16[] =
 static char **fReturn = fReturn24;
 static char *accUse[] =
 {"a", "b"};
-
+static char *javaRet[] = { "r0","r1","r2","r3"};
 static short rbank = -1;
 
 static struct
@@ -87,6 +87,7 @@ static struct
     short r0Pushed;
     short r1Pushed;
     short accInUse;
+    short bInUse;
     short inLine;
     short debugLine;
     short nRegsSaved;
@@ -113,7 +114,7 @@ static void saveRBank (int, iCode *, bool);
 
 // A scratch register which will be used to hold
 // result bytes from operands in far space via DPTR2.
-#define DP2_RESULT_REG	"ap"
+#define DP2_RESULT_REG	"_ap"
 
 static lineNode *lineHead = NULL;
 static lineNode *lineCurr = NULL;
@@ -148,10 +149,10 @@ emitcode (char *inst, char *fmt,...)
 	sprintf (lb, "%s\t", inst);
       else
 	sprintf (lb, "%s", inst);
-      vsprintf (lb + (strlen (lb)), fmt, ap);
+      tvsprintf (lb + (strlen (lb)), fmt, ap);
     }
   else
-    vsprintf (lb, fmt, ap);
+    tvsprintf (lb, fmt, ap);
 
   while (isspace (*lbp))
     lbp++;
@@ -293,12 +294,12 @@ genSetDPTR (int n)
 
   if (!n)
     {
-      emitcode ("mov", "dps, #0x00");
+      emitcode ("mov", "dps,#0");
     }
   else
     {
       TR_DPTR("#1");
-      emitcode ("mov", "dps, #0x01");
+      emitcode ("mov", "dps,#1");
     }
 }
 
@@ -429,14 +430,20 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2)
 	      if (_G.accInUse)
 		emitcode ("push", "acc");
 
+	      if (_G.bInUse)
+		emitcode ("push", "b");
+
 	      emitcode ("mov", "a,_bp");
-	      emitcode ("add", "a,#0x%02x",
+	      emitcode ("add", "a,#!constbyte",
 			((sym->stack < 0) ?
 			 ((char) (sym->stack - _G.nRegsSaved)) :
 			 ((char) sym->stack)) & 0xff);
 	      emitcode ("mov", "%s,a",
 			aop->aopu.aop_ptr->name);
 
+	      if (_G.bInUse)
+		emitcode ("pop", "b");
+
 	      if (_G.accInUse)
 		emitcode ("pop", "acc");
 	    }
@@ -453,43 +460,68 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2)
 
   if (sym->onStack && options.stack10bit)
     {
+	short stack_val = -((sym->stack < 0) ?
+			    ((short) (sym->stack - _G.nRegsSaved)) :
+			    ((short) sym->stack)) ;
       /* It's on the 10 bit stack, which is located in
        * far data space.
        */
-
-      if (_G.accInUse)
-	emitcode ("push", "acc");
-
-      emitcode ("mov", "a,_bpx");
-      emitcode ("clr","c");
-      emitcode ("subb", "a,#0x%02x",
-		-((sym->stack < 0) ?
-		  ((short) (sym->stack - _G.nRegsSaved)) :
-		  ((short) sym->stack)) & 0xff);
-      emitcode ("mov","b,a");
-      emitcode ("mov","a,_bpx+1");
-      emitcode ("subb","a,#0x%02x",(-((sym->stack < 0) ?
-				     ((short) (sym->stack - _G.nRegsSaved)) :
-				     ((short) sym->stack)) >> 8) & 0xff);
-      if (useDP2) {
-	  if (options.model == MODEL_FLAT24)
-	      emitcode ("mov", "dpx1,#0x%02x", (options.stack_loc >> 16) & 0xff);
-	  TR_DPTR("#2");
-	  emitcode ("mov", "dph1,a");
-	  emitcode ("mov", "dpl1,b");
-      } else {
-	  if (options.model == MODEL_FLAT24)
-	      emitcode ("mov", "dpx,#0x%02x", (options.stack_loc >> 16) & 0xff);
-	  emitcode ("mov", "dph,a");
-	  emitcode ("mov", "dpl,b");
-      }
-
-      if (_G.accInUse)
-	emitcode ("pop", "acc");
-
-      sym->aop = aop = newAsmop ((short) (useDP2 ? AOP_DPTR2 : AOP_DPTR));
-      aop->size = getSize (sym->type);
-      return aop;
+	if (stack_val < 0 && stack_val > -3) { /* between -3 & -1 */
+	    if (useDP2) {
+		if (options.model == MODEL_FLAT24)
+		    emitcode ("mov", "dpx1,#!constbyte", (options.stack_loc >> 16) & 0xff);
+		TR_DPTR("#2");
+		emitcode ("mov", "dph1,_bpx+1");
+		emitcode ("mov", "dpl1,_bpx");
+		emitcode ("mov","dps,#1");
+	    } else {
+		if (options.model == MODEL_FLAT24)
+		    emitcode ("mov", "dpx,#!constbyte", (options.stack_loc >> 16) & 0xff);
+		emitcode ("mov", "dph,_bpx+1");
+		emitcode ("mov", "dpl,_bpx");
+	    }
+	    stack_val = -stack_val;
+	    while (stack_val--) {
+		emitcode ("inc","dptr");
+	    }
+	    if (useDP2) {
+		emitcode("mov","dps,#0");
+	    }
+	}  else {
+	    if (_G.accInUse)
+		emitcode ("push", "acc");
+	    
+	    if (_G.bInUse)
+		emitcode ("push", "b");
+	
+	    emitcode ("mov", "a,_bpx");
+	    emitcode ("clr","c");
+	    emitcode ("subb", "a,#!constbyte", stack_val & 0xff);
+	    emitcode ("mov","b,a");
+	    emitcode ("mov","a,_bpx+1");
+	    emitcode ("subb","a,#!constbyte",(stack_val >> 8) & 0xff);
+	    if (useDP2) {
+		if (options.model == MODEL_FLAT24)
+		    emitcode ("mov", "dpx1,#!constbyte", (options.stack_loc >> 16) & 0xff);
+		TR_DPTR("#2");
+		emitcode ("mov", "dph1,a");
+		emitcode ("mov", "dpl1,b");
+	    } else {
+		if (options.model == MODEL_FLAT24)
+		    emitcode ("mov", "dpx,#!constbyte", (options.stack_loc >> 16) & 0xff);
+		emitcode ("mov", "dph,a");
+		emitcode ("mov", "dpl,b");
+	    }
+	    
+	    if (_G.bInUse)
+		emitcode ("pop", "b");
+	    
+	    if (_G.accInUse)
+		emitcode ("pop", "acc");
+	}
+	sym->aop = aop = newAsmop ((short) (useDP2 ? AOP_DPTR2 : AOP_DPTR));
+	aop->size = getSize (sym->type);
+	return aop;
     }
 
   /* if in bit space */
@@ -586,7 +618,7 @@ aopForRemat (symbol * sym)
   strcpy (aop->aopu.aop_immd.aop_immd1, buffer);
   /* set immd2 field if required */
   if (aop->aopu.aop_immd.from_cast_remat) {
-	  sprintf(buffer,"#0x%02x",ptr_type);
+	  tsprintf(buffer,"#!constbyte",ptr_type);
 	  aop->aopu.aop_immd.aop_immd2 = Safe_calloc (1, strlen (buffer) + 1);
 	  strcpy (aop->aopu.aop_immd.aop_immd2, buffer);
   }
@@ -594,6 +626,23 @@ aopForRemat (symbol * sym)
   return aop;
 }
 
+/*-----------------------------------------------------------------*/
+/* aopHasRegs - returns true if aop has regs between from-to       */
+/*-----------------------------------------------------------------*/
+static int aopHasRegs(asmop *aop, int from, int to)
+{
+    int size =0;
+
+    if (aop->type != AOP_REG) return 0; /* if not assigned to regs */
+
+    for (; size < aop->size ; size++) {
+	int reg;
+	for (reg = from ; reg <= to ; reg++)
+	    if (aop->aopu.aop_reg[size] == ds390_regWithIdx(reg)) return 1;
+    }
+    return 0;
+}
+
 /*-----------------------------------------------------------------*/
 /* regsInCommon - two operands have some registers in common       */
 /*-----------------------------------------------------------------*/
@@ -814,6 +863,10 @@ aopOp (operand * op, iCode * ic, bool result, bool useDP2)
 	}
 
       /* else spill location  */
+      if (sym->usl.spillLoc && getSize(sym->type) != getSize(sym->usl.spillLoc->type)) {
+	  /* force a new aop if sizes differ */
+	  sym->usl.spillLoc->aop = NULL;
+      }
       sym->aop = op->aop = aop =
 	aopForSym (ic, sym->usl.spillLoc, result, useDP2);
       aop->size = getSize (sym->type);
@@ -897,7 +950,7 @@ freeAsmop (operand * op, asmop * aaop, iCode * ic, bool pop)
 	if (stk)
 	  {
 	    emitcode ("mov", "a,_bp");
-	    emitcode ("add", "a,#0x%02x", ((char) stk) & 0xff);
+	    emitcode ("add", "a,#!constbyte", ((char) stk) & 0xff);
 	    emitcode ("mov", "%s,a", aop->aopu.aop_ptr->name);
 	  }
 	else
@@ -1053,10 +1106,23 @@ aopGet (asmop * aop,
 	      sprintf(s,"%s",aop->aopu.aop_immd.aop_immd2);
       } else if (bit16)
 	sprintf (s, "#%s", aop->aopu.aop_immd.aop_immd1);
-      else if (offset)
-	sprintf (s, "#(%s >> %d)",
-		 aop->aopu.aop_immd.aop_immd1,
-		 offset * 8);
+      else if (offset) {
+	  switch (offset) {
+	  case 1:
+	      tsprintf(s,"#!his",aop->aopu.aop_immd.aop_immd1);
+	      break;
+	  case 2:
+	      tsprintf(s,"#!hihis",aop->aopu.aop_immd.aop_immd1);
+	      break;
+	  case 3:
+	      tsprintf(s,"#!hihihis",aop->aopu.aop_immd.aop_immd1);
+	      break;
+	  default: /* should not need this (just in case) */
+	      sprintf (s, "#(%s >> %d)",
+		       aop->aopu.aop_immd.aop_immd1,
+		       offset * 8);
+	  }
+      }
       else
 	sprintf (s, "#%s",
 		 aop->aopu.aop_immd.aop_immd1);
@@ -1283,9 +1349,9 @@ aopPut (asmop * aop, char *s, int offset)
 	      {
 		symbol *lbl = newiTempLabel (NULL);
 		emitcode ("clr", "c");
-		emitcode ("jz", "%05d$", lbl->key + 100);
+		emitcode ("jz", "!tlabel", lbl->key + 100);
 		emitcode ("cpl", "c");
-		emitcode ("", "%05d$:", lbl->key + 100);
+		emitcode ("", "!tlabeldef", lbl->key + 100);
 		emitcode ("mov", "%s,c", aop->aopu.aop_dir);
 	      }
 	    }
@@ -1429,9 +1495,9 @@ genNotFloat (operand * op, operand * res)
 
   tlbl = newiTempLabel (NULL);
   aopPut (res->aop, one, 1);
-  emitcode ("jz", "%05d$", (tlbl->key + 100));
+  emitcode ("jz", "!tlabel", (tlbl->key + 100));
   aopPut (res->aop, zero, 1);
-  emitcode ("", "%05d$:", (tlbl->key + 100));
+  emitcode ("", "!tlabeldef", (tlbl->key + 100));
 
   size = res->aop->size - 2;
   offset = 2;
@@ -1607,8 +1673,8 @@ genNot (iCode * ic)
   toBoolean (IC_LEFT (ic));
 
   tlbl = newiTempLabel (NULL);
-  emitcode ("cjne", "a,#0x01,%05d$", tlbl->key + 100);
-  emitcode ("", "%05d$:", tlbl->key + 100);
+  emitcode ("cjne", "a,#1,!tlabel", tlbl->key + 100);
+  emitcode ("", "!tlabeldef", tlbl->key + 100);
   outBitC (IC_RESULT (ic));
 
 release:
@@ -1776,16 +1842,45 @@ release:
   freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
 }
 
+/*-----------------------------------------------------------------*/
+/* savermask - saves registers in the mask                         */
+/*-----------------------------------------------------------------*/
+static void savermask(bitVect *rs_mask)
+{
+    int i;
+    if (options.useXstack) {
+	if (bitVectBitValue (rs_mask, R0_IDX))
+	    emitcode ("mov", "b,r0");
+	emitcode ("mov", "r0,%s", spname);
+	for (i = 0; i < ds390_nRegs; i++) {
+	    if (bitVectBitValue (rs_mask, i)) {
+		if (i == R0_IDX)
+		    emitcode ("mov", "a,b");
+		else
+		    emitcode ("mov", "a,%s", ds390_regWithIdx (i)->name);
+		emitcode ("movx", "@r0,a");
+		emitcode ("inc", "r0");
+	    }
+	}
+	emitcode ("mov", "%s,r0", spname);
+	if (bitVectBitValue (rs_mask, R0_IDX))
+	    emitcode ("mov", "r0,b");
+    } else {
+	for (i = 0; i < ds390_nRegs; i++) {
+	    if (bitVectBitValue (rs_mask, i))
+		emitcode ("push", "%s", ds390_regWithIdx (i)->dname);
+	}
+    }
+}
+
 /*-----------------------------------------------------------------*/
 /* saveRegisters - will look for a call and save the registers     */
 /*-----------------------------------------------------------------*/
 static void
 saveRegisters (iCode * lic)
 {
-  int i;
   iCode *ic;
   bitVect *rsave;
-  sym_link *detype;
 
   /* look for call */
   for (ic = lic; ic; ic = ic->next)
@@ -1811,42 +1906,44 @@ saveRegisters (iCode * lic)
 	  if (bitVectBitValue(ic->rMask,i))
 	      rsave = bitVectSetBit(rsave,i);
       }
+      rsave = bitVectCplAnd(rsave,ds390_rUmaskForOp (IC_RESULT(ic)));
   } else {
-      /* find the registers in use at this time
-	 and push them away to safety */
-      rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
-			     ic->rUsed);
+    /* safe the registers in use at this time but skip the
+       ones for the result */
+    rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+			   ds390_rUmaskForOp (IC_RESULT(ic)));
   }
   ic->regsSaved = 1;
-  if (options.useXstack)
-    {
-      if (bitVectBitValue (rsave, R0_IDX))
-	emitcode ("mov", "b,r0");
-      emitcode ("mov", "r0,%s", spname);
-      for (i = 0; i < ds390_nRegs; i++)
-	{
-	  if (bitVectBitValue (rsave, i))
-	    {
-	      if (i == R0_IDX)
-		emitcode ("mov", "a,b");
-	      else
-		emitcode ("mov", "a,%s", ds390_regWithIdx (i)->name);
-	      emitcode ("movx", "@r0,a");
-	      emitcode ("inc", "r0");
-	    }
+  savermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* usavermask - restore registers with mask                        */
+/*-----------------------------------------------------------------*/
+static void unsavermask(bitVect *rs_mask)
+{
+    int i;
+    if (options.useXstack) {
+	emitcode ("mov", "r0,%s", spname);
+	for (i = ds390_nRegs; i >= 0; i--) {
+	    if (bitVectBitValue (rs_mask, i)) {
+		emitcode ("dec", "r0");
+		emitcode ("movx", "a,@r0");
+		if (i == R0_IDX)
+		    emitcode ("mov", "b,a");
+		else
+		    emitcode ("mov", "%s,a", ds390_regWithIdx (i)->name);
+	    }	    
+	}
+	emitcode ("mov", "%s,r0", spname);
+	if (bitVectBitValue (rs_mask, R0_IDX))
+	    emitcode ("mov", "r0,b");
+    } else {
+	for (i = ds390_nRegs; i >= 0; i--) {
+	    if (bitVectBitValue (rs_mask, i))
+		emitcode ("pop", "%s", ds390_regWithIdx (i)->dname);
 	}
-      emitcode ("mov", "%s,r0", spname);
-      if (bitVectBitValue (rsave, R0_IDX))
-	emitcode ("mov", "r0,b");
     }
-  else
-    for (i = 0; i < ds390_nRegs; i++)
-      {
-	if (bitVectBitValue (rsave, i))
-	  emitcode ("push", "%s", ds390_regWithIdx (i)->dname);
-      }
-
-  detype = getSpec (operandType (IC_LEFT (ic)));
 }
 
 /*-----------------------------------------------------------------*/
@@ -1855,7 +1952,6 @@ saveRegisters (iCode * lic)
 static void
 unsaveRegisters (iCode * ic)
 {
-  int i;
   bitVect *rsave;
 
   if (IFFUNC_CALLEESAVES(OP_SYMBOL (IC_LEFT (ic))->type)) {
@@ -1865,39 +1961,14 @@ unsaveRegisters (iCode * ic)
 	  if (bitVectBitValue(ic->rMask,i))
 	      rsave = bitVectSetBit(rsave,i);
       }
+      rsave = bitVectCplAnd(rsave,ds390_rUmaskForOp (IC_RESULT(ic)));
   } else {
-      /* find the registers in use at this time
-	 and push them away to safety */
-      rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
-			     ic->rUsed);
+    /* restore the registers in use at this time but skip the
+       ones for the result */
+    rsave = bitVectCplAnd (bitVectCopy (ic->rMask), 
+			   ds390_rUmaskForOp (IC_RESULT(ic)));
   }
-  if (options.useXstack)
-    {
-      emitcode ("mov", "r0,%s", spname);
-      for (i = ds390_nRegs; i >= 0; i--)
-	{
-	  if (bitVectBitValue (rsave, i))
-	    {
-	      emitcode ("dec", "r0");
-	      emitcode ("movx", "a,@r0");
-	      if (i == R0_IDX)
-		emitcode ("mov", "b,a");
-	      else
-		emitcode ("mov", "%s,a", ds390_regWithIdx (i)->name);
-	    }
-
-	}
-      emitcode ("mov", "%s,r0", spname);
-      if (bitVectBitValue (rsave, R0_IDX))
-	emitcode ("mov", "r0,b");
-    }
-  else
-    for (i = ds390_nRegs; i >= 0; i--)
-      {
-	if (bitVectBitValue (rsave, i))
-	  emitcode ("pop", "%s", ds390_regWithIdx (i)->dname);
-      }
-
+  unsavermask(rsave);
 }
 
 
@@ -2130,7 +2201,7 @@ unsaveRBank (int bank, iCode * ic, bool popPsw)
       }
     }
 
-  for (i = (ds390_nRegs - 1); i >= 0; i--)
+  for (i = 7; i >= 0; i--) /* only R7-R0 needs to be popped */
     {
       if (options.useXstack)
 	{
@@ -2181,7 +2252,7 @@ saveRBank (int bank, iCode * ic, bool pushPsw)
         emitcode ("mov", "%s,_spx", r->name);    
     }
 
-  for (i = 0; i < ds390_nRegs; i++)
+  for (i = 0; i < 8 ; i++) /* only R0-R7 needs saving */
     {
       if (options.useXstack)
 	{
@@ -2209,7 +2280,7 @@ saveRBank (int bank, iCode * ic, bool pushPsw)
 	emitcode ("push", "psw");
       }
 
-      emitcode ("mov", "psw,#0x%02x", (bank << 3) & 0x00ff);
+      emitcode ("mov", "psw,#!constbyte", (bank << 3) & 0x00ff);
     }
   
   if (aop)
@@ -2239,7 +2310,7 @@ genCall (iCode * ic)
      the same register bank then we need to save the
      destination registers on the stack */
   dtype = operandType (IC_LEFT (ic));
-  if (dtype && !IFFUNC_ISNAKED(dtype) &&
+  if (currFunc && dtype && !IFFUNC_ISNAKED(dtype) &&
       (FUNC_REGBANK (currFunc->type) != FUNC_REGBANK (dtype)) &&
       IFFUNC_ISISR (currFunc->type))
   {
@@ -2273,48 +2344,12 @@ genCall (iCode * ic)
 	{
 	  int size, offset = 0;
 
-#if 0
-	  aopOp (IC_LEFT (sic), sic, FALSE, FALSE);
-	  size = AOP_SIZE (IC_LEFT (sic));
-
-	  _startLazyDPSEvaluation ();
-	  while (size--)
-	    {
-	      char *l = aopGet (AOP(IC_LEFT(sic)), offset,
-				FALSE, FALSE, TRUE);
-	        if ((AOP_TYPE(IC_LEFT(sic)) == AOP_DPTR) && size)
-	        {
-	            emitcode("mov", "%s,%s", regs390[offset].name, l);
-	        }
-	        else if (strcmp (l, fReturn[offset]))
-	        {
-		    emitcode ("mov", "%s,%s",
-			      fReturn[offset],
-			      l);
-	        }
-	      offset++;
-	    }
-	  _endLazyDPSEvaluation ();
-	  if (AOP_TYPE(IC_LEFT(sic)) == AOP_DPTR)
-	  {
-	      size = AOP_SIZE (IC_LEFT (sic));
-	      if (size)
-	      {
-	         size--;
-	      }
-	      while (size)
-	      {
-	      	   size--;
-		   emitcode("mov", "%s,%s",
-		   		    fReturn[size], regs390[size].name);
-	      }
-	  }
-#else
 	  // we know that dpl(hxb) is the result, so
 	  _startLazyDPSEvaluation ();
 	  size=getSize(operandType(IC_LEFT(sic)));
 	  if (size>1) {
-	    aopOp (IC_LEFT (sic), sic, FALSE, TRUE);
+	    aopOp (IC_LEFT (sic), sic, FALSE, 
+		   (IS_SYMOP(IC_LEFT(sic)) && OP_SYMBOL(IC_LEFT(sic))->ruonly ? FALSE : TRUE));
 	  } else {
 	    aopOp (IC_LEFT (sic), sic, FALSE, FALSE);
 	  }
@@ -2331,7 +2366,6 @@ genCall (iCode * ic)
 	      offset++;
 	    }
 	  _endLazyDPSEvaluation ();
-#endif
 	  freeAsmop (IC_LEFT (sic), NULL, sic, TRUE);
 	}
       _G.sendSet = NULL;
@@ -2339,7 +2373,7 @@ genCall (iCode * ic)
     
   if (swapBanks)
   {
-        emitcode ("mov", "psw,#0x%02x", 
+        emitcode ("mov", "psw,#!constbyte", 
            ((FUNC_REGBANK(dtype)) << 3) & 0xff);
   }
 
@@ -2350,7 +2384,7 @@ genCall (iCode * ic)
 
   if (swapBanks)
   {
-       emitcode ("mov", "psw,#0x%02x", 
+       emitcode ("mov", "psw,#!constbyte", 
           ((FUNC_REGBANK(currFunc->type)) << 3) & 0xff);
   }
 
@@ -2397,19 +2431,26 @@ genCall (iCode * ic)
   /* adjust the stack for parameters if
      required */
   if (ic->parmBytes) {
+      int i;
       if (options.stack10bit) {
-	  emitcode ("clr","c");
-	  emitcode ("mov","a,sp");
-	  emitcode ("subb","a,#0x%02x",ic->parmBytes & 0xff);
-	  emitcode ("mov","sp,a");
-	  emitcode ("mov","a,esp");
-	  emitcode ("subb","a,#0x%02x",(ic->parmBytes >> 8) & 0xff);
-	  emitcode ("mov","esp,a");	  
+	  if (ic->parmBytes <= 4) {
+	      emitcode(";","stack adjustment for parms");
+	      for (i=0; i < ic->parmBytes ; i++) {
+		  emitcode("pop","acc");
+	      }
+	  } else {
+	      emitcode ("clr","c");
+	      emitcode ("mov","a,sp");
+	      emitcode ("subb","a,#!constbyte",ic->parmBytes & 0xff);
+	      emitcode ("mov","sp,a");
+	      emitcode ("mov","a,esp");
+	      emitcode ("subb","a,#!constbyte",(ic->parmBytes >> 8) & 0xff);
+	      emitcode ("mov","esp,a");	  
+	  }
       } else {
-	  int i;
 	  if (ic->parmBytes > 3) {
 	      emitcode ("mov", "a,%s", spname);
-	      emitcode ("add", "a,#0x%02x", (-ic->parmBytes) & 0xff);
+	      emitcode ("add", "a,#!constbyte", (-ic->parmBytes) & 0xff);
 	      emitcode ("mov", "%s,a", spname);
 	  } else
 	      for (i = 0; i < ic->parmBytes; i++)
@@ -2448,7 +2489,7 @@ genPcall (iCode * ic)
      the same register bank then we need to save the
      destination registers on the stack */
   dtype = operandType (IC_LEFT (ic));
-  if (dtype && !IFFUNC_ISNAKED(dtype) &&
+  if (currFunc && dtype && !IFFUNC_ISNAKED(dtype) &&
       IFFUNC_ISISR (currFunc->type) &&
       (FUNC_REGBANK (currFunc->type) != FUNC_REGBANK (dtype))) {
     saveRBank (FUNC_REGBANK (dtype), ic, TRUE);
@@ -2456,14 +2497,14 @@ genPcall (iCode * ic)
   }
 
   /* push the return address on to the stack */
-  emitcode ("mov", "a,#%05d$", (rlbl->key + 100));
+  emitcode ("mov", "a,#!tlabel", (rlbl->key + 100));
   emitcode ("push", "acc");
-  emitcode ("mov", "a,#(%05d$ >> 8)", (rlbl->key + 100));
+  emitcode ("mov", "a,#!hil", (rlbl->key + 100));
   emitcode ("push", "acc");
 
   if (options.model == MODEL_FLAT24)
     {
-      emitcode ("mov", "a,#(%05d$ >> 16)", (rlbl->key + 100));
+      emitcode ("mov", "a,#!hihil", (rlbl->key + 100));
       emitcode ("push", "acc");
     }
 
@@ -2511,7 +2552,7 @@ genPcall (iCode * ic)
     }
 
   emitcode ("ret", "");
-  emitcode ("", "%05d$:", (rlbl->key + 100));
+  emitcode ("", "!tlabeldef", (rlbl->key + 100));
 
 
   /* if we need assign a result value */
@@ -2538,7 +2579,7 @@ genPcall (iCode * ic)
       if (ic->parmBytes > 3)
 	{
 	  emitcode ("mov", "a,%s", spname);
-	  emitcode ("add", "a,#0x%02x", (-ic->parmBytes) & 0xff);
+	  emitcode ("add", "a,#!constbyte", (-ic->parmBytes) & 0xff);
 	  emitcode ("mov", "%s,a", spname);
 	}
       else
@@ -2630,7 +2671,9 @@ genFunction (iCode * ic)
       emitcode(";", "naked function: no prologue.");
       return;
   }
-
+  
+  if (options.stack_probe) 
+      emitcode ("lcall","__stack_probe");
   /* if critical function then turn interrupts off */
   if (IFFUNC_ISCRITICAL (ftype))
     emitcode ("clr", "ea");
@@ -2646,11 +2689,11 @@ genFunction (iCode * ic)
 	{
 	  if (regs390[i].print) {
 	      if (strcmp (regs390[i].base, "0") == 0)
-		  emitcode ("", "%s = 0x%02x",
+		  emitcode ("", "%s !equ !constbyte",
 			    regs390[i].dname,
 			    8 * rbank + regs390[i].offset);
 	      else
-		  emitcode ("", "%s = %s + 0x%02x",
+		  emitcode ("", "%s !equ %s + !constbyte",
 			    regs390[i].dname,
 			    regs390[i].base,
 			    8 * rbank + regs390[i].offset);
@@ -2676,7 +2719,7 @@ genFunction (iCode * ic)
 	  emitcode ("push", "dpx");
 	  /* Make sure we're using standard DPTR */
 	  emitcode ("push", "dps");
-	  emitcode ("mov", "dps, #0x00");
+	  emitcode ("mov", "dps,#0");
 	  if (options.stack10bit)
 	    {
 	      /* This ISR could conceivably use DPTR2. Better save it. */
@@ -2794,7 +2837,7 @@ genFunction (iCode * ic)
 		     * the caller's R0 isn't trashed.
 		     */
 		    emitcode ("push", "psw");
-		    emitcode ("mov", "psw,#0x%02x", 
+		    emitcode ("mov", "psw,#!constbyte", 
 		    	      (FUNC_REGBANK (sym->type) << 3) & 0x00ff);
 		    switchedPSW = TRUE;
 		}
@@ -2841,10 +2884,11 @@ genFunction (iCode * ic)
    && !switchedPSW)
     {
       emitcode ("push", "psw");
-      emitcode ("mov", "psw,#0x%02x", (FUNC_REGBANK (sym->type) << 3) & 0x00ff);
+      emitcode ("mov", "psw,#!constbyte", (FUNC_REGBANK (sym->type) << 3) & 0x00ff);
     }
 
-  if (IFFUNC_ISREENT (sym->type) || options.stackAuto) {
+  if ( (IFFUNC_ISREENT (sym->type) || options.stackAuto) &&
+       (sym->stack || FUNC_HASSTACKPARM(sym->type))) {
       if (options.stack10bit) {
 	  emitcode ("push","_bpx");
 	  emitcode ("push","_bpx+1");
@@ -2872,10 +2916,10 @@ genFunction (iCode * ic)
 	  if ( i > 1024) werror (W_STACK_OVERFLOW, sym->name);
 	  assert (sym->recvSize <= 4);
 	  emitcode ("mov","a,sp");
-	  emitcode ("add","a,#0x%02x", ((short) sym->stack & 0xff));
+	  emitcode ("add","a,#!constbyte", ((short) sym->stack & 0xff));
 	  emitcode ("mov","sp,a");
 	  emitcode ("mov","a,esp");
-	  emitcode ("addc","a,#0x%02x", (((short) sym->stack) >> 8) & 0xff);
+	  emitcode ("addc","a,#!constbyte", (((short) sym->stack) >> 8) & 0xff);
 	  emitcode ("mov","esp,a");
       } else {
 	  if (i > 256)
@@ -2884,7 +2928,7 @@ genFunction (iCode * ic)
 	  if (i > 3 && sym->recvSize < 4) {
 	      
 	      emitcode ("mov", "a,sp");
-	      emitcode ("add", "a,#0x%02x", ((char) sym->stack & 0xff));
+	      emitcode ("add", "a,#!constbyte", ((char) sym->stack & 0xff));
 	      emitcode ("mov", "sp,a");
 	      
 	  } else
@@ -2897,7 +2941,7 @@ genFunction (iCode * ic)
     {
 
       emitcode ("mov", "a,_spx");
-      emitcode ("add", "a,#0x%02x", ((char) sym->xstack & 0xff));
+      emitcode ("add", "a,#!constbyte", ((char) sym->xstack & 0xff));
       emitcode ("mov", "_spx,a");
     }
 
@@ -2919,7 +2963,9 @@ genEndFunction (iCode * ic)
       return;
   }
 
-  if (IFFUNC_ISREENT (sym->type) || options.stackAuto) {
+  if ((IFFUNC_ISREENT (sym->type) || options.stackAuto) &&
+       (sym->stack || FUNC_HASSTACKPARM(sym->type))) {
+
       if (options.stack10bit) {
 	  emitcode ("mov", "sp,_bpx", spname);
 	  emitcode ("mov", "esp,_bpx+1", spname);
@@ -2933,12 +2979,14 @@ genEndFunction (iCode * ic)
      local stack */
   if (options.useXstack && sym->stack) {
       emitcode ("mov", "a,sp");
-      emitcode ("add", "a,#0x%02x", ((char) -sym->stack) & 0xff);
+      emitcode ("add", "a,#!constbyte", ((char) -sym->stack) & 0xff);
       emitcode ("mov", "sp,a");
   }
 
 
-  if ((IFFUNC_ISREENT (sym->type) || options.stackAuto)) {
+  if ((IFFUNC_ISREENT (sym->type) || options.stackAuto) &&
+       (sym->stack || FUNC_HASSTACKPARM(sym->type))) {
+
       if (options.useXstack) {
 	  emitcode ("mov", "r0,%s", spname);
 	  emitcode ("movx", "a,@r0");
@@ -3113,6 +3161,37 @@ genEndFunction (iCode * ic)
 
 }
 
+/*-----------------------------------------------------------------*/
+/* genJavaNativeRet - generate code for return JavaNative          */
+/*-----------------------------------------------------------------*/
+static void genJavaNativeRet(iCode *ic)
+{
+    int i, size;
+
+    aopOp (IC_LEFT (ic), ic, FALSE, 
+	   (IS_SYMOP(IC_LEFT(ic)) && OP_SYMBOL(IC_LEFT(ic))->ruonly ? FALSE :TRUE));
+    size = AOP_SIZE (IC_LEFT (ic));
+
+    assert (size <= 4);
+
+    /* it is assigned to GPR0-R3 then push them */
+    if (aopHasRegs(AOP(IC_LEFT(ic)),R0_IDX,R1_IDX) ||
+	aopHasRegs(AOP(IC_LEFT(ic)),R2_IDX,R3_IDX)) {
+	for (i = 0 ; i < size ; i++ ) {
+	    emitcode ("push","%s",aopGet(AOP(IC_LEFT(ic)),i,FALSE,TRUE,FALSE));	    
+	}
+	for (i = (size-1) ; i >= 0 ; i--) {
+	    emitcode ("pop","a%s",javaRet[i]);
+	}
+    } else {
+	for (i = 0 ; i < size ; i++) 
+	    emitcode ("mov","%s,%s",javaRet[i],aopGet(AOP(IC_LEFT(ic)),i,FALSE,TRUE,FALSE));
+    }
+    for (i = size ; i < 4 ; i++ )
+	    emitcode ("mov","%s,#0",javaRet[i]);
+    return;
+}
+
 /*-----------------------------------------------------------------*/
 /* genRet - generate code for return statement                     */
 /*-----------------------------------------------------------------*/
@@ -3129,6 +3208,12 @@ genRet (iCode * ic)
   if (!IC_LEFT (ic))
     goto jumpret;
 
+  /* if this is a JavaNative function then return 
+     value in different register */
+  if (IFFUNC_ISJAVANATIVE(currFunc->type)) {
+      genJavaNativeRet(ic);
+      goto jumpret;
+  }
   /* we have something to return then
      move the return value into place */
   aopOp (IC_LEFT (ic), ic, FALSE, 
@@ -3178,7 +3263,7 @@ jumpret:
   if (!(ic->next && ic->next->op == LABEL &&
 	IC_LABEL (ic->next) == returnLabel))
 
-    emitcode ("ljmp", "%05d$", (returnLabel->key + 100));
+    emitcode ("ljmp", "!tlabel", (returnLabel->key + 100));
 
 }
 
@@ -3195,7 +3280,7 @@ genLabel (iCode * ic)
   D (emitcode (";", "genLabel ");
     );
 
-  emitcode ("", "%05d$:", (IC_LABEL (ic)->key + 100));
+  emitcode ("", "!tlabeldef", (IC_LABEL (ic)->key + 100));
 }
 
 /*-----------------------------------------------------------------*/
@@ -3206,7 +3291,7 @@ genGoto (iCode * ic)
 {
   D (emitcode (";", "genGoto ");
     );
-  emitcode ("ljmp", "%05d$", (IC_LABEL (ic)->key + 100));
+  emitcode ("ljmp", "!tlabel", (IC_LABEL (ic)->key + 100));
 }
 
 /*-----------------------------------------------------------------*/
@@ -3255,6 +3340,13 @@ genPlusIncr (iCode * ic)
   if ((icount = (unsigned int) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit)) > 4)
     return FALSE;
 
+  if (size == 1 && AOP(IC_LEFT(ic)) == AOP(IC_RESULT(ic)) &&
+      AOP_TYPE(IC_LEFT(ic)) == AOP_DIR ) {
+      while (icount--) {
+	  emitcode("inc","%s",aopGet(AOP(IC_RESULT(ic)),0,FALSE,FALSE,FALSE));
+      }
+      return TRUE;
+  }
   /* if increment 16 bits in register */
   if (
        AOP_TYPE (IC_LEFT (ic)) == AOP_REG &&
@@ -3287,13 +3379,13 @@ genPlusIncr (iCode * ic)
       emitcode ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE));
       if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
 	  IS_AOP_PREG (IC_RESULT (ic)))
-	emitcode ("cjne", "%s,#0x00,%05d$"
+	emitcode ("cjne", "%s,#0,!tlabel"
 		  ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE)
 		  ,tlbl->key + 100);
       else
 	{
 	  emitcode ("clr", "a");
-	  emitcode ("cjne", "a,%s,%05d$"
+	  emitcode ("cjne", "a,%s,!tlabel"
 		    ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE)
 		    ,tlbl->key + 100);
 	}
@@ -3303,11 +3395,11 @@ genPlusIncr (iCode * ic)
 	{
 	  if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
 	      IS_AOP_PREG (IC_RESULT (ic)))
-	    emitcode ("cjne", "%s,#0x00,%05d$"
+	    emitcode ("cjne", "%s,#0,!tlabel"
 		  ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE)
 		      ,tlbl->key + 100);
 	  else
-	    emitcode ("cjne", "a,%s,%05d$"
+	    emitcode ("cjne", "a,%s,!tlabel"
 		  ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE)
 		      ,tlbl->key + 100);
 
@@ -3317,12 +3409,12 @@ genPlusIncr (iCode * ic)
 	{
 	  if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
 	      IS_AOP_PREG (IC_RESULT (ic)))
-	    emitcode ("cjne", "%s,#0x00,%05d$"
+	    emitcode ("cjne", "%s,#0,!tlabel"
 		  ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE)
 		      ,tlbl->key + 100);
 	  else
 	    {
-	      emitcode ("cjne", "a,%s,%05d$"
+	      emitcode ("cjne", "a,%s,!tlabel"
 		  ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE)
 			,tlbl->key + 100);
 	    }
@@ -3331,7 +3423,7 @@ genPlusIncr (iCode * ic)
 
       if (emitTlbl)
 	{
-	  emitcode ("", "%05d$:", tlbl->key + 100);
+	  emitcode ("", "!tlabeldef", tlbl->key + 100);
 	}
       return TRUE;
     }
@@ -3353,7 +3445,7 @@ genPlusIncr (iCode * ic)
       if (icount > 3)
 	{
 	  MOVA (aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE, TRUE));
-	  emitcode ("add", "a,#0x%02x", ((char) icount) & 0xff);
+	  emitcode ("add", "a,#!constbyte", ((char) icount) & 0xff);
 	  aopPut (AOP (IC_RESULT (ic)), "a", 0);
 	}
       else
@@ -3387,9 +3479,9 @@ outBitAcc (operand * result)
     }
   else
     {
-      emitcode ("jz", "%05d$", tlbl->key + 100);
+      emitcode ("jz", "!tlabel", tlbl->key + 100);
       emitcode ("mov", "a,%s", one);
-      emitcode ("", "%05d$:", tlbl->key + 100);
+      emitcode ("", "!tlabeldef", tlbl->key + 100);
       outAcc (result);
     }
 }
@@ -3406,9 +3498,9 @@ genPlusBits (iCode * ic)
     {
       symbol *lbl = newiTempLabel (NULL);
       emitcode ("mov", "c,%s", AOP (IC_LEFT (ic))->aopu.aop_dir);
-      emitcode ("jnb", "%s,%05d$", AOP (IC_RIGHT (ic))->aopu.aop_dir, (lbl->key + 100));
+      emitcode ("jnb", "%s,!tlabel", AOP (IC_RIGHT (ic))->aopu.aop_dir, (lbl->key + 100));
       emitcode ("cpl", "c");
-      emitcode ("", "%05d$:", (lbl->key + 100));
+      emitcode ("", "!tlabeldef", (lbl->key + 100));
       outBitC (IC_RESULT (ic));
     }
   else
@@ -3417,7 +3509,7 @@ genPlusBits (iCode * ic)
       emitcode ("mov", "c,%s", AOP (IC_LEFT (ic))->aopu.aop_dir);
       emitcode ("rlc", "a");
       emitcode ("mov", "c,%s", AOP (IC_RIGHT (ic))->aopu.aop_dir);
-      emitcode ("addc", "a,#0x00");
+      emitcode ("addc", "a,#0");
       outAcc (IC_RESULT (ic));
     }
 }
@@ -3480,9 +3572,9 @@ adjustArithmeticResult (iCode * ic)
 #define AOP_OP_3_NOFATAL(ic, rc) \
     aopOp (IC_RIGHT(ic),ic,FALSE, FALSE); \
     aopOp (IC_LEFT(ic),ic,FALSE, (AOP_TYPE(IC_RIGHT(ic)) == AOP_DPTR) || \
-                                  (OP_SYMBOL(IC_RESULT(ic))->ruonly)); \
+                                  ((OP_SYMBOL(IC_RESULT(ic))->ruonly) && !isOperandEqual(IC_LEFT(ic),IC_RESULT(ic)))); \
     if (AOP_TYPE(IC_LEFT(ic)) == AOP_DPTR2 && \
-        (isOperandInFarSpace(IC_RESULT(ic)) || OP_SYMBOL(IC_RESULT(ic))->ruonly )) \
+        (isOperandInFarSpace(IC_RESULT(ic)) || (OP_SYMBOL(IC_RESULT(ic))->ruonly && !isOperandEqual(IC_LEFT(ic),IC_RESULT(ic))))) \
     { \
        /* No can do; DPTR & DPTR2 in use, and we need another. */ \
        rc = TRUE; \
@@ -3556,7 +3648,7 @@ genPlus (iCode * ic)
   D (emitcode (";", "genPlus "););
 
   /* special cases :- */
-  if (isOperandEqual(IC_LEFT(ic),IC_RESULT(ic)) &&
+  if ( IS_SYMOP(IC_LEFT(ic)) && OP_SYMBOL(IC_LEFT(ic))->ruonly &&
       isOperandLiteral(IC_RIGHT(ic)) && OP_SYMBOL(IC_RESULT(ic))->ruonly) {
       aopOp (IC_RIGHT (ic), ic, TRUE, FALSE);
       size = floatFromVal (AOP (IC_RIGHT(ic))->aopu.aop_lit);
@@ -3564,13 +3656,13 @@ genPlus (iCode * ic)
 	  while (size--) emitcode ("inc","dptr");
       } else {
 	  emitcode ("mov","a,dpl");
-	  emitcode ("add","a,#0x%02x",size & 0xff);
+	  emitcode ("add","a,#!constbyte",size & 0xff);
 	  emitcode ("mov","dpl,a");
 	  emitcode ("mov","a,dph");
-	  emitcode ("addc","a,#0x%02x",(size >> 8) & 0xff);
+	  emitcode ("addc","a,#!constbyte",(size >> 8) & 0xff);
 	  emitcode ("mov","dph,a");
 	  emitcode ("mov","a,dpx");
-	  emitcode ("addc","a,#0x%02x",(size >> 16) & 0xff);
+	  emitcode ("addc","a,#!constbyte",(size >> 16) & 0xff);
 	  emitcode ("mov","dpx,a");
       }
       freeAsmop (IC_RIGHT (ic), NULL, ic, FALSE);
@@ -3633,7 +3725,7 @@ genPlus (iCode * ic)
 	      while (size--)
 		{
 		  MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, TRUE));
-		  emitcode ("addc", "a,#00");
+		  emitcode ("addc", "a,#0");
 		  aopPut (AOP (IC_RESULT (ic)), "a", offset++);
 		}
 	      _endLazyDPSEvaluation ();
@@ -3755,6 +3847,13 @@ genMinusDec (iCode * ic)
   if ((icount = (unsigned int) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit)) > 4)
     return FALSE;
 
+  if (size == 1 && AOP(IC_LEFT(ic)) == AOP(IC_RESULT(ic)) &&
+      AOP_TYPE(IC_LEFT(ic)) == AOP_DIR ) {
+      while (icount--) {
+	  emitcode("dec","%s",aopGet(AOP(IC_RESULT(ic)),0,FALSE,FALSE,FALSE));
+      }
+      return TRUE;
+  }
   /* if decrement 16 bits in register */
   if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG &&
       AOP_TYPE (IC_RESULT (ic)) == AOP_REG &&
@@ -3788,13 +3887,13 @@ genMinusDec (iCode * ic)
       if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
 	  AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR ||
 	  IS_AOP_PREG (IC_RESULT (ic)))
-	emitcode ("cjne", "%s,#0xff,%05d$"
-		  ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE)
+	emitcode ("cjne", "%s,#!constbyte,!tlabel"
+		  ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE), 0xff
 		  ,tlbl->key + 100);
       else
 	{
-	  emitcode ("mov", "a,#0xff");
-	  emitcode ("cjne", "a,%s,%05d$"
+	  emitcode ("mov", "a,#!constbyte",0xff);
+	  emitcode ("cjne", "a,%s,!tlabel"
 		    ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE)
 		    ,tlbl->key + 100);
 	}
@@ -3804,12 +3903,12 @@ genMinusDec (iCode * ic)
 	  if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
 	      AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR ||
 	      IS_AOP_PREG (IC_RESULT (ic)))
-	    emitcode ("cjne", "%s,#0xff,%05d$"
-		  ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE)
+	    emitcode ("cjne", "%s,#!constbyte,!tlabel"
+		      ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE),0xff
 		      ,tlbl->key + 100);
 	  else
 	    {
-	      emitcode ("cjne", "a,%s,%05d$"
+	      emitcode ("cjne", "a,%s,!tlabel"
 		  ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE)
 			,tlbl->key + 100);
 	    }
@@ -3820,12 +3919,12 @@ genMinusDec (iCode * ic)
 	  if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
 	      AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR ||
 	      IS_AOP_PREG (IC_RESULT (ic)))
-	    emitcode ("cjne", "%s,#0xff,%05d$"
-		  ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE)
+	    emitcode ("cjne", "%s,#!constbyte,!tlabel"
+		      ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE),0xff
 		      ,tlbl->key + 100);
 	  else
 	    {
-	      emitcode ("cjne", "a,%s,%05d$"
+	      emitcode ("cjne", "a,%s,!tlabel"
 		  ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE)
 			,tlbl->key + 100);
 	    }
@@ -3833,7 +3932,7 @@ genMinusDec (iCode * ic)
 	}
       if (emitTlbl)
 	{
-	  emitcode ("", "%05d$:", tlbl->key + 100);
+	  emitcode ("", "!tlabeldef", tlbl->key + 100);
 	}
       return TRUE;
     }
@@ -3908,18 +4007,18 @@ genMinusBits (iCode * ic)
   if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY)
     {
       emitcode ("mov", "c,%s", AOP (IC_LEFT (ic))->aopu.aop_dir);
-      emitcode ("jnb", "%s,%05d$", AOP (IC_RIGHT (ic))->aopu.aop_dir, (lbl->key + 100));
+      emitcode ("jnb", "%s,!tlabel", AOP (IC_RIGHT (ic))->aopu.aop_dir, (lbl->key + 100));
       emitcode ("cpl", "c");
-      emitcode ("", "%05d$:", (lbl->key + 100));
+      emitcode ("", "!tlabeldef", (lbl->key + 100));
       outBitC (IC_RESULT (ic));
     }
   else
     {
       emitcode ("mov", "c,%s", AOP (IC_RIGHT (ic))->aopu.aop_dir);
       emitcode ("subb", "a,acc");
-      emitcode ("jnb", "%s,%05d$", AOP (IC_LEFT (ic))->aopu.aop_dir, (lbl->key + 100));
+      emitcode ("jnb", "%s,!tlabel", AOP (IC_LEFT (ic))->aopu.aop_dir, (lbl->key + 100));
       emitcode ("inc", "a");
-      emitcode ("", "%05d$:", (lbl->key + 100));
+      emitcode ("", "!tlabeldef", (lbl->key + 100));
       aopPut (AOP (IC_RESULT (ic)), "a", 0);
       addSign (IC_RESULT (ic), MSB16, SPEC_USIGN (getSpec (operandType (IC_RESULT (ic)))));
     }
@@ -3993,11 +4092,11 @@ genMinus (iCode * ic)
 	    if (!size && lit==-1) {
 	      emitcode ("dec", "a");
 	    } else {
-	      emitcode ("add", "a,#0x%02x",
+	      emitcode ("add", "a,#!constbyte",
 			(unsigned int) (lit & 0x0FFL));
 	    }
 	  } else {
-	    emitcode ("addc", "a,#0x%02x",
+	    emitcode ("addc", "a,#!constbyte",
 		      (unsigned int) ((lit >> (offset * 8)) & 0x0FFL));
 	  }
 	}
@@ -4090,7 +4189,7 @@ genMultOneByte (operand * left,
     MOVA (aopGet (AOP (left), 0, FALSE, FALSE, TRUE));
     emitcode ("mul", "ab");
    
-    _G.accInUse++;
+    _G.accInUse++; _G.bInUse++;
     aopOp(result, ic, TRUE, FALSE);
       
       if (AOP_SIZE(result)<1 || AOP_SIZE(result)>2) 
@@ -4102,7 +4201,7 @@ genMultOneByte (operand * left,
       }      
       
     aopPut (AOP (result), "a", 0);
-    _G.accInUse--;
+    _G.accInUse--; _G.bInUse--;
     if (AOP_SIZE(result)==2) 
     {
       aopPut (AOP (result), "b", 1);
@@ -4117,13 +4216,13 @@ genMultOneByte (operand * left,
   MOVA (aopGet (AOP (left), 0, FALSE, FALSE, TRUE));
 
   lbl=newiTempLabel(NULL);
-  emitcode ("jnb", "acc.7,%05d$",  lbl->key+100);
+  emitcode ("jnb", "acc.7,!tlabel",  lbl->key+100);
   // left side is negative, 8-bit two's complement, this fails for -128
   emitcode ("setb", "F0"); // set sign flag
   emitcode ("cpl", "a");
   emitcode ("inc", "a");
 
-  emitcode ("", "%05d$:", lbl->key+100);
+  emitcode ("", "!tlabeldef", lbl->key+100);
 
   /* if literal */
   if (AOP_TYPE(right)==AOP_LIT) {
@@ -4131,24 +4230,24 @@ genMultOneByte (operand * left,
     /* AND literal negative */
     if ((int) val < 0) {
       emitcode ("cpl", "F0"); // complement sign flag
-      emitcode ("mov", "b,#0x%02x", -val);
+      emitcode ("mov", "b,#!constbyte", -val);
     } else {
-      emitcode ("mov", "b,#0x%02x", val);
+      emitcode ("mov", "b,#!constbyte", val);
     }
   } else {
     lbl=newiTempLabel(NULL);
     emitcode ("mov", "b,a");
     emitcode ("mov", "a,%s", aopGet (AOP (right), 0, FALSE, FALSE, TRUE));
-    emitcode ("jnb", "acc.7,%05d$", lbl->key+100);
+    emitcode ("jnb", "acc.7,!tlabel", lbl->key+100);
     // right side is negative, 8-bit two's complement
     emitcode ("cpl", "F0"); // complement sign flag
     emitcode ("cpl", "a");
     emitcode ("inc", "a");
-    emitcode ("", "%05d$:", lbl->key+100);
+    emitcode ("", "!tlabeldef", lbl->key+100);
   }
   emitcode ("mul", "ab");
     
-  _G.accInUse++;
+  _G.accInUse++;_G.bInUse++;
   aopOp(result, ic, TRUE, FALSE);
     
   if (AOP_SIZE(result)<1 || AOP_SIZE(result)>2) 
@@ -4160,7 +4259,7 @@ genMultOneByte (operand * left,
   }    
     
   lbl=newiTempLabel(NULL);
-  emitcode ("jnb", "F0,%05d$", lbl->key+100);
+  emitcode ("jnb", "F0,!tlabel", lbl->key+100);
   // only ONE op was negative, we have to do a 8/16-bit two's complement
   emitcode ("cpl", "a"); // lsb
   if (AOP_SIZE(result)==1) {
@@ -4173,9 +4272,9 @@ genMultOneByte (operand * left,
     emitcode ("xch", "a,b");
   }
 
-  emitcode ("", "%05d$:", lbl->key+100);
+  emitcode ("", "!tlabeldef", lbl->key+100);
   aopPut (AOP (result), "a", 0);
-  _G.accInUse--;
+  _G.accInUse--;_G.bInUse--;
   if (AOP_SIZE(result)==2) {
     aopPut (AOP (result), "b", 1);
   }
@@ -4200,9 +4299,9 @@ static void genMultTwoByte (operand *left, operand *right,
 	/* save EA bit in F1 */
 	lbl = newiTempLabel(NULL);
 	emitcode ("setb","F1");
-	emitcode ("jbc","EA,%05d$",lbl->key+100);
+	emitcode ("jbc","EA,!tlabel",lbl->key+100);
 	emitcode ("clr","F1");
-	emitcode("","%05d$:",lbl->key+100);
+	emitcode("","!tlabeldef",lbl->key+100);
 
 	/* load up MB with right */
 	if (!umult) {
@@ -4213,13 +4312,13 @@ static void genMultTwoByte (operand *left, operand *right,
 				emitcode("setb","F0");
 				val = -val;
 			}
-			emitcode ("mov","mb,#0x%02x",val & 0xff);
-			emitcode ("mov","mb,#0x%02x",(val >> 8) & 0xff);		    
+			emitcode ("mov","mb,#!constbyte",val & 0xff);
+			emitcode ("mov","mb,#!constbyte",(val >> 8) & 0xff);		    
 		} else {
 			lbl = newiTempLabel(NULL);
 			emitcode ("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE,TRUE));
 			emitcode ("mov","a,%s",aopGet(AOP(right),1,FALSE,FALSE,TRUE));
-			emitcode ("jnb","acc.7,%05d$",lbl->key+100);		
+			emitcode ("jnb","acc.7,!tlabel",lbl->key+100);		
 			emitcode ("xch", "a,b");
 			emitcode ("cpl","a");
 			emitcode ("add", "a,#1");
@@ -4227,7 +4326,7 @@ static void genMultTwoByte (operand *left, operand *right,
 			emitcode ("cpl", "a"); // msb
 			emitcode ("addc", "a,#0");
 			emitcode ("setb","F0");
-			emitcode ("","%05d$:",lbl->key+100);
+			emitcode ("","!tlabeldef",lbl->key+100);
 			emitcode ("mov","mb,b");
 			emitcode ("mov","mb,a");
 		}
@@ -4240,16 +4339,16 @@ static void genMultTwoByte (operand *left, operand *right,
 		lbl = newiTempLabel(NULL);
 		emitcode ("mov","b,%s",aopGet(AOP(left),0,FALSE,FALSE,TRUE));
 		emitcode ("mov","a,%s",aopGet(AOP(left),1,FALSE,FALSE,TRUE));
-		emitcode ("jnb","acc.7,%05d$",lbl->key+100);
+		emitcode ("jnb","acc.7,!tlabel",lbl->key+100);
 		emitcode ("xch", "a,b");
 		emitcode ("cpl","a");
 		emitcode ("add", "a,#1");
 		emitcode ("xch", "a,b");
 		emitcode ("cpl", "a"); // msb
 		emitcode ("addc","a,#0");
-		emitcode ("jbc","F0,%05d$",lbl->key+100);
+		emitcode ("jbc","F0,!tlabel",lbl->key+100);
 		emitcode ("setb","F0");
-		emitcode ("","%05d$:",lbl->key+100);
+		emitcode ("","!tlabeldef",lbl->key+100);
 		emitcode ("mov","ma,b");
 		emitcode ("mov","ma,a");
 	} else {
@@ -4258,10 +4357,10 @@ static void genMultTwoByte (operand *left, operand *right,
 	}
 	/* wait for multiplication to finish */
 	lbl = newiTempLabel(NULL);
-	emitcode("","%05d$:", lbl->key+100);
+	emitcode("","!tlabeldef", lbl->key+100);
 	emitcode("mov","a,mcnt1");
-	emitcode("anl","a,#0x80");
-	emitcode("jnz","%05d$",lbl->key+100);
+	emitcode("anl","a,#!constbyte",0x80);
+	emitcode("jnz","!tlabel",lbl->key+100);
 	
 	freeAsmop (left, NULL, ic, TRUE);
 	freeAsmop (right, NULL, ic,TRUE);
@@ -4282,10 +4381,10 @@ static void genMultTwoByte (operand *left, operand *right,
 		MOVA("ma");
 		/* negate result if needed */
 		lbl = newiTempLabel(NULL); 	
-		emitcode("jnb","F0,%05d$",lbl->key+100);
+		emitcode("jnb","F0,!tlabel",lbl->key+100);
 		emitcode("cpl","a");
 		emitcode("add","a,#1");
-		emitcode("","%05d$:", lbl->key+100);
+		emitcode("","!tlabeldef", lbl->key+100);
 	        if (AOP_TYPE(result) == AOP_ACC)
 	        {
 		    D(emitcode(";", "ACC special case."););
@@ -4301,27 +4400,27 @@ static void genMultTwoByte (operand *left, operand *right,
 	    
 		emitcode("pop","acc");
 		lbl = newiTempLabel(NULL); 	
-		emitcode("jnb","F0,%05d$",lbl->key+100);
+		emitcode("jnb","F0,!tlabel",lbl->key+100);
 		emitcode("cpl","a");
 		emitcode("addc","a,#0");
-		emitcode("","%05d$:", lbl->key+100);
+		emitcode("","!tlabeldef", lbl->key+100);
 		aopPut(AOP(result),"a",1);
 		emitcode("pop","acc");
 		if (AOP_SIZE(result) >= 3) {
 			lbl = newiTempLabel(NULL); 	
-			emitcode("jnb","F0,%05d$",lbl->key+100);
+			emitcode("jnb","F0,!tlabel",lbl->key+100);
 			emitcode("cpl","a");
 			emitcode("addc","a,#0");			
-			emitcode("","%05d$:", lbl->key+100);
+			emitcode("","!tlabeldef", lbl->key+100);
 			aopPut(AOP(result),"a",2);
 		}
 		emitcode("pop","acc");
 		if (AOP_SIZE(result) >= 4) {
 			lbl = newiTempLabel(NULL); 	
-			emitcode("jnb","F0,%05d$",lbl->key+100);
+			emitcode("jnb","F0,!tlabel",lbl->key+100);
 			emitcode("cpl","a");
 			emitcode("addc","a,#0");			
-			emitcode("","%05d$:", lbl->key+100);
+			emitcode("","!tlabeldef", lbl->key+100);
 			aopPut(AOP(result),"a",3);
 		}
 	        if (AOP_TYPE(result) == AOP_ACC)
@@ -4335,9 +4434,9 @@ static void genMultTwoByte (operand *left, operand *right,
 
 	/* restore EA bit in F1 */
 	lbl = newiTempLabel(NULL);
-	emitcode ("jnb","F1,%05d$",lbl->key+100);
+	emitcode ("jnb","F1,!tlabel",lbl->key+100);
 	emitcode ("setb","EA");
-	emitcode("","%05d$:",lbl->key+100);
+	emitcode("","!tlabeldef",lbl->key+100);
 	return ;
 }
 
@@ -4456,10 +4555,10 @@ genDivOneByte (operand * left,
   l = aopGet (AOP (right), 0, FALSE, FALSE, TRUE);
   MOVA (l);
   lbl = newiTempLabel (NULL);
-  emitcode ("jnb", "acc.7,%05d$", (lbl->key + 100));
+  emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100));
   emitcode ("cpl", "a");
   emitcode ("inc", "a");
-  emitcode ("", "%05d$:", (lbl->key + 100));
+  emitcode ("", "!tlabeldef", (lbl->key + 100));
   emitcode ("mov", "b,a");
 
   /* sign adjust left side */
@@ -4467,10 +4566,10 @@ genDivOneByte (operand * left,
   MOVA (l);
 
   lbl = newiTempLabel (NULL);
-  emitcode ("jnb", "acc.7,%05d$", (lbl->key + 100));
+  emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100));
   emitcode ("cpl", "a");
   emitcode ("inc", "a");
-  emitcode ("", "%05d$:", (lbl->key + 100));
+  emitcode ("", "!tlabeldef", (lbl->key + 100));
 
   /* now the division */
   emitcode ("nop", "; workaround for DS80C390 div bug.");
@@ -4482,16 +4581,16 @@ genDivOneByte (operand * left,
   emitcode ("pop", "acc");
   /* if there was an over flow we don't
      adjust the sign of the result */
-  emitcode ("jb", "ov,%05d$", (lbl->key + 100));
-  emitcode ("jnb", "acc.7,%05d$", (lbl->key + 100));
+  emitcode ("jb", "ov,!tlabel", (lbl->key + 100));
+  emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100));
   CLRC;
   emitcode ("clr", "a");
   emitcode ("subb", "a,b");
   emitcode ("mov", "b,a");
-  emitcode ("", "%05d$:", (lbl->key + 100));
+  emitcode ("", "!tlabeldef", (lbl->key + 100));
 
   /* now we are done */
-    _G.accInUse++;
+  _G.accInUse++;     _G.bInUse++;
     aopOp(result, ic, TRUE, FALSE);
     
     aopPut (AOP (result), "b", 0);
@@ -4507,7 +4606,7 @@ genDivOneByte (operand * left,
     {
 	aopPut (AOP (result), "a", offset++);
     }
-    _G.accInUse--;
+    _G.accInUse--;     _G.bInUse--;
 
 }
 
@@ -4525,9 +4624,9 @@ static void genDivTwoByte (operand *left, operand *right,
 	/* save EA bit in F1 */
 	lbl = newiTempLabel(NULL);
 	emitcode ("setb","F1");
-	emitcode ("jbc","EA,%05d$",lbl->key+100);
+	emitcode ("jbc","EA,!tlabel",lbl->key+100);
 	emitcode ("clr","F1");
-	emitcode("","%05d$:",lbl->key+100);
+	emitcode("","!tlabeldef",lbl->key+100);
 
 	/* load up MA with left */
 	if (!umult) {
@@ -4535,7 +4634,7 @@ static void genDivTwoByte (operand *left, operand *right,
 		lbl = newiTempLabel(NULL);
 		emitcode ("mov","b,%s",aopGet(AOP(left),0,FALSE,FALSE,TRUE));
 		emitcode ("mov","a,%s",aopGet(AOP(left),1,FALSE,FALSE,TRUE));
-		emitcode ("jnb","acc.7,%05d$",lbl->key+100);
+		emitcode ("jnb","acc.7,!tlabel",lbl->key+100);
 		emitcode ("xch", "a,b");
 		emitcode ("cpl","a");
 		emitcode ("add", "a,#1");
@@ -4543,7 +4642,7 @@ static void genDivTwoByte (operand *left, operand *right,
 		emitcode ("cpl", "a"); // msb
 		emitcode ("addc","a,#0");
 		emitcode ("setb","F0");
-		emitcode ("","%05d$:",lbl->key+100);
+		emitcode ("","!tlabeldef",lbl->key+100);
 		emitcode ("mov","ma,b");
 		emitcode ("mov","ma,a");
 	} else {
@@ -4557,27 +4656,27 @@ static void genDivTwoByte (operand *left, operand *right,
 			int val=floatFromVal (AOP (right)->aopu.aop_lit);
 			if (val < 0) {
 				lbl = newiTempLabel(NULL);
-				emitcode ("jbc","F0,%05d$",lbl->key+100);
+				emitcode ("jbc","F0,!tlabel",lbl->key+100);
 				emitcode("setb","F0");
-				emitcode ("","%05d$:",lbl->key+100);
+				emitcode ("","!tlabeldef",lbl->key+100);
 				val = -val;
 			} 
-			emitcode ("mov","mb,#0x%02x",val & 0xff);		    
-			emitcode ("mov","mb,#0x%02x",(val >> 8) & 0xff);
+			emitcode ("mov","mb,#!constbyte",val & 0xff);		    
+			emitcode ("mov","mb,#!constbyte",(val >> 8) & 0xff);
 		} else {
 			lbl = newiTempLabel(NULL);
 			emitcode ("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE,TRUE));
 			emitcode ("mov","a,%s",aopGet(AOP(right),1,FALSE,FALSE,TRUE));
-			emitcode ("jnb","acc.7,%05d$",lbl->key+100);		
+			emitcode ("jnb","acc.7,!tlabel",lbl->key+100);		
 			emitcode ("xch", "a,b");
 			emitcode ("cpl","a");
 			emitcode ("add", "a,#1");
 			emitcode ("xch", "a,b");
 			emitcode ("cpl", "a"); // msb
 			emitcode ("addc", "a,#0");
-			emitcode ("jbc","F0,%05d$",lbl->key+100);
+			emitcode ("jbc","F0,!tlabel",lbl->key+100);
 			emitcode ("setb","F0");
-			emitcode ("","%05d$:",lbl->key+100);
+			emitcode ("","!tlabeldef",lbl->key+100);
 			emitcode ("mov","mb,b");
 			emitcode ("mov","mb,a");
 		}
@@ -4588,10 +4687,10 @@ static void genDivTwoByte (operand *left, operand *right,
 
 	/* wait for multiplication to finish */
 	lbl = newiTempLabel(NULL);
-	emitcode("","%05d$:", lbl->key+100);
+	emitcode("","!tlabeldef", lbl->key+100);
 	emitcode("mov","a,mcnt1");
-	emitcode("anl","a,#0x80");
-	emitcode("jnz","%05d$",lbl->key+100);
+	emitcode("anl","a,#!constbyte",0x80);
+	emitcode("jnz","!tlabel",lbl->key+100);
 	
 	freeAsmop (left, NULL, ic, TRUE);
 	freeAsmop (right, NULL, ic,TRUE);
@@ -4606,25 +4705,25 @@ static void genDivTwoByte (operand *left, operand *right,
 		MOVA("ma");
 		/* negate result if needed */
 		lbl = newiTempLabel(NULL); 	
-		emitcode("jnb","F0,%05d$",lbl->key+100);
+		emitcode("jnb","F0,!tlabel",lbl->key+100);
 		emitcode("cpl","a");
 		emitcode("add","a,#1");
-		emitcode("","%05d$:", lbl->key+100);
+		emitcode("","!tlabeldef", lbl->key+100);
 		aopPut(AOP(result),"a",0);
 		emitcode("pop","acc");
 		lbl = newiTempLabel(NULL); 	
-		emitcode("jnb","F0,%05d$",lbl->key+100);
+		emitcode("jnb","F0,!tlabel",lbl->key+100);
 		emitcode("cpl","a");
 		emitcode("addc","a,#0");
-		emitcode("","%05d$:", lbl->key+100);
+		emitcode("","!tlabeldef", lbl->key+100);
 		aopPut(AOP(result),"a",1);
 	}
 	freeAsmop (result, NULL, ic, TRUE);
 	/* restore EA bit in F1 */
 	lbl = newiTempLabel(NULL);
-	emitcode ("jnb","F1,%05d$",lbl->key+100);
+	emitcode ("jnb","F1,!tlabel",lbl->key+100);
 	emitcode ("setb","EA");
-	emitcode("","%05d$:",lbl->key+100);
+	emitcode("","!tlabeldef",lbl->key+100);
 	return ;
 }
 
@@ -4732,10 +4831,10 @@ genModOneByte (operand * left,
   MOVA (l);
 
   lbl = newiTempLabel (NULL);
-  emitcode ("jnb", "acc.7,%05d$", (lbl->key + 100));
+  emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100));
   emitcode ("cpl", "a");
   emitcode ("inc", "a");
-  emitcode ("", "%05d$:", (lbl->key + 100));
+  emitcode ("", "!tlabeldef", (lbl->key + 100));
   emitcode ("mov", "b,a");
 
   /* sign adjust left side */
@@ -4743,10 +4842,10 @@ genModOneByte (operand * left,
   MOVA (l);
 
   lbl = newiTempLabel (NULL);
-  emitcode ("jnb", "acc.7,%05d$", (lbl->key + 100));
+  emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100));
   emitcode ("cpl", "a");
   emitcode ("inc", "a");
-  emitcode ("", "%05d$:", (lbl->key + 100));
+  emitcode ("", "!tlabeldef", (lbl->key + 100));
 
   /* now the multiplication */
   emitcode ("nop", "; workaround for DS80C390 div bug.");
@@ -4757,17 +4856,19 @@ genModOneByte (operand * left,
   emitcode ("pop", "acc");
   /* if there was an over flow we don't
      adjust the sign of the result */
-  emitcode ("jb", "ov,%05d$", (lbl->key + 100));
-  emitcode ("jnb", "acc.7,%05d$", (lbl->key + 100));
+  emitcode ("jb", "ov,!tlabel", (lbl->key + 100));
+  emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100));
   CLRC;
   emitcode ("clr", "a");
   emitcode ("subb", "a,b");
   emitcode ("mov", "b,a");
-  emitcode ("", "%05d$:", (lbl->key + 100));
-
+  emitcode ("", "!tlabeldef", (lbl->key + 100));
+  
+  _G.bInUse++;
   /* now we are done */
   aopOp(result, ic, TRUE, FALSE);    
   aopPut (AOP (result), "b", 0);
+  _G.bInUse--;
 
 }
 
@@ -4786,22 +4887,22 @@ static void genModTwoByte (operand *left, operand *right,
 	/* save EA bit in F1 */
 	lbl = newiTempLabel(NULL);
 	emitcode ("setb","F1");
-	emitcode ("jbc","EA,%05d$",lbl->key+100);
+	emitcode ("jbc","EA,!tlabel",lbl->key+100);
 	emitcode ("clr","F1");
-	emitcode("","%05d$:",lbl->key+100);
+	emitcode("","!tlabeldef",lbl->key+100);
 
 	if (!umult) {
 		lbl = newiTempLabel(NULL);
 		emitcode ("mov","b,%s",aopGet(AOP(left),0,FALSE,FALSE,TRUE));
 		emitcode ("mov","a,%s",aopGet(AOP(left),1,FALSE,FALSE,TRUE));
-		emitcode ("jnb","acc.7,%05d$",lbl->key+100);
+		emitcode ("jnb","acc.7,!tlabel",lbl->key+100);
 		emitcode ("xch", "a,b");
 		emitcode ("cpl","a");
 		emitcode ("add", "a,#1");
 		emitcode ("xch", "a,b");
 		emitcode ("cpl", "a"); // msb
 		emitcode ("addc","a,#0");
-		emitcode ("","%05d$:",lbl->key+100);
+		emitcode ("","!tlabeldef",lbl->key+100);
 		emitcode ("mov","ma,b");
 		emitcode ("mov","ma,a");
 	} else {
@@ -4816,20 +4917,20 @@ static void genModTwoByte (operand *left, operand *right,
 			if (val < 0) {
 				val = -val;
 			} 
-			emitcode ("mov","mb,#0x%02x",val & 0xff);
-			emitcode ("mov","mb,#0x%02x",(val >> 8) & 0xff);		    
+			emitcode ("mov","mb,#!constbyte",val & 0xff);
+			emitcode ("mov","mb,#!constbyte",(val >> 8) & 0xff);		    
 		} else {
 			lbl = newiTempLabel(NULL);
 			emitcode ("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE,TRUE));
 			emitcode ("mov","a,%s",aopGet(AOP(right),1,FALSE,FALSE,TRUE));
-			emitcode ("jnb","acc.7,%05d$",lbl->key+100);		
+			emitcode ("jnb","acc.7,!tlabel",lbl->key+100);		
 			emitcode ("xch", "a,b");
 			emitcode ("cpl","a");
 			emitcode ("add", "a,#1");
 			emitcode ("xch", "a,b");
 			emitcode ("cpl", "a"); // msb
 			emitcode ("addc", "a,#0");
-			emitcode ("","%05d$:",lbl->key+100);
+			emitcode ("","!tlabeldef",lbl->key+100);
 			emitcode ("mov","mb,b");
 			emitcode ("mov","mb,a");
 		}
@@ -4840,10 +4941,10 @@ static void genModTwoByte (operand *left, operand *right,
 
 	/* wait for multiplication to finish */
 	lbl = newiTempLabel(NULL);
-	emitcode("","%05d$:", lbl->key+100);
+	emitcode("","!tlabeldef", lbl->key+100);
 	emitcode("mov","a,mcnt1");
-	emitcode("anl","a,#0x80");
-	emitcode("jnz","%05d$",lbl->key+100);
+	emitcode("anl","a,#!constbyte",0x80);
+	emitcode("jnz","!tlabel",lbl->key+100);
 	
 	freeAsmop (left, NULL, ic, TRUE);
 	freeAsmop (right, NULL, ic,TRUE);
@@ -4855,9 +4956,9 @@ static void genModTwoByte (operand *left, operand *right,
 
 	/* restore EA bit in F1 */
 	lbl = newiTempLabel(NULL);
-	emitcode ("jnb","F1,%05d$",lbl->key+100);
+	emitcode ("jnb","F1,!tlabel",lbl->key+100);
 	emitcode ("setb","EA");
-	emitcode("","%05d$:",lbl->key+100);
+	emitcode("","!tlabeldef",lbl->key+100);
 	return ;
 }
 
@@ -4937,11 +5038,11 @@ genIfxJump (iCode * ic, char *jval)
 	       (strcmp (jval, "c") == 0 ? "jc" : "jb")));
     }
   if (strcmp (inst, "jb") == 0 || strcmp (inst, "jnb") == 0)
-    emitcode (inst, "%s,%05d$", jval, (tlbl->key + 100));
+    emitcode (inst, "%s,!tlabel", jval, (tlbl->key + 100));
   else
-    emitcode (inst, "%05d$", tlbl->key + 100);
-  emitcode ("ljmp", "%05d$", jlbl->key + 100);
-  emitcode ("", "%05d$:", tlbl->key + 100);
+    emitcode (inst, "!tlabel", tlbl->key + 100);
+  emitcode ("ljmp", "!tlabel", jlbl->key + 100);
+  emitcode ("", "!tlabeldef", tlbl->key + 100);
 
   /* mark the icode as generated */
   ic->generated = 1;
@@ -4979,14 +5080,14 @@ genCmp (operand * left, operand * right,
 
       /* if unsigned char cmp with lit, do cjne left,#right,zz */
       if ((size == 1) && !sign &&
-	  (AOP_TYPE (right) == AOP_LIT && AOP_TYPE (left) != AOP_DIR))
+	  (AOP_TYPE (right) == AOP_LIT && AOP_TYPE (left) != AOP_DIR && AOP_TYPE (left) != AOP_STR))
 	{
 	  symbol *lbl = newiTempLabel (NULL);
-	  emitcode ("cjne", "%s,%s,%05d$",
+	  emitcode ("cjne", "%s,%s,!tlabel",
 		    aopGet (AOP (left), offset, FALSE, FALSE, FALSE),
 		    aopGet (AOP (right), offset, FALSE, FALSE, FALSE),
 		    lbl->key + 100);
-	  emitcode ("", "%05d$:", lbl->key + 100);
+	  emitcode ("", "!tlabeldef", lbl->key + 100);
 	}
       else
 	{
@@ -5027,31 +5128,31 @@ genCmp (operand * left, operand * right,
 	  CLRC;
 	  while (size--)
 	    {
-	      emitcode (";", "genCmp #1: %d/%d/%d", size, sign, offset);
+	      //emitcode (";", "genCmp #1: %d/%d/%d", size, sign, offset);
 	      MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
-	      emitcode (";", "genCmp #2");
+	      //emitcode (";", "genCmp #2");
 	      if (sign && (size == 0))
 		{
-		  emitcode (";", "genCmp #3");
-		  emitcode ("xrl", "a,#0x80");
+		    //emitcode (";", "genCmp #3");
+		  emitcode ("xrl", "a,#!constbyte",0x80);
 		  if (AOP_TYPE (right) == AOP_LIT)
 		    {
 		      unsigned long lit = (unsigned long)
 		      floatFromVal (AOP (right)->aopu.aop_lit);
-		      emitcode (";", "genCmp #3.1");
-		      emitcode ("subb", "a,#0x%02x",
+		      //emitcode (";", "genCmp #3.1");
+		      emitcode ("subb", "a,#!constbyte",
 				0x80 ^ (unsigned int) ((lit >> (offset * 8)) & 0x0FFL));
 		    }
 		  else
 		    {
-		      emitcode (";", "genCmp #3.2");
+		      //emitcode (";", "genCmp #3.2");
 		      if (AOP_NEEDSACC (right))
 			{
 			  emitcode ("push", "acc");
 			}
 		      emitcode ("mov", "b,%s", aopGet (AOP (right), offset++,
 						       FALSE, FALSE, FALSE));
-		      emitcode ("xrl", "b,#0x80");
+		      emitcode ("xrl", "b,#!constbyte",0x80);
 		      if (AOP_NEEDSACC (right))
 			{
 			  emitcode ("pop", "acc");
@@ -5063,11 +5164,11 @@ genCmp (operand * left, operand * right,
 		{
 		  const char *s;
 
-		  emitcode (";", "genCmp #4");
+		  //emitcode (";", "genCmp #4");
 		  if (AOP_NEEDSACC (right))
 		    {
 		      /* Yuck!! */
-		      emitcode (";", "genCmp #4.1");
+		      //emitcode (";", "genCmp #4.1");
 		      emitcode ("xch", "a, b");
 		      MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, TRUE));
 		      emitcode ("xch", "a, b");
@@ -5075,7 +5176,7 @@ genCmp (operand * left, operand * right,
 		    }
 		  else
 		    {
-		      emitcode (";", "genCmp #4.2");
+		      //emitcode (";", "genCmp #4.2");
 		      s = aopGet (AOP (right), offset++, FALSE, FALSE, FALSE);
 		    }
 
@@ -5213,7 +5314,7 @@ gencjneshort (operand * left, operand * right, symbol * lbl)
 	{
 	  char *l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE);
 	  MOVA (l);
-	  emitcode ("cjne", "a,%s,%05d$",
+	  emitcode ("cjne", "a,%s,!tlabel",
 		    aopGet (AOP (right), offset, FALSE, FALSE, FALSE),
 		    lbl->key + 100);
 	  offset++;
@@ -5232,9 +5333,9 @@ gencjneshort (operand * left, operand * right, symbol * lbl)
 	  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
 	  if ((AOP_TYPE (left) == AOP_DIR && AOP_TYPE (right) == AOP_LIT) &&
 	      ((unsigned int) ((lit >> (offset * 8)) & 0x0FFL) == 0))
-	    emitcode ("jnz", "%05d$", lbl->key + 100);
+	    emitcode ("jnz", "!tlabel", lbl->key + 100);
 	  else
-	    emitcode ("cjne", "a,%s,%05d$",
+	    emitcode ("cjne", "a,%s,!tlabel",
 		      aopGet (AOP (right), offset, FALSE, TRUE, FALSE),
 		      lbl->key + 100);
 	  offset++;
@@ -5249,7 +5350,7 @@ gencjneshort (operand * left, operand * right, symbol * lbl)
 	  if (strcmp (l, "b"))
 	    emitcode ("mov", "b,%s", l);
 	  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
-	  emitcode ("cjne", "a,b,%05d$", lbl->key + 100);
+	  emitcode ("cjne", "a,b,!tlabel", lbl->key + 100);
 	  offset++;
 	}
     }
@@ -5269,10 +5370,10 @@ gencjne (operand * left, operand * right, symbol * lbl)
   gencjneshort (left, right, lbl);
 
   emitcode ("mov", "a,%s", one);
-  emitcode ("sjmp", "%05d$", tlbl->key + 100);
-  emitcode ("", "%05d$:", lbl->key + 100);
+  emitcode ("sjmp", "!tlabel", tlbl->key + 100);
+  emitcode ("", "!tlabeldef", lbl->key + 100);
   emitcode ("clr", "a");
-  emitcode ("", "%05d$:", tlbl->key + 100);
+  emitcode ("", "!tlabeldef", tlbl->key + 100);
 }
 
 /*-----------------------------------------------------------------*/
@@ -5331,24 +5432,24 @@ genCmpEq (iCode * ic, iCode * ifx)
 	    {
 	      symbol *lbl = newiTempLabel (NULL);
 	      emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
-	      emitcode ("jb", "%s,%05d$", AOP (right)->aopu.aop_dir, (lbl->key + 100));
+	      emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, (lbl->key + 100));
 	      emitcode ("cpl", "c");
-	      emitcode ("", "%05d$:", (lbl->key + 100));
+	      emitcode ("", "!tlabeldef", (lbl->key + 100));
 	    }
 	  /* if true label then we jump if condition
 	     supplied is true */
 	  tlbl = newiTempLabel (NULL);
 	  if (IC_TRUE (ifx))
 	    {
-	      emitcode ("jnc", "%05d$", tlbl->key + 100);
-	      emitcode ("ljmp", "%05d$", IC_TRUE (ifx)->key + 100);
+	      emitcode ("jnc", "!tlabel", tlbl->key + 100);
+	      emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100);
 	    }
 	  else
 	    {
-	      emitcode ("jc", "%05d$", tlbl->key + 100);
-	      emitcode ("ljmp", "%05d$", IC_FALSE (ifx)->key + 100);
+	      emitcode ("jc", "!tlabel", tlbl->key + 100);
+	      emitcode ("ljmp", "!tlabel", IC_FALSE (ifx)->key + 100);
 	    }
-	  emitcode ("", "%05d$:", tlbl->key + 100);
+	  emitcode ("", "!tlabeldef", tlbl->key + 100);
 	}
       else
 	{
@@ -5356,16 +5457,16 @@ genCmpEq (iCode * ic, iCode * ifx)
 	  gencjneshort (left, right, tlbl);
 	  if (IC_TRUE (ifx))
 	    {
-	      emitcode ("ljmp", "%05d$", IC_TRUE (ifx)->key + 100);
-	      emitcode ("", "%05d$:", tlbl->key + 100);
+	      emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100);
+	      emitcode ("", "!tlabeldef", tlbl->key + 100);
 	    }
 	  else
 	    {
 	      symbol *lbl = newiTempLabel (NULL);
-	      emitcode ("sjmp", "%05d$", lbl->key + 100);
-	      emitcode ("", "%05d$:", tlbl->key + 100);
-	      emitcode ("ljmp", "%05d$", IC_FALSE (ifx)->key + 100);
-	      emitcode ("", "%05d$:", lbl->key + 100);
+	      emitcode ("sjmp", "!tlabel", lbl->key + 100);
+	      emitcode ("", "!tlabeldef", tlbl->key + 100);
+	      emitcode ("ljmp", "!tlabel", IC_FALSE (ifx)->key + 100);
+	      emitcode ("", "!tlabeldef", lbl->key + 100);
 	    }
 	}
       /* mark the icode as generated */
@@ -5402,9 +5503,9 @@ genCmpEq (iCode * ic, iCode * ifx)
 	{
 	  symbol *lbl = newiTempLabel (NULL);
 	  emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
-	  emitcode ("jb", "%s,%05d$", AOP (right)->aopu.aop_dir, (lbl->key + 100));
+	  emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, (lbl->key + 100));
 	  emitcode ("cpl", "c");
-	  emitcode ("", "%05d$:", (lbl->key + 100));
+	  emitcode ("", "!tlabeldef", (lbl->key + 100));
 	}
 
       freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
@@ -5482,7 +5583,7 @@ ifxForOp (operand * op, iCode * ic)
 /* hasInc - operand is incremented before any other use            */
 /*-----------------------------------------------------------------*/
 static iCode *
-hasInc (operand *op, iCode *ic)
+hasInc (operand *op, iCode *ic, int osize)
 {
   sym_link *type = operandType(op);
   sym_link *retype = getSpec (type);
@@ -5493,7 +5594,7 @@ hasInc (operand *op, iCode *ic)
   if (!IS_SYMOP(op)) return NULL;
 
   if (IS_BITVAR(retype)||!IS_PTR(type)) return NULL;
-  isize = getSize(type->next);
+  if (osize != (isize = getSize(type->next))) return NULL;
   while (lic) {
       /* if operand of the form op = op + <sizeof *op> */
       if (lic->op == '+' && isOperandEqual(IC_LEFT(lic),op) &&
@@ -5507,7 +5608,7 @@ hasInc (operand *op, iCode *ic)
 	  return NULL;
       }
       /* if GOTO or IFX */
-      if (lic->op == IFX || lic->op == GOTO) break;
+      if (lic->op == IFX || lic->op == GOTO || lic->op == LABEL) break;
       lic = lic->next;
   }
   return NULL;
@@ -5546,9 +5647,9 @@ genAndOp (iCode * ic)
     {
       tlbl = newiTempLabel (NULL);
       toBoolean (left);
-      emitcode ("jz", "%05d$", tlbl->key + 100);
+      emitcode ("jz", "!tlabel", tlbl->key + 100);
       toBoolean (right);
-      emitcode ("", "%05d$:", tlbl->key + 100);
+      emitcode ("", "!tlabeldef", tlbl->key + 100);
       freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
       freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
   
@@ -5593,9 +5694,9 @@ genOrOp (iCode * ic)
     {
       tlbl = newiTempLabel (NULL);
       toBoolean (left);
-      emitcode ("jnz", "%05d$", tlbl->key + 100);
+      emitcode ("jnz", "!tlabel", tlbl->key + 100);
       toBoolean (right);
-      emitcode ("", "%05d$:", tlbl->key + 100);
+      emitcode ("", "!tlabeldef", tlbl->key + 100);
       freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
       freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
   
@@ -5636,7 +5737,7 @@ static void
 continueIfTrue (iCode * ic)
 {
   if (IC_TRUE (ic))
-    emitcode ("ljmp", "%05d$", IC_TRUE (ic)->key + 100);
+    emitcode ("ljmp", "!tlabel", IC_TRUE (ic)->key + 100);
   ic->generated = 1;
 }
 
@@ -5647,7 +5748,7 @@ static void
 jumpIfTrue (iCode * ic)
 {
   if (!IC_TRUE (ic))
-    emitcode ("ljmp", "%05d$", IC_FALSE (ic)->key + 100);
+    emitcode ("ljmp", "!tlabel", IC_FALSE (ic)->key + 100);
   ic->generated = 1;
 }
 
@@ -5661,15 +5762,15 @@ jmpTrueOrFalse (iCode * ic, symbol * tlbl)
   if (IC_TRUE (ic))
     {
       symbol *nlbl = newiTempLabel (NULL);
-      emitcode ("sjmp", "%05d$", nlbl->key + 100);
-      emitcode ("", "%05d$:", tlbl->key + 100);
-      emitcode ("ljmp", "%05d$", IC_TRUE (ic)->key + 100);
-      emitcode ("", "%05d$:", nlbl->key + 100);
+      emitcode ("sjmp", "!tlabel", nlbl->key + 100);
+      emitcode ("", "!tlabeldef", tlbl->key + 100);
+      emitcode ("ljmp", "!tlabel", IC_TRUE (ic)->key + 100);
+      emitcode ("", "!tlabeldef", nlbl->key + 100);
     }
   else
     {
-      emitcode ("ljmp", "%05d$", IC_FALSE (ic)->key + 100);
-      emitcode ("", "%05d$:", tlbl->key + 100);
+      emitcode ("ljmp", "!tlabel", IC_FALSE (ic)->key + 100);
+      emitcode ("", "!tlabeldef", tlbl->key + 100);
     }
   ic->generated = 1;
 }
@@ -5883,13 +5984,13 @@ genAnd (iCode * ic, iCode * ifx)
 		  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
 		  // byte ==  2^n ?
 		  if ((posbit = isLiteralBit (bytelit)) != 0)
-		    emitcode ("jb", "acc.%d,%05d$", (posbit - 1) & 0x07, tlbl->key + 100);
+		    emitcode ("jb", "acc.%d,!tlabel", (posbit - 1) & 0x07, tlbl->key + 100);
 		  else
 		    {
 		      if (bytelit != 0x0FFL)
 			emitcode ("anl", "a,%s",
 			  aopGet (AOP (right), offset, FALSE, TRUE, FALSE));
-		      emitcode ("jnz", "%05d$", tlbl->key + 100);
+		      emitcode ("jnz", "!tlabel", tlbl->key + 100);
 		    }
 		}
 	      offset++;
@@ -5898,7 +5999,7 @@ genAnd (iCode * ic, iCode * ifx)
 	  if (size)
 	    {
 	      emitcode ("clr", "c");
-	      emitcode ("", "%05d$:", tlbl->key + 100);
+	      emitcode ("", "!tlabeldef", tlbl->key + 100);
 	    }
 	  // if(left & literal)
 	  else
@@ -5982,13 +6083,13 @@ genAnd (iCode * ic, iCode * ifx)
 			    aopGet (AOP (left), offset, FALSE, FALSE, FALSE));
 		}
 	      }
-	      emitcode ("jnz", "%05d$", tlbl->key + 100);
+	      emitcode ("jnz", "!tlabel", tlbl->key + 100);
 	      offset++;
 	    }
 	  if (size)
 	    {
 	      CLRC;
-	      emitcode ("", "%05d$:", tlbl->key + 100);
+	      emitcode ("", "!tlabeldef", tlbl->key + 100);
 	      outBitC (result);
 	    }
 	  else if (ifx)
@@ -6161,10 +6262,10 @@ genOr (iCode * ic, iCode * ifx)
 	      symbol *tlbl = newiTempLabel (NULL);
 	      if (!((AOP_TYPE (result) == AOP_CRY) && ifx))
 		emitcode ("setb", "c");
-	      emitcode ("jb", "%s,%05d$",
+	      emitcode ("jb", "%s,!tlabel",
 			AOP (left)->aopu.aop_dir, tlbl->key + 100);
 	      toBoolean (right);
-	      emitcode ("jnz", "%05d$", tlbl->key + 100);
+	      emitcode ("jnz", "!tlabel", tlbl->key + 100);
 	      if ((AOP_TYPE (result) == AOP_CRY) && ifx)
 		{
 		  jmpTrueOrFalse (ifx, tlbl);
@@ -6173,7 +6274,7 @@ genOr (iCode * ic, iCode * ifx)
 	      else
 		{
 		  CLRC;
-		  emitcode ("", "%05d$:", tlbl->key + 100);
+		  emitcode ("", "!tlabeldef", tlbl->key + 100);
 		}
 	    }
 	}
@@ -6211,9 +6312,9 @@ genOr (iCode * ic, iCode * ifx)
 	  if (size)
 	    {
 	      symbol *tlbl = newiTempLabel (NULL);
-	      emitcode ("jnz", "%05d$", tlbl->key + 100);
+	      emitcode ("jnz", "!tlabel", tlbl->key + 100);
 	      CLRC;
-	      emitcode ("", "%05d$:", tlbl->key + 100);
+	      emitcode ("", "!tlabeldef", tlbl->key + 100);
 	    }
 	  else
 	    {
@@ -6297,13 +6398,13 @@ genOr (iCode * ic, iCode * ifx)
 		emitcode ("orl", "a,%s",
 			  aopGet (AOP (left), offset, FALSE, FALSE, FALSE));
 	      }
-	      emitcode ("jnz", "%05d$", tlbl->key + 100);
+	      emitcode ("jnz", "!tlabel", tlbl->key + 100);
 	      offset++;
 	    }
 	  if (size)
 	    {
 	      CLRC;
-	      emitcode ("", "%05d$:", tlbl->key + 100);
+	      emitcode ("", "!tlabeldef", tlbl->key + 100);
 	      outBitC (result);
 	    }
 	  else if (ifx)
@@ -6498,16 +6599,16 @@ genXor (iCode * ic, iCode * ifx)
 		  MOVA (aopGet (AOP (right), sizer - 1, FALSE, FALSE, TRUE));
 		  if (sizer == 1)
 		    // test the msb of the lsb
-		    emitcode ("anl", "a,#0xfe");
-		  emitcode ("jnz", "%05d$", tlbl->key + 100);
+		    emitcode ("anl", "a,#!constbyte",0xfe);
+		  emitcode ("jnz", "!tlabel", tlbl->key + 100);
 		  sizer--;
 		}
 	      // val = (0,1)
 	      emitcode ("rrc", "a");
 	    }
-	  emitcode ("jnb", "%s,%05d$", AOP (left)->aopu.aop_dir, (tlbl->key + 100));
+	  emitcode ("jnb", "%s,!tlabel", AOP (left)->aopu.aop_dir, (tlbl->key + 100));
 	  emitcode ("cpl", "c");
-	  emitcode ("", "%05d$:", (tlbl->key + 100));
+	  emitcode ("", "!tlabeldef", (tlbl->key + 100));
 	}
       // bit = c
       // val = c
@@ -6595,13 +6696,13 @@ genXor (iCode * ic, iCode * ifx)
 		      emitcode ("xrl", "a,%s", rOp);		      
 		  }
 		}
-	      emitcode ("jnz", "%05d$", tlbl->key + 100);
+	      emitcode ("jnz", "!tlabel", tlbl->key + 100);
 	      offset++;
 	    }
 	  if (size)
 	    {
 	      CLRC;
-	      emitcode ("", "%05d$:", tlbl->key + 100);
+	      emitcode ("", "!tlabeldef", tlbl->key + 100);
 	      outBitC (result);
 	    }
 	  else if (ifx)
@@ -6835,7 +6936,7 @@ genGetHbit (iCode * ic)
   else
     {
       emitcode ("rl", "a");
-      emitcode ("anl", "a,#0x01");
+      emitcode ("anl", "a,#1");
       outAcc (result);
     }
 
@@ -6904,7 +7005,7 @@ AccLsh (int shCount)
 	  /* rotate left accumulator */
 	  AccRol (shCount);
 	  /* and kill the lower order bits */
-	  emitcode ("anl", "a,#0x%02x", SLMask[shCount]);
+	  emitcode ("anl", "a,#!constbyte", SLMask[shCount]);
 	}
     }
 }
@@ -6927,7 +7028,7 @@ AccRsh (int shCount)
 	  /* rotate right accumulator */
 	  AccRol (8 - shCount);
 	  /* and kill the higher order bits */
-	  emitcode ("anl", "a,#0x%02x", SRMask[shCount]);
+	  emitcode ("anl", "a,#!constbyte", SRMask[shCount]);
 	}
     }
 }
@@ -6960,11 +7061,11 @@ AccSRsh (int shCount)
 	  /* rotate right accumulator */
 	  AccRol (8 - shCount);
 	  /* and kill the higher order bits */
-	  emitcode ("anl", "a,#0x%02x", SRMask[shCount]);
-	  emitcode ("jnb", "acc.%d,%05d$", 7 - shCount, tlbl->key + 100);
-	  emitcode ("orl", "a,#0x%02x",
+	  emitcode ("anl", "a,#!constbyte", SRMask[shCount]);
+	  emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100);
+	  emitcode ("orl", "a,#!constbyte",
 		    (unsigned char) ~SRMask[shCount]);
-	  emitcode ("", "%05d$:", tlbl->key + 100);
+	  emitcode ("", "!tlabeldef", tlbl->key + 100);
 	}
     }
 }
@@ -7109,7 +7210,7 @@ AccAXLsh (char *x, int shCount)
 
       AccRol (shCount);		// BBBAAAAA:CCCCCDDD
 
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		SLMask[shCount]);	// BBB00000:CCCCCDDD
 
       emitcode ("xch", "a,%s", x);	// CCCCCDDD:BBB00000
@@ -7122,7 +7223,7 @@ AccAXLsh (char *x, int shCount)
 
       emitcode ("xch", "a,%s", x);	// DDDCCCCC:(BBB^DDD)CCCCC
 
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		SLMask[shCount]);	// DDD00000:(BBB^DDD)CCCCC
 
       emitcode ("xch", "a,%s", x);	// (BBB^DDD)CCCCC:DDD00000
@@ -7131,7 +7232,7 @@ AccAXLsh (char *x, int shCount)
 
       break;
     case 6:			// AAAAAABB:CCCCCCDD
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		SRMask[shCount]);	// 000000BB:CCCCCCDD
       emitcode ("mov", "c,acc.0");	// c = B
       emitcode ("xch", "a,%s", x);	// CCCCCCDD:000000BB
@@ -7153,7 +7254,7 @@ AccAXLsh (char *x, int shCount)
       break;
     case 7:			// a:x <<= 7
 
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		SRMask[shCount]);	// 0000000B:CCCCCCCD
 
       emitcode ("mov", "c,acc.0");	// c = B
@@ -7204,14 +7305,14 @@ AccAXRsh (char *x, int shCount)
 
       AccRol (8 - shCount);	// DDDCCCCC:BBBAAAAA
 
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		SRMask[shCount]);	// 000CCCCC:BBBAAAAA
 
       emitcode ("xrl", "a,%s", x);	// BBB(CCCCC^AAAAA):BBBAAAAA
 
       emitcode ("xch", "a,%s", x);	// BBBAAAAA:BBB(CCCCC^AAAAA)
 
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		SRMask[shCount]);	// 000AAAAA:BBB(CCCCC^AAAAA)
 
       emitcode ("xch", "a,%s", x);	// BBB(CCCCC^AAAAA):000AAAAA
@@ -7230,7 +7331,7 @@ AccAXRsh (char *x, int shCount)
 
       emitcode ("xch", "a,%s", x);	// DDDDDDAA:BBBBBBCC
 
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		SRMask[shCount]);	// 000000AA:BBBBBBCC
 
       break;
@@ -7242,7 +7343,7 @@ AccAXRsh (char *x, int shCount)
 
       emitcode ("xch", "a,%s", x);	// DDDDDDDA:BBBBBBCC
 
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		SRMask[shCount]);	// 0000000A:BBBBBBBC
 
       break;
@@ -7288,14 +7389,14 @@ AccAXRshS (char *x, int shCount)
 
       AccRol (8 - shCount);	// DDDCCCCC:BBBAAAAA
 
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		SRMask[shCount]);	// 000CCCCC:BBBAAAAA
 
       emitcode ("xrl", "a,%s", x);	// BBB(CCCCC^AAAAA):BBBAAAAA
 
       emitcode ("xch", "a,%s", x);	// BBBAAAAA:BBB(CCCCC^AAAAA)
 
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		SRMask[shCount]);	// 000AAAAA:BBB(CCCCC^AAAAA)
 
       emitcode ("xch", "a,%s", x);	// BBB(CCCCC^AAAAA):000AAAAA
@@ -7304,11 +7405,11 @@ AccAXRshS (char *x, int shCount)
 
       emitcode ("xch", "a,%s", x);	// 000SAAAA:BBBCCCCC
 
-      emitcode ("jnb", "acc.%d,%05d$", 7 - shCount, tlbl->key + 100);
-      emitcode ("orl", "a,#0x%02x",
+      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100);
+      emitcode ("orl", "a,#!constbyte",
 		(unsigned char) ~SRMask[shCount]);	// 111AAAAA:BBBCCCCC
 
-      emitcode ("", "%05d$:", tlbl->key + 100);
+      emitcode ("", "!tlabeldef", tlbl->key + 100);
       break;			// SSSSAAAA:BBBCCCCC
 
     case 6:			// AABBBBBB:CCDDDDDD
@@ -7321,14 +7422,14 @@ AccAXRshS (char *x, int shCount)
 
       emitcode ("xch", "a,%s", x);	// DDDDDDAA:BBBBBBCC
 
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		SRMask[shCount]);	// 000000AA:BBBBBBCC
 
-      emitcode ("jnb", "acc.%d,%05d$", 7 - shCount, tlbl->key + 100);
-      emitcode ("orl", "a,#0x%02x",
+      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100);
+      emitcode ("orl", "a,#!constbyte",
 		(unsigned char) ~SRMask[shCount]);	// 111111AA:BBBBBBCC
 
-      emitcode ("", "%05d$:", tlbl->key + 100);
+      emitcode ("", "!tlabeldef", tlbl->key + 100);
       break;
     case 7:			// ABBBBBBB:CDDDDDDD
 
@@ -7339,14 +7440,14 @@ AccAXRshS (char *x, int shCount)
 
       emitcode ("xch", "a,%s", x);	// DDDDDDDA:BBBBBBCC
 
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		SRMask[shCount]);	// 0000000A:BBBBBBBC
 
-      emitcode ("jnb", "acc.%d,%05d$", 7 - shCount, tlbl->key + 100);
-      emitcode ("orl", "a,#0x%02x",
+      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100);
+      emitcode ("orl", "a,#!constbyte",
 		(unsigned char) ~SRMask[shCount]);	// 1111111A:BBBBBBBC
 
-      emitcode ("", "%05d$:", tlbl->key + 100);
+      emitcode ("", "!tlabeldef", tlbl->key + 100);
       break;
     default:
       break;
@@ -7796,7 +7897,7 @@ genLeftShiftLiteral (operand * left,
   aopOp(left, ic, FALSE, FALSE);
   aopOp(result, ic, FALSE, (AOP_TYPE(left) == AOP_DPTR));
 
-#if 1 // debug spew
+#if 0 // debug spew
   if (IS_SYMOP(left) && OP_SYMBOL(left)->aop)
   {
   	emitcode(";", "left (%s) is %d", OP_SYMBOL(left)->rname, AOP_TYPE(left));
@@ -7910,7 +8011,7 @@ genLeftShift (iCode * ic)
        * but since I'm too lazy to fix that today, at least we can make
        * some small improvement.
        */
-       emitcode("mov", "b,#0x%02x",
+       emitcode("mov", "b,#!constbyte",
        	        ((int) floatFromVal (AOP (right)->aopu.aop_lit)) + 1);
   }
   else
@@ -7959,19 +8060,19 @@ genLeftShift (iCode * ic)
 
       l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE);
       MOVA (l);
-      emitcode ("sjmp", "%05d$", tlbl1->key + 100);
-      emitcode ("", "%05d$:", tlbl->key + 100);
+      emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+      emitcode ("", "!tlabeldef", tlbl->key + 100);
       emitcode ("add", "a,acc");
-      emitcode ("", "%05d$:", tlbl1->key + 100);
-      emitcode ("djnz", "b,%05d$", tlbl->key + 100);
+      emitcode ("", "!tlabeldef", tlbl1->key + 100);
+      emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
       aopPut (AOP (result), "a", 0);
       goto release;
     }
 
   reAdjustPreg (AOP (result));
 
-  emitcode ("sjmp", "%05d$", tlbl1->key + 100);
-  emitcode ("", "%05d$:", tlbl->key + 100);
+  emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+  emitcode ("", "!tlabeldef", tlbl->key + 100);
   l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE);
   MOVA (l);
   emitcode ("add", "a,acc");
@@ -7987,8 +8088,8 @@ genLeftShift (iCode * ic)
   _endLazyDPSEvaluation ();
   reAdjustPreg (AOP (result));
 
-  emitcode ("", "%05d$:", tlbl1->key + 100);
-  emitcode ("djnz", "b,%05d$", tlbl->key + 100);
+  emitcode ("", "!tlabeldef", tlbl1->key + 100);
+  emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
 release:
   freeAsmop (left, NULL, ic, TRUE);
   freeAsmop (result, NULL, ic, TRUE);
@@ -8310,7 +8411,7 @@ genSignedRightShift (iCode * ic)
        * but since I'm too lazy to fix that today, at least we can make
        * some small improvement.
        */
-       emitcode("mov", "b,#0x%02x",
+       emitcode("mov", "b,#!constbyte",
        	        ((int) floatFromVal (AOP (right)->aopu.aop_lit)) + 1);
   }
   else
@@ -8361,19 +8462,19 @@ genSignedRightShift (iCode * ic)
     {
       l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE);
       MOVA (l);
-      emitcode ("sjmp", "%05d$", tlbl1->key + 100);
-      emitcode ("", "%05d$:", tlbl->key + 100);
+      emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+      emitcode ("", "!tlabeldef", tlbl->key + 100);
       emitcode ("mov", "c,ov");
       emitcode ("rrc", "a");
-      emitcode ("", "%05d$:", tlbl1->key + 100);
-      emitcode ("djnz", "b,%05d$", tlbl->key + 100);
+      emitcode ("", "!tlabeldef", tlbl1->key + 100);
+      emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
       aopPut (AOP (result), "a", 0);
       goto release;
     }
 
   reAdjustPreg (AOP (result));
-  emitcode ("sjmp", "%05d$", tlbl1->key + 100);
-  emitcode ("", "%05d$:", tlbl->key + 100);
+  emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+  emitcode ("", "!tlabeldef", tlbl->key + 100);
   emitcode ("mov", "c,ov");
   _startLazyDPSEvaluation ();
   while (size--)
@@ -8385,8 +8486,8 @@ genSignedRightShift (iCode * ic)
     }
   _endLazyDPSEvaluation ();
   reAdjustPreg (AOP (result));
-  emitcode ("", "%05d$:", tlbl1->key + 100);
-  emitcode ("djnz", "b,%05d$", tlbl->key + 100);
+  emitcode ("", "!tlabeldef", tlbl1->key + 100);
+  emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
 
 release:
   freeAsmop (left, NULL, ic, TRUE);
@@ -8454,7 +8555,7 @@ genRightShift (iCode * ic)
        * but since I'm too lazy to fix that today, at least we can make
        * some small improvement.
        */
-       emitcode("mov", "b,#0x%02x",
+       emitcode("mov", "b,#!constbyte",
        	        ((int) floatFromVal (AOP (right)->aopu.aop_lit)) + 1);
   }
   else
@@ -8501,19 +8602,19 @@ genRightShift (iCode * ic)
     {
       l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE);
       MOVA (l);
-      emitcode ("sjmp", "%05d$", tlbl1->key + 100);
-      emitcode ("", "%05d$:", tlbl->key + 100);
+      emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+      emitcode ("", "!tlabeldef", tlbl->key + 100);
       CLRC;
       emitcode ("rrc", "a");
-      emitcode ("", "%05d$:", tlbl1->key + 100);
-      emitcode ("djnz", "b,%05d$", tlbl->key + 100);
+      emitcode ("", "!tlabeldef", tlbl1->key + 100);
+      emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
       aopPut (AOP (result), "a", 0);
       goto release;
     }
 
   reAdjustPreg (AOP (result));
-  emitcode ("sjmp", "%05d$", tlbl1->key + 100);
-  emitcode ("", "%05d$:", tlbl->key + 100);
+  emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+  emitcode ("", "!tlabeldef", tlbl->key + 100);
   CLRC;
   _startLazyDPSEvaluation ();
   while (size--)
@@ -8526,8 +8627,8 @@ genRightShift (iCode * ic)
   _endLazyDPSEvaluation ();
   reAdjustPreg (AOP (result));
 
-  emitcode ("", "%05d$:", tlbl1->key + 100);
-  emitcode ("djnz", "b,%05d$", tlbl->key + 100);
+  emitcode ("", "!tlabeldef", tlbl1->key + 100);
+  emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
 
 release:
   freeAsmop (left, NULL, ic, TRUE);
@@ -8587,7 +8688,7 @@ genUnpackBits (operand * result, char *rname, int ptype)
       /* shift right acc */
       AccRsh (shCnt);
 
-      emitcode ("anl", "a,#0x%02x",
+      emitcode ("anl", "a,#!constbyte",
 		((unsigned char) -1) >> (8 - SPEC_BLEN (etype)));
       aopPut (AOP (result), "a", offset);
       return;
@@ -8641,7 +8742,7 @@ genUnpackBits (operand * result, char *rname, int ptype)
 
   if (rlen)
     {
-      emitcode ("anl", "a,#0x%02x", ((unsigned char) -1) >> (rlen));
+      emitcode ("anl", "a,#!constbyte", ((unsigned char) -1) >> (rlen));
       aopPut (AOP (result), "a", offset);
     }
 
@@ -9286,7 +9387,7 @@ genPackBits (sym_link * etype,
 	      break;
 	    }
 
-	  emitcode ("anl", "a,#0x%02x", (unsigned char)
+	  emitcode ("anl", "a,#!constbyte", (unsigned char)
 		    ((unsigned char) (0xFF << (blen + bstr)) |
 		     (unsigned char) (0xFF >> (8 - bstr))));
 	  emitcode ("orl", "a,b");
@@ -9378,7 +9479,7 @@ genPackBits (sym_link * etype,
 	  break;
 	}
 
-      emitcode ("anl", "a,#0x%02x", ((unsigned char) -1 << rLen));
+      emitcode ("anl", "a,#!constbyte", ((unsigned char) -1 << rLen));
       emitcode ("orl", "a,b");
     }
 
@@ -9929,24 +10030,24 @@ genAddrOf (iCode * ic)
       /* if 10 bit stack */
       if (options.stack10bit) {
 	  char buff[10];
-	  sprintf(buff,"#0x%02x",(options.stack_loc >> 16) & 0xff);
+	  tsprintf(buff,"#!constbyte",(options.stack_loc >> 16) & 0xff);
 	  /* if it has an offset then we need to compute it */
-	  emitcode ("subb", "a,#0x%02x",
+	  emitcode ("subb", "a,#!constbyte",
 		    -((sym->stack < 0) ?
 		      ((short) (sym->stack - _G.nRegsSaved)) :
 		      ((short) sym->stack)) & 0xff);
 	  emitcode ("mov","b,a");
-	  emitcode ("mov","a,#0x%02x",(-((sym->stack < 0) ?
+	  emitcode ("mov","a,#!constbyte",(-((sym->stack < 0) ?
 					 ((short) (sym->stack - _G.nRegsSaved)) :
 					 ((short) sym->stack)) >> 8) & 0xff);
 	  if (sym->stack) {
 	      emitcode ("mov", "a,_bpx");
-	      emitcode ("add", "a,#0x%02x", ((sym->stack < 0) ? 
+	      emitcode ("add", "a,#!constbyte", ((sym->stack < 0) ? 
 					     ((char) (sym->stack - _G.nRegsSaved)) :
 					     ((char) sym->stack )) & 0xff);
 	      emitcode ("mov", "b,a");
 	      emitcode ("mov", "a,_bpx+1");
-	      emitcode ("addc","a,#0x%02x", (((sym->stack < 0) ? 
+	      emitcode ("addc","a,#!constbyte", (((sym->stack < 0) ? 
 					      ((short) (sym->stack - _G.nRegsSaved)) :
 					      ((short) sym->stack )) >> 8) & 0xff);
 	      aopPut (AOP (IC_RESULT (ic)), "b", 0);
@@ -9962,7 +10063,7 @@ genAddrOf (iCode * ic)
 	  /* if it has an offset then we need to compute it */
 	  if (sym->stack) {
 	      emitcode ("mov", "a,_bp");
-	      emitcode ("add", "a,#0x%02x", ((char) sym->stack & 0xff));
+	      emitcode ("add", "a,#!constbyte", ((char) sym->stack & 0xff));
 	      aopPut (AOP (IC_RESULT (ic)), "a", 0);
 	  } else {
 	      /* we can just move _bp */
@@ -9992,12 +10093,24 @@ genAddrOf (iCode * ic)
   while (size--)
     {
       char s[SDCC_NAME_MAX];
-      if (offset)
-	sprintf (s, "#(%s >> %d)",
-		 sym->rname,
-		 offset * 8);
-      else
-	sprintf (s, "#%s", sym->rname);
+      if (offset) {
+	  switch (offset) {
+	  case 1:
+	      tsprintf(s,"!his",sym->rname);
+	      break;
+	  case 2:
+	      tsprintf(s,"!hihis",sym->rname);
+	      break;
+	  case 3:
+	      tsprintf(s,"!hihihis",sym->rname);
+	      break;
+	  default: /* should not need this (just in case) */
+	      sprintf (s, "#(%s >> %d)",
+		       sym->rname,
+		       offset * 8);
+	  }
+      } else
+	  sprintf (s, "#%s", sym->rname);
       aopPut (AOP (IC_RESULT (ic)), s, offset++);
     }
 
@@ -10080,10 +10193,10 @@ genArrayInit (iCode * ic)
 		tlbl = newiTempLabel (NULL);
 		if (firstpass || (count & 0xff))
 		{
-		    emitcode("mov", "b, #0x%x", count & 0xff);
+		    emitcode("mov", "b, #!constbyte", count & 0xff);
 		}
 		
-		emitcode ("", "%05d$:", tlbl->key + 100);
+		emitcode ("", "!tlabeldef", tlbl->key + 100);
 	    }
 	    
 	    firstpass = FALSE;
@@ -10093,7 +10206,7 @@ genArrayInit (iCode * ic)
 		val = (((int)iLoop->literalValue) >> (eIndex * 8)) & 0xff;
 		if (val != lastVal)
 		{
-		    emitcode("mov", "a, #0x%x", val);
+		    emitcode("mov", "a, #!constbyte", val);
 		    lastVal = val;
 		}
 		
@@ -10103,7 +10216,7 @@ genArrayInit (iCode * ic)
 	    
 	    if (count > 1)
 	    {
-		emitcode("djnz", "b, %05d$", tlbl->key + 100);
+		emitcode("djnz", "b, !tlabel", tlbl->key + 100);
 	    }
 	    
 	    ix -= count;
@@ -10158,7 +10271,7 @@ genFarFarAssign (operand * result, operand * right, iCode * ic)
       /* We can use the '390 auto-toggle feature to good effect here. */
       
       D(emitcode(";","genFarFarAssign (390 auto-toggle fun)"););
-      emitcode("mov", "dps, #0x21"); 	/* Select DPTR2 & auto-toggle. */
+      emitcode("mov", "dps,#!constbyte",0x21); 	/* Select DPTR2 & auto-toggle. */
       emitcode ("mov", "dptr,#%s", rSym->rname); 
       /* DP2 = result, DP1 = right, DP1 is current. */
       while (size)
@@ -10171,13 +10284,13 @@ genFarFarAssign (operand * result, operand * right, iCode * ic)
                emitcode("inc", "dptr");
           }
       }
-      emitcode("mov", "dps, #0");
+      emitcode("mov", "dps,#0");
       freeAsmop (right, NULL, ic, FALSE);
 #if 0
 some alternative code for processors without auto-toggle
 no time to test now, so later well put in...kpb
         D(emitcode(";","genFarFarAssign (dual-dptr fun)"););
-        emitcode("mov", "dps, #0x01"); 	/* Select DPTR2. */
+        emitcode("mov", "dps,#1"); 	/* Select DPTR2. */
         emitcode ("mov", "dptr,#%s", rSym->rname); 
         /* DP2 = result, DP1 = right, DP1 is current. */
         while (size)
@@ -10192,7 +10305,7 @@ no time to test now, so later well put in...kpb
             emitcode("inc", "dptr");
           emitcode("inc", "dps");
         }
-        emitcode("mov", "dps, #0");
+        emitcode("mov", "dps,#0");
         freeAsmop (right, NULL, ic, FALSE);
 #endif
   }
@@ -10357,13 +10470,13 @@ genJumpTab (iCode * ic)
   freeAsmop (IC_JTCOND (ic), NULL, ic, TRUE);
 
   jtab = newiTempLabel (NULL);
-  emitcode ("mov", "dptr,#%05d$", jtab->key + 100);
+  emitcode ("mov", "dptr,#!tlabel", jtab->key + 100);
   emitcode ("jmp", "@a+dptr");
-  emitcode ("", "%05d$:", jtab->key + 100);
+  emitcode ("", "!tlabeldef", jtab->key + 100);
   /* now generate the jump labels */
   for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab;
        jtab = setNextItem (IC_JTLABELS (ic)))
-    emitcode ("ljmp", "%05d$", jtab->key + 100);
+    emitcode ("ljmp", "!tlabel", jtab->key + 100);
 
 }
 
@@ -10661,24 +10774,24 @@ genDjnz (iCode * ic, iCode * ifx)
       }
       emitcode ("dec", "%s", rByte);
       aopPut(AOP(IC_RESULT(ic)), rByte, 0);
-      emitcode ("jnz", "%05d$", lbl->key + 100);
+      emitcode ("jnz", "!tlabel", lbl->key + 100);
   }
   else if (IS_AOP_PREG (IC_RESULT (ic)))
     {
       emitcode ("dec", "%s",
 		aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, FALSE));
       emitcode ("mov", "a,%s", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, FALSE));
-      emitcode ("jnz", "%05d$", lbl->key + 100);
+      emitcode ("jnz", "!tlabel", lbl->key + 100);
     }
   else
     {
-      emitcode ("djnz", "%s,%05d$", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, TRUE, FALSE),
+      emitcode ("djnz", "%s,!tlabel", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, TRUE, FALSE),
 		lbl->key + 100);
     }
-  emitcode ("sjmp", "%05d$", lbl1->key + 100);
-  emitcode ("", "%05d$:", lbl->key + 100);
-  emitcode ("ljmp", "%05d$", IC_TRUE (ifx)->key + 100);
-  emitcode ("", "%05d$:", lbl1->key + 100);
+  emitcode ("sjmp", "!tlabel", lbl1->key + 100);
+  emitcode ("", "!tlabeldef", lbl->key + 100);
+  emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100);
+  emitcode ("", "!tlabeldef", lbl1->key + 100);
 
   freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
   ifx->generated = 1;
@@ -10735,10 +10848,22 @@ static void genMemcpyX2X( iCode *ic, int nparms, operand **parms, int fromc)
 {
     operand *from , *to , *count;
     symbol *lbl;
+    bitVect *rsave;
+    int i;
 
     /* we know it has to be 3 parameters */
     assert (nparms == 3);
     
+    rsave = newBitVect(16);
+    /* save DPTR if it needs to be saved */
+    for (i = DPL_IDX ; i <= B_IDX ; i++ ) {
+	    if (bitVectBitValue(ic->rMask,i))
+		    rsave = bitVectSetBit(rsave,i);
+    }
+    rsave = bitVectIntersect(rsave,bitVectCplAnd (bitVectCopy (ic->rMask),
+						  ds390_rUmaskForOp (IC_RESULT(ic))));
+    savermask(rsave);
+    
     to = parms[0];
     from = parms[1];
     count = parms[2];
@@ -10789,10 +10914,10 @@ static void genMemcpyX2X( iCode *ic, int nparms, operand **parms, int fromc)
     /* now for the actual copy */
     if (AOP_TYPE(count) == AOP_LIT && 
 	(int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) {
-	emitcode (";","OH! JOY auto increment with djnz (very fast)");
-	emitcode ("mov", "dps, #0x21"); 	/* Select DPTR2 & auto-toggle. */
+	emitcode (";","OH  JOY auto increment with djnz (very fast)");
+	emitcode ("mov", "dps,#!constbyte",0x21); 	/* Select DPTR2 & auto-toggle. */
 	emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE));
-	emitcode ("","%05d$:",lbl->key+100);
+	emitcode ("","!tlabeldef",lbl->key+100);
 	if (fromc) {
 	    emitcode ("clr","a");
 	    emitcode ("movc", "a,@a+dptr");
@@ -10801,15 +10926,15 @@ static void genMemcpyX2X( iCode *ic, int nparms, operand **parms, int fromc)
 	emitcode ("movx", "@dptr,a");
 	emitcode ("inc", "dptr");
 	emitcode ("inc", "dptr");
-	emitcode ("djnz","b,%05d$",lbl->key+100);
+	emitcode ("djnz","b,!tlabel",lbl->key+100);
     } else {
 	symbol *lbl1 = newiTempLabel(NULL);
 	
 	emitcode (";"," Auto increment but no djnz");
-	emitcode ("mov","ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, TRUE));
+	emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, TRUE));
 	emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, TRUE));
-	emitcode ("mov", "dps, #0x21"); 	/* Select DPTR2 & auto-toggle. */
-	emitcode ("","%05d$:",lbl->key+100);
+	emitcode ("mov", "dps,#!constbyte",0x21); 	/* Select DPTR2 & auto-toggle. */
+	emitcode ("","!tlabeldef",lbl->key+100);
 	if (fromc) {
 	    emitcode ("clr","a");
 	    emitcode ("movc", "a,@a+dptr");
@@ -10819,47 +10944,814 @@ static void genMemcpyX2X( iCode *ic, int nparms, operand **parms, int fromc)
 	emitcode ("inc", "dptr");
 	emitcode ("inc", "dptr");
 	emitcode ("mov","a,b");
-	emitcode ("orl","a,ap");
-	emitcode ("jz","%05d$",lbl1->key+100);
-	emitcode ("mov","a,ap");
-	emitcode ("add","a,#0xFF");
-	emitcode ("mov","ap,a");
+	emitcode ("orl","a,_ap");
+	emitcode ("jz","!tlabel",lbl1->key+100);
+	emitcode ("mov","a,_ap");
+	emitcode ("add","a,#!constbyte",0xFF);
+	emitcode ("mov","_ap,a");
 	emitcode ("mov","a,b");
-	emitcode ("addc","a,#0xFF");
+	emitcode ("addc","a,#!constbyte",0xFF);
 	emitcode ("mov","b,a");
-	emitcode ("sjmp","%05d$",lbl->key+100);
-	emitcode ("","%05d$:",lbl1->key+100);
+	emitcode ("sjmp","!tlabel",lbl->key+100);
+	emitcode ("","!tlabeldef",lbl1->key+100);
     }
-    emitcode ("mov", "dps, #0"); 
+    emitcode ("mov", "dps,#0"); 
     freeAsmop (count, NULL, ic, FALSE);
+    unsavermask(rsave);
 
 }
 
 /*-----------------------------------------------------------------*/
-/* genBuiltIn - calls the appropriate function to  generating code */
-/* for a built in function 					   */
+/* genMemsetX - gencode for memSetX data                           */
 /*-----------------------------------------------------------------*/
-static void genBuiltIn (iCode *ic)
+static void genMemsetX(iCode *ic, int nparms, operand **parms)
 {
-    operand *bi_parms[MAX_BUILTIN_ARGS];
-    int nbi_parms;
-    iCode *bi_iCode;
-    symbol *bif;
+    operand *to , *val , *count;
+    symbol *lbl;
+    char *l;
+    int i;
+    bitVect *rsave = NULL;
 
-    /* get all the arguments for a built in function */
-    bi_iCode = getBuiltinParms(ic,&nbi_parms,bi_parms);
+    /* we know it has to be 3 parameters */
+    assert (nparms == 3);
+    
+    to = parms[0];
+    val = parms[1];
+    count = parms[2];
+        
+    /* save DPTR if it needs to be saved */
+    rsave = newBitVect(16);
+    for (i = DPL_IDX ; i <= B_IDX ; i++ ) {
+	    if (bitVectBitValue(ic->rMask,i))
+		    rsave = bitVectSetBit(rsave,i);
+    }
+    rsave = bitVectIntersect(rsave,bitVectCplAnd (bitVectCopy (ic->rMask),
+						  ds390_rUmaskForOp (IC_RESULT(ic))));
+    savermask(rsave);
+
+    aopOp (to, ic, FALSE, FALSE);
+    /* get "to" into DPTR */
+    /* if the operand is already in dptr
+       then we do nothing else we move the value to dptr */
+    if (AOP_TYPE (to) != AOP_STR) {
+	/* if already in DPTR then we need to push */
+	if (AOP_TYPE(to) == AOP_DPTR) {
+	    emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, TRUE));
+	    emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, TRUE));
+	    if (options.model == MODEL_FLAT24)
+		emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE));
+	    emitcode ("pop", "dph");
+	    emitcode ("pop", "dpl");	    
+	} else {
+	    _startLazyDPSEvaluation ();
+	    /* if this is remateriazable */
+	    if (AOP_TYPE (to) == AOP_IMMD) {
+		emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, FALSE));
+	    } else {			/* we need to get it byte by byte */
+		emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, TRUE));
+		emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, TRUE));
+		if (options.model == MODEL_FLAT24) {
+		    emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE));
+		}
+	    }
+	    _endLazyDPSEvaluation ();
+	}
+    }
+    freeAsmop (to, NULL, ic, FALSE);
 
-    /* which function is it */
-    bif = OP_SYMBOL(IC_LEFT(bi_iCode));
-    if (strcmp(bif->name,"__builtin_memcpy_x2x")==0) {
-	genMemcpyX2X(bi_iCode,nbi_parms,bi_parms,0);
-    } else if (strcmp(bif->name,"__builtin_memcpy_c2x")==0) {
-	genMemcpyX2X(bi_iCode,nbi_parms,bi_parms,1);
+    aopOp (val, ic->next->next, FALSE,FALSE);
+    aopOp (count, ic->next->next, FALSE,FALSE);    
+    lbl =newiTempLabel(NULL);
+    /* now for the actual copy */
+    if (AOP_TYPE(count) == AOP_LIT && 
+	(int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) {
+	l = aopGet(AOP (val), 0, FALSE, FALSE, TRUE);
+	emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE));
+	MOVA(l);
+	emitcode ("","!tlabeldef",lbl->key+100);
+	emitcode ("movx", "@dptr,a");
+	emitcode ("inc", "dptr");
+	emitcode ("djnz","b,!tlabel",lbl->key+100);
     } else {
-	werror(E_INTERNAL_ERROR,"unknown builtin function encountered\n");
-	return ;
+	symbol *lbl1 = newiTempLabel(NULL);
+	
+	emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, TRUE));
+	emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, TRUE));
+	emitcode ("","!tlabeldef",lbl->key+100);
+	l = aopGet(AOP (val), 0, FALSE, FALSE, TRUE);
+	MOVA(l);
+	emitcode ("movx", "a,@dptr");
+	emitcode ("inc", "dptr");
+	emitcode ("mov","a,b");
+	emitcode ("orl","a,_ap");
+	emitcode ("jz","!tlabel",lbl1->key+100);
+	emitcode ("mov","a,_ap");
+	emitcode ("add","a,#!constbyte",0xFF);
+	emitcode ("mov","_ap,a");
+	emitcode ("mov","a,b");
+	emitcode ("addc","a,#!constbyte",0xFF);
+	emitcode ("mov","b,a");
+	emitcode ("sjmp","!tlabel",lbl->key+100);
+	emitcode ("","!tlabeldef",lbl1->key+100);
     }
-    return ;    
+    freeAsmop (count, NULL, ic, FALSE);
+    unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genNatLibLoadPrimitive - calls TINI api function to load primitive */
+/*-----------------------------------------------------------------*/
+static void genNatLibLoadPrimitive(iCode *ic, int nparms, operand **parms,int size)
+{
+	bitVect *rsave ;
+	operand *pnum, *result;
+	int i;
+    
+	assert (nparms==1);
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));
+    
+	pnum = parms[0]; 
+	aopOp (pnum, ic, FALSE, FALSE);
+	emitcode ("mov","a,%s",aopGet(AOP(pnum),0,FALSE,FALSE,FALSE));
+	freeAsmop (pnum, NULL, ic, FALSE);
+	emitcode ("lcall","NatLib_LoadPrimitive");
+	aopOp (result=IC_RESULT(ic), ic, FALSE, FALSE);
+	if (aopHasRegs(AOP(result),R0_IDX,R1_IDX) || 
+	    aopHasRegs(AOP(result),R2_IDX,R3_IDX) ) {
+		for (i = (size-1) ; i >= 0 ; i-- ) {
+			emitcode ("push","a%s",javaRet[i]);
+		}
+		for (i=0; i < size ; i++ ) {
+			emitcode ("pop","a%s",aopGet(AOP(result),i,FALSE,FALSE,FALSE));
+		}
+	} else {
+		for (i = 0 ; i < size ; i++ ) {
+			aopPut(AOP(result),javaRet[i],i);
+		}
+	}    
+	freeAsmop (result, NULL, ic, FALSE);
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genNatLibLoadPointer - calls TINI api function to load pointer  */
+/*-----------------------------------------------------------------*/
+static void genNatLibLoadPointer(iCode *ic, int nparms, operand **parms)
+{
+	bitVect *rsave ;
+	operand *pnum, *result;
+	int size = 3;
+	int i;
+    
+	assert (nparms==1);
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));
+    
+	pnum = parms[0]; 
+	aopOp (pnum, ic, FALSE, FALSE);
+	emitcode ("mov","a,%s",aopGet(AOP(pnum),0,FALSE,FALSE,FALSE));
+	freeAsmop (pnum, NULL, ic, FALSE);
+	emitcode ("lcall","NatLib_LoadPointer");
+	aopOp (result=IC_RESULT(ic), ic, FALSE, FALSE);
+	if (AOP_TYPE(result)!=AOP_STR) {
+		for (i = 0 ; i < size ; i++ ) {
+			aopPut(AOP(result),fReturn[i],i);
+		}
+	}    
+	freeAsmop (result, NULL, ic, FALSE);
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genNatLibInstallStateBlock - 				   */
+/*-----------------------------------------------------------------*/
+static void genNatLibInstallStateBlock(iCode *ic, int nparms, 
+				       operand **parms, const char *name)
+{
+	bitVect *rsave ;
+	operand *psb, *handle;
+	assert (nparms==2);
+
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));
+	psb = parms[0];
+	handle = parms[1];
+
+	/* put pointer to state block into DPTR1 */
+	aopOp (psb, ic, FALSE, FALSE);
+	if (AOP_TYPE (psb) == AOP_IMMD) {
+		emitcode ("mov","dps,#1");
+		emitcode ("mov", "dptr,%s", aopGet (AOP (psb), 0, TRUE, FALSE, FALSE));
+		emitcode ("mov","dps,#0");
+	} else {
+		emitcode ("mov","dpl1,%s",aopGet(AOP(psb),0,FALSE,FALSE,FALSE));
+		emitcode ("mov","dph1,%s",aopGet(AOP(psb),1,FALSE,FALSE,FALSE));
+		emitcode ("mov","dpx1,%s",aopGet(AOP(psb),2,FALSE,FALSE,FALSE));
+	}
+	freeAsmop (psb, NULL, ic, FALSE);
+
+	/* put libraryID into DPTR */
+	emitcode ("mov","dptr,#LibraryID");
+
+	/* put handle into r3:r2 */
+	aopOp (handle, ic, FALSE, FALSE);
+	if (aopHasRegs(AOP(handle),R2_IDX,R3_IDX)) {
+		emitcode ("push","%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE));	
+		emitcode ("push","%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE));
+		emitcode ("pop","ar3");
+		emitcode ("pop","ar2");
+	} else {	
+		emitcode ("mov","r2,%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE));	
+		emitcode ("mov","r3,%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE));
+	}
+	freeAsmop (psb, NULL, ic, FALSE);
+
+	/* make the call */
+	emitcode ("lcall","NatLib_Install%sStateBlock",name);
+
+	/* put return value into place*/
+	_G.accInUse++;
+	aopOp (IC_RESULT(ic), ic, FALSE, FALSE);
+	_G.accInUse--;
+	aopPut(AOP(IC_RESULT(ic)),"a",0);
+	freeAsmop (IC_RESULT(ic), NULL, ic, FALSE);
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genNatLibRemoveStateBlock -                                     */
+/*-----------------------------------------------------------------*/
+static void genNatLibRemoveStateBlock(iCode *ic,int nparms,const char *name)
+{
+	bitVect *rsave ;
+
+	assert(nparms==0);
+
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));
+
+	/* put libraryID into DPTR */
+	emitcode ("mov","dptr,#LibraryID");
+	/* make the call */
+	emitcode ("lcall","NatLib_Remove%sStateBlock",name);
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genNatLibGetStateBlock -                                        */
+/*-----------------------------------------------------------------*/
+static void genNatLibGetStateBlock(iCode *ic,int nparms,
+				   operand **parms,const char *name)
+{
+	bitVect *rsave ;
+	symbol *lbl = newiTempLabel(NULL);
+	
+	assert(nparms==0);
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));
+
+	/* put libraryID into DPTR */
+	emitcode ("mov","dptr,#LibraryID");
+	/* make the call */
+	emitcode ("lcall","NatLib_Remove%sStateBlock",name);
+	emitcode ("jnz","!tlabel",lbl->key+100);
+
+	/* put return value into place */
+	aopOp(IC_RESULT(ic),ic,FALSE,FALSE);
+	if (aopHasRegs(AOP(IC_RESULT(ic)),R2_IDX,R3_IDX)) {
+		emitcode ("push","ar3");
+		emitcode ("push","ar2");
+		emitcode ("pop","%s",aopGet(AOP(IC_RESULT(ic)),0,FALSE,TRUE,FALSE));
+		emitcode ("pop","%s",aopGet(AOP(IC_RESULT(ic)),1,FALSE,TRUE,FALSE));
+	} else {
+		aopPut(AOP(IC_RESULT(ic)),"r2",0);
+		aopPut(AOP(IC_RESULT(ic)),"r3",1);
+	}
+	freeAsmop (IC_RESULT(ic), NULL, ic, FALSE);
+	emitcode ("","!tlabeldef",lbl->key+100);
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genMMMalloc -                                                   */
+/*-----------------------------------------------------------------*/
+static void genMMMalloc (iCode *ic,int nparms, operand **parms,
+			 int size, const char *name)
+{
+	bitVect *rsave ;
+	operand *bsize;
+	symbol *rsym;
+	symbol *lbl = newiTempLabel(NULL);
+
+	assert (nparms == 1);
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));	
+	
+	bsize=parms[0];
+	aopOp (bsize,ic,FALSE,FALSE);
+
+	/* put the size in R4-R2 */
+	if (aopHasRegs(AOP(bsize),R2_IDX, (size==3 ? R4_IDX: R3_IDX))) {
+		emitcode("push","%s",aopGet(AOP(bsize),0,FALSE,TRUE,FALSE));
+		emitcode("push","%s",aopGet(AOP(bsize),1,FALSE,TRUE,FALSE));
+		if (size==3) {
+			emitcode("push","%s",aopGet(AOP(bsize),2,FALSE,TRUE,FALSE));
+			emitcode("pop","ar4");
+		}
+		emitcode("pop","ar3");
+		emitcode("pop","ar2");		
+	} else {
+		emitcode ("mov","r2,%s",aopGet(AOP(bsize),0,FALSE,TRUE,FALSE));
+		emitcode ("mov","r3,%s",aopGet(AOP(bsize),1,FALSE,TRUE,FALSE));
+		if (size==3) {
+			emitcode("mov","r4,%s",aopGet(AOP(bsize),2,FALSE,TRUE,FALSE));
+		}
+	}
+	freeAsmop (bsize, NULL, ic, FALSE);
+
+	/* make the call */
+	emitcode ("lcall","MM_%s",name);
+	emitcode ("jz","!tlabel",lbl->key+100);
+	emitcode ("mov","r2,#!constbyte",0xff);
+	emitcode ("mov","r3,#!constbyte",0xff);
+	emitcode ("","!tlabeldef",lbl->key+100);
+	/* we don't care about the pointer : we just save the handle */
+	rsym = OP_SYMBOL(IC_RESULT(ic));
+	if (rsym->liveFrom != rsym->liveTo) {
+		aopOp(IC_RESULT(ic),ic,FALSE,FALSE);
+		if (aopHasRegs(AOP(IC_RESULT(ic)),R2_IDX,R3_IDX)) {
+			emitcode ("push","ar3");
+			emitcode ("push","ar2");
+			emitcode ("pop","%s",aopGet(AOP(IC_RESULT(ic)),0,FALSE,TRUE,FALSE));
+			emitcode ("pop","%s",aopGet(AOP(IC_RESULT(ic)),1,FALSE,TRUE,FALSE));
+		} else {
+			aopPut(AOP(IC_RESULT(ic)),"r2",0);
+			aopPut(AOP(IC_RESULT(ic)),"r3",1);
+		}
+		freeAsmop (IC_RESULT(ic), NULL, ic, FALSE);
+	}
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genMMDeref -                                                    */
+/*-----------------------------------------------------------------*/
+static void genMMDeref (iCode *ic,int nparms, operand **parms)
+{
+	bitVect *rsave ;
+	operand *handle;
+
+	assert (nparms == 1);
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));	
+	
+	handle=parms[0];
+	aopOp (handle,ic,FALSE,FALSE);
+
+	/* put the size in R4-R2 */
+	if (aopHasRegs(AOP(handle),R2_IDX,R3_IDX)) {
+		emitcode("push","%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE));
+		emitcode("push","%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE));
+		emitcode("pop","ar3");
+		emitcode("pop","ar2");		
+	} else {
+		emitcode ("mov","r2,%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE));
+		emitcode ("mov","r3,%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE));
+	}
+	freeAsmop (handle, NULL, ic, FALSE);
+
+	/* make the call */
+	emitcode ("lcall","MM_Deref");
+	
+	{
+		symbol *rsym = OP_SYMBOL(IC_RESULT(ic));
+		if (rsym->liveFrom != rsym->liveTo) {			
+			aopOp (IC_RESULT(ic),ic,FALSE,FALSE);
+			if (AOP_TYPE(IC_RESULT(ic)) != AOP_STR) {
+				aopPut(AOP(IC_RESULT(ic)),"dpl",0);
+				aopPut(AOP(IC_RESULT(ic)),"dph",1);
+				aopPut(AOP(IC_RESULT(ic)),"dpx",2);
+			}
+		}
+	}
+	freeAsmop (IC_RESULT(ic), NULL, ic, FALSE);
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genMMUnrestrictedPersist -                                      */
+/*-----------------------------------------------------------------*/
+static void genMMUnrestrictedPersist(iCode *ic,int nparms, operand **parms)
+{
+	bitVect *rsave ;
+	operand *handle;
+
+	assert (nparms == 1);
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));	
+	
+	handle=parms[0];
+	aopOp (handle,ic,FALSE,FALSE);
+
+	/* put the size in R3-R2 */
+	if (aopHasRegs(AOP(handle),R2_IDX,R3_IDX)) {
+		emitcode("push","%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE));
+		emitcode("push","%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE));
+		emitcode("pop","ar3");
+		emitcode("pop","ar2");		
+	} else {
+		emitcode ("mov","r2,%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE));
+		emitcode ("mov","r3,%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE));
+	}
+	freeAsmop (handle, NULL, ic, FALSE);
+
+	/* make the call */
+	emitcode ("lcall","MM_UnrestrictedPersist");
+
+	{
+		symbol *rsym = OP_SYMBOL(IC_RESULT(ic));
+		if (rsym->liveFrom != rsym->liveTo) {	
+			aopOp (IC_RESULT(ic),ic,FALSE,FALSE);
+			aopPut(AOP(IC_RESULT(ic)),"a",0);
+			freeAsmop (IC_RESULT(ic), NULL, ic, FALSE);
+		}
+	}
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genSystemExecJavaProcess -                                      */
+/*-----------------------------------------------------------------*/
+static void genSystemExecJavaProcess(iCode *ic,int nparms, operand **parms)
+{
+	bitVect *rsave ;
+	operand *handle, *pp;
+
+	assert (nparms==2);
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));	
+	
+	pp = parms[0];
+	handle = parms[1];
+	
+	/* put the handle in R3-R2 */
+	aopOp (handle,ic,FALSE,FALSE);
+	if (aopHasRegs(AOP(handle),R2_IDX,R3_IDX)) {
+		emitcode("push","%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE));
+		emitcode("push","%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE));
+		emitcode("pop","ar3");
+		emitcode("pop","ar2");		
+	} else {
+		emitcode ("mov","r2,%s",aopGet(AOP(handle),0,FALSE,TRUE,FALSE));
+		emitcode ("mov","r3,%s",aopGet(AOP(handle),1,FALSE,TRUE,FALSE));
+	}
+	freeAsmop (handle, NULL, ic, FALSE);
+	
+	/* put pointer in DPTR */
+	aopOp (pp,ic,FALSE,FALSE);
+	if (AOP_TYPE(pp) == AOP_IMMD) {
+		emitcode ("mov", "dptr,%s", aopGet (AOP (pp), 0, TRUE, FALSE, FALSE));		
+	} else if (AOP_TYPE(pp) != AOP_STR) { /* not already in dptr */
+		emitcode ("mov","dpl,%s",aopGet(AOP(pp),0,FALSE,FALSE,FALSE));
+		emitcode ("mov","dph,%s",aopGet(AOP(pp),1,FALSE,FALSE,FALSE));
+		emitcode ("mov","dpx,%s",aopGet(AOP(pp),2,FALSE,FALSE,FALSE));
+	}
+	freeAsmop (handle, NULL, ic, FALSE);
+
+	/* make the call */
+	emitcode ("lcall","System_ExecJavaProcess");
+	
+	/* put result in place */
+	{
+		symbol *rsym = OP_SYMBOL(IC_RESULT(ic));
+		if (rsym->liveFrom != rsym->liveTo) {	
+			aopOp (IC_RESULT(ic),ic,FALSE,FALSE);
+			aopPut(AOP(IC_RESULT(ic)),"a",0);
+			freeAsmop (IC_RESULT(ic), NULL, ic, FALSE);
+		}
+	}
+	
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genSystemRTCRegisters -                                         */
+/*-----------------------------------------------------------------*/
+static void genSystemRTCRegisters(iCode *ic,int nparms, operand **parms,
+				  char *name)
+{
+	bitVect *rsave ;
+	operand *pp;
+
+	assert (nparms==1);
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));	
+	
+	pp=parms[0];
+	/* put pointer in DPTR */
+	aopOp (pp,ic,FALSE,FALSE);
+	if (AOP_TYPE (pp) == AOP_IMMD) {
+		emitcode ("mov","dps,#1");
+		emitcode ("mov", "dptr,%s", aopGet (AOP (pp), 0, TRUE, FALSE, FALSE));
+		emitcode ("mov","dps,#0");
+	} else {
+		emitcode ("mov","dpl1,%s",aopGet(AOP(pp),0,FALSE,FALSE,FALSE));
+		emitcode ("mov","dph1,%s",aopGet(AOP(pp),1,FALSE,FALSE,FALSE));
+		emitcode ("mov","dpx1,%s",aopGet(AOP(pp),2,FALSE,FALSE,FALSE));
+	}
+	freeAsmop (pp, NULL, ic, FALSE);
+
+	/* make the call */
+	emitcode ("lcall","System_%sRTCRegisters",name);
+
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genSystemThreadSleep -                                          */
+/*-----------------------------------------------------------------*/
+static void genSystemThreadSleep(iCode *ic,int nparms, operand **parms, char *name)
+{
+	bitVect *rsave ;
+	operand *to, *s;
+
+	assert (nparms==1);
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));	
+
+	to = parms[0];
+	aopOp(to,ic,FALSE,FALSE);
+	if (aopHasRegs(AOP(to),R2_IDX,R3_IDX) ||
+	    aopHasRegs(AOP(to),R0_IDX,R1_IDX) ) {
+		emitcode ("push","%s",aopGet(AOP(to),0,FALSE,TRUE,FALSE));
+		emitcode ("push","%s",aopGet(AOP(to),1,FALSE,TRUE,FALSE));
+		emitcode ("push","%s",aopGet(AOP(to),2,FALSE,TRUE,FALSE));
+		emitcode ("push","%s",aopGet(AOP(to),3,FALSE,TRUE,FALSE));
+		emitcode ("pop","ar3");
+		emitcode ("pop","ar2");
+		emitcode ("pop","ar1");
+		emitcode ("pop","ar0");
+	} else {
+		emitcode ("mov","r0,%s",aopGet(AOP(to),0,FALSE,TRUE,FALSE));
+		emitcode ("mov","r1,%s",aopGet(AOP(to),1,FALSE,TRUE,FALSE));
+		emitcode ("mov","r2,%s",aopGet(AOP(to),2,FALSE,TRUE,FALSE));
+		emitcode ("mov","r3,%s",aopGet(AOP(to),3,FALSE,TRUE,FALSE));
+	}
+	freeAsmop (to, NULL, ic, FALSE);
+
+	/* suspend in acc */
+	s = parms[1];
+	aopOp(s,ic,FALSE,FALSE);
+	emitcode ("mov","a,%s",aopGet(AOP(s),0,FALSE,TRUE,FALSE));
+	freeAsmop (s, NULL, ic, FALSE);
+
+	/* make the call */
+	emitcode ("lcall","System_%s",name);
+
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genSystemThreadResume -                                         */
+/*-----------------------------------------------------------------*/
+static void genSystemThreadResume(iCode *ic,int nparms, operand **parms)
+{
+	bitVect *rsave ;
+	operand *tid,*pid;
+
+	assert (nparms==2);
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));
+	
+	tid = parms[0];
+	pid = parms[1];
+	
+	/* PID in R0 */
+	aopOp(pid,ic,FALSE,FALSE);
+	emitcode ("mov","r0,%s",aopGet(AOP(pid),0,FALSE,TRUE,FALSE));
+	freeAsmop (pid, NULL, ic, FALSE);
+	
+	/* tid into ACC */
+	aopOp(tid,ic,FALSE,FALSE);
+	emitcode ("mov","a,%s",aopGet(AOP(tid),0,FALSE,TRUE,FALSE));
+	freeAsmop (tid, NULL, ic, FALSE);
+	
+	emitcode ("lcall","System_ThreadResume");
+
+	/* put result into place */
+	{
+		symbol *rsym = OP_SYMBOL(IC_RESULT(ic));
+		if (rsym->liveFrom != rsym->liveTo) {	
+			aopOp (IC_RESULT(ic),ic,FALSE,FALSE);
+			aopPut(AOP(IC_RESULT(ic)),"a",0);
+			freeAsmop (IC_RESULT(ic), NULL, ic, FALSE);
+		}
+	}
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genSystemProcessResume -                                        */
+/*-----------------------------------------------------------------*/
+static void genSystemProcessResume(iCode *ic,int nparms, operand **parms)
+{
+	bitVect *rsave ;
+	operand *pid;
+
+	assert (nparms==1);
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));
+	
+	pid = parms[0];
+	
+	/* pid into ACC */
+	aopOp(pid,ic,FALSE,FALSE);
+	emitcode ("mov","a,%s",aopGet(AOP(pid),0,FALSE,TRUE,FALSE));
+	freeAsmop (pid, NULL, ic, FALSE);
+	
+	emitcode ("lcall","System_ProcessResume");
+
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genSystem -                                                     */
+/*-----------------------------------------------------------------*/
+static void genSystem (iCode *ic,int nparms,char *name)
+{
+	assert(nparms == 0);
+
+	emitcode ("lcall","System_%s",name);
+}
+
+/*-----------------------------------------------------------------*/
+/* genSystemPoll -                                                  */
+/*-----------------------------------------------------------------*/
+static void genSystemPoll(iCode *ic,int nparms, operand **parms,char *name)
+{
+	bitVect *rsave ;
+	operand *fp;
+
+	assert (nparms==1);
+	/* save registers that need to be saved */
+	savermask(rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
+					 ds390_rUmaskForOp (IC_RESULT(ic))));
+
+	fp = parms[0];
+	aopOp (fp,ic,FALSE,FALSE);
+	if (AOP_TYPE (fp) == AOP_IMMD) {
+		emitcode ("mov", "dptr,%s", aopGet (AOP (fp), 0, TRUE, FALSE, FALSE));
+	} else if (AOP_TYPE(fp) != AOP_STR) { /* not already in dptr */
+		emitcode ("mov","dpl,%s",aopGet(AOP(fp),0,FALSE,FALSE,FALSE));
+		emitcode ("mov","dph,%s",aopGet(AOP(fp),1,FALSE,FALSE,FALSE));
+		emitcode ("mov","dpx,%s",aopGet(AOP(fp),2,FALSE,FALSE,FALSE));
+	}
+	freeAsmop (fp, NULL, ic, FALSE);
+
+	emitcode ("lcall","System_%sPoll",name);
+
+	/* put result into place */
+	{
+		symbol *rsym = OP_SYMBOL(IC_RESULT(ic));
+		if (rsym->liveFrom != rsym->liveTo) {	
+			aopOp (IC_RESULT(ic),ic,FALSE,FALSE);
+			aopPut(AOP(IC_RESULT(ic)),"a",0);
+			freeAsmop (IC_RESULT(ic), NULL, ic, FALSE);
+		}
+	}
+	unsavermask(rsave);
+}
+
+/*-----------------------------------------------------------------*/
+/* genSystemGetCurrentID -                                         */
+/*-----------------------------------------------------------------*/
+static void genSystemGetCurrentID(iCode *ic,int nparms, operand **parms,char *name)
+{
+	assert (nparms==0);
+
+	emitcode ("lcall","System_GetCurrent%sId",name);
+	/* put result into place */
+	{
+		symbol *rsym = OP_SYMBOL(IC_RESULT(ic));
+		if (rsym->liveFrom != rsym->liveTo) {	
+			aopOp (IC_RESULT(ic),ic,FALSE,FALSE);
+			aopPut(AOP(IC_RESULT(ic)),"a",0);
+			freeAsmop (IC_RESULT(ic), NULL, ic, FALSE);
+		}
+	}
+}
+
+/*-----------------------------------------------------------------*/
+/* genBuiltIn - calls the appropriate function to  generating code */
+/* for a built in function 					   */
+/*-----------------------------------------------------------------*/
+static void genBuiltIn (iCode *ic)
+{
+	operand *bi_parms[MAX_BUILTIN_ARGS];
+	int nbi_parms;
+	iCode *bi_iCode;
+	symbol *bif;
+
+	/* get all the arguments for a built in function */
+	bi_iCode = getBuiltinParms(ic,&nbi_parms,bi_parms);
+
+	/* which function is it */
+	bif = OP_SYMBOL(IC_LEFT(bi_iCode));
+	if (strcmp(bif->name,"__builtin_memcpy_x2x")==0) {
+		genMemcpyX2X(bi_iCode,nbi_parms,bi_parms,0);
+	} else if (strcmp(bif->name,"__builtin_memcpy_c2x")==0) {
+		genMemcpyX2X(bi_iCode,nbi_parms,bi_parms,1);
+	} else if (strcmp(bif->name,"__builtin_memset_x")==0) {
+		genMemsetX(bi_iCode,nbi_parms,bi_parms);
+	} else if (strcmp(bif->name,"NatLib_LoadByte")==0) {
+		genNatLibLoadPrimitive(bi_iCode,nbi_parms,bi_parms,1);
+	} else if (strcmp(bif->name,"NatLib_LoadShort")==0) {
+		genNatLibLoadPrimitive(bi_iCode,nbi_parms,bi_parms,2);
+	} else if (strcmp(bif->name,"NatLib_LoadInt")==0) {
+		genNatLibLoadPrimitive(bi_iCode,nbi_parms,bi_parms,4);
+	} else if (strcmp(bif->name,"NatLib_LoadPointer")==0) {
+		genNatLibLoadPointer(bi_iCode,nbi_parms,bi_parms);
+	} else if (strcmp(bif->name,"NatLib_InstallImmutableStateBlock")==0) {
+		genNatLibInstallStateBlock(bi_iCode,nbi_parms,bi_parms,"Immutable");
+	} else if (strcmp(bif->name,"NatLib_InstallEphemeralStateBlock")==0) {
+		genNatLibInstallStateBlock(bi_iCode,nbi_parms,bi_parms,"Ephemeral");
+	} else if (strcmp(bif->name,"NatLib_RemoveImmutableStateBlock")==0) {
+		genNatLibRemoveStateBlock(bi_iCode,nbi_parms,"Immutable");
+	} else if (strcmp(bif->name,"NatLib_RemoveEphemeralStateBlock")==0) {
+		genNatLibRemoveStateBlock(bi_iCode,nbi_parms,"Ephemeral");
+	} else if (strcmp(bif->name,"NatLib_GetImmutableStateBlock")==0) {
+		genNatLibGetStateBlock(bi_iCode,nbi_parms,bi_parms,"Immutable");
+	} else if (strcmp(bif->name,"NatLib_GetEphemeralStateBlock")==0) {
+		genNatLibGetStateBlock(bi_iCode,nbi_parms,bi_parms,"Ephemeral");
+	} else if (strcmp(bif->name,"MM_XMalloc")==0) {
+		genMMMalloc(bi_iCode,nbi_parms,bi_parms,3,"XMalloc");
+	} else if (strcmp(bif->name,"MM_Malloc")==0) {
+		genMMMalloc(bi_iCode,nbi_parms,bi_parms,2,"Malloc");
+	} else if (strcmp(bif->name,"MM_ApplicationMalloc")==0) {
+		genMMMalloc(bi_iCode,nbi_parms,bi_parms,2,"ApplicationMalloc");
+	} else if (strcmp(bif->name,"MM_Free")==0) {
+		genMMMalloc(bi_iCode,nbi_parms,bi_parms,2,"Free");
+	} else if (strcmp(bif->name,"MM_Deref")==0) {
+		genMMDeref(bi_iCode,nbi_parms,bi_parms);
+	} else if (strcmp(bif->name,"MM_UnrestrictedPersist")==0) {
+		genMMUnrestrictedPersist(bi_iCode,nbi_parms,bi_parms);
+	} else if (strcmp(bif->name,"System_ExecJavaProcess")==0) {
+		genSystemExecJavaProcess(bi_iCode,nbi_parms,bi_parms);
+	} else if (strcmp(bif->name,"System_GetRTCRegisters")==0) {
+		genSystemRTCRegisters(bi_iCode,nbi_parms,bi_parms,"Get");
+	} else if (strcmp(bif->name,"System_SetRTCRegisters")==0) {
+		genSystemRTCRegisters(bi_iCode,nbi_parms,bi_parms,"Set");
+	} else if (strcmp(bif->name,"System_ThreadSleep")==0) {
+		genSystemThreadSleep(bi_iCode,nbi_parms,bi_parms,"ThreadSleep");
+	} else if (strcmp(bif->name,"System_ThreadSleep_ExitCriticalSection")==0) {
+		genSystemThreadSleep(bi_iCode,nbi_parms,bi_parms,"ThreadSleep_ExitCriticalSection");
+	} else if (strcmp(bif->name,"System_ProcessSleep")==0) {
+		genSystemThreadSleep(bi_iCode,nbi_parms,bi_parms,"ProcessSleep");
+	} else if (strcmp(bif->name,"System_ProcessSleep_ExitCriticalSection")==0) {
+		genSystemThreadSleep(bi_iCode,nbi_parms,bi_parms,"ProcessSleep_ExitCriticalSection");
+	} else if (strcmp(bif->name,"System_ThreadResume")==0) {
+		genSystemThreadResume(bi_iCode,nbi_parms,bi_parms);
+	} else if (strcmp(bif->name,"System_SaveThread")==0) {
+		genSystemThreadResume(bi_iCode,nbi_parms,bi_parms);
+	} else if (strcmp(bif->name,"System_ThreadResume")==0) {
+		genSystemThreadResume(bi_iCode,nbi_parms,bi_parms);
+	} else if (strcmp(bif->name,"System_ProcessResume")==0) {
+		genSystemProcessResume(bi_iCode,nbi_parms,bi_parms);
+	} else if (strcmp(bif->name,"System_SaveJavaThreadState")==0) {
+		genSystem(bi_iCode,nbi_parms,"SaveJavaThreadState");
+	} else if (strcmp(bif->name,"System_RestoreJavaThreadState")==0) {
+		genSystem(bi_iCode,nbi_parms,"RestoreJavaThreadState");
+	} else if (strcmp(bif->name,"System_ProcessYield")==0) {
+		genSystem(bi_iCode,nbi_parms,"ProcessYield");
+	} else if (strcmp(bif->name,"System_ProcessSuspend")==0) {
+		genSystem(bi_iCode,nbi_parms,"ProcessSuspend");
+	} else if (strcmp(bif->name,"System_RegisterPoll")==0) {
+		genSystemPoll(bi_iCode,nbi_parms,bi_parms,"Register");
+	} else if (strcmp(bif->name,"System_RemovePoll")==0) {
+		genSystemPoll(bi_iCode,nbi_parms,bi_parms,"Remove");
+	} else if (strcmp(bif->name,"System_GetCurrentThreadId")==0) {
+		genSystemGetCurrentID(bi_iCode,nbi_parms,bi_parms,"Thread");
+	} else if (strcmp(bif->name,"System_GetCurrentProcessId")==0) {
+		genSystemGetCurrentID(bi_iCode,nbi_parms,bi_parms,"Process");
+	} else {
+		werror(E_INTERNAL_ERROR,__FILE__,__LINE__,"unknown builtin function encountered\n");
+		return ;
+	}
+	return ;    
 }
 
 /*-----------------------------------------------------------------*/
@@ -11078,12 +11970,12 @@ gen390Code (iCode * lic)
 	  break;
 
 	case GET_VALUE_AT_ADDRESS:
-	  genPointerGet (ic,hasInc(IC_LEFT(ic),ic));
+	  genPointerGet (ic,hasInc(IC_LEFT(ic),ic, getSize(operandType(IC_LEFT(ic)))));
 	  break;
 
 	case '=':
 	  if (POINTER_SET (ic))
-	    genPointerSet (ic,hasInc(IC_RESULT(ic),ic));
+	    genPointerSet (ic,hasInc(IC_RESULT(ic),ic,getSize(operandType(IC_RIGHT(ic)))));
 	  else
 	    genAssign (ic);
 	  break;