X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fds390%2Fgen.c;h=c412390a5978e259ab811682b5918e080b9546ec;hb=7e96e3019db9e62aefa193c1aeacd1a7d8a2e65f;hp=1cf40126b348e97bf7c6490a1f18184af97ec885;hpb=df203a96d87ea3322e836e3dd980f64b80b234e7;p=fw%2Fsdcc

diff --git a/src/ds390/gen.c b/src/ds390/gen.c
index 1cf40126..c412390a 100644
--- a/src/ds390/gen.c
+++ b/src/ds390/gen.c
@@ -36,23 +36,6 @@
 #include "SDCCglobl.h"
 #include "newalloc.h"
 
-#ifdef HAVE_SYS_ISA_DEFS_H
-#include <sys/isa_defs.h>
-#else
-#ifdef HAVE_MACHINE_ENDIAN_H
-#include <machine/endian.h>
-#else
-#ifdef HAVE_ENDIAN_H
-#include <endian.h>
-#else
-#if !defined(__BORLANDC__) && !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__CYGWIN__)
-#warning "Cannot determine ENDIANESS of this machine assuming LITTLE_ENDIAN"
-#warning "If you running sdcc on an INTEL 80x86 Platform you are okay"
-#endif
-#endif
-#endif
-#endif
-
 #define BETTER_LITERAL_SHIFT
 
 char *aopLiteral (value * val, int offset);
@@ -109,14 +92,9 @@ static void saveRBank (int, iCode *, bool);
                          (IC_RESULT(x) && IC_RESULT(x)->aop && \
                          IC_RESULT(x)->aop->type == AOP_STK )
 
-/* #define MOVA(x) if (strcmp(x,"a") && strcmp(x,"acc")) emitcode("mov","a,%s",x); */
-#define MOVA(x) { char *_mova_tmp = strdup(x); \
-                 if (strcmp(_mova_tmp,"a") && strcmp(_mova_tmp,"acc")) \
-                 { \
-                    emitcode("mov","a,%s",_mova_tmp); \
-                 } \
-                 free(_mova_tmp); \
-                }
+#define MOVA(x) _movA(x)
+#define MOVB(x) _movB(x)
+                
 #define CLRC    emitcode("clr","c")
 #define SETC    emitcode("setb","c")
 
@@ -202,14 +180,38 @@ emitcode (char *inst, char *fmt,...)
     va_end (ap);
 }
 
+//
+// Move the passed value into A unless it is already there.
+// 
+static void
+_movA(const char *s)
+{
+    if (strcmp(s,"a") && strcmp(s,"acc"))
+    { 
+	emitcode("mov","a,%s",s);
+    } 
+}
+
+//
+// Move the passed value into B unless it is already there.
+// 
+static void
+_movB(const char *s)
+{
+    if (strcmp(s,"b"))
+    { 
+	emitcode("mov","b,%s",s);
+    } 
+}
+
 /*-----------------------------------------------------------------*/
 /* getFreePtr - returns r0 or r1 whichever is free or can be pushed */
 /*-----------------------------------------------------------------*/
 static regs *
 getFreePtr (iCode * ic, asmop ** aopp, bool result)
 {
-  bool r0iu = FALSE, r1iu = FALSE;
-  bool r0ou = FALSE, r1ou = FALSE;
+  bool r0iu, r1iu;
+  bool r0ou, r1ou;
 
   /* the logic: if r0 & r1 used in the instruction
      then we are in trouble otherwise */
@@ -291,6 +293,8 @@ endOfWorld:
   werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
 	  "getFreePtr should never reach here");
   exit (1);
+    
+  return NULL; // notreached, but makes compiler happy.
 }
 
 /*-----------------------------------------------------------------*/
@@ -514,14 +518,20 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2)
 	if (stack_val < 0 && stack_val > -5) { /* between -5 & -1 */
 	    if (useDP2) {
 		if (options.model == MODEL_FLAT24)
-		    emitcode ("mov", "dpx1,#!constbyte", (options.stack_loc >> 16) & 0xff);
-		TR_DPTR("#2");
+		{
+		    emitcode ("mov", "dpx1,#!constbyte",
+			      (options.stack_loc >> 16) & 0xff);
+		}
 		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", "dpx,#!constbyte",
+			      (options.stack_loc >> 16) & 0xff);
+		}
 		emitcode ("mov", "dph,_bpx+1");
 		emitcode ("mov", "dpl,_bpx");
 	    }
@@ -547,13 +557,18 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2)
 	    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", "dpx1,#!constbyte",
+			      (options.stack_loc >> 16) & 0xff);
+		}
 		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", "dpx,#!constbyte",
+			      (options.stack_loc >> 16) & 0xff);
+		}
 		emitcode ("mov", "dph,a");
 		emitcode ("mov", "dpl,b");
 	    }
@@ -590,8 +605,7 @@ aopForSym (iCode * ic, symbol * sym, bool result, bool useDP2)
   if (IS_FUNC (sym->type))
     {
       sym->aop = aop = newAsmop (AOP_IMMD);
-      aop->aopu.aop_immd.aop_immd1 = Safe_calloc (1, strlen (sym->rname) + 1);
-      strcpy (aop->aopu.aop_immd.aop_immd1, sym->rname);
+      aop->aopu.aop_immd.aop_immd1 = Safe_strdup(sym->rname);	
       aop->size = FPTRSIZE;
       return aop;
     }
@@ -652,24 +666,32 @@ aopForRemat (symbol * sym)
     }
 
   if (val)
-    sprintf (buffer, "(%s %c 0x%04x)",
-	     OP_SYMBOL (IC_LEFT (ic))->rname,
-	     val >= 0 ? '+' : '-',
-	     abs (val) & 0xffff);
-  else {
+  {
+      SNPRINTF (buffer, sizeof(buffer),
+		"(%s %c 0x%04x)",
+		OP_SYMBOL (IC_LEFT (ic))->rname,
+		val >= 0 ? '+' : '-',
+		abs (val) & 0xffffff);
+  }
+  else 
+  {
       if (IS_ASSIGN_ICODE(ic) && isOperandLiteral(IC_RIGHT(ic)))
-	  sprintf(buffer,"0x%x",(int) operandLitValue (IC_RIGHT (ic)));
+      {
+	  SNPRINTF(buffer, sizeof(buffer), 
+		   "0x%x",(int) operandLitValue (IC_RIGHT (ic)));
+      }
       else
-	  strcpy (buffer, OP_SYMBOL (IC_LEFT (ic))->rname);
+      {
+	  strncpyz (buffer, OP_SYMBOL (IC_LEFT (ic))->rname, sizeof(buffer));
+      }
   }
 
-  aop->aopu.aop_immd.aop_immd1 = Safe_calloc (1, strlen (buffer) + 1);
-  strcpy (aop->aopu.aop_immd.aop_immd1, buffer);
+  aop->aopu.aop_immd.aop_immd1 = Safe_strdup(buffer);  
   /* set immd2 field if required */
   if (aop->aopu.aop_immd.from_cast_remat) 
   {
       tsprintf(buffer, sizeof(buffer), "#!constbyte",ptr_type);
-      aop->aopu.aop_immd.aop_immd2 = Safe_strdup(buffer);  
+      aop->aopu.aop_immd.aop_immd2 = Safe_strdup(buffer);
   }
 
   return aop;
@@ -1065,24 +1087,25 @@ dealloc:
     }
 }
 
-/*------------------------------------------------------------------*/
-/* aopGet - for fetching value of the aop                           */
-/*                    */
-/* Set canClobberACC if you are sure it is OK to clobber the value  */
-/* in the accumulator. Set it FALSE otherwise; FALSE is always safe, */
-/* just less efficient.               */
-/*------------------------------------------------------------------*/
+#define DEFAULT_ACC_WARNING 0
+static int saveAccWarn = DEFAULT_ACC_WARNING;
+
+/*-------------------------------------------------------------------*/
+/* aopGet - for fetching value of the aop                            */
+/*                    						     */
+/* Set saveAcc to NULL if you are sure it is OK to clobber the value */
+/* in the accumulator. Set it to the name of a free register         */
+/* if acc must be preserved; the register will be used to preserve   */
+/* acc temporarily and to return the result byte.		     */
+/*-------------------------------------------------------------------*/
 
 static char *
-aopGet (asmop * aop,
-	int offset,
-	bool bit16,
-	bool dname,
-	bool canClobberACC)
+aopGet (asmop *aop,
+	int   offset,
+	bool  bit16,
+	bool  dname,
+	char  *saveAcc)
 {
-  //char *s = buffer;
-  //char *rs;
-
   /* offset is greater than
      size then zero */
   if (offset > (aop->size - 1) &&
@@ -1127,11 +1150,18 @@ aopGet (asmop * aop,
       if (aop->type == AOP_DPTR2)
 	{
 	  genSetDPTR (1);
-	  if (!canClobberACC)
-	    {
-		    TR_AP("#1");
-		    emitcode ("xch", "a, %s", DP2_RESULT_REG);
-	    }
+	}
+	
+      if (saveAcc)
+	{
+	    TR_AP("#1");
+//	    if (aop->type != AOP_DPTR2)
+//	    {
+//		if (saveAccWarn) { fprintf(stderr, "saveAcc for DPTR...\n"); }
+//		emitcode(";", "spanky: saveAcc for DPTR");
+//	    }
+	    
+	    emitcode ("xch", "a, %s", saveAcc);
 	}
 
       _flushLazyDPS ();
@@ -1162,12 +1192,18 @@ aopGet (asmop * aop,
       if (aop->type == AOP_DPTR2)
 	{
 	  genSetDPTR (0);
-	  if (!canClobberACC)
-	    {
+	}
+	
+	if (saveAcc)
+	{
        TR_AP("#2");
-	      emitcode ("xch", "a, %s", DP2_RESULT_REG);
-	      return DP2_RESULT_REG;
-	    }
+	      emitcode ("xch", "a, %s", saveAcc);
+//	      if (strcmp(saveAcc, "_ap"))
+//	      {
+//		  emitcode(";", "spiffy: non _ap return from aopGet.");
+//	      }
+		  
+	      return saveAcc;
 	}
       return (dname ? "acc" : "a");
 
@@ -1260,6 +1296,8 @@ aopGet (asmop * aop,
   werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
 	  "aopget got unsupported aop->type");
   exit (1);
+    
+  return NULL;  // not reached, but makes compiler happy.
 }
 /*-----------------------------------------------------------------*/
 /* aopPut - puts a string for a aop                                */
@@ -1267,8 +1305,6 @@ aopGet (asmop * aop,
 static void
 aopPut (asmop * aop, char *s, int offset)
 {
-  char *d = buffer;
-
   if (aop->size && offset > (aop->size - 1))
     {
       werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
@@ -1281,15 +1317,23 @@ aopPut (asmop * aop, char *s, int offset)
   switch (aop->type)
     {
     case AOP_DIR:
-      if (offset)
-	sprintf (d, "(%s + %d)",
-		 aop->aopu.aop_dir, offset);
-      else
-	sprintf (d, "%s", aop->aopu.aop_dir);
-
-      if (strcmp (d, s))
-	emitcode ("mov", "%s,%s", d, s);
+        if (offset)
+	{
+	    SNPRINTF (buffer, sizeof(buffer),
+		      "(%s + %d)",
+		      aop->aopu.aop_dir, offset);
+	}
+	else
+	{
+	    SNPRINTF (buffer, sizeof(buffer), 
+		     "%s", aop->aopu.aop_dir);
+	}
+	
 
+	if (strcmp (buffer, s))
+	{
+	    emitcode ("mov", "%s,%s", buffer, s);
+	}
       break;
 
     case AOP_REG:
@@ -1305,11 +1349,15 @@ aopPut (asmop * aop, char *s, int offset)
 	      strcmp (s, "r5") == 0 ||
 	      strcmp (s, "r6") == 0 ||
 	      strcmp (s, "r7") == 0)
-	    emitcode ("mov", "%s,%s",
-		      aop->aopu.aop_reg[offset]->dname, s);
-	  else
-	    emitcode ("mov", "%s,%s",
-		      aop->aopu.aop_reg[offset]->name, s);
+	    {
+		emitcode ("mov", "%s,%s",
+			  aop->aopu.aop_reg[offset]->dname, s);
+	    }
+	    else
+	    {
+		emitcode ("mov", "%s,%s",
+			  aop->aopu.aop_reg[offset]->name, s);
+	    }
 	}
       break;
 
@@ -1392,14 +1440,16 @@ aopPut (asmop * aop, char *s, int offset)
 	       strcmp (s, "r6") == 0 ||
 	       strcmp (s, "r7") == 0)
 	{
-	  char buffer[10];
-	  sprintf (buffer, "a%s", s);
+	  char buff[10];
+	  SNPRINTF(buff, sizeof(buff), 
+		   "a%s", s);
 	  emitcode ("mov", "@%s,%s",
-		    aop->aopu.aop_ptr->name, buffer);
+		    aop->aopu.aop_ptr->name, buff);
+	}
+	else
+	{
+	    emitcode ("mov", "@%s,%s", aop->aopu.aop_ptr->name, s);
 	}
-      else
-	emitcode ("mov", "@%s,%s", aop->aopu.aop_ptr->name, s);
-
       break;
 
     case AOP_STK:
@@ -1522,7 +1572,12 @@ reAdjustPreg (asmop * aop)
                       (x->aopu.aop_reg[0] == ds390_regWithIdx(R0_IDX) || \
                       x->aopu.aop_reg[0] == ds390_regWithIdx(R1_IDX) )))
 #define AOP_INDPTRn(x) (AOP_TYPE(x) == AOP_DPTRn)
-#define AOP_USESDPTR(x) (AOP_TYPE(x) == AOP_DPTR || AOP_TYPE(x) == AOP_STR)
+#define AOP_USESDPTR(x) ((AOP_TYPE(x) == AOP_DPTR) || (AOP_TYPE(x) == AOP_STR))
+#define AOP_USESDPTR2(x) ((AOP_TYPE(x) == AOP_DPTR2) || (AOP_TYPE(x) == AOP_DPTRn))
+
+// The following two macros can be used even if the aop has not yet been aopOp'd.
+#define AOP_IS_STR(x) (IS_SYMOP(x) && OP_SYMBOL(x)->ruonly)
+#define AOP_IS_DPTRn(x) (IS_SYMOP(x) && OP_SYMBOL(x)->dptr)
 
 /* Workaround for DS80C390 bug: div ab may return bogus results
  * if A is accessed in instruction immediately before the div.
@@ -1538,15 +1593,16 @@ reAdjustPreg (asmop * aop)
        * thus avoiding touching A right before the div. \
        */             \
       D(emitcode(";", "DS80C390 div bug: rearranged ops.");); \
-      L = aopGet(AOP(LEFT),0,FALSE,FALSE,TRUE);     \
+      L = aopGet(AOP(LEFT),0,FALSE,FALSE,NULL);     \
       MOVA(L);            \
-      emitcode("mov","b,%s",aopGet(AOP(RIGHT),0,FALSE,FALSE,FALSE));\
+      L = aopGet(AOP(RIGHT),0,FALSE,FALSE,"b"); \
+      MOVB(L); \
     }               \
     else              \
     {               \
       /* Just stuff in a nop after loading A. */    \
-      emitcode("mov","b,%s",aopGet(AOP(RIGHT),0,FALSE,FALSE,FALSE));\
-      L = aopGet(AOP(LEFT),0,FALSE,FALSE,TRUE);   \
+      emitcode("mov","b,%s",aopGet(AOP(RIGHT),0,FALSE,FALSE,NULL));\
+      L = aopGet(AOP(LEFT),0,FALSE,FALSE,NULL);   \
       MOVA(L);            \
       emitcode("nop", "; workaround for DS80C390 div bug.");  \
     }
@@ -1558,11 +1614,9 @@ static void
 genNotFloat (operand * op, operand * res)
 {
   int size, offset;
-  char *l;
   symbol *tlbl;
 
-  D (emitcode (";", "genNotFloat ");
-    );
+  D (emitcode (";", "genNotFloat "););
 
   /* we will put 127 in the first byte of
      the result */
@@ -1571,14 +1625,14 @@ genNotFloat (operand * op, operand * res)
   offset = 1;
 
   _startLazyDPSEvaluation ();
-  l = aopGet (op->aop, offset++, FALSE, FALSE, TRUE);
-  MOVA (l);
+  MOVA(aopGet(op->aop, offset++, FALSE, FALSE, NULL));
 
   while (size--)
     {
       emitcode ("orl", "a,%s",
 		aopGet (op->aop,
-			offset++, FALSE, FALSE, FALSE));
+			offset++, FALSE, FALSE,
+			DP2_RESULT_REG));
     }
   _endLazyDPSEvaluation ();
 
@@ -1690,8 +1744,7 @@ toBoolean (operand * oper)
    */
   if (opIsGptr (oper))
     {
-      D (emitcode (";", "toBoolean: generic ptr special case.");
-	);
+      D (emitcode (";", "toBoolean: generic ptr special case."););
       size--;
     }
 
@@ -1699,22 +1752,28 @@ toBoolean (operand * oper)
   if (AOP_NEEDSACC (oper) && size)
     {
       usedB = TRUE;
-      emitcode ("push", "b");
-      emitcode ("mov", "b, %s", aopGet (AOP (oper), 0, FALSE, FALSE, FALSE));
+      if (_G.bInUse)
+      {
+	  emitcode ("push", "b");
+      }
+      MOVB (aopGet (AOP (oper), 0, FALSE, FALSE, NULL));
     }
   else
     {
-      MOVA (aopGet (AOP (oper), 0, FALSE, FALSE, TRUE));
+      MOVA (aopGet (AOP (oper), 0, FALSE, FALSE, NULL));
     }
+    
   while (size--)
     {
       if (usedB)
 	{
-	  emitcode ("orl", "b,%s", aopGet (AOP (oper), offset++, FALSE, FALSE, FALSE));
+	  emitcode ("orl", "b,%s",
+		    aopGet (AOP (oper), offset++, FALSE, FALSE, NULL));
 	}
       else
 	{
-	  emitcode ("orl", "a,%s", aopGet (AOP (oper), offset++, FALSE, FALSE, FALSE));
+	  emitcode ("orl", "a,%s",
+		    aopGet (AOP (oper), offset++, FALSE, FALSE, NULL));
 	}
     }
   _endLazyDPSEvaluation ();
@@ -1722,7 +1781,11 @@ toBoolean (operand * oper)
   if (usedB)
     {
       emitcode ("mov", "a,b");
-      emitcode ("pop", "b");
+      if (_G.bInUse)
+      {
+	  emitcode ("pop", "b");
+      }
+	
     }
 }
 
@@ -1736,12 +1799,11 @@ genNot (iCode * ic)
   symbol *tlbl;
   sym_link *optype = operandType (IC_LEFT (ic));
 
-  D (emitcode (";", "genNot ");
-    );
+  D (emitcode (";", "genNot "););
 
   /* assign asmOps to operand & result */
   aopOp (IC_LEFT (ic), ic, FALSE, FALSE);
-  aopOp (IC_RESULT (ic), ic, TRUE, AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR);
+  aopOp (IC_RESULT (ic), ic, TRUE, AOP_USESDPTR(IC_LEFT (ic)));
 
   /* if in bit space then a special case */
   if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY)
@@ -1783,13 +1845,12 @@ genCpl (iCode * ic)
   int size;
   symbol *tlbl;
 
-  D (emitcode (";", "genCpl ");
-    );
+  D (emitcode (";", "genCpl "););
 
 
   /* assign asmOps to operand & result */
   aopOp (IC_LEFT (ic), ic, FALSE, FALSE);
-  aopOp (IC_RESULT (ic), ic, TRUE, AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR);
+  aopOp (IC_RESULT (ic), ic, TRUE, AOP_USESDPTR(IC_LEFT (ic)));
 
   /* special case if in bit space */
   if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY) {
@@ -1801,7 +1862,7 @@ genCpl (iCode * ic)
     }
     tlbl=newiTempLabel(NULL);
     emitcode ("cjne", "%s,#0x01,%05d$", 
-	      aopGet(AOP(IC_LEFT(ic)), 0, FALSE,FALSE,TRUE), tlbl->key+100);
+	      aopGet(AOP(IC_LEFT(ic)), 0, FALSE,FALSE,NULL), tlbl->key+100);
     emitcode ("", "%05d$:", tlbl->key+100);
     outBitC (IC_RESULT(ic));
     goto release;
@@ -1811,8 +1872,7 @@ genCpl (iCode * ic)
   _startLazyDPSEvaluation ();
   while (size--)
     {
-      char *l = aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, TRUE);
-      MOVA (l);
+      MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, NULL));
       emitcode ("cpl", "a");
       aopPut (AOP (IC_RESULT (ic)), "a", offset++);
     }
@@ -1832,27 +1892,26 @@ static void
 genUminusFloat (operand * op, operand * result)
 {
   int size, offset = 0;
-  char *l;
-  /* for this we just need to flip the
-     first it then copy the rest in place */
-  D (emitcode (";", "genUminusFloat");
-    );
-
+    
+  D(emitcode (";", "genUminusFloat"););
+  
+  /* for this we just copy and then flip the bit */
+    
   _startLazyDPSEvaluation ();
   size = AOP_SIZE (op) - 1;
-  l = aopGet (AOP (op), 3, FALSE, FALSE, TRUE);
-  MOVA (l);
-
-  emitcode ("cpl", "acc.7");
-  aopPut (AOP (result), "a", 3);
 
   while (size--)
-    {
+  {
       aopPut (AOP (result),
-	      aopGet (AOP (op), offset, FALSE, FALSE, FALSE),
+	      aopGet (AOP (op), offset, FALSE, FALSE, NULL),
 	      offset);
       offset++;
     }
+  
+  MOVA(aopGet (AOP (op), offset, FALSE, FALSE, NULL));
+
+  emitcode ("cpl", "acc.7");
+  aopPut (AOP (result), "a", offset);    
   _endLazyDPSEvaluation ();
 }
 
@@ -1863,15 +1922,13 @@ static void
 genUminus (iCode * ic)
 {
   int offset, size;
-  sym_link *optype, *rtype;
-
-  D (emitcode (";", "genUminus ");
-    );
+  sym_link *optype;
 
+  D (emitcode (";", "genUminus "););
 
   /* assign asmops */
   aopOp (IC_LEFT (ic), ic, FALSE, FALSE);
-  aopOp (IC_RESULT (ic), ic, TRUE, AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR);
+  aopOp (IC_RESULT (ic), ic, TRUE, AOP_USESDPTR(IC_LEFT (ic)));
 
   /* if both in bit space then special
      case */
@@ -1886,7 +1943,6 @@ genUminus (iCode * ic)
     }
 
   optype = operandType (IC_LEFT (ic));
-  rtype = operandType (IC_RESULT (ic));
 
   /* if float then do float stuff */
   if (IS_FLOAT (optype))
@@ -1901,7 +1957,7 @@ genUminus (iCode * ic)
   _startLazyDPSEvaluation ();
   while (size--)
     {
-      char *l = aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, TRUE);
+      char *l = aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, NULL);
       if (!strcmp (l, "a"))
 	{
 	  if (offset == 0)
@@ -1922,7 +1978,7 @@ genUminus (iCode * ic)
 
   /* if any remaining bytes in the result */
   /* we just need to propagate the sign   */
-  if ((size = (AOP_SIZE (IC_RESULT (ic)) - AOP_SIZE (IC_LEFT (ic)))))
+  if ((size = (AOP_SIZE(IC_RESULT(ic)) - AOP_SIZE(IC_LEFT(ic)))) != 0)
     {
       emitcode ("rlc", "a");
       emitcode ("subb", "a,acc");
@@ -1989,12 +2045,15 @@ saveRegisters (iCode * lic)
 
   /* if the registers have been saved already then
      do nothing */
-  if (ic->regsSaved || IFFUNC_ISNAKED(OP_SYM_TYPE(IC_LEFT(ic)))) return ;
+  if (ic->regsSaved || 
+      (IS_SYMOP(IC_LEFT(ic)) && IFFUNC_ISNAKED(OP_SYM_TYPE(IC_LEFT(ic)))))
+    return ;
 
   /* special case if DPTR alive across a function call then must save it 
      even though callee saves */
-  if (IFFUNC_CALLEESAVES(OP_SYMBOL (IC_LEFT (ic))->type)) {
-      int i =0;
+  if (IS_SYMOP(IC_LEFT(ic)) &&
+      IFFUNC_CALLEESAVES(OP_SYMBOL (IC_LEFT (ic))->type)) {
+      int i;
       rsave = newBitVect(ic->rMask->size);
       for (i = DPL_IDX ; i <= B_IDX ; i++ ) {
 	  if (bitVectBitValue(ic->rMask,i))
@@ -2049,7 +2108,7 @@ unsaveRegisters (iCode * ic)
   bitVect *rsave;
 
   if (IFFUNC_CALLEESAVES(OP_SYMBOL (IC_LEFT (ic))->type)) {
-      int i =0;
+      int i;
       rsave = newBitVect(ic->rMask->size);
       for (i = DPL_IDX ; i <= B_IDX ; i++ ) {
 	  if (bitVectBitValue(ic->rMask,i))
@@ -2076,7 +2135,7 @@ pushSide (operand * oper, int size)
   _startLazyDPSEvaluation ();
   while (size--)
     {
-      char *l = aopGet (AOP (oper), offset++, FALSE, TRUE, FALSE);
+      char *l = aopGet (AOP (oper), offset++, FALSE, TRUE, NULL);
       if (AOP_TYPE (oper) != AOP_REG &&
 	  AOP_TYPE (oper) != AOP_DIR &&
 	  strcmp (l, "a"))
@@ -2098,7 +2157,24 @@ assignResultValue (operand * oper)
 {
   int offset = 0;
   int size = AOP_SIZE (oper);
+  bool pushedAcc = FALSE;
 
+  if (size == fReturnSizeDS390)
+  {
+      /* I don't think this case can ever happen... */
+      /* ACC is the last part of this. If writing the result
+       * uses AC, we must preserve it.
+       */
+      if (AOP_NEEDSACC(oper))
+      {
+	  emitcode(";", "assignResultValue special case for ACC.");
+	  emitcode("push", "acc");
+	  pushedAcc = TRUE;
+	  size--;
+      }
+  }
+    
+    
   _startLazyDPSEvaluation ();
   while (size--)
     {
@@ -2106,6 +2182,12 @@ assignResultValue (operand * oper)
       offset++;
     }
   _endLazyDPSEvaluation ();
+    
+  if (pushedAcc)
+    {
+	emitcode("pop", "acc");
+	aopPut(AOP(oper), "a", offset);
+    }
 }
 
 
@@ -2133,9 +2215,8 @@ genXpush (iCode * ic)
   while (size--)
     {
 
-      char *l = aopGet (AOP (IC_LEFT (ic)),
-			offset++, FALSE, FALSE, TRUE);
-      MOVA (l);
+      MOVA (aopGet (AOP (IC_LEFT (ic)),
+			offset++, FALSE, FALSE, NULL));
       emitcode ("movx", "@%s,a", r->name);
       emitcode ("inc", "%s", r->name);
 
@@ -2150,7 +2231,7 @@ genXpush (iCode * ic)
 }
 
 /*-----------------------------------------------------------------*/
-/* genIpush - genrate code for pushing this gets a little complex  */
+/* genIpush - generate code for pushing this gets a little complex  */
 /*-----------------------------------------------------------------*/
 static void
 genIpush (iCode * ic)
@@ -2176,7 +2257,7 @@ genIpush (iCode * ic)
       _startLazyDPSEvaluation ();
       while (size--)
 	{
-	  l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE, TRUE);
+	  l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE, NULL);
 	  if (*l == '#')
 	    {
 	      MOVA (l);
@@ -2210,16 +2291,18 @@ genIpush (iCode * ic)
   _startLazyDPSEvaluation ();
   while (size--)
     {
-      l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE, FALSE);
+      l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE, NULL);
       if (AOP_TYPE (IC_LEFT (ic)) != AOP_REG &&
 	  AOP_TYPE (IC_LEFT (ic)) != AOP_DIR &&
-	  strcmp (l, "a"))
+	  strcmp (l, "acc"))
 	{
 	  emitcode ("mov", "a,%s", l);
 	  emitcode ("push", "acc");
 	}
       else
-	emitcode ("push", "%s", l);
+	{
+	    emitcode ("push", "%s", l);
+	}
     }
   _endLazyDPSEvaluation ();
 
@@ -2249,7 +2332,7 @@ genIpop (iCode * ic)
   while (size--)
     {
       emitcode ("pop", "%s", aopGet (AOP (IC_LEFT (ic)), offset--,
-				     FALSE, TRUE, TRUE));
+				     FALSE, TRUE, NULL));
     }
   _endLazyDPSEvaluation ();
 
@@ -2409,13 +2492,13 @@ static void genSend(set *sendSet)
 	    _startLazyDPSEvaluation ();
 	    if (size>1) {
 		aopOp (IC_LEFT (sic), sic, FALSE, 
-		       (IS_SYMOP(IC_LEFT(sic)) && OP_SYMBOL(IC_LEFT(sic))->ruonly ? FALSE : TRUE));
+		       (AOP_IS_STR(IC_LEFT(sic)) ? FALSE : TRUE));
 	    } else {
 		aopOp (IC_LEFT (sic), sic, FALSE, FALSE);
 	    }
 	    while (size--) {
 		char *l = aopGet (AOP (IC_LEFT (sic)), offset,
-				  FALSE, FALSE, TRUE);
+				  FALSE, FALSE, NULL);
 		if (strcmp (l, fReturn[offset])) {
 		    emitcode ("mov", "%s,%s",
 			      fReturn[offset],
@@ -2430,7 +2513,7 @@ static void genSend(set *sendSet)
 	    aopOp (IC_LEFT (sic), sic, FALSE, TRUE);
 	    while (size--) {
 		emitcode ("mov","b1_%d,%s",rb1_count++,aopGet (AOP (IC_LEFT (sic)), offset++,
-								FALSE, FALSE, TRUE));
+								FALSE, FALSE, NULL));
 	    }
 	    freeAsmop (IC_LEFT (sic), NULL, sic, TRUE);
 	}
@@ -2438,6 +2521,18 @@ static void genSend(set *sendSet)
     }
 }
 
+static void
+adjustEsp(const char *reg)
+{
+    emitcode ("anl","%s,#3", reg);
+    if (TARGET_IS_DS400)
+    {
+	emitcode ("orl","%s,#!constbyte",
+		  reg,
+		  (options.stack_loc >> 8) & 0xff);
+    }
+}
+
 /*-----------------------------------------------------------------*/
 /* genCall - generates a call statement                            */
 /*-----------------------------------------------------------------*/
@@ -2563,7 +2658,7 @@ genCall (iCode * ic)
 	      emitcode ("subb","a,#!constbyte",ic->parmBytes & 0xff);
 	      emitcode ("mov","sp,a");
 	      emitcode ("mov","a,esp");
-	      emitcode ("anl","a,#3");
+	      adjustEsp("a");
 	      emitcode ("subb","a,#!constbyte",(ic->parmBytes >> 8) & 0xff);
 	      emitcode ("mov","esp,a");	  
 	      UNPROTECT_SP;
@@ -2681,7 +2776,7 @@ genPcall (iCode * ic)
 	      emitcode ("subb","a,#!constbyte",ic->parmBytes & 0xff);
 	      emitcode ("mov","sp,a");
 	      emitcode ("mov","a,esp");
-	      emitcode ("anl","a,#3");
+	      adjustEsp("a");
 	      emitcode ("subb","a,#!constbyte",(ic->parmBytes >> 8) & 0xff);
 	      emitcode ("mov","esp,a");	  
 	      UNPROTECT_SP;
@@ -2964,7 +3059,7 @@ genFunction (iCode * ic)
 	             }
 	        }
 	    }
-	    // jwk: this needs a closer look
+	    // TODO: this needs a closer look
 	    SPEC_ISR_SAVED_BANKS(currFunc->etype) = banksToSave;
 	}
     }
@@ -3008,7 +3103,7 @@ genFunction (iCode * ic)
 	  emitcode ("push","_bpx+1");
 	  emitcode ("mov","_bpx,%s",spname);
 	  emitcode ("mov","_bpx+1,esp");
-	  emitcode ("anl","_bpx+1,#3");
+	  adjustEsp("_bpx+1");
       } else {
 	  if (options.useXstack) {
 	      emitcode ("mov", "r0,%s", spname);
@@ -3037,7 +3132,7 @@ genFunction (iCode * ic)
 	      emitcode ("add","a,#!constbyte", ((short) sym->stack & 0xff));
 	      emitcode ("mov","sp,a");
 	      emitcode ("mov","a,esp");
-	      emitcode ("anl","a,#3");
+	      adjustEsp("a");
 	      emitcode ("addc","a,#!constbyte", (((short) sym->stack) >> 8) & 0xff);
 	      emitcode ("mov","esp,a");
 	      UNPROTECT_SP;
@@ -3187,7 +3282,6 @@ genEndFunction (iCode * ic)
 	     * Restore any register banks saved by genFunction
 	     * in reverse order.
 	     */
-	  // jwk: this needs a closer look
 	    unsigned savedBanks = SPEC_ISR_SAVED_BANKS(currFunc->etype);
 	    int ix;
 	  
@@ -3297,7 +3391,7 @@ 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));
+	   AOP_IS_STR(IC_LEFT(ic)) ? FALSE :TRUE);
     size = AOP_SIZE (IC_LEFT (ic));
 
     assert (size <= 4);
@@ -3306,14 +3400,16 @@ static void genJavaNativeRet(iCode *ic)
     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));	    
+	    emitcode ("push","%s",
+		      aopGet(AOP(IC_LEFT(ic)),i,FALSE,TRUE,DP2_RESULT_REG));
 	}
 	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));
+	    emitcode ("mov","%s,%s",javaRet[i],
+		      aopGet(AOP(IC_LEFT(ic)),i,FALSE,TRUE,DP2_RESULT_REG));
     }
     for (i = size ; i < 4 ; i++ )
 	    emitcode ("mov","%s,#0",javaRet[i]);
@@ -3328,8 +3424,7 @@ genRet (iCode * ic)
 {
   int size, offset = 0, pushed = 0;
 
-  D (emitcode (";", "genRet ");
-    );
+  D (emitcode (";", "genRet "););
 
   /* if we have no return value then
      just generate the "ret" */
@@ -3345,7 +3440,7 @@ genRet (iCode * ic)
   /* we have something to return then
      move the return value into place */
   aopOp (IC_LEFT (ic), ic, FALSE, 
-	 (IS_SYMOP(IC_LEFT(ic)) && OP_SYMBOL(IC_LEFT(ic))->ruonly ? FALSE :TRUE));
+	 (AOP_IS_STR(IC_LEFT(ic)) ? FALSE :TRUE));
   size = AOP_SIZE (IC_LEFT (ic));
 
   _startLazyDPSEvaluation ();
@@ -3355,7 +3450,7 @@ genRet (iCode * ic)
       if (AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR)
 	{
 	  l = aopGet (AOP (IC_LEFT (ic)), offset++,
-		      FALSE, TRUE, FALSE);
+		      FALSE, TRUE, NULL);
 	  emitcode ("push", "%s", l);
 	  pushed++;
 	}
@@ -3365,7 +3460,7 @@ genRet (iCode * ic)
 	   * is is OK to clobber it in the aopGet.
 	   */
 	  l = aopGet (AOP (IC_LEFT (ic)), offset,
-		      FALSE, FALSE, TRUE);
+		      FALSE, FALSE, NULL);
 	  if (strcmp (fReturn[offset], l))
 	    emitcode ("mov", "%s,%s", fReturn[offset++], l);
 	}
@@ -3478,7 +3573,7 @@ genPlusIncr (iCode * ic)
   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));
+	  emitcode("inc","%s",aopGet(AOP(IC_RESULT(ic)),0,FALSE,FALSE,NULL));
       }
       return TRUE;
   }
@@ -3490,9 +3585,10 @@ genPlusIncr (iCode * ic)
        (size > 1) &&
        (icount == 1))
     {
-      symbol *tlbl;
-      int emitTlbl;
-      int labelRange;
+      symbol  *tlbl;
+      int     emitTlbl;
+      int     labelRange;
+      char    *l;
 
       /* If the next instruction is a goto and the goto target
        * is <= 5 instructions previous to this, we can generate
@@ -3502,7 +3598,7 @@ genPlusIncr (iCode * ic)
 	  && (labelRange = findLabelBackwards (ic, IC_LABEL (ic->next)->key)) != 0
 	  && labelRange <= 5)
 	{
-	  emitcode (";", "tail increment optimized (range %d)", labelRange);
+	  D(emitcode (";", "tail increment optimized (range %d)", labelRange););
 	  tlbl = IC_LABEL (ic->next);
 	  emitTlbl = 0;
 	}
@@ -3511,50 +3607,60 @@ genPlusIncr (iCode * ic)
 	  tlbl = newiTempLabel (NULL);
 	  emitTlbl = 1;
 	}
-      emitcode ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE));
+	
+      l = aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, NULL);
+      emitcode ("inc", "%s", l);
+      
       if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
 	  IS_AOP_PREG (IC_RESULT (ic)))
-	emitcode ("cjne", "%s,#0,!tlabel"
-		  ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE)
-		  ,tlbl->key + 100);
+      {	  
+	emitcode ("cjne", "%s,#0,!tlabel", l, tlbl->key + 100);
+      }
       else
-	{
+      {
 	  emitcode ("clr", "a");
-	  emitcode ("cjne", "a,%s,!tlabel"
-		    ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE)
-		    ,tlbl->key + 100);
-	}
+	  emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+      }
 
-      emitcode ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE));
+      l = aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, NULL); 
+      emitcode ("inc", "%s", l);
       if (size > 2)
 	{
-	  if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
-	      IS_AOP_PREG (IC_RESULT (ic)))
-	    emitcode ("cjne", "%s,#0,!tlabel"
-		  ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE)
-		      ,tlbl->key + 100);
-	  else
-	    emitcode ("cjne", "a,%s,!tlabel"
-		  ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE)
-		      ,tlbl->key + 100);
+	    if (!strcmp(l, "acc"))
+	    {
+		emitcode("jnz", "!tlabel", tlbl->key + 100);
+	    }
+	    else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
+		     IS_AOP_PREG (IC_RESULT (ic)))
+	    {
+		emitcode ("cjne", "%s,#0,!tlabel", l, tlbl->key + 100);
+	    }
+	    else
+	    {
+		emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+	    }
 
-	  emitcode ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE));
+	    l = aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, NULL);
+	    emitcode ("inc", "%s", l);
 	}
       if (size > 3)
 	{
-	  if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
-	      IS_AOP_PREG (IC_RESULT (ic)))
-	    emitcode ("cjne", "%s,#0,!tlabel"
-		  ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE)
-		      ,tlbl->key + 100);
-	  else
+	    if (!strcmp(l, "acc"))
 	    {
-	      emitcode ("cjne", "a,%s,!tlabel"
-		  ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE)
-			,tlbl->key + 100);
+		emitcode("jnz", "!tlabel", tlbl->key + 100);
 	    }
-	  emitcode ("inc", "%s", aopGet (AOP (IC_RESULT (ic)), MSB32, FALSE, FALSE, FALSE));
-	}
+	    else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
+		     IS_AOP_PREG (IC_RESULT (ic)))
+	    {
+		emitcode ("cjne", "%s,#0,!tlabel", l, tlbl->key + 100);
+	    }
+	    else
+	    {
+		emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+	    }
+
+	    l = aopGet (AOP (IC_RESULT (ic)), MSB32, FALSE, FALSE, NULL);
+	    emitcode ("inc", "%s", l);	}
 
       if (emitTlbl)
 	{
@@ -3569,11 +3675,11 @@ genPlusIncr (iCode * ic)
 
       switch (size) {
       case 3:
-	  emitcode ("mov","dpx,%s",aopGet(AOP (IC_LEFT (ic)), 2, FALSE, FALSE, FALSE));
+	  emitcode ("mov","dpx,%s",aopGet(AOP (IC_LEFT (ic)), 2, FALSE, FALSE, NULL));
       case 2:
-	  emitcode ("mov","dph,%s",aopGet(AOP (IC_LEFT (ic)), 1, FALSE, FALSE, FALSE));
+	  emitcode ("mov","dph,%s",aopGet(AOP (IC_LEFT (ic)), 1, FALSE, FALSE, NULL));
       case 1:
-	  emitcode ("mov","dpl,%s",aopGet(AOP (IC_LEFT (ic)), 0, FALSE, FALSE, FALSE));
+	  emitcode ("mov","dpl,%s",aopGet(AOP (IC_LEFT (ic)), 0, FALSE, FALSE, NULL));
 	  break;
       }
       while (icount--) emitcode ("inc","dptr");      
@@ -3605,7 +3711,7 @@ genPlusIncr (iCode * ic)
 
       if (icount > 3)
 	{
-	  MOVA (aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE, TRUE));
+	  MOVA (aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE, NULL));
 	  emitcode ("add", "a,#!constbyte", ((char) icount) & 0xff);
 	  aopPut (AOP (IC_RESULT (ic)), "a", 0);
 	}
@@ -3615,7 +3721,7 @@ genPlusIncr (iCode * ic)
 	  _startLazyDPSEvaluation ();
 	  while (icount--)
 	    {
-	      emitcode ("inc", "%s", aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE, FALSE));
+	      emitcode ("inc", "%s", aopGet (AOP (IC_LEFT (ic)), 0, FALSE, FALSE, NULL));
 	    }
 	  _endLazyDPSEvaluation ();
 	}
@@ -3653,8 +3759,8 @@ outBitAcc (operand * result)
 static void
 genPlusBits (iCode * ic)
 {
-  D (emitcode (";", "genPlusBits ");
-    );
+  D (emitcode (";", "genPlusBits "););
+    
   if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY)
     {
       symbol *lbl = newiTempLabel (NULL);
@@ -3683,7 +3789,7 @@ adjustArithmeticResult (iCode * ic)
       !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic))))
     {
       aopPut (AOP (IC_RESULT (ic)),
-	      aopGet (AOP (IC_LEFT (ic)), GPTRSIZE - 1, FALSE, FALSE, FALSE),
+	      aopGet (AOP (IC_LEFT (ic)), GPTRSIZE - 1, FALSE, FALSE, NULL),
 	      GPTRSIZE - 1);
     }
 
@@ -3692,7 +3798,7 @@ adjustArithmeticResult (iCode * ic)
       !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_RIGHT (ic))))
     {
       aopPut (AOP (IC_RESULT (ic)),
-	    aopGet (AOP (IC_RIGHT (ic)), GPTRSIZE - 1, FALSE, FALSE, FALSE),
+	    aopGet (AOP (IC_RIGHT (ic)), GPTRSIZE - 1, FALSE, FALSE, NULL),
 	      GPTRSIZE - 1);
     }
 
@@ -3702,56 +3808,20 @@ adjustArithmeticResult (iCode * ic)
       !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic))) &&
       !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_RIGHT (ic))))
     {
-      char buffer[5];
-      sprintf (buffer, "#%d", pointerCode (getSpec (operandType (IC_LEFT (ic)))));
-      aopPut (AOP (IC_RESULT (ic)), buffer, GPTRSIZE - 1);
+      char buff[5];
+      SNPRINTF (buff, sizeof(buff), 
+		"#%d", pointerCode (getSpec (operandType (IC_LEFT (ic)))));
+      aopPut (AOP (IC_RESULT (ic)), buff, GPTRSIZE - 1);
     }
 }
 
-#ifdef KEVIN_SCREWED_UP
-// Macro to aopOp all three operands of an ic. If this cannot be done, 
-// the IC_LEFT and IC_RIGHT operands will be aopOp'd, and the rc parameter
-// will be set TRUE. The caller must then handle the case specially, noting
-// that the IC_RESULT operand is not aopOp'd.
-#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) && !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 && !isOperandEqual(IC_LEFT(ic),IC_RESULT(ic))))) \
-    { \
-       /* No can do; DPTR & DPTR2 in use, and we need another. */ \
-       rc = TRUE; \
-    }  \
-    else \
-    { \
-       aopOp (IC_RESULT(ic),ic,TRUE, (AOP_TYPE(IC_LEFT(ic)) == AOP_DPTR) || \
-                                     (AOP_TYPE(IC_RIGHT(ic)) == AOP_DPTR)); \
-       rc = FALSE; \
-       if (AOP_TYPE(IC_LEFT(ic)) == AOP_DPTR2 && \
-           AOP_TYPE(IC_RESULT(ic)) == AOP_DPTR2) \
-       { \
-            /* werror(E_INTERNAL_ERROR,__FILE__,__LINE__, */ \
-            fprintf(stderr,                                  \
-                    "Ack: got unexpected DP2! (%s:%d %s:%d)\n", __FILE__, __LINE__, ic->filename, ic->lineno);   \
-       } \
-    }
-
-// aopOp the left & right operands of an ic.
-#define AOP_OP_2(ic) \
-    aopOp (IC_RIGHT(ic),ic,FALSE, FALSE); \
-    aopOp (IC_LEFT(ic),ic,FALSE, (AOP_TYPE(IC_RIGHT(ic)) == AOP_DPTR));
-
-#else // Kevin didn't screw up...
-
-#define AOP_IS_STR(x) (IS_SYMOP(x) && OP_SYMBOL(x)->ruonly)
-
 // The guts of AOP_OP_3_NOFATAL. Generates the left & right opcodes of an IC,
 // generates the result if possible. If result is generated, returns TRUE; otherwise
 // returns false and caller must deal with fact that result isn't aopOp'd.
 bool aopOp3(iCode * ic)
 {
     bool dp1InUse, dp2InUse;
+    bool useDp2;
     
     // First, generate the right opcode. DPTR may be used if neither left nor result are
     // of type AOP_STR.
@@ -3760,35 +3830,82 @@ bool aopOp3(iCode * ic)
 //	       AOP_IS_STR(IC_LEFT(ic)) ? "true" : "false",
 //	       AOP_IS_STR(IC_RIGHT(ic)) ? "true" : "false",
 //	       AOP_IS_STR(IC_RESULT(ic)) ? "true" : "false");
+//      );
+//    D(emitcode(";", "aopOp3: AOP_IS_DPTRn left: %s right: %s result: %s",
+//	       AOP_IS_DPTRn(IC_LEFT(ic)) ? "true" : "false",
+//	       AOP_IS_DPTRn(IC_RIGHT(ic)) ? "true" : "false",
+//	       AOP_IS_DPTRn(IC_RESULT(ic)) ? "true" : "false");
 //      );
     
-    aopOp (IC_RIGHT(ic),ic,FALSE, AOP_IS_STR(IC_LEFT(ic)) || AOP_IS_STR(IC_RESULT(ic)));
+    // Right uses DPTR unless left or result is an AOP_STR; however,
+    // if right is an AOP_STR, it must use DPTR regardless.
+    if ((AOP_IS_STR(IC_LEFT(ic)) || AOP_IS_STR(IC_RESULT(ic)))
+     && !AOP_IS_STR(IC_RIGHT(ic)))
+    {
+	useDp2 = TRUE;
+    }
+    else
+    {
+	useDp2 = FALSE;
+    }
+	
+    aopOp (IC_RIGHT(ic),ic,FALSE, useDp2);
     
-    // Now, the left opcode. This can use DPTR if the right didn't AND the result is not
-    // AOP_STR (however, if the result is the same operand as the left, then DPTR may be used).
-    aopOp (IC_LEFT(ic),ic,FALSE, AOP_USESDPTR(IC_RIGHT(ic)) ||
-                                  (AOP_IS_STR(IC_RESULT(ic)) && !isOperandEqual(IC_LEFT(ic),IC_RESULT(ic))));
+    // if the right used DPTR, left MUST use DPTR2.
+    // if the right used DPTR2, left MUST use DPTR.
+    // if both are still available, we prefer to use DPTR. But if result is an AOP_STR
+    // and left is not an AOP_STR, then we will get better code if we use DP2 for left,
+    // enabling us to assign DPTR to result.
+     
+    if (AOP_USESDPTR(IC_RIGHT(ic)))
+    {
+	useDp2 = TRUE;
+    }
+    else if (AOP_USESDPTR2(IC_RIGHT(ic)))
+    {
+	useDp2 = FALSE;
+    }
+    else
+    {
+	if (AOP_IS_STR(IC_RESULT(ic)) && !AOP_IS_STR(IC_LEFT(ic)))
+	{
+	    useDp2 = TRUE;
+	}
+	else
+	{
+	    useDp2 = FALSE;
+	}
+    }
+
+    aopOp(IC_LEFT(ic), ic, FALSE, useDp2);
     
-    // We've op'd the left. So, if left & result are the same operand, we know aopOp
-    // will succeed, and we can just do it & bail.
-    if (isOperandEqual(IC_LEFT(ic),IC_RESULT(ic)))
+    // We've op'd the left & right. So, if left or right are the same operand as result, 
+    // we know aopOp will succeed, and we can just do it & bail.
+    if (isOperandEqual(IC_LEFT(ic),IC_RESULT(ic)) ||
+	isOperandEqual(IC_RIGHT(ic),IC_RESULT(ic)))
     {
-//	D(emitcode(";", "aopOp3: left & result equal"););
+//	D(emitcode(";", "aopOp3: (left | right) & result equal"););
 	aopOp(IC_RESULT(ic),ic,TRUE, FALSE);
 	return TRUE;
     }
     
     // Note which dptrs are currently in use.
-    dp1InUse = (AOP_TYPE(IC_RIGHT(ic)) == AOP_DPTR) || (AOP_TYPE(IC_LEFT(ic)) == AOP_DPTR) ||
-	        AOP_IS_STR(IC_RIGHT(ic)) || AOP_IS_STR(IC_LEFT(ic));
-    dp2InUse = (AOP_TYPE(IC_RIGHT(ic)) == AOP_DPTR2) || (AOP_TYPE(IC_LEFT(ic)) == AOP_DPTR2);
+    dp1InUse = AOP_USESDPTR(IC_LEFT(ic)) || AOP_USESDPTR(IC_RIGHT(ic));
+    dp2InUse = AOP_USESDPTR2(IC_LEFT(ic)) || AOP_USESDPTR2(IC_RIGHT(ic));
     
-    // OK, now if either left or right uses DPTR and the result is an AOP_STR, we cannot generate it.
+    // OK, now if either left or right uses DPTR and the result is an AOP_STR, we cannot 
+    // generate it.
     if (dp1InUse && AOP_IS_STR(IC_RESULT(ic)))
     {
 	return FALSE;
     }
     
+    // Likewise, if left or right uses DPTR2 and the result is a DPTRn, we cannot generate it.
+    if (dp2InUse && AOP_IS_DPTRn(IC_RESULT(ic)))
+    {
+	return FALSE;
+    }
+    
     // or, if both dp1 & dp2 are in use and the result needs a dptr, we're out of luck    
     if (dp1InUse && dp2InUse && isOperandInFarSpace(IC_RESULT(ic)))
     {
@@ -3797,15 +3914,23 @@ bool aopOp3(iCode * ic)
 
     aopOp (IC_RESULT(ic),ic,TRUE, dp1InUse);
 
-    // SOme sanity checking...
-    if (AOP_TYPE(IC_LEFT(ic)) == AOP_DPTR2 &&
-	AOP_TYPE(IC_RESULT(ic)) == AOP_DPTR2)
+    // Some sanity checking...
+    if (dp1InUse && AOP_USESDPTR(IC_RESULT(ic)))
     {
 	fprintf(stderr,
-		"Ack: got unexpected DP2! (%s:%d %s:%d)\n",
+		"Internal error: got unexpected DPTR (%s:%d %s:%d)\n",
 		__FILE__, __LINE__, ic->filename, ic->lineno);  
+	emitcode(";", ">>> unexpected DPTR here.");
     }
-	
+    
+    if (dp2InUse && AOP_USESDPTR2(IC_RESULT(ic)))
+    {
+	fprintf(stderr,
+		"Internal error: got unexpected DPTR2 (%s:%d %s:%d)\n",
+		__FILE__, __LINE__, ic->filename, ic->lineno);  
+	emitcode(";", ">>> unexpected DPTR2 here.");
+    }    
+    
     return TRUE;
 }
 
@@ -3822,8 +3947,6 @@ bool aopOp3(iCode * ic)
     aopOp (IC_RIGHT(ic),ic,FALSE, AOP_IS_STR(IC_LEFT(ic))); \
     aopOp (IC_LEFT(ic),ic,FALSE, AOP_USESDPTR(IC_RIGHT(ic)));
 
-#endif
-
 // convienience macro.
 #define AOP_SET_LOCALS(ic) \
     left = IC_LEFT(ic); \
@@ -3868,13 +3991,13 @@ static void
 genPlus (iCode * ic)
 {
   int size, offset = 0;
-  bool pushResult = FALSE;
+  bool pushResult;
   int rSize;
 
   D (emitcode (";", "genPlus "););
 
   /* special cases :- */
-  if ( IS_SYMOP(IC_LEFT(ic)) && OP_SYMBOL(IC_LEFT(ic))->ruonly &&
+  if ( AOP_IS_STR(IC_LEFT(ic)) &&
       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);
@@ -3903,6 +4026,7 @@ genPlus (iCode * ic)
   }
 		
   AOP_OP_3_NOFATAL (ic, pushResult);
+    
   if (pushResult)
     {
       D (emitcode (";", "genPlus: must push result: 3 ops in far space"););
@@ -3950,7 +4074,7 @@ genPlus (iCode * ic)
 	      _startLazyDPSEvaluation ();
 	      while (size--)
 		{
-		  MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, TRUE));
+		  MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, NULL));
 		  emitcode ("addc", "a,#0");
 		  aopPut (AOP (IC_RESULT (ic)), "a", offset++);
 		}
@@ -3975,13 +4099,13 @@ genPlus (iCode * ic)
     {
       if (AOP_TYPE(IC_LEFT(ic)) == AOP_ACC && !AOP_NEEDSACC(IC_RIGHT(ic)))
 	{
-	  MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, TRUE));
+	  MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, NULL));
 	  if (offset == 0)
 	    emitcode ("add", "a,%s",
-		 aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, FALSE));
+		 aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, NULL));
 	  else
 	    emitcode ("addc", "a,%s",
-		 aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, FALSE));
+		 aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, NULL));
 	}
       else
 	{
@@ -3995,7 +4119,7 @@ genPlus (iCode * ic)
 	      D(emitcode(";", "+ AOP_ACC special case."););
 	      emitcode("xch", "a, %s", DP2_RESULT_REG);
 	  }
-	  MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, TRUE));
+	  MOVA (aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, NULL));
 	  if (offset == 0)
 	  {
 	    if (AOP_TYPE(IC_LEFT(ic)) == AOP_ACC)
@@ -4006,13 +4130,15 @@ genPlus (iCode * ic)
 	    else
 	    {
 	    	emitcode ("add", "a,%s",
-		  	aopGet (AOP(IC_LEFT(ic)), offset, FALSE, FALSE, FALSE));
+			  aopGet (AOP(IC_LEFT(ic)), offset, FALSE, FALSE,
+				  DP2_RESULT_REG));
 	    }
           }
 	  else
 	  {
 	    emitcode ("addc", "a,%s",
-		  aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, FALSE));
+		  aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE,
+			  DP2_RESULT_REG));
 	  }
 	}
       if (!pushResult)
@@ -4076,7 +4202,7 @@ genMinusDec (iCode * ic)
   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));
+	  emitcode("dec","%s",aopGet(AOP(IC_RESULT(ic)),0,FALSE,FALSE,NULL));
       }
       return TRUE;
   }
@@ -4088,8 +4214,9 @@ genMinusDec (iCode * ic)
       (icount == 1))
     {
       symbol *tlbl;
-      int emitTlbl;
-      int labelRange;
+      int    emitTlbl;
+      int    labelRange;
+      char   *l;
 
       /* If the next instruction is a goto and the goto target
          * is <= 5 instructions previous to this, we can generate
@@ -4109,52 +4236,61 @@ genMinusDec (iCode * ic)
 	  emitTlbl = 1;
 	}
 
-      emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE));
+      l = aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, NULL);
+      emitcode ("dec", "%s", l);
+ 
       if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
 	  AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR ||
 	  IS_AOP_PREG (IC_RESULT (ic)))
-	emitcode ("cjne", "%s,#!constbyte,!tlabel"
-		  ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE), 0xff
-		  ,tlbl->key + 100);
+      {	    
+	  emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, tlbl->key + 100);
+      }
       else
-	{
+      {
 	  emitcode ("mov", "a,#!constbyte",0xff);
-	  emitcode ("cjne", "a,%s,!tlabel"
-		    ,aopGet (AOP (IC_RESULT (ic)), LSB, FALSE, FALSE, FALSE)
-		    ,tlbl->key + 100);
-	}
-      emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE));
+	  emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+      }
+      l = aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, NULL);
+      emitcode ("dec", "%s", l);
       if (size > 2)
 	{
-	  if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
-	      AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR ||
-	      IS_AOP_PREG (IC_RESULT (ic)))
-	    emitcode ("cjne", "%s,#!constbyte,!tlabel"
-		      ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE),0xff
-		      ,tlbl->key + 100);
-	  else
+	    if (!strcmp(l, "acc"))
 	    {
-	      emitcode ("cjne", "a,%s,!tlabel"
-		  ,aopGet (AOP (IC_RESULT (ic)), MSB16, FALSE, FALSE, FALSE)
-			,tlbl->key + 100);
+		emitcode("jnz", "!tlabel", tlbl->key + 100);
 	    }
-	  emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE));
+	    else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
+		     AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR ||
+		     IS_AOP_PREG (IC_RESULT (ic)))
+	    {	    
+		emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, tlbl->key + 100);
+	    }
+	    else
+	    {
+		emitcode ("mov", "a,#!constbyte",0xff);
+		emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+	    }
+	    l = aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, NULL);
+	    emitcode ("dec", "%s", l);
 	}
       if (size > 3)
 	{
-	  if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
-	      AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR ||
-	      IS_AOP_PREG (IC_RESULT (ic)))
-	    emitcode ("cjne", "%s,#!constbyte,!tlabel"
-		      ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE),0xff
-		      ,tlbl->key + 100);
-	  else
+	    if (!strcmp(l, "acc"))
 	    {
-	      emitcode ("cjne", "a,%s,!tlabel"
-		  ,aopGet (AOP (IC_RESULT (ic)), MSB24, FALSE, FALSE, FALSE)
-			,tlbl->key + 100);
+		emitcode("jnz", "!tlabel", tlbl->key + 100);
 	    }
-	  emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), MSB32, FALSE, FALSE, FALSE));
+	    else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
+		     AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR ||
+		     IS_AOP_PREG (IC_RESULT (ic)))
+	    {	    
+		emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, tlbl->key + 100);
+	    }
+	    else
+	    {
+		emitcode ("mov", "a,#!constbyte",0xff);
+		emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+	    }	    
+	    l = aopGet (AOP (IC_RESULT (ic)), MSB32, FALSE, FALSE, NULL);
+	    emitcode ("dec", "%s", l);
 	}
       if (emitTlbl)
 	{
@@ -4180,7 +4316,8 @@ genMinusDec (iCode * ic)
       _startLazyDPSEvaluation ();
       while (icount--)
 	{
-	  emitcode ("dec", "%s", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, FALSE));
+	  emitcode ("dec", "%s",
+		    aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, NULL));
 	}
       _endLazyDPSEvaluation ();
 
@@ -4256,26 +4393,17 @@ genMinusBits (iCode * ic)
 static void
 genMinus (iCode * ic)
 {
-  int size, offset = 0;
-  int rSize;
-  unsigned long lit = 0L;
-  bool pushResult = FALSE;
+    int size, offset = 0;
+    int rSize;
+    long lit = 0L;
+    bool pushResult;
 
-  D (emitcode (";", "genMinus "););
+    D (emitcode (";", "genMinus "););
 
-  aopOp (IC_LEFT (ic), ic, FALSE, FALSE);
-  aopOp (IC_RIGHT (ic), ic, FALSE, 
-	 (AOP_INDPTRn(IC_LEFT(ic)) ? FALSE : (AOP_USESDPTR(IC_LEFT(ic)) ? TRUE : FALSE)));
-  if ((AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR) &&
-      ((AOP_TYPE (IC_RIGHT (ic)) == AOP_DPTR2)
-       || OP_SYMBOL(IC_RESULT(ic))->ruonly))
-    {
-      pushResult = TRUE;
-    }
-  else
-    {
-      aopOp (IC_RESULT (ic), ic, TRUE, AOP_TYPE (IC_LEFT (ic)) == AOP_DPTR);
+    AOP_OP_3_NOFATAL(ic, pushResult);	
 
+    if (!pushResult)
+    {
       /* special cases :- */
       /* if both left & right are in bit space */
       if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY &&
@@ -4300,26 +4428,28 @@ genMinus (iCode * ic)
     }
   else
     {
-      lit = (unsigned long) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit);
-      lit = -(long) lit;
+      lit = (long) floatFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit);
+      lit = -lit;
     }
 
 
   /* if literal, add a,#-lit, else normal subb */
   _startLazyDPSEvaluation ();
   while (size--) {
-      MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, TRUE));
       if (AOP_TYPE (IC_RIGHT (ic)) != AOP_LIT) {
 	  if (AOP_USESDPTR(IC_RIGHT(ic))) {
-	      emitcode ("mov","b,a");
-	      MOVA(aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, FALSE));
-	      emitcode ("xch","a,b");
+	      emitcode ("mov","b,%s",
+			aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, NULL));
+	      MOVA(aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, NULL));
 	      emitcode ("subb","a,b");
 	  } else {
+	      MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, NULL));
 	      emitcode ("subb", "a,%s",
-			aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, FALSE));
+			aopGet (AOP (IC_RIGHT (ic)), offset, FALSE, FALSE, 
+				DP2_RESULT_REG));
 	  }
       } else {
+	  MOVA (aopGet (AOP (IC_LEFT (ic)), offset, FALSE, FALSE, NULL));
 	  /* first add without previous c */
 	  if (!offset) {
 	      if (!size && lit==-1) {
@@ -4415,8 +4545,8 @@ genMultOneByte (operand * left,
 	  SPEC_USIGN(operandType(right)))) {
     // just an unsigned 8*8=8/16 multiply
     //emitcode (";","unsigned");
-    emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, TRUE));
-    MOVA (aopGet (AOP (left), 0, FALSE, FALSE, TRUE));
+    emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, NULL));
+    MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL));
     emitcode ("mul", "ab");
    
     _G.accInUse++; _G.bInUse++;
@@ -4443,7 +4573,7 @@ genMultOneByte (operand * left,
 
   emitcode (";", "signed");
   emitcode ("clr", "F0"); // reset sign flag
-  MOVA (aopGet (AOP (left), 0, FALSE, FALSE, TRUE));
+  MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL));
 
   lbl=newiTempLabel(NULL);
   emitcode ("jnb", "acc.7,!tlabel",  lbl->key+100);
@@ -4467,7 +4597,7 @@ genMultOneByte (operand * left,
   } else {
     lbl=newiTempLabel(NULL);
     emitcode ("mov", "b,a");
-    emitcode ("mov", "a,%s", aopGet (AOP (right), 0, FALSE, FALSE, TRUE));
+    emitcode ("mov", "a,%s", aopGet (AOP (right), 0, FALSE, FALSE, NULL));
     emitcode ("jnb", "acc.7,!tlabel", lbl->key+100);
     // right side is negative, 8-bit two's complement
     emitcode ("cpl", "F0"); // complement sign flag
@@ -4546,8 +4676,8 @@ static void genMultTwoByte (operand *left, operand *right,
 			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 ("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE,NULL));
+			emitcode ("mov","a,%s",aopGet(AOP(right),1,FALSE,FALSE,NULL));
 			emitcode ("jnb","acc.7,!tlabel",lbl->key+100);		
 			emitcode ("xch", "a,b");
 			emitcode ("cpl","a");
@@ -4561,14 +4691,14 @@ static void genMultTwoByte (operand *left, operand *right,
 			emitcode ("mov","mb,a");
 		}
 	} else {
-		emitcode ("mov","mb,%s",aopGet(AOP(right),0,FALSE,FALSE,TRUE));
-		emitcode ("mov","mb,%s",aopGet(AOP(right),1,FALSE,FALSE,TRUE));
+		emitcode ("mov","mb,%s",aopGet(AOP(right),0,FALSE,FALSE,NULL));
+		emitcode ("mov","mb,%s",aopGet(AOP(right),1,FALSE,FALSE,NULL));
 	}
 	/* load up MA with left */
 	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 ("mov","b,%s",aopGet(AOP(left),0,FALSE,FALSE,NULL));
+		emitcode ("mov","a,%s",aopGet(AOP(left),1,FALSE,FALSE,NULL));
 		emitcode ("jnb","acc.7,!tlabel",lbl->key+100);
 		emitcode ("xch", "a,b");
 		emitcode ("cpl","a");
@@ -4582,8 +4712,8 @@ static void genMultTwoByte (operand *left, operand *right,
 		emitcode ("mov","ma,b");
 		emitcode ("mov","ma,a");
 	} else {
-		emitcode ("mov","ma,%s",aopGet(AOP(left),0,FALSE,FALSE,TRUE));
-		emitcode ("mov","ma,%s",aopGet(AOP(left),1,FALSE,FALSE,TRUE));
+		emitcode ("mov","ma,%s",aopGet(AOP(left),0,FALSE,FALSE,NULL));
+		emitcode ("mov","ma,%s",aopGet(AOP(left),1,FALSE,FALSE,NULL));
 	}
 	/* wait for multiplication to finish */
 	lbl = newiTempLabel(NULL);
@@ -4776,14 +4906,12 @@ genDivOneByte (operand * left,
   /* signed is a little bit more difficult */
 
   /* save the signs of the operands */
-  l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE);
-  MOVA (l);
+  MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL));
   emitcode ("xrl", "a,%s", aopGet (AOP (right), 0, FALSE, TRUE, FALSE));
   emitcode ("push", "acc");	/* save it on the stack */
 
   /* now sign adjust for both left & right */
-  l = aopGet (AOP (right), 0, FALSE, FALSE, TRUE);
-  MOVA (l);
+  MOVA (aopGet (AOP (right), 0, FALSE, FALSE, NULL));
   lbl = newiTempLabel (NULL);
   emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100));
   emitcode ("cpl", "a");
@@ -4792,8 +4920,7 @@ genDivOneByte (operand * left,
   emitcode ("mov", "b,a");
 
   /* sign adjust left side */
-  l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE);
-  MOVA (l);
+  MOVA( aopGet (AOP (left), 0, FALSE, FALSE, NULL));
 
   lbl = newiTempLabel (NULL);
   emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100));
@@ -4862,8 +4989,8 @@ static void genDivTwoByte (operand *left, operand *right,
 	if (!umult) {
 		emitcode("clr","F0");
 		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 ("mov","b,%s",aopGet(AOP(left),0,FALSE,FALSE,NULL));
+		emitcode ("mov","a,%s",aopGet(AOP(left),1,FALSE,FALSE,NULL));
 		emitcode ("jnb","acc.7,!tlabel",lbl->key+100);
 		emitcode ("xch", "a,b");
 		emitcode ("cpl","a");
@@ -4876,8 +5003,8 @@ static void genDivTwoByte (operand *left, operand *right,
 		emitcode ("mov","ma,b");
 		emitcode ("mov","ma,a");
 	} else {
-		emitcode ("mov","ma,%s",aopGet(AOP(left),0,FALSE,FALSE,TRUE));
-		emitcode ("mov","ma,%s",aopGet(AOP(left),1,FALSE,FALSE,TRUE));
+		emitcode ("mov","ma,%s",aopGet(AOP(left),0,FALSE,FALSE,NULL));
+		emitcode ("mov","ma,%s",aopGet(AOP(left),1,FALSE,FALSE,NULL));
 	}
 
 	/* load up MB with right */
@@ -4895,8 +5022,8 @@ static void genDivTwoByte (operand *left, operand *right,
 			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 ("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE,NULL));
+			emitcode ("mov","a,%s",aopGet(AOP(right),1,FALSE,FALSE,NULL));
 			emitcode ("jnb","acc.7,!tlabel",lbl->key+100);		
 			emitcode ("xch", "a,b");
 			emitcode ("cpl","a");
@@ -4911,8 +5038,8 @@ static void genDivTwoByte (operand *left, operand *right,
 			emitcode ("mov","mb,a");
 		}
 	} else {
-		emitcode ("mov","mb,%s",aopGet(AOP(right),0,FALSE,FALSE,TRUE));
-		emitcode ("mov","mb,%s",aopGet(AOP(right),1,FALSE,FALSE,TRUE));
+		emitcode ("mov","mb,%s",aopGet(AOP(right),0,FALSE,FALSE,NULL));
+		emitcode ("mov","mb,%s",aopGet(AOP(right),1,FALSE,FALSE,NULL));
 	}
 
 	/* wait for multiplication to finish */
@@ -5050,15 +5177,13 @@ genModOneByte (operand * left,
   /* signed is a little bit more difficult */
 
   /* save the signs of the operands */
-  l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE);
-  MOVA (l);
+  MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL));
 
   emitcode ("xrl", "a,%s", aopGet (AOP (right), 0, FALSE, FALSE, FALSE));
   emitcode ("push", "acc");	/* save it on the stack */
 
   /* now sign adjust for both left & right */
-  l = aopGet (AOP (right), 0, FALSE, FALSE, TRUE);
-  MOVA (l);
+  MOVA (aopGet (AOP (right), 0, FALSE, FALSE, NULL));
 
   lbl = newiTempLabel (NULL);
   emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100));
@@ -5068,8 +5193,7 @@ genModOneByte (operand * left,
   emitcode ("mov", "b,a");
 
   /* sign adjust left side */
-  l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE);
-  MOVA (l);
+  MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL));
 
   lbl = newiTempLabel (NULL);
   emitcode ("jnb", "acc.7,!tlabel", (lbl->key + 100));
@@ -5123,8 +5247,8 @@ static void genModTwoByte (operand *left, operand *right,
 
 	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 ("mov","b,%s",aopGet(AOP(left),0,FALSE,FALSE,NULL));
+		emitcode ("mov","a,%s",aopGet(AOP(left),1,FALSE,FALSE,NULL));
 		emitcode ("jnb","acc.7,!tlabel",lbl->key+100);
 		emitcode ("xch", "a,b");
 		emitcode ("cpl","a");
@@ -5136,8 +5260,8 @@ static void genModTwoByte (operand *left, operand *right,
 		emitcode ("mov","ma,b");
 		emitcode ("mov","ma,a");
 	} else {
-		emitcode ("mov","ma,%s",aopGet(AOP(left),0,FALSE,FALSE,TRUE));
-		emitcode ("mov","ma,%s",aopGet(AOP(left),1,FALSE,FALSE,TRUE));
+		emitcode ("mov","ma,%s",aopGet(AOP(left),0,FALSE,FALSE,NULL));
+		emitcode ("mov","ma,%s",aopGet(AOP(left),1,FALSE,FALSE,NULL));
 	}
 
 	/* load up MB with right */
@@ -5151,8 +5275,8 @@ static void genModTwoByte (operand *left, operand *right,
 			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 ("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE,NULL));
+			emitcode ("mov","a,%s",aopGet(AOP(right),1,FALSE,FALSE,NULL));
 			emitcode ("jnb","acc.7,!tlabel",lbl->key+100);		
 			emitcode ("xch", "a,b");
 			emitcode ("cpl","a");
@@ -5165,8 +5289,8 @@ static void genModTwoByte (operand *left, operand *right,
 			emitcode ("mov","mb,a");
 		}
 	} else {
-		emitcode ("mov","mb,%s",aopGet(AOP(right),0,FALSE,FALSE,TRUE));
-		emitcode ("mov","mb,%s",aopGet(AOP(right),1,FALSE,FALSE,TRUE));
+		emitcode ("mov","mb,%s",aopGet(AOP(right),0,FALSE,FALSE,NULL));
+		emitcode ("mov","mb,%s",aopGet(AOP(right),1,FALSE,FALSE,NULL));
 	}
 
 	/* wait for multiplication to finish */
@@ -5249,8 +5373,7 @@ genIfxJump (iCode * ic, char *jval)
   symbol *tlbl = newiTempLabel (NULL);
   char *inst;
 
-  D (emitcode (";", "genIfxJump ");
-    );
+  D (emitcode (";", "genIfxJump"););
 
   /* if true label then we jump if condition
      supplied is true */
@@ -5289,8 +5412,7 @@ genCmp (operand * left, operand * right,
   unsigned long lit = 0L;
   operand *result;
 
-  D (emitcode (";", "genCmp");
-    );
+  D (emitcode (";", "genCmp"););
 
   result = IC_RESULT (ic);
 
@@ -5299,7 +5421,7 @@ genCmp (operand * left, operand * right,
       AOP_TYPE (right) == AOP_CRY)
     {
       emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir);
-      emitcode ("anl", "c,/%s", AOP (left)->aopu.aop_dir);
+      emitcode ("anl", "c,%s", AOP (left)->aopu.aop_dir);
     }
   else
     {
@@ -5309,13 +5431,13 @@ genCmp (operand * left, operand * right,
       size = max (AOP_SIZE (left), AOP_SIZE (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 (left) != AOP_STR))
+      if ((size == 1) && !sign 
+	  && (AOP_TYPE (right) == AOP_LIT && AOP_TYPE (left) != AOP_DIR && AOP_TYPE (left) != AOP_STR))
 	{
 	  symbol *lbl = newiTempLabel (NULL);
 	  emitcode ("cjne", "%s,%s,!tlabel",
-		    aopGet (AOP (left), offset, FALSE, FALSE, FALSE),
-		    aopGet (AOP (right), offset, FALSE, FALSE, FALSE),
+		    aopGet (AOP (left), offset, FALSE, FALSE, NULL),
+		    aopGet (AOP (right), offset, FALSE, FALSE, NULL),
 		    lbl->key + 100);
 	  emitcode ("", "!tlabeldef", lbl->key + 100);
 	}
@@ -5333,7 +5455,7 @@ genCmp (operand * left, operand * right,
 		    }
 		  else
 		    {
-		      MOVA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE, TRUE));
+		      MOVA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE, NULL));
 
 		      freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
 		      freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
@@ -5358,35 +5480,28 @@ genCmp (operand * left, operand * right,
 	  CLRC;
 	  while (size--)
 	    {
-	      //emitcode (";", "genCmp #1: %d/%d/%d", size, sign, offset);
-	      MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
-	      //emitcode (";", "genCmp #2");
+	      // emitcode (";", "genCmp #1: %d/%d/%d", size, sign, offset);
+	      MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
+	      // emitcode (";", "genCmp #2");
 	      if (sign && (size == 0))
 		{
-		    //emitcode (";", "genCmp #3");
+		  // 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 (";", "genCmp #3.1");
 		      emitcode ("subb", "a,#!constbyte",
 				0x80 ^ (unsigned int) ((lit >> (offset * 8)) & 0x0FFL));
 		    }
 		  else
 		    {
-		      //emitcode (";", "genCmp #3.2");
-		      if (AOP_NEEDSACC (right))
-			{
-			  emitcode ("push", "acc");
-			}
-		      emitcode ("mov", "b,%s", aopGet (AOP (right), offset++,
-						       FALSE, FALSE, FALSE));
+		      // emitcode (";", "genCmp #3.2");
+		      saveAccWarn = 0;	
+		      MOVB(aopGet (AOP (right), offset++, FALSE, FALSE, "b"));
+		      saveAccWarn = DEFAULT_ACC_WARNING;
 		      emitcode ("xrl", "b,#!constbyte",0x80);
-		      if (AOP_NEEDSACC (right))
-			{
-			  emitcode ("pop", "acc");
-			}
 		      emitcode ("subb", "a,b");
 		    }
 		}
@@ -5394,21 +5509,10 @@ genCmp (operand * left, operand * right,
 		{
 		  const char *s;
 
-		  //emitcode (";", "genCmp #4");
-		  if (AOP_NEEDSACC (right))
-		    {
-		      /* Yuck!! */
-		      //emitcode (";", "genCmp #4.1");
-		      emitcode ("xch", "a, b");
-		      MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, TRUE));
-		      emitcode ("xch", "a, b");
-		      s = "b";
-		    }
-		  else
-		    {
-		      //emitcode (";", "genCmp #4.2");
-		      s = aopGet (AOP (right), offset++, FALSE, FALSE, FALSE);
-		    }
+		  // emitcode (";", "genCmp #4");
+		  saveAccWarn = 0;
+		  s = aopGet (AOP (right), offset++, FALSE, FALSE, "b");
+		  saveAccWarn = DEFAULT_ACC_WARNING;
 
 		  emitcode ("subb", "a,%s", s);
 		}
@@ -5531,8 +5635,7 @@ gencjneshort (operand * left, operand * right, symbol * lbl)
        * Exclude the generic type byte from the comparison.
        */
       size--;
-      D (emitcode (";", "cjneshort: generic ptr special case.");
-	)
+      D (emitcode (";", "cjneshort: generic ptr special case."););
     }
 
 
@@ -5542,10 +5645,9 @@ gencjneshort (operand * left, operand * right, symbol * lbl)
     {
       while (size--)
 	{
-	  char *l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE);
-	  MOVA (l);
+	  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
 	  emitcode ("cjne", "a,%s,!tlabel",
-		    aopGet (AOP (right), offset, FALSE, FALSE, FALSE),
+		    aopGet (AOP (right), offset, FALSE, FALSE, NULL),
 		    lbl->key + 100);
 	  offset++;
 	}
@@ -5560,13 +5662,13 @@ gencjneshort (operand * left, operand * right, symbol * lbl)
     {
       while (size--)
 	{
-	  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
+	  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
 	  if ((AOP_TYPE (left) == AOP_DIR && AOP_TYPE (right) == AOP_LIT) &&
 	      ((unsigned int) ((lit >> (offset * 8)) & 0x0FFL) == 0))
 	    emitcode ("jnz", "!tlabel", lbl->key + 100);
 	  else
 	    emitcode ("cjne", "a,%s,!tlabel",
-		      aopGet (AOP (right), offset, FALSE, TRUE, FALSE),
+		      aopGet (AOP (right), offset, FALSE, TRUE, DP2_RESULT_REG),
 		      lbl->key + 100);
 	  offset++;
 	}
@@ -5576,10 +5678,8 @@ gencjneshort (operand * left, operand * right, symbol * lbl)
       /* right is a pointer reg need both a & b */
       while (size--)
 	{
-	  char *l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE);
-	  if (strcmp (l, "b"))
-	    emitcode ("mov", "b,%s", l);
-	  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
+	  MOVB (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
+	  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL));
 	  emitcode ("cjne", "a,b,!tlabel", lbl->key + 100);
 	  offset++;
 	}
@@ -6026,9 +6126,9 @@ genFarFarLogicOp(iCode *ic, char *logicOp)
       _startLazyDPSEvaluation();
       for (size = compSize; (size--); offset++)
       {
-      	  MOVA (aopGet (AOP (IC_LEFT(ic)), offset, FALSE, FALSE, TRUE));
+      	  MOVA (aopGet (AOP (IC_LEFT(ic)), offset, FALSE, FALSE, NULL));
       	  emitcode ("mov", "%s, acc", DP2_RESULT_REG);
-      	  MOVA (aopGet (AOP (IC_RIGHT(ic)), offset, FALSE, FALSE, TRUE));
+      	  MOVA (aopGet (AOP (IC_RIGHT(ic)), offset, FALSE, FALSE, NULL));
       	  
       	  emitcode (logicOp, "a,%s", DP2_RESULT_REG);
       	  emitcode ("push", "acc");
@@ -6063,8 +6163,8 @@ genAnd (iCode * ic, iCode * ifx)
   operand *left, *right, *result;
   int size, offset = 0;
   unsigned long lit = 0L;
-  int bytelit = 0;
-  char buffer[10];
+  int bytelit;
+  char buff[10];
   bool pushResult;
 
   D (emitcode (";", "genAnd "););
@@ -6161,7 +6261,7 @@ genAnd (iCode * ic, iCode * ifx)
 	  else
 	    {
 	      // c = bit & val;
-	      MOVA (aopGet (AOP (right), 0, FALSE, FALSE, TRUE));
+	      MOVA (aopGet (AOP (right), 0, FALSE, FALSE, NULL));
 	      // c = lsb
 	      emitcode ("rrc", "a");
 	      emitcode ("anl", "c,%s", AOP (left)->aopu.aop_dir);
@@ -6188,7 +6288,7 @@ genAnd (iCode * ic, iCode * ifx)
       if (posbit)
 	{
 	  posbit--;
-	  MOVA (aopGet (AOP (left), posbit >> 3, FALSE, FALSE, TRUE));
+	  MOVA (aopGet (AOP (left), posbit >> 3, FALSE, FALSE, NULL));
 	  // bit = left & 2^n
 	  if (size)
 	    emitcode ("mov", "c,acc.%d", posbit & 0x07);
@@ -6197,8 +6297,9 @@ genAnd (iCode * ic, iCode * ifx)
 	    {
 	      if (ifx)
 		{
-		  sprintf (buffer, "acc.%d", posbit & 0x07);
-		  genIfxJump (ifx, buffer);
+		  SNPRINTF (buff, sizeof(buff), 
+			    "acc.%d", posbit & 0x07);
+		  genIfxJump (ifx, buff);
 		}
 	      else 
 		  {
@@ -6217,7 +6318,7 @@ genAnd (iCode * ic, iCode * ifx)
 	    {
 	      if ((bytelit = ((lit >> (offset * 8)) & 0x0FFL)) != 0x0L)
 		{
-		  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
+		  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
 		  // byte ==  2^n ?
 		  if ((posbit = isLiteralBit (bytelit)) != 0)
 		    emitcode ("jb", "acc.%d,!tlabel", (posbit - 1) & 0x07, tlbl->key + 100);
@@ -6225,7 +6326,7 @@ genAnd (iCode * ic, iCode * ifx)
 		    {
 		      if (bytelit != 0x0FFL)
 			emitcode ("anl", "a,%s",
-			  aopGet (AOP (right), offset, FALSE, TRUE, FALSE));
+			  aopGet (AOP (right), offset, FALSE, TRUE, DP2_RESULT_REG));
 		      emitcode ("jnz", "!tlabel", tlbl->key + 100);
 		    }
 		}
@@ -6262,31 +6363,33 @@ genAnd (iCode * ic, iCode * ifx)
 		aopPut (AOP (result), zero, offset);
 	      else if (IS_AOP_PREG (result))
 		{
-		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
-		  emitcode ("anl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE));
+		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL));
+		  emitcode ("anl", "a,%s",
+			    aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG));
 		  aopPut (AOP (result), "a", offset);
 		}
 	      else
 		emitcode ("anl", "%s,%s",
-			  aopGet (AOP (left), offset, FALSE, TRUE, FALSE),
-			  aopGet (AOP (right), offset, FALSE, FALSE, FALSE));
+			  aopGet (AOP (left), offset, FALSE, TRUE, NULL),
+			  aopGet (AOP (right), offset, FALSE, FALSE, NULL));
 	    }
 	  else
 	    {
 	      if (AOP_TYPE (left) == AOP_ACC)
-		emitcode ("anl", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE, FALSE));
+		emitcode ("anl", "a,%s",
+			  aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG));
 	      else
 		{
-		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
+		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL));
 		  if (IS_AOP_PREG (result))
 		    {
-		      emitcode ("anl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE));
+		      emitcode ("anl", "a,%s",
+				aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG));
 		      aopPut (AOP (result), "a", offset);
-
 		    }
 		  else
 		    emitcode ("anl", "%s,a",
-			   aopGet (AOP (left), offset, FALSE, TRUE, FALSE));
+			   aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG));
 		}
 	    }
 	}
@@ -6307,16 +6410,16 @@ genAnd (iCode * ic, iCode * ifx)
 	    {
 	      if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) {
 		emitcode ("anl", "a,%s",
-			  aopGet (AOP (right), offset, FALSE, FALSE, FALSE));
+			  aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG));
 	      } else {
 		if (AOP_TYPE(left)==AOP_ACC) {
 		  emitcode("mov", "b,a");
-		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
+		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL));
 		  emitcode("anl", "a,b");
 		}else {
-		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
+		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL));
 		  emitcode ("anl", "a,%s",
-			    aopGet (AOP (left), offset, FALSE, FALSE, FALSE));
+			    aopGet (AOP (left), offset, FALSE, FALSE, DP2_RESULT_REG));
 		}
 	      }
 	      emitcode ("jnz", "!tlabel", tlbl->key + 100);
@@ -6342,7 +6445,7 @@ genAnd (iCode * ic, iCode * ifx)
 		  if ((bytelit = (int) ((lit >> (offset * 8)) & 0x0FFL)) == 0x0FF)
 		    {
 		      aopPut (AOP (result),
-			   aopGet (AOP (left), offset, FALSE, FALSE, FALSE),
+			   aopGet (AOP (left), offset, FALSE, FALSE, NULL),
 			      offset);
 		      continue;
 		    }
@@ -6352,9 +6455,9 @@ genAnd (iCode * ic, iCode * ifx)
 		      continue;
 		    }
 		  D (emitcode (";", "better literal AND."););
-		  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
+		  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
 		  emitcode ("anl", "a, %s", aopGet (AOP (right), offset,
-						    FALSE, FALSE, FALSE));
+						    FALSE, FALSE, DP2_RESULT_REG));
 
 		}
 	      else
@@ -6363,19 +6466,19 @@ genAnd (iCode * ic, iCode * ifx)
 		  // and better if result is SFR
 		  if (AOP_TYPE (left) == AOP_ACC)
 		    {
-		      emitcode ("anl", "a,%s", aopGet (AOP (right), offset,
-						       FALSE, FALSE, FALSE));
+		      emitcode ("anl", "a,%s", 
+				aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG));
 		    }
 		  else
 		    {
-		      char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, TRUE);
+		      char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, NULL);
 		      if (!strcmp(rOp, "a") || !strcmp(rOp, "acc"))
 		      {
 			  emitcode("mov", "b,a");
 			  rOp = "b";
 		      }
 			
-		      MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
+		      MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
 		      emitcode ("anl", "a,%s", rOp);
 		    }			
 		}
@@ -6520,7 +6623,7 @@ genOr (iCode * ic, iCode * ifx)
 	outBitC (result);
       // if(bit | ...)
       else if ((AOP_TYPE (result) == AOP_CRY) && ifx)
-	genIfxJump (ifx, "c");
+	   genIfxJump (ifx, "c");
       goto release;
     }
 
@@ -6577,15 +6680,16 @@ genOr (iCode * ic, iCode * ifx)
 		{
 		  if (IS_AOP_PREG (left))
 		    {
-		      MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
-		      emitcode ("orl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE));
+		      MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL));
+		      emitcode ("orl", "a,%s",
+				aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG));
 		      aopPut (AOP (result), "a", offset);
 		    }
 		  else
 		    {
 		      emitcode ("orl", "%s,%s",
-			    aopGet (AOP (left), offset, FALSE, TRUE, FALSE),
-			 aopGet (AOP (right), offset, FALSE, FALSE, FALSE));
+				aopGet (AOP (left), offset, FALSE, TRUE, NULL),
+				aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG));
 		    }
 		}
 	    }
@@ -6593,20 +6697,22 @@ genOr (iCode * ic, iCode * ifx)
 	    {
 	      if (AOP_TYPE (left) == AOP_ACC)
 		{
-		  emitcode ("orl", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE, FALSE));
+		  emitcode ("orl", "a,%s",
+			    aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG));
 		}
 	      else
 		{
-		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
+		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL));
 		  if (IS_AOP_PREG (left))
 		    {
-		      emitcode ("orl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE));
+		      emitcode ("orl", "a,%s", 
+				aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG));
 		      aopPut (AOP (result), "a", offset);
 		    }
 		  else
 		    {
 		      emitcode ("orl", "%s,a",
-			   aopGet (AOP (left), offset, FALSE, TRUE, FALSE));
+			   aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG));
 		    }
 		}
 	    }
@@ -6628,11 +6734,11 @@ genOr (iCode * ic, iCode * ifx)
 	    {
 	      if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) {
 		emitcode ("orl", "a,%s",
-			  aopGet (AOP (right), offset, FALSE, FALSE, FALSE));
+			  aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG));
 	      } else {
-		MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
+		MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL));
 		emitcode ("orl", "a,%s",
-			  aopGet (AOP (left), offset, FALSE, FALSE, FALSE));
+			  aopGet (AOP (left), offset, FALSE, FALSE, DP2_RESULT_REG));
 	      }
 	      emitcode ("jnz", "!tlabel", tlbl->key + 100);
 	      offset++;
@@ -6658,14 +6764,15 @@ genOr (iCode * ic, iCode * ifx)
 		  if (((lit >> (offset * 8)) & 0x0FFL) == 0x00L)
 		    {
 		      aopPut (AOP (result),
-			   aopGet (AOP (left), offset, FALSE, FALSE, FALSE),
+			   aopGet (AOP (left), offset, FALSE, FALSE, NULL),
 			      offset);
 		      continue;
 		    }
 		  D (emitcode (";", "better literal OR."););
-		  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
-		  emitcode ("orl", "a, %s", aopGet (AOP (right), offset,
-						    FALSE, FALSE, FALSE));
+		  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
+		  emitcode ("orl", "a, %s",
+			    aopGet (AOP (right), offset,
+				    FALSE, FALSE, DP2_RESULT_REG));
 
 		}
 	      else
@@ -6674,12 +6781,13 @@ genOr (iCode * ic, iCode * ifx)
 		  // and better if result is SFR
 		  if (AOP_TYPE (left) == AOP_ACC)
 		    {
-		      emitcode ("orl", "a,%s", aopGet (AOP (right), offset,
-						       FALSE, FALSE, FALSE));
+		      emitcode ("orl", "a,%s",
+				aopGet (AOP (right), offset,
+					FALSE, FALSE, DP2_RESULT_REG));
 		    }
 		  else
 		    {
-		      char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, TRUE);
+		      char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, NULL);
 			
 		      if (!strcmp(rOp, "a") || !strcmp(rOp, "acc"))
 		      {
@@ -6687,7 +6795,7 @@ genOr (iCode * ic, iCode * ifx)
 			  rOp = "b";
 		      }
 			
-		      MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
+		      MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
 		      emitcode ("orl", "a,%s", rOp);
 		    }
 		}
@@ -6832,7 +6940,7 @@ genXor (iCode * ic, iCode * ifx)
 	      emitcode ("setb", "c");
 	      while (sizer)
 		{
-		  MOVA (aopGet (AOP (right), sizer - 1, FALSE, FALSE, TRUE));
+		  MOVA (aopGet (AOP (right), sizer - 1, FALSE, FALSE, NULL));
 		  if (sizer == 1)
 		    // test the msb of the lsb
 		    emitcode ("anl", "a,#!constbyte",0xfe);
@@ -6867,30 +6975,33 @@ genXor (iCode * ic, iCode * ifx)
 		continue;
 	      else if (IS_AOP_PREG (left))
 		{
-		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
-		  emitcode ("xrl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE));
+		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL));
+		  emitcode ("xrl", "a,%s",
+			    aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG));
 		  aopPut (AOP (result), "a", offset);
 		}
 	      else
 		emitcode ("xrl", "%s,%s",
-			  aopGet (AOP (left), offset, FALSE, TRUE, FALSE),
-			  aopGet (AOP (right), offset, FALSE, FALSE, FALSE));
+			  aopGet (AOP (left), offset, FALSE, TRUE, NULL),
+			  aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG));
 	    }
 	  else
 	    {
 	      if (AOP_TYPE (left) == AOP_ACC)
-		emitcode ("xrl", "a,%s", aopGet (AOP (right), offset, FALSE, FALSE, FALSE));
+		emitcode ("xrl", "a,%s",
+			  aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG));
 	      else
 		{
-		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
+		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE, NULL));
 		  if (IS_AOP_PREG (left))
 		    {
-		      emitcode ("xrl", "a,%s", aopGet (AOP (left), offset, FALSE, TRUE, FALSE));
+		      emitcode ("xrl", "a,%s",
+				aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG));
 		      aopPut (AOP (result), "a", offset);
 		    }
 		  else
 		    emitcode ("xrl", "%s,a",
-			   aopGet (AOP (left), offset, FALSE, TRUE, FALSE));
+			   aopGet (AOP (left), offset, FALSE, TRUE, DP2_RESULT_REG));
 		}
 	    }
 	}
@@ -6913,22 +7024,22 @@ genXor (iCode * ic, iCode * ifx)
 	      if ((AOP_TYPE (right) == AOP_LIT) &&
 		  (((lit >> (offset * 8)) & 0x0FFL) == 0x00L))
 		{
-		  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
+		  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
 		}
 	      else
 		{
 		  if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) {
 		    emitcode ("xrl", "a,%s",
-			      aopGet (AOP (right), offset, FALSE, FALSE, FALSE));
+			      aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG));
 		  } else {
-		      char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, TRUE);
+		      char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, NULL);
 		      if (!strcmp(rOp, "a") || !strcmp(rOp, "acc"))
 		      {
 			  emitcode("mov", "b,a");
 			  rOp = "b";
 		      }
 			
-		      MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
+		      MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
 		      emitcode ("xrl", "a,%s", rOp);		      
 		  }
 		}
@@ -6955,14 +7066,14 @@ genXor (iCode * ic, iCode * ifx)
 		if (((lit >> (offset * 8)) & 0x0FFL) == 0x00L)
 		  {
 		    aopPut (AOP (result),
-			    aopGet (AOP (left), offset, FALSE, FALSE, FALSE),
+			    aopGet (AOP (left), offset, FALSE, FALSE, NULL),
 			    offset);
 		    continue;
 		  }
 		D (emitcode (";", "better literal XOR."););
-		MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
-		emitcode ("xrl", "a, %s", aopGet (AOP (right), offset,
-						  FALSE, FALSE, FALSE));
+		MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
+		emitcode ("xrl", "a, %s",
+			  aopGet (AOP (right), offset, FALSE, FALSE, DP2_RESULT_REG));
 	      }
 	    else
 	      {
@@ -6970,19 +7081,20 @@ genXor (iCode * ic, iCode * ifx)
 		// and better if result is SFR
 		if (AOP_TYPE (left) == AOP_ACC)
 		  {
-		    emitcode ("xrl", "a,%s", aopGet (AOP (right), offset,
-						     FALSE, FALSE, FALSE));
+		    emitcode ("xrl", "a,%s",
+			      aopGet (AOP (right), offset,
+				      FALSE, FALSE, DP2_RESULT_REG));
 		  }
 		else
 		  {
-		      char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, TRUE);
+		      char *rOp = aopGet (AOP (right), offset, FALSE, FALSE, NULL);
 		      if (!strcmp(rOp, "a") || !strcmp(rOp, "acc"))
 		      {
 			  emitcode("mov", "b,a");
 			  rOp = "b";
 		      }
 			
-		      MOVA (aopGet (AOP (left), offset, FALSE, FALSE, TRUE));
+		      MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
 		      emitcode ("xrl", "a,%s", rOp);
 		  }
 	      }
@@ -7006,13 +7118,13 @@ genInline (iCode * ic)
 {
   char *buffer, *bp, *bp1;
 
-  D (emitcode (";", "genInline ");
-    );
+  D (emitcode (";", "genInline "); );
 
   _G.inLine += (!options.asmpeep);
 
-  buffer = bp = bp1 = Safe_calloc(1, strlen(IC_INLINE(ic))+1);
-  strcpy (buffer, IC_INLINE (ic));
+  buffer = Safe_strdup(IC_INLINE(ic));
+  bp = buffer;
+  bp1 = buffer;
 
   /* emit each line as a code */
   while (*bp)
@@ -7050,17 +7162,15 @@ static void
 genRRC (iCode * ic)
 {
   operand *left, *result;
-  int size, offset = 0;
-  char *l;
+  int 	  size, offset;
 
-  D (emitcode (";", "genRRC ");
-    );
+  D (emitcode (";", "genRRC "););
 
   /* rotate right with carry */
   left = IC_LEFT (ic);
   result = IC_RESULT (ic);
   aopOp (left, ic, FALSE, FALSE);
-  aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR);
+  aopOp (result, ic, FALSE, AOP_USESDPTR(left));
 
   /* move it to the result */
   size = AOP_SIZE (result);
@@ -7070,8 +7180,7 @@ genRRC (iCode * ic)
   _startLazyDPSEvaluation ();
   while (size--)
     {
-      l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE);
-      MOVA (l);
+      MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
       emitcode ("rrc", "a");
       if (AOP_SIZE (result) > 1)
 	aopPut (AOP (result), "a", offset--);
@@ -7082,8 +7191,7 @@ genRRC (iCode * ic)
      highest order byte of the result */
   if (AOP_SIZE (result) > 1)
     {
-      l = aopGet (AOP (result), AOP_SIZE (result) - 1, FALSE, FALSE, TRUE);
-      MOVA (l);
+      MOVA (aopGet (AOP (result), AOP_SIZE (result) - 1, FALSE, FALSE, NULL));
     }
   emitcode ("mov", "acc.7,c");
   aopPut (AOP (result), "a", AOP_SIZE (result) - 1);
@@ -7098,24 +7206,23 @@ static void
 genRLC (iCode * ic)
 {
   operand *left, *result;
-  int size, offset = 0;
+  int size, offset;
   char *l;
 
-  D (emitcode (";", "genRLC ");
-    );
+  D (emitcode (";", "genRLC "););
 
   /* rotate right with carry */
   left = IC_LEFT (ic);
   result = IC_RESULT (ic);
   aopOp (left, ic, FALSE, FALSE);
-  aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR);
+  aopOp (result, ic, FALSE, AOP_USESDPTR(left));
 
   /* move it to the result */
   size = AOP_SIZE (result);
   offset = 0;
   if (size--)
     {
-      l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE);
+      l = aopGet (AOP (left), offset, FALSE, FALSE, NULL);
       MOVA (l);
       emitcode ("add", "a,acc");
       if (AOP_SIZE (result) > 1)
@@ -7126,7 +7233,7 @@ genRLC (iCode * ic)
       _startLazyDPSEvaluation ();
       while (size--)
 	{
-	  l = aopGet (AOP (left), offset, FALSE, FALSE, TRUE);
+	  l = aopGet (AOP (left), offset, FALSE, FALSE, NULL);
 	  MOVA (l);
 	  emitcode ("rlc", "a");
 	  if (AOP_SIZE (result) > 1)
@@ -7138,7 +7245,7 @@ genRLC (iCode * ic)
      highest order byte of the result */
   if (AOP_SIZE (result) > 1)
     {
-      l = aopGet (AOP (result), 0, FALSE, FALSE, TRUE);
+      l = aopGet (AOP (result), 0, FALSE, FALSE, NULL);
       MOVA (l);
     }
   emitcode ("mov", "acc.0,c");
@@ -7157,13 +7264,12 @@ genGetHbit (iCode * ic)
   left = IC_LEFT (ic);
   result = IC_RESULT (ic);
   aopOp (left, ic, FALSE, FALSE);
-  aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR);
+  aopOp (result, ic, FALSE, AOP_USESDPTR(left));
 
-  D (emitcode (";", "genGetHbit ");
-    );
+  D (emitcode (";", "genGetHbit "););
 
   /* get the highest order byte into a */
-  MOVA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE, TRUE));
+  MOVA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE, NULL));
   if (AOP_TYPE (result) == AOP_CRY)
     {
       emitcode ("rlc", "a");
@@ -7316,7 +7422,7 @@ shiftR1Left2Result (operand * left, int offl,
 		    operand * result, int offr,
 		    int shCount, int sign)
 {
-  MOVA (aopGet (AOP (left), offl, FALSE, FALSE, TRUE));
+  MOVA (aopGet (AOP (left), offl, FALSE, FALSE, NULL));
   /* shift right accumulator */
   if (sign)
     AccSRsh (shCount);
@@ -7334,7 +7440,7 @@ static void
 shiftL1Left2Result (operand * left, int offl,
 		    operand * result, int offr, int shCount)
 {
-  MOVA(aopGet (AOP (left), offl, FALSE, FALSE, TRUE));
+  MOVA(aopGet (AOP (left), offl, FALSE, FALSE, NULL));
   /* shift left accumulator */
   AccLsh (shCount);
   aopPut (AOP (result), "a", offr);
@@ -7352,7 +7458,7 @@ movLeft2Result (operand * left, int offl,
   char *l;
   if (!sameRegs (AOP (left), AOP (result)) || (offl != offr))
   {
-      l = aopGet (AOP (left), offl, FALSE, FALSE, TRUE);
+      l = aopGet (AOP (left), offl, FALSE, FALSE, NULL);
 
       if (*l == '@' && (IS_AOP_PREG (result)))
       {
@@ -7716,22 +7822,22 @@ _loadLeftIntoAx(char 	**lsb,
       if (AOP_TYPE(left) == AOP_DPTR2)
        {
            // Get MSB in A.
-       	   MOVA(aopGet(AOP(left), offl + MSB16, FALSE, FALSE, TRUE));
+       	   MOVA(aopGet(AOP(left), offl + MSB16, FALSE, FALSE, NULL));
        	   // get LSB in DP2_RESULT_REG.
-       	   leftByte = aopGet(AOP(left), offl, FALSE, FALSE, FALSE);
+       	   leftByte = aopGet(AOP(left), offl, FALSE, FALSE, DP2_RESULT_REG);
        	   assert(!strcmp(leftByte, DP2_RESULT_REG));
        }
        else
        {
            // get LSB into DP2_RESULT_REG
-       	   leftByte = aopGet (AOP(left), offl, FALSE, FALSE, TRUE);
+       	   leftByte = aopGet (AOP(left), offl, FALSE, FALSE, NULL);
            if (strcmp(leftByte, DP2_RESULT_REG))
            {
                TR_AP("#7");
                emitcode("mov","%s,%s", DP2_RESULT_REG, leftByte);
        	   }
        	   // And MSB in A.
-       	   leftByte = aopGet(AOP(left), offl + MSB16, FALSE, FALSE, TRUE);
+       	   leftByte = aopGet(AOP(left), offl + MSB16, FALSE, FALSE, NULL);
        	   assert(strcmp(leftByte, DP2_RESULT_REG));
        	   MOVA(leftByte);
        }
@@ -7744,16 +7850,16 @@ _loadLeftIntoAx(char 	**lsb,
       	((offl + MSB16) == offr))
       {
       	  /* don't crash result[offr] */
-      	  MOVA(aopGet(AOP(left), offl, FALSE, FALSE, TRUE));
+      	  MOVA(aopGet(AOP(left), offl, FALSE, FALSE, NULL));
       	  emitcode ("xch", "a,%s", 
-      	  	    aopGet(AOP(left), offl + MSB16, FALSE, FALSE, FALSE));
+      	  	    aopGet(AOP(left), offl + MSB16, FALSE, FALSE, DP2_RESULT_REG));
       }
       else
       {
       	  movLeft2Result (left, offl, result, offr, 0);
-      	  MOVA (aopGet (AOP (left), offl + MSB16, FALSE, FALSE, TRUE));
+      	  MOVA (aopGet (AOP (left), offl + MSB16, FALSE, FALSE, NULL));
       }
-      *lsb = aopGet(AOP (result), offr, FALSE, FALSE, FALSE);
+      *lsb = aopGet(AOP (result), offr, FALSE, FALSE, DP2_RESULT_REG);
       assert(strcmp(*lsb,"a"));      
   }
 }
@@ -7823,8 +7929,6 @@ shiftR2Left2Result (operand * left, int offl,
 }
 #endif
 
-#if 0
-//REMOVE ME!!!
 /*-----------------------------------------------------------------*/
 /* shiftLLeftOrResult - shift left one byte from left, or to result */
 /*-----------------------------------------------------------------*/
@@ -7832,15 +7936,15 @@ static void
 shiftLLeftOrResult (operand * left, int offl,
 		    operand * result, int offr, int shCount)
 {
-  MOVA (aopGet (AOP (left), offl, FALSE, FALSE, TRUE));
+  MOVA (aopGet (AOP (left), offl, FALSE, FALSE, NULL));
   /* shift left accumulator */
   AccLsh (shCount);
   /* or with result */
-  emitcode ("orl", "a,%s", aopGet (AOP (result), offr, FALSE, FALSE, FALSE));
+  emitcode ("orl", "a,%s",
+	    aopGet (AOP (result), offr, FALSE, FALSE, DP2_RESULT_REG));
   /* back to result */
   aopPut (AOP (result), "a", offr);
 }
-#endif
 
 #if 0
 //REMOVE ME!!!
@@ -7851,11 +7955,12 @@ static void
 shiftRLeftOrResult (operand * left, int offl,
 		    operand * result, int offr, int shCount)
 {
-  MOVA (aopGet (AOP (left), offl, FALSE, FALSE, TRUE));
+  MOVA (aopGet (AOP (left), offl, FALSE, FALSE, NULL));
   /* shift right accumulator */
   AccRsh (shCount);
   /* or with result */
-  emitcode ("orl", "a,%s", aopGet (AOP (result), offr, FALSE, FALSE, FALSE));
+  emitcode ("orl", "a,%s",
+	    aopGet (AOP (result), offr, FALSE, FALSE, DP2_RESULT_REG));
   /* back to result */
   aopPut (AOP (result), "a", offr);
 }
@@ -7944,13 +8049,13 @@ shiftLLong (operand * left, operand * result, int offr)
 
   if (size >= LSB + offr)
     {
-      l = aopGet (AOP (left), LSB, FALSE, FALSE, TRUE);
+      l = aopGet (AOP (left), LSB, FALSE, FALSE, NULL);
       MOVA (l);
       emitcode ("add", "a,acc");
       if (sameRegs (AOP (left), AOP (result)) &&
 	  size >= MSB16 + offr && offr != LSB)
 	emitcode ("xch", "a,%s",
-		  aopGet (AOP (left), LSB + offr, FALSE, FALSE, FALSE));
+		  aopGet (AOP (left), LSB + offr, FALSE, FALSE, DP2_RESULT_REG));
       else
 	aopPut (AOP (result), "a", LSB + offr);
     }
@@ -7959,14 +8064,13 @@ shiftLLong (operand * left, operand * result, int offr)
     {
       if (!(sameRegs (AOP (result), AOP (left)) && size >= MSB16 + offr && offr != LSB))
 	{
-	  l = aopGet (AOP (left), MSB16, FALSE, FALSE, TRUE);
-	  MOVA (l);
+	  MOVA (aopGet (AOP (left), MSB16, FALSE, FALSE, TRUE));
 	}
       emitcode ("rlc", "a");
       if (sameRegs (AOP (left), AOP (result)) &&
 	  size >= MSB24 + offr && offr != LSB)
 	emitcode ("xch", "a,%s",
-		  aopGet (AOP (left), MSB16 + offr, FALSE, FALSE, FALSE));
+		  aopGet (AOP (left), MSB16 + offr, FALSE, FALSE, DP2_RESULT_REG));
       else
 	aopPut (AOP (result), "a", MSB16 + offr);
     }
@@ -7975,14 +8079,13 @@ shiftLLong (operand * left, operand * result, int offr)
     {
       if (!(sameRegs (AOP (left), AOP (left)) && size >= MSB24 + offr && offr != LSB))
 	{
-	  l = aopGet (AOP (left), MSB24, FALSE, FALSE, TRUE);
-	  MOVA (l);
+	  MOVA (aopGet (AOP (left), MSB24, FALSE, FALSE, NULL));
 	}
       emitcode ("rlc", "a");
       if (sameRegs (AOP (left), AOP (result)) &&
 	  size >= MSB32 + offr && offr != LSB)
 	emitcode ("xch", "a,%s",
-		  aopGet (AOP (left), MSB24 + offr, FALSE, FALSE, FALSE));
+		  aopGet (AOP (left), MSB24 + offr, FALSE, FALSE, DP2_RESULT_REG));
       else
 	aopPut (AOP (result), "a", MSB24 + offr);
     }
@@ -7991,8 +8094,7 @@ shiftLLong (operand * left, operand * result, int offr)
     {
       if (!(sameRegs (AOP (result), AOP (left)) && size >= MSB32 + offr && offr != LSB))
 	{
-	  l = aopGet (AOP (left), MSB32, FALSE, FALSE, TRUE);
-	  MOVA (l);
+	  MOVA (aopGet (AOP (left), MSB32, FALSE, FALSE, NULL));
 	}
       emitcode ("rlc", "a");
       aopPut (AOP (result), "a", MSB32 + offr);
@@ -8131,7 +8233,7 @@ genLeftShiftLiteral (operand * left,
   freeAsmop (right, NULL, ic, TRUE);
 
   aopOp(left, ic, FALSE, FALSE);
-  aopOp(result, ic, FALSE, (AOP_TYPE(left) == AOP_DPTR));
+  aopOp(result, ic, FALSE, AOP_USESDPTR(left));
 
 #if 0 // debug spew
   if (IS_SYMOP(left) && OP_SYMBOL(left)->aop)
@@ -8252,12 +8354,12 @@ genLeftShift (iCode * ic)
   }
   else
   {
-  	emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, FALSE));
-  	emitcode ("inc", "b");
+      MOVB(aopGet (AOP (right), 0, FALSE, FALSE, "b"));
+      emitcode ("inc", "b");
   }
   freeAsmop (right, NULL, ic, TRUE);
   aopOp (left, ic, FALSE, FALSE);
-  aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR);
+  aopOp (result, ic, FALSE, AOP_USESDPTR(left));
 
   /* now move the left to the result if they are not the
      same */
@@ -8270,7 +8372,7 @@ genLeftShift (iCode * ic)
       _startLazyDPSEvaluation ();
       while (size--)
 	{
-	  l = aopGet (AOP (left), offset, FALSE, TRUE, FALSE);
+	  l = aopGet (AOP (left), offset, FALSE, TRUE, NULL);
 	  if (*l == '@' && (IS_AOP_PREG (result)))
 	    {
 
@@ -8294,8 +8396,7 @@ genLeftShift (iCode * ic)
     {
       symbol *tlbl1 = newiTempLabel (NULL);
 
-      l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE);
-      MOVA (l);
+      MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL));
       emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
       emitcode ("", "!tlabeldef", tlbl->key + 100);
       emitcode ("add", "a,acc");
@@ -8309,15 +8410,13 @@ genLeftShift (iCode * ic)
 
   emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
   emitcode ("", "!tlabeldef", tlbl->key + 100);
-  l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE);
-  MOVA (l);
+  MOVA (aopGet (AOP (result), offset, FALSE, FALSE, NULL));
   emitcode ("add", "a,acc");
   aopPut (AOP (result), "a", offset++);
   _startLazyDPSEvaluation ();
   while (--size)
     {
-      l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE);
-      MOVA (l);
+      MOVA (aopGet (AOP (result), offset, FALSE, FALSE, NULL));
       emitcode ("rlc", "a");
       aopPut (AOP (result), "a", offset++);
     }
@@ -8380,8 +8479,6 @@ genrshTwo (operand * result, operand * left,
 }
 #endif
 
-#if 0
-//REMOVE ME!!!
 /*-----------------------------------------------------------------*/
 /* shiftRLong - shift right one long from left to result           */
 /* offl = LSB or MSB16                                             */
@@ -8397,14 +8494,15 @@ shiftRLong (operand * left, int offl,
     werror(E_INTERNAL_ERROR, __FILE__, __LINE__);
   }
 
-  MOVA (aopGet (AOP (left), MSB32, FALSE, FALSE));
+  MOVA (aopGet (AOP (left), MSB32, FALSE, FALSE, NULL));
   
   if (offl==MSB16) {
     // shift is > 8
     if (sign) {
       emitcode ("rlc", "a");
       emitcode ("subb", "a,acc");
-      emitcode ("xch", "a,%s", aopGet(AOP(left), MSB32, FALSE, FALSE));
+      emitcode ("xch", "a,%s",
+		aopGet(AOP(left), MSB32, FALSE, FALSE, DP2_RESULT_REG));
     } else {
       aopPut (AOP(result), zero, MSB32);
     }
@@ -8419,33 +8517,32 @@ shiftRLong (operand * left, int offl,
   emitcode ("rrc", "a");
 
   if (isSameRegs && offl==MSB16) {
-    emitcode ("xch", "a,%s",aopGet (AOP (left), MSB24, FALSE, FALSE));
+    emitcode ("xch",
+	      "a,%s",aopGet (AOP (left), MSB24, FALSE, FALSE, DP2_RESULT_REG));
   } else {
     aopPut (AOP (result), "a", MSB32);
-    MOVA (aopGet (AOP (left), MSB24, FALSE, FALSE));
+    MOVA (aopGet (AOP (left), MSB24, FALSE, FALSE, NULL));
   }
 
   emitcode ("rrc", "a");
   if (isSameRegs && offl==1) {
-    emitcode ("xch", "a,%s",aopGet (AOP (left), MSB16, FALSE, FALSE));
+    emitcode ("xch", "a,%s",
+	      aopGet (AOP (left), MSB16, FALSE, FALSE, DP2_RESULT_REG));
   } else {
     aopPut (AOP (result), "a", MSB24);
-    MOVA (aopGet (AOP (left), MSB16, FALSE, FALSE));
+    MOVA (aopGet (AOP (left), MSB16, FALSE, FALSE, NULL));
   }
   emitcode ("rrc", "a");
   aopPut (AOP (result), "a", MSB16 - offl);
 
   if (offl == LSB)
     {
-      MOVA (aopGet (AOP (left), LSB, FALSE, FALSE));
+      MOVA (aopGet (AOP (left), LSB, FALSE, FALSE, NULL));
       emitcode ("rrc", "a");
       aopPut (AOP (result), "a", LSB);
     }
 }
-#endif
 
-#if 0
-//REMOVE ME!!!
 /*-----------------------------------------------------------------*/
 /* genrshFour - shift four byte by a known amount != 0             */
 /*-----------------------------------------------------------------*/
@@ -8453,22 +8550,24 @@ static void
 genrshFour (operand * result, operand * left,
 	    int shCount, int sign)
 {
-  D (emitcode (";", "genrshFour");
-    );
+  D (emitcode (";", "genrshFour"););
 
   /* if shifting more that 3 bytes */
   if (shCount >= 24)
     {
       shCount -= 24;
+      _startLazyDPSEvaluation();
       if (shCount)
 	shiftR1Left2Result (left, MSB32, result, LSB, shCount, sign);
       else
 	movLeft2Result (left, MSB32, result, LSB, sign);
       addSign (result, MSB16, sign);
+      _endLazyDPSEvaluation();
     }
   else if (shCount >= 16)
     {
       shCount -= 16;
+      _startLazyDPSEvaluation();
       if (shCount)
 	shiftR2Left2Result (left, MSB24, result, LSB, shCount, sign);
       else
@@ -8477,12 +8576,16 @@ genrshFour (operand * result, operand * left,
 	  movLeft2Result (left, MSB32, result, MSB16, sign);
 	}
       addSign (result, MSB24, sign);
+      _endLazyDPSEvaluation();
     }
   else if (shCount >= 8)
     {
       shCount -= 8;
+      _startLazyDPSEvaluation();
       if (shCount == 1)
-	shiftRLong (left, MSB16, result, sign);
+	{
+	    shiftRLong (left, MSB16, result, sign);
+	}
       else if (shCount == 0)
 	{
 	  movLeft2Result (left, MSB16, result, LSB, 0);
@@ -8498,9 +8601,11 @@ genrshFour (operand * result, operand * left,
 	  shiftR1Left2Result (left, MSB32, result, MSB24, shCount, sign);
 	  addSign (result, MSB32, sign);
 	}
+	_endLazyDPSEvaluation();
     }
   else
-    {				/* 1 <= shCount <= 7 */
+    {	
+	/* 1 <= shCount <= 7 */
       if (shCount <= 2)
 	{
 	  shiftRLong (left, LSB, result, sign);
@@ -8515,7 +8620,6 @@ genrshFour (operand * result, operand * left,
 	}
     }
 }
-#endif
 
 #ifdef BETTER_LITERAL_SHIFT
 /*-----------------------------------------------------------------*/
@@ -8539,7 +8643,8 @@ genRightShiftLiteral (operand * left,
   if ((shCount != 0)
    && (shCount < (size * 8))
    && (size != 1)
-   && (size != 2))
+   && (size != 2)
+   /* && (size != 4) in a minute... */)
   {
       D(emitcode (";", "genRightShiftLiteral wimping out"););	
       return FALSE;
@@ -8548,7 +8653,7 @@ genRightShiftLiteral (operand * left,
   freeAsmop (right, NULL, ic, TRUE);
 
   aopOp (left, ic, FALSE, FALSE);
-  aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR);
+  aopOp (result, ic, FALSE, AOP_USESDPTR(left));
 
 #if VIEW_SIZE
   emitcode ("; shift right ", "result %d, left %d", AOP_SIZE (result),
@@ -8573,7 +8678,7 @@ genRightShiftLiteral (operand * left,
       if (sign)
       {
 	/* get sign in acc.7 */
-	MOVA (aopGet (AOP (left), size - 1, FALSE, FALSE, TRUE));
+	MOVA (aopGet (AOP (left), size - 1, FALSE, FALSE, NULL));
       }
       addSign (result, LSB, sign);
     }
@@ -8588,7 +8693,7 @@ genRightShiftLiteral (operand * left,
 	case 2:
 	  genrshTwo (result, left, shCount, sign);
 	  break;
-#if 0
+#if 1
 	case 4:
 	  genrshFour (result, left, shCount, sign);
 	  break;
@@ -8652,12 +8757,12 @@ genSignedRightShift (iCode * ic)
   }
   else
   {
-  	emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, FALSE));
+  	MOVB(aopGet (AOP (right), 0, FALSE, FALSE, "b"));
   	emitcode ("inc", "b");
   }
   freeAsmop (right, NULL, ic, TRUE);
   aopOp (left, ic, FALSE, FALSE);
-  aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR);
+  aopOp (result, ic, FALSE, AOP_USESDPTR(left)); 
 
   /* now move the left to the result if they are not the
      same */
@@ -8670,7 +8775,7 @@ genSignedRightShift (iCode * ic)
       _startLazyDPSEvaluation ();
       while (size--)
 	{
-	  l = aopGet (AOP (left), offset, FALSE, TRUE, FALSE);
+	  l = aopGet (AOP (left), offset, FALSE, TRUE, NULL);
 	  if (*l == '@' && IS_AOP_PREG (result))
 	    {
 
@@ -8690,14 +8795,13 @@ genSignedRightShift (iCode * ic)
 
   size = AOP_SIZE (result);
   offset = size - 1;
-  emitcode ("mov", "a,%s", aopGet (AOP (left), offset, FALSE, FALSE, FALSE));
+  MOVA (aopGet (AOP (left), offset, FALSE, FALSE, NULL));
   emitcode ("rlc", "a");
   emitcode ("mov", "ov,c");
   /* if it is only one byte then */
   if (size == 1)
     {
-      l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE);
-      MOVA (l);
+      MOVA( aopGet (AOP (left), 0, FALSE, FALSE, NULL));
       emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
       emitcode ("", "!tlabeldef", tlbl->key + 100);
       emitcode ("mov", "c,ov");
@@ -8715,8 +8819,7 @@ genSignedRightShift (iCode * ic)
   _startLazyDPSEvaluation ();
   while (size--)
     {
-      l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE);
-      MOVA (l);
+      MOVA (aopGet (AOP (result), offset, FALSE, FALSE, NULL));
       emitcode ("rrc", "a");
       aopPut (AOP (result), "a", offset--);
     }
@@ -8796,12 +8899,12 @@ genRightShift (iCode * ic)
   }
   else
   {
-  	emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE, FALSE));
-  	emitcode ("inc", "b");
+      MOVB(aopGet (AOP (right), 0, FALSE, FALSE, "b"));
+      emitcode ("inc", "b");
   }
   freeAsmop (right, NULL, ic, TRUE);
   aopOp (left, ic, FALSE, FALSE);
-  aopOp (result, ic, FALSE, AOP_TYPE (left) == AOP_DPTR);
+  aopOp (result, ic, FALSE, AOP_USESDPTR(left));
 
   /* now move the left to the result if they are not the
      same */
@@ -8814,7 +8917,7 @@ genRightShift (iCode * ic)
       _startLazyDPSEvaluation ();
       while (size--)
 	{
-	  l = aopGet (AOP (left), offset, FALSE, TRUE, FALSE);
+	  l = aopGet (AOP (left), offset, FALSE, TRUE, NULL);
 	  if (*l == '@' && IS_AOP_PREG (result))
 	    {
 
@@ -8836,8 +8939,7 @@ genRightShift (iCode * ic)
   /* if it is only one byte then */
   if (size == 1)
     {
-      l = aopGet (AOP (left), 0, FALSE, FALSE, TRUE);
-      MOVA (l);
+      MOVA (aopGet (AOP (left), 0, FALSE, FALSE, NULL));
       emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
       emitcode ("", "!tlabeldef", tlbl->key + 100);
       CLRC;
@@ -8855,8 +8957,7 @@ genRightShift (iCode * ic)
   _startLazyDPSEvaluation ();
   while (size--)
     {
-      l = aopGet (AOP (result), offset, FALSE, FALSE, TRUE);
-      MOVA (l);
+      MOVA (aopGet (AOP (result), offset, FALSE, FALSE, NULL));
       emitcode ("rrc", "a");
       aopPut (AOP (result), "a", offset--);
     }
@@ -8878,12 +8979,11 @@ static void
 genUnpackBits (operand * result, char *rname, int ptype)
 {
   int shCnt;
-  int rlen = 0;
+  int rlen;
   sym_link *etype;
   int offset = 0;
 
-  D (emitcode (";", "genUnpackBits ");
-    );
+  D (emitcode (";", "genUnpackBits "););
 
   etype = getSpec (operandType (result));
 
@@ -8917,8 +9017,7 @@ genUnpackBits (operand * result, char *rname, int ptype)
   /* if we have bitdisplacement then it fits   */
   /* into this byte completely or if length is */
   /* less than a byte                          */
-  if ((shCnt = SPEC_BSTR (etype)) ||
-      (SPEC_BLEN (etype) <= 8))
+  if (((shCnt = SPEC_BSTR (etype)) != 0) || (SPEC_BLEN (etype) <= 8))
     {
 
       /* shift right acc */
@@ -8995,21 +9094,27 @@ genDataPointerGet (operand * left,
 		   iCode * ic)
 {
   char *l;
-  char buffer[256];
+  char buff[256];
   int size, offset = 0;
   aopOp (result, ic, TRUE, FALSE);
 
   /* get the string representation of the name */
-  l = aopGet (AOP (left), 0, FALSE, TRUE, FALSE);
+  l = aopGet (AOP (left), 0, FALSE, TRUE, NULL);
   size = AOP_SIZE (result);
   _startLazyDPSEvaluation ();
   while (size--)
     {
-      if (offset)
-	sprintf (buffer, "(%s + %d)", l + 1, offset);
-      else
-	sprintf (buffer, "%s", l + 1);
-      aopPut (AOP (result), buffer, offset++);
+	if (offset)
+	{
+	    SNPRINTF (buff, sizeof(buff), 
+		      "(%s + %d)", l + 1, offset);
+	}
+	else
+	{
+	    SNPRINTF (buff, sizeof(buff), 
+		      "%s", l + 1);
+	}
+      aopPut (AOP (result), buff, offset++);
     }
   _endLazyDPSEvaluation ();
 
@@ -9027,11 +9132,11 @@ genNearPointerGet (operand * left,
 		   iCode *pi)
 {
   asmop *aop = NULL;
-  regs *preg = NULL;
+  regs *preg;
   char *rname;
   sym_link *rtype, *retype, *letype;
   sym_link *ltype = operandType (left);
-  char buffer[80];
+  char buff[80];
 
   rtype = operandType (result);
   retype = getSpec (rtype);
@@ -9061,11 +9166,11 @@ genNearPointerGet (operand * left,
       preg = getFreePtr (ic, &aop, FALSE);
       emitcode ("mov", "%s,%s",
 		preg->name,
-		aopGet (AOP (left), 0, FALSE, TRUE, FALSE));
+		aopGet (AOP (left), 0, FALSE, TRUE, DP2_RESULT_REG));
       rname = preg->name;
     }
   else
-    rname = aopGet (AOP (left), 0, FALSE, FALSE, FALSE);
+    rname = aopGet (AOP (left), 0, FALSE, FALSE, DP2_RESULT_REG);
 
   freeAsmop (left, NULL, ic, TRUE);
   aopOp (result, ic, FALSE, FALSE);
@@ -9089,12 +9194,14 @@ genNearPointerGet (operand * left,
 	    }
 	  else
 	    {
-	      sprintf (buffer, "@%s", rname);
-	      aopPut (AOP (result), buffer, offset);
+	      SNPRINTF (buff, sizeof(buff), "@%s", rname);
+	      aopPut (AOP (result), buff, offset);
 	    }
 	  offset++;
 	  if (size || pi)
-	    emitcode ("inc", "%s", rname);
+	    {
+		emitcode ("inc", "%s", rname);
+	    }
 	}
     }
 
@@ -9141,7 +9248,7 @@ genPagedPointerGet (operand * left,
 		    iCode * pi)
 {
   asmop *aop = NULL;
-  regs *preg = NULL;
+  regs *preg;
   char *rname;
   sym_link *rtype, *retype, *letype;
 
@@ -9159,11 +9266,11 @@ genPagedPointerGet (operand * left,
       preg = getFreePtr (ic, &aop, FALSE);
       emitcode ("mov", "%s,%s",
 		preg->name,
-		aopGet (AOP (left), 0, FALSE, TRUE, FALSE));
+		aopGet (AOP (left), 0, FALSE, TRUE, NULL));
       rname = preg->name;
     }
   else
-    rname = aopGet (AOP (left), 0, FALSE, FALSE, FALSE);
+    rname = aopGet (AOP (left), 0, FALSE, FALSE, NULL);
 
   freeAsmop (left, NULL, ic, TRUE);
   aopOp (result, ic, FALSE, FALSE);
@@ -9231,8 +9338,7 @@ genFarPointerGet (operand * left,
     int size, offset, dopi=1;
   sym_link *retype = getSpec (operandType (result));
   sym_link *letype = getSpec (operandType (left));
-  D (emitcode (";", "genFarPointerGet");
-    );
+  D (emitcode (";", "genFarPointerGet"););
 
   aopOp (left, ic, FALSE, FALSE);
 
@@ -9243,7 +9349,7 @@ genFarPointerGet (operand * left,
       /* if this is remateriazable */
       if (AOP_TYPE (left) == AOP_IMMD)
 	{
-	  emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, FALSE));
+	  emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, NULL));
 	}
       else
 	{
@@ -9251,20 +9357,19 @@ genFarPointerGet (operand * left,
 	  _startLazyDPSEvaluation ();
 	  if (AOP_TYPE (left) != AOP_DPTR)
 	    {
-	      emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE, TRUE));
-	      emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE, TRUE));
+	      emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE, NULL));
+	      emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE, NULL));
 	      if (options.model == MODEL_FLAT24)
-		emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE));
+		emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, NULL));
 	    }
 	  else
 	    {
 	      /* We need to generate a load to DPTR indirect through DPTR. */
-	      D (emitcode (";", "genFarPointerGet -- indirection special case.");
-		);
-	      emitcode ("push", "%s", aopGet (AOP (left), 0, FALSE, TRUE, TRUE));
-	      emitcode ("push", "%s", aopGet (AOP (left), 1, FALSE, TRUE, TRUE));
+	      D (emitcode (";", "genFarPointerGet -- indirection special case."););
+	      emitcode ("push", "%s", aopGet (AOP (left), 0, FALSE, TRUE, NULL));
+	      emitcode ("push", "%s", aopGet (AOP (left), 1, FALSE, TRUE, NULL));
 	      if (options.model == MODEL_FLAT24)
-		emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE));
+		emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, NULL));
 	      emitcode ("pop", "dph");
 	      emitcode ("pop", "dpl");
 	      dopi =0;
@@ -9319,15 +9424,18 @@ genFarPointerGet (operand * left,
     }
   if (dopi && pi && AOP_TYPE (left) != AOP_IMMD) {
       if (!AOP_INDPTRn(left)) {
+	  _startLazyDPSEvaluation ();
 	  aopPut ( AOP (left), "dpl", 0);
 	  aopPut ( AOP (left), "dph", 1);
 	  if (options.model == MODEL_FLAT24)
 	      aopPut ( AOP (left), "dpx", 2);
+	  _endLazyDPSEvaluation ();
       }
     pi->generated = 1;
-  } else if ((OP_SYMBOL(left)->ruonly || AOP_INDPTRn(left)) && 
+  } else if ((AOP_IS_STR(left) || AOP_INDPTRn(left)) && 
 	     AOP_SIZE(result) > 1 &&
-	     (OP_SYMBOL (left)->liveTo > ic->seq || ic->depth)) {
+	     IS_SYMOP(left) &&
+	     (OP_SYMBOL(left)->liveTo > ic->seq || ic->depth)) {
       
       size = AOP_SIZE (result) - 1;
       if (AOP_INDPTRn(left)) {
@@ -9362,27 +9470,26 @@ genCodePointerGet (operand * left,
       /* if this is remateriazable */
       if (AOP_TYPE (left) == AOP_IMMD)
 	{
-	  emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, FALSE));
+	  emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, NULL));
 	}
       else
 	{			/* we need to get it byte by byte */
 	  _startLazyDPSEvaluation ();
 	  if (AOP_TYPE (left) != AOP_DPTR)
 	    {
-	      emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE, TRUE));
-	      emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE, TRUE));
+	      emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE, NULL));
+	      emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE, NULL));
 	      if (options.model == MODEL_FLAT24)
-	        emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE));
+	        emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, NULL));
 	    }
 	  else
 	    {
 	      /* We need to generate a load to DPTR indirect through DPTR. */
-	      D (emitcode (";", "gencodePointerGet -- indirection special case.");
-		);
-	      emitcode ("push", "%s", aopGet (AOP (left), 0, FALSE, TRUE, TRUE));
-	      emitcode ("push", "%s", aopGet (AOP (left), 1, FALSE, TRUE, TRUE));
+	      D (emitcode (";", "gencodePointerGet -- indirection special case."););
+	      emitcode ("push", "%s", aopGet (AOP (left), 0, FALSE, TRUE, NULL));
+	      emitcode ("push", "%s", aopGet (AOP (left), 1, FALSE, TRUE, NULL));
 	      if (options.model == MODEL_FLAT24)
-	        emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE));
+	        emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, NULL));
 	      emitcode ("pop", "dph");
 	      emitcode ("pop", "dpl");
 	      dopi=0;
@@ -9438,10 +9545,14 @@ genCodePointerGet (operand * left,
     }
   if (dopi && pi && AOP_TYPE (left) != AOP_IMMD) {
       if (!AOP_INDPTRn(left)) {
+	  _startLazyDPSEvaluation ();
+	  
 	  aopPut ( AOP (left), "dpl", 0);
 	  aopPut ( AOP (left), "dph", 1);
 	  if (options.model == MODEL_FLAT24)
 	      aopPut ( AOP (left), "dpx", 2);
+
+	  _endLazyDPSEvaluation ();
       }
       pi->generated = 1;
   } else if ((OP_SYMBOL(left)->ruonly || AOP_INDPTRn(left)) && 
@@ -9475,7 +9586,7 @@ genGenPointerGet (operand * left,
 
   D (emitcode (";", "genGenPointerGet "); );
 
-  aopOp (left, ic, FALSE, (OP_SYMBOL(left)->ruonly ? FALSE : TRUE));
+  aopOp (left, ic, FALSE, (AOP_IS_STR(left) ? FALSE : TRUE));
 
   /* if the operand is already in dptr
      then we do nothing else we move the value to dptr */
@@ -9484,50 +9595,28 @@ genGenPointerGet (operand * left,
       /* if this is remateriazable */
       if (AOP_TYPE (left) == AOP_IMMD)
 	{
-	  emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, FALSE));
+	  emitcode ("mov", "dptr,%s", aopGet (AOP (left), 0, TRUE, FALSE, NULL));
 	  if (AOP(left)->aopu.aop_immd.from_cast_remat) 
-		  emitcode ("mov", "b,%s",aopGet(AOP (left), AOP_SIZE(left)-1, FALSE, FALSE, FALSE));
-	  else
-		  emitcode ("mov", "b,#%d", pointerCode (retype));
+	    {
+		MOVB(aopGet(AOP (left), AOP_SIZE(left)-1, FALSE, FALSE, NULL));
+	    }
+	    else
+	    {
+		emitcode ("mov", "b,#%d", pointerCode (retype));
+	    }
 	}
       else
 	{			/* we need to get it byte by byte */
-	  _startLazyDPSEvaluation ();
-#if 0	// I see no point at all to this code.
-	// So I yanked it. Kill at some future date if no bugs rear their heads.
-	  if (AOP(left)->type==AOP_DPTR2) {
-	    char *l;
-	    l=aopGet(AOP(left),0,FALSE,FALSE,TRUE);
-	    genSetDPTR(0);
-	    _flushLazyDPS();
-	    emitcode ("mov", "dpl,%s", l);
-	    l=aopGet(AOP(left),1,FALSE,FALSE,TRUE);
-	    genSetDPTR(0);
-	    _flushLazyDPS();
-	    emitcode ("mov", "dph,%s", l);
-	    if (options.model == MODEL_FLAT24) {
-	      l=aopGet(AOP(left),2,FALSE,FALSE,TRUE);
-	      genSetDPTR(0);
-	      _flushLazyDPS();
-	      emitcode ("mov", "dpx,%s", l);
-	      emitcode ("mov", "b,%s", aopGet (AOP(left),3,FALSE,FALSE,TRUE));
-	    } else {
-	      emitcode ("mov", "b,%s", aopGet (AOP(left),2,FALSE,FALSE,TRUE));
-	    }
-	  } 
-	  else 
-#endif		
-	  {
-	    emitcode ("mov", "dpl,%s", aopGet (AOP(left),0,FALSE,FALSE,TRUE));
-	    emitcode ("mov", "dph,%s", aopGet (AOP(left),1,FALSE,FALSE,TRUE));
+	    _startLazyDPSEvaluation ();
+	    emitcode ("mov", "dpl,%s", aopGet (AOP(left),0,FALSE,FALSE,NULL));
+	    emitcode ("mov", "dph,%s", aopGet (AOP(left),1,FALSE,FALSE,NULL));
 	    if (options.model == MODEL_FLAT24) {
-	      emitcode ("mov", "dpx,%s", aopGet (AOP(left),2,FALSE,FALSE,TRUE));
-	      emitcode ("mov", "b,%s", aopGet (AOP(left),3,FALSE,FALSE,TRUE));
+		emitcode ("mov", "dpx,%s", aopGet (AOP(left),2,FALSE,FALSE,NULL));
+		emitcode ("mov", "b,%s", aopGet (AOP(left),3,FALSE,FALSE,NULL));
 	    } else {
-	      emitcode ("mov", "b,%s", aopGet (AOP(left),2,FALSE,FALSE,TRUE));
+		emitcode ("mov", "b,%s", aopGet (AOP(left),2,FALSE,FALSE,NULL));
 	    }
-	  }
-	  _endLazyDPSEvaluation ();
+	    _endLazyDPSEvaluation ();
 	}
     }
 
@@ -9576,12 +9665,17 @@ genGenPointerGet (operand * left,
     }
 
   if (pi && AOP_TYPE (left) != AOP_IMMD) {
+    _startLazyDPSEvaluation ();
+      
     aopPut ( AOP (left), "dpl", 0);
     aopPut ( AOP (left), "dph", 1);
     if (options.model == MODEL_FLAT24) {
 	aopPut ( AOP (left), "dpx", 2);
 	aopPut ( AOP (left), "b", 3);	
     } else  aopPut ( AOP (left), "b", 2);	
+    
+    _endLazyDPSEvaluation ();
+      
     pi->generated = 1;
   } else if (OP_SYMBOL(left)->ruonly && AOP_SIZE(result) > 1 &&
 	     (OP_SYMBOL (left)->liveTo > ic->seq || ic->depth)) {
@@ -9666,26 +9760,22 @@ genPackBits (sym_link * etype,
 	     operand * right,
 	     char *rname, int p_type)
 {
-  int shCount = 0;
   int offset = 0;
-  int rLen = 0;
+  int rLen;
   int blen, bstr;
   char *l;
 
   blen = SPEC_BLEN (etype);
   bstr = SPEC_BSTR (etype);
 
-  l = aopGet (AOP (right), offset++, FALSE, FALSE, TRUE);
-  MOVA (l);
+  MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, NULL));
 
   /* if the bit lenth is less than or    */
   /* it exactly fits a byte then         */
   if (SPEC_BLEN (etype) <= 8)
     {
-      shCount = SPEC_BSTR (etype);
-
       /* shift left acc */
-      AccLsh (shCount);
+      AccLsh (SPEC_BSTR (etype));
 
       if (SPEC_BLEN (etype) < 8)
 	{			/* if smaller than a byte */
@@ -9746,7 +9836,7 @@ genPackBits (sym_link * etype,
   while (1)
     {
 
-      l = aopGet (AOP (right), offset++, FALSE, TRUE, FALSE);
+      l = aopGet (AOP (right), offset++, FALSE, TRUE, NULL);
 
       rLen -= 8;
       if (rLen < 8)
@@ -9835,20 +9925,25 @@ genDataPointerSet (operand * right,
 		   iCode * ic)
 {
   int size, offset = 0;
-  char *l, buffer[256];
+  char *l, buff[256];
 
   aopOp (right, ic, FALSE, FALSE);
 
-  l = aopGet (AOP (result), 0, FALSE, TRUE, FALSE);
+  l = aopGet (AOP (result), 0, FALSE, TRUE, NULL);
   size = AOP_SIZE (right);
   while (size--)
     {
       if (offset)
-	sprintf (buffer, "(%s + %d)", l + 1, offset);
+	{
+	    SNPRINTF (buff, sizeof(buff), "(%s + %d)", l + 1, offset);
+	}
       else
-	sprintf (buffer, "%s", l + 1);
-      emitcode ("mov", "%s,%s", buffer,
-		aopGet (AOP (right), offset++, FALSE, FALSE, FALSE));
+	{
+	    SNPRINTF (buff, sizeof(buff), "%s", l + 1);
+	}
+	
+      emitcode ("mov", "%s,%s", buff,
+		aopGet (AOP (right), offset++, FALSE, FALSE, NULL));
     }
 
   freeAsmop (right, NULL, ic, TRUE);
@@ -9865,7 +9960,6 @@ genNearPointerSet (operand * right,
 		   iCode * pi)
 {
   asmop *aop = NULL;
-  regs *preg = NULL;
   char *rname, *l;
   sym_link *retype, *letype;
   sym_link *ptype = operandType (result);
@@ -9891,15 +9985,17 @@ genNearPointerSet (operand * right,
   if (!AOP_INPREG (AOP (result)))
     {
       /* otherwise get a free pointer register */
+      regs *preg;
+	
       aop = newAsmop (0);
       preg = getFreePtr (ic, &aop, FALSE);
       emitcode ("mov", "%s,%s",
 		preg->name,
-		aopGet (AOP (result), 0, FALSE, TRUE, FALSE));
+		aopGet (AOP (result), 0, FALSE, TRUE, NULL));
       rname = preg->name;
     }
   else
-    rname = aopGet (AOP (result), 0, FALSE, FALSE, FALSE);
+    rname = aopGet (AOP (result), 0, FALSE, FALSE, NULL);
 
   aopOp (right, ic, FALSE, FALSE);
 
@@ -9914,7 +10010,7 @@ genNearPointerSet (operand * right,
 
       while (size--)
 	{
-	  l = aopGet (AOP (right), offset, FALSE, TRUE, FALSE);
+	  l = aopGet (AOP (right), offset, FALSE, TRUE, NULL);
 	  if (*l == '@')
 	    {
 	      MOVA (l);
@@ -9972,8 +10068,7 @@ genPagedPointerSet (operand * right,
 		    iCode *pi)
 {
   asmop *aop = NULL;
-  regs *preg = NULL;
-  char *rname, *l;
+  char *rname;
   sym_link *retype, *letype;
 
   retype = getSpec (operandType (right));
@@ -9986,15 +10081,17 @@ genPagedPointerSet (operand * right,
   if (!AOP_INPREG (AOP (result)))
     {
       /* otherwise get a free pointer register */
+      regs *preg;
+	
       aop = newAsmop (0);
       preg = getFreePtr (ic, &aop, FALSE);
       emitcode ("mov", "%s,%s",
 		preg->name,
-		aopGet (AOP (result), 0, FALSE, TRUE, FALSE));
+		aopGet (AOP (result), 0, FALSE, TRUE, NULL));
       rname = preg->name;
     }
   else
-    rname = aopGet (AOP (result), 0, FALSE, FALSE, FALSE);
+    rname = aopGet (AOP (result), 0, FALSE, FALSE, NULL);
 
   aopOp (right, ic, FALSE, FALSE);
 
@@ -10009,9 +10106,8 @@ genPagedPointerSet (operand * right,
 
       while (size--)
 	{
-	  l = aopGet (AOP (right), offset, FALSE, TRUE, TRUE);
+	  MOVA (aopGet (AOP (right), offset, FALSE, TRUE, NULL));
 
-	  MOVA (l);
 	  emitcode ("movx", "@%s,a", rname);
 
 	  if (size || pi)
@@ -10074,27 +10170,28 @@ genFarPointerSet (operand * right,
     {
       /* if this is remateriazable */
       if (AOP_TYPE (result) == AOP_IMMD)
-	emitcode ("mov", "dptr,%s", aopGet (AOP (result), 0, TRUE, FALSE, FALSE));
+	emitcode ("mov", "dptr,%s", 
+		  aopGet (AOP (result), 0, TRUE, FALSE, NULL));
       else
 	{
 	  /* we need to get it byte by byte */
 	  _startLazyDPSEvaluation ();
 	  if (AOP_TYPE (result) != AOP_DPTR)
 	    {
-	      emitcode ("mov", "dpl,%s", aopGet (AOP (result), 0, FALSE, FALSE, TRUE));
-	      emitcode ("mov", "dph,%s", aopGet (AOP (result), 1, FALSE, FALSE, TRUE));
+	      emitcode ("mov", "dpl,%s", aopGet (AOP (result), 0, FALSE, FALSE, NULL));
+	      emitcode ("mov", "dph,%s", aopGet (AOP (result), 1, FALSE, FALSE, NULL));
 	      if (options.model == MODEL_FLAT24)
-	        emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, TRUE));
+	        emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, NULL));
 	    }
 	  else
 	    {
 	      /* We need to generate a load to DPTR indirect through DPTR. */
-	      D (emitcode (";", "genFarPointerSet -- indirection special case.");
-		);
-	      emitcode ("push", "%s", aopGet (AOP (result), 0, FALSE, TRUE, TRUE));
-	      emitcode ("push", "%s", aopGet (AOP (result), 1, FALSE, TRUE, TRUE));
+	      D (emitcode (";", "genFarPointerSet -- indirection special case."););
+		
+	      emitcode ("push", "%s", aopGet (AOP (result), 0, FALSE, TRUE, NULL));
+	      emitcode ("push", "%s", aopGet (AOP (result), 1, FALSE, TRUE, NULL));
 	      if (options.model == MODEL_FLAT24)
-	        emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, TRUE));
+	        emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, NULL));
 	      emitcode ("pop", "dph");
 	      emitcode ("pop", "dpl");
 	      dopi=0;
@@ -10119,8 +10216,7 @@ genFarPointerSet (operand * right,
       offset = 0;
       if (AOP_INDPTRn(result) && AOP_USESDPTR(right)) {
 	  while (size--) {
-	      char *l = aopGet (AOP (right), offset++, FALSE, FALSE, TRUE);
-	      MOVA (l);
+	      MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, NULL));
 	      
 	      genSetDPTR(AOP(result)->aopu.dptr);
 	      emitcode ("movx", "@dptr,a");
@@ -10131,8 +10227,7 @@ genFarPointerSet (operand * right,
       } else {
 	  _startLazyDPSEvaluation ();
 	  while (size--) {
-	      char *l = aopGet (AOP (right), offset++, FALSE, FALSE, TRUE);
-	      MOVA (l);
+	      MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, NULL));
 	      
 	      if (AOP_INDPTRn(result)) {
 		  genSetDPTR(AOP(result)->aopu.dptr);
@@ -10151,10 +10246,14 @@ genFarPointerSet (operand * right,
   
   if (dopi && pi && AOP_TYPE (result) != AOP_IMMD) {
       if (!AOP_INDPTRn(result)) {
+	  _startLazyDPSEvaluation ();
+	  
 	  aopPut (AOP(result),"dpl",0);
 	  aopPut (AOP(result),"dph",1);
 	  if (options.model == MODEL_FLAT24)
 	      aopPut (AOP(result),"dpx",2);
+
+	  _endLazyDPSEvaluation ();
       }
       pi->generated=1;
   } else if ((OP_SYMBOL(result)->ruonly || AOP_INDPTRn(result)) && 
@@ -10185,7 +10284,7 @@ genGenPointerSet (operand * right,
   sym_link *retype = getSpec (operandType (right));
   sym_link *letype = getSpec (operandType (result));
 
-  aopOp (result, ic, FALSE, OP_SYMBOL(result)->ruonly ? FALSE : TRUE);
+  aopOp (result, ic, FALSE, AOP_IS_STR(result) ? FALSE : TRUE);
 
   /* if the operand is already in dptr
      then we do nothing else we move the value to dptr */
@@ -10195,53 +10294,87 @@ genGenPointerSet (operand * right,
       /* if this is remateriazable */
       if (AOP_TYPE (result) == AOP_IMMD)
 	{
-	  emitcode ("mov", "dptr,%s", aopGet (AOP (result), 0, TRUE, FALSE, FALSE));
+	  emitcode ("mov", "dptr,%s", aopGet (AOP (result), 0, TRUE, FALSE, NULL));
 	  if (AOP(result)->aopu.aop_immd.from_cast_remat) 
-		  emitcode ("mov", "b,%s",aopGet(AOP (result), AOP_SIZE(result)-1, FALSE, FALSE, FALSE));
+	  {
+	      MOVB(aopGet(AOP (result), AOP_SIZE(result)-1, FALSE, FALSE, NULL));
+	  }
 	  else
-		  emitcode ("mov", "b,%s + 1", aopGet (AOP (result), 0, TRUE, FALSE, FALSE));
+	  {
+	      emitcode ("mov", 
+			"b,%s + 1", aopGet (AOP (result), 0, TRUE, FALSE, NULL));
+	  }
 	}
       else
 	{			/* we need to get it byte by byte */
-	  emitcode ("mov", "dpl,%s", aopGet (AOP (result), 0, FALSE, FALSE, TRUE));
-	  emitcode ("mov", "dph,%s", aopGet (AOP (result), 1, FALSE, FALSE, TRUE));
+	  emitcode ("mov", "dpl,%s", aopGet (AOP (result), 0, FALSE, FALSE, NULL));
+	  emitcode ("mov", "dph,%s", aopGet (AOP (result), 1, FALSE, FALSE, NULL));
 	  if (options.model == MODEL_FLAT24) {
-	    emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, TRUE));
-	    emitcode ("mov", "b,%s", aopGet (AOP (result), 3, FALSE, FALSE, TRUE));
+	    emitcode ("mov", "dpx,%s", aopGet (AOP (result), 2, FALSE, FALSE, NULL));
+	    emitcode ("mov", "b,%s", aopGet (AOP (result), 3, FALSE, FALSE, NULL));
 	  } else {
-	    emitcode ("mov", "b,%s", aopGet (AOP (result), 2, FALSE, FALSE, TRUE));
+	    emitcode ("mov", "b,%s", aopGet (AOP (result), 2, FALSE, FALSE, NULL));
 	  }
 	}
       _endLazyDPSEvaluation ();
     }
-  /* so dptr know contains the address */
+  /* so dptr + b now contains the address */
+  _G.bInUse++;
   aopOp (right, ic, FALSE, TRUE);
+  _G.bInUse--;
+    
 
   /* if bit then unpack */
   if (IS_BITVAR (retype) || IS_BITVAR (letype))
-    genPackBits ((IS_BITVAR (retype) ? retype : letype), right, "dptr", GPOINTER);
+    {
+	genPackBits ((IS_BITVAR (retype) ? retype : letype), right, "dptr", GPOINTER);
+    }
   else
     {
-      size = AOP_SIZE (right);
-      offset = 0;
+	size = AOP_SIZE (right);
+	offset = 0;
 
-      _startLazyDPSEvaluation ();
-      while (size--)
+	_startLazyDPSEvaluation ();
+	while (size--)
 	{
-	  char *l = aopGet (AOP (right), offset++, FALSE, FALSE, TRUE);
-	  MOVA (l);
-
-	  genSetDPTR (0);
-	  _flushLazyDPS ();
+	    if (size)
+	    {
+		// Set two bytes at a time, passed in _AP & A.
+		// dptr will be incremented ONCE by __gptrputWord.
+		//
+		// Note: any change here must be coordinated
+		// with the implementation of __gptrputWord
+		// in device/lib/_gptrput.c
+		emitcode("mov", "_ap, %s", 
+			 aopGet (AOP (right), offset++, FALSE, FALSE, NULL));
+		MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, NULL));
+		
+		genSetDPTR (0);
+		_flushLazyDPS ();
+		emitcode ("lcall", "__gptrputWord");
+		size--;
+	    }
+	    else
+	    {
+		// Only one byte to put.
+		MOVA (aopGet (AOP (right), offset++, FALSE, FALSE, NULL));
 
-	  emitcode ("lcall", "__gptrput");
-	  if (size || (pi && AOP_TYPE (result) != AOP_IMMD))
-	    emitcode ("inc", "dptr");
+		genSetDPTR (0);
+		_flushLazyDPS ();		
+		emitcode ("lcall", "__gptrput");
+	    }
+	    
+	    if (size || (pi && AOP_TYPE (result) != AOP_IMMD))
+	    {
+		emitcode ("inc", "dptr");
+	    }
 	}
-      _endLazyDPSEvaluation ();
+	_endLazyDPSEvaluation ();
     }
 
   if (pi && AOP_TYPE (result) != AOP_IMMD) {
+      _startLazyDPSEvaluation ();
+      
       aopPut (AOP(result),"dpl",0);
       aopPut (AOP(result),"dph",1);
       if (options.model == MODEL_FLAT24) {
@@ -10250,6 +10383,8 @@ genGenPointerSet (operand * right,
       } else {
 	  aopPut (AOP(result),"b",2);
       }
+      _endLazyDPSEvaluation ();
+      
       pi->generated=1;
   } else if (OP_SYMBOL(result)->ruonly && AOP_SIZE(right) > 1 &&
 	     (OP_SYMBOL (result)->liveTo > ic->seq || ic->depth)) {
@@ -10271,8 +10406,7 @@ genPointerSet (iCode * ic, iCode *pi)
   sym_link *type, *etype;
   int p_type;
 
-  D (emitcode (";", "genPointerSet ");
-    );
+  D (emitcode (";", "genPointerSet "););
 
   right = IC_RIGHT (ic);
   result = IC_RESULT (ic);
@@ -10343,9 +10477,14 @@ genIfx (iCode * ic, iCode * popIc)
 
   /* get the value into acc */
   if (AOP_TYPE (cond) != AOP_CRY)
-    toBoolean (cond);
+    {
+	toBoolean (cond);
+    }
   else
-    isbit = 1;
+    {
+	isbit = 1;
+    }
+    
   /* the result is now in the accumulator */
   freeAsmop (cond, NULL, ic, TRUE);
 
@@ -10356,11 +10495,17 @@ genIfx (iCode * ic, iCode * popIc)
   /* if the condition is  a bit variable */
   if (isbit && IS_ITEMP (cond) &&
       SPIL_LOC (cond))
-    genIfxJump (ic, SPIL_LOC (cond)->rname);
+    {
+	genIfxJump (ic, SPIL_LOC (cond)->rname);
+    }
   else if (isbit && !IS_ITEMP (cond))
-    genIfxJump (ic, OP_SYMBOL (cond)->rname);
+    {
+	genIfxJump (ic, OP_SYMBOL (cond)->rname);
+    }
   else
-    genIfxJump (ic, "a");
+    {
+	genIfxJump (ic, "a");
+    }
 
   ic->generated = 1;
 }
@@ -10387,8 +10532,10 @@ genAddrOf (iCode * ic)
       /* if 10 bit stack */
       if (options.stack10bit) {
 	  char buff[10];
+	  int  offset;
+	  
 	  tsprintf(buff, sizeof(buff), 
-	  	   "#!constbyte",(options.stack_loc >> 16) & 0xff);
+		   "#!constbyte",(options.stack_loc >> 16) & 0xff);
 	  /* if it has an offset then we need to compute it */
 /* 	  emitcode ("subb", "a,#!constbyte", */
 /* 		    -((sym->stack < 0) ? */
@@ -10405,9 +10552,13 @@ genAddrOf (iCode * ic)
 					     ((char) sym->stack )) & 0xff);
 	      emitcode ("mov", "b,a");
 	      emitcode ("mov", "a,_bpx+1");
-	      emitcode ("addc","a,#!constbyte", (((sym->stack < 0) ? 
-					      ((short) (sym->stack - _G.nRegsSaved)) :
-					      ((short) sym->stack )) >> 8) & 0xff);
+	      
+	      offset = (((sym->stack < 0) ? 
+			 ((short) (sym->stack - _G.nRegsSaved)) :
+			 ((short) sym->stack )) >> 8) & 0xff;
+	  
+	      emitcode ("addc","a,#!constbyte", offset);
+
 	      aopPut (AOP (IC_RESULT (ic)), "b", 0);
 	      aopPut (AOP (IC_RESULT (ic)), "a", 1);
 	      aopPut (AOP (IC_RESULT (ic)), buff, 2);
@@ -10454,21 +10605,25 @@ genAddrOf (iCode * ic)
       if (offset) {
 	  switch (offset) {
 	  case 1:
-	      tsprintf(s, sizeof(s), "!his",sym->rname);
+	      tsprintf(s, sizeof(s), "#!his",sym->rname);
 	      break;
 	  case 2:
-	      tsprintf(s, sizeof(s), "!hihis",sym->rname);
+	      tsprintf(s, sizeof(s), "#!hihis",sym->rname);
 	      break;
 	  case 3:
-	      tsprintf(s, sizeof(s), "!hihihis",sym->rname);
+	      tsprintf(s, sizeof(s), "#!hihihis",sym->rname);
 	      break;
 	  default: /* should not need this (just in case) */
 	      SNPRINTF (s, sizeof(s), "#(%s >> %d)",
 		       sym->rname,
 		       offset * 8);
 	  }
-      } else
-	  sprintf (s, "#%s", sym->rname);
+      } 
+      else
+      {
+	  SNPRINTF (s, sizeof(s), "#%s", sym->rname);
+      }
+	
       aopPut (AOP (IC_RESULT (ic)), s, offset++);
     }
 
@@ -10477,6 +10632,7 @@ release:
 
 }
 
+#if 0 // obsolete, and buggy for != xdata
 /*-----------------------------------------------------------------*/
 /* genArrayInit - generates code for address of                       */
 /*-----------------------------------------------------------------*/
@@ -10498,7 +10654,7 @@ genArrayInit (iCode * ic)
     {
 	// Load immediate value into DPTR.
 	emitcode("mov", "dptr, %s",
-	     aopGet(AOP(IC_LEFT(ic)), 0, TRUE, FALSE, TRUE));
+	     aopGet(AOP(IC_LEFT(ic)), 0, TRUE, FALSE, NULL));
     }
     else if (AOP_TYPE(IC_LEFT(ic)) != AOP_DPTR)
     {
@@ -10508,10 +10664,10 @@ genArrayInit (iCode * ic)
       exit(1);
 #else
       // a regression because of SDCCcse.c:1.52
-      emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE, TRUE));
-      emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE, TRUE));
+      emitcode ("mov", "dpl,%s", aopGet (AOP (left), 0, FALSE, FALSE, NULL));
+      emitcode ("mov", "dph,%s", aopGet (AOP (left), 1, FALSE, FALSE, NULL));
       if (options.model == MODEL_FLAT24)
-	emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, TRUE));
+	emitcode ("mov", "dpx,%s", aopGet (AOP (left), 2, FALSE, FALSE, NULL));
 #endif
     }
     
@@ -10585,6 +10741,7 @@ genArrayInit (iCode * ic)
     
     freeAsmop (IC_LEFT(ic), NULL, ic, TRUE);
 }
+#endif
 
 /*-----------------------------------------------------------------*/
 /* genFarFarAssign - assignment when both are in far space         */
@@ -10600,7 +10757,7 @@ genFarFarAssign (operand * result, operand * right, iCode * ic)
   {
       /* quick & easy case. */
       D(emitcode(";","genFarFarAssign (1 byte case)"););      
-      MOVA(aopGet(AOP(right), 0, FALSE, FALSE, TRUE));
+      MOVA(aopGet(AOP(right), 0, FALSE, FALSE, NULL));
       freeAsmop (right, NULL, ic, FALSE);
       /* now assign DPTR to result */
       _G.accInUse++;
@@ -10677,7 +10834,7 @@ no time to test now, so later well put in...kpb
       while (size--)
 	{
 	  aopPut (AOP (result),
-		  aopGet (AOP (right), offset, FALSE, FALSE, FALSE), offset);
+		  aopGet (AOP (right), offset, FALSE, FALSE, NULL), offset);
 	  offset++;
 	}
       _endLazyDPSEvaluation ();
@@ -10772,7 +10929,7 @@ genAssign (iCode * ic)
       while (size && ((unsigned int) (lit >> (offset * 8)) != 0))
 	{
 	  aopPut (AOP (result),
-		  aopGet (AOP (right), offset, FALSE, FALSE, TRUE),
+		  aopGet (AOP (right), offset, FALSE, FALSE, NULL),
 		  offset);
 	  offset++;
 	  size--;
@@ -10794,7 +10951,7 @@ genAssign (iCode * ic)
       while (size--)
 	{
 	  aopPut (AOP (result),
-		  aopGet (AOP (right), offset, FALSE, FALSE, FALSE),
+		  aopGet (AOP (right), offset, FALSE, FALSE, NULL),
 		  offset);
 	  offset++;
 	}
@@ -10820,7 +10977,7 @@ genJumpTab (iCode * ic)
 
   aopOp (IC_JTCOND (ic), ic, FALSE, FALSE);
   /* get the condition into accumulator */
-  l = aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE, TRUE);
+  l = aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE, NULL);
   MOVA (l);
   /* multiply by four! */
   emitcode ("add", "a,acc");
@@ -10850,15 +11007,14 @@ genCast (iCode * ic)
   operand *right = IC_RIGHT (ic);
   int size, offset;
 
-  D (emitcode (";", "genCast ");
-    );
+  D (emitcode (";", "genCast "););
 
   /* if they are equivalent then do nothing */
   if (operandsEqu (IC_RESULT (ic), IC_RIGHT (ic)))
     return;
 
   aopOp (right, ic, FALSE, FALSE);
-  aopOp (result, ic, FALSE, AOP_TYPE (right) == AOP_DPTR);
+  aopOp (result, ic, FALSE, AOP_USESDPTR(right));
 
   /* if the result is a bit */
   // if (AOP_TYPE (result) == AOP_CRY) /* works only for true symbols */
@@ -10905,7 +11061,7 @@ genCast (iCode * ic)
       while (size--)
 	{
 	  aopPut (AOP (result),
-		  aopGet (AOP (right), offset, FALSE, FALSE, FALSE),
+		  aopGet (AOP (right), offset, FALSE, FALSE, NULL),
 		  offset);
 	  offset++;
 	}
@@ -10976,7 +11132,7 @@ genCast (iCode * ic)
 	  while (size--)
 	    {
 	      aopPut (AOP (result),
-		      aopGet (AOP (right), offset, FALSE, FALSE, FALSE),
+		      aopGet (AOP (right), offset, FALSE, FALSE, NULL),
 		      offset);
 	      offset++;
 	    }
@@ -10993,7 +11149,7 @@ genCast (iCode * ic)
 		    exit(1);
 		}
 	    
-		sprintf(gpValStr, "#0x%d", gpVal);
+		SNPRINTF(gpValStr, sizeof(gpValStr), "#0x%d", gpVal);
 		aopPut (AOP (result), gpValStr, GPTRSIZE - 1);
 	    }
 	  goto release;
@@ -11006,7 +11162,7 @@ genCast (iCode * ic)
       while (size--)
 	{
 	  aopPut (AOP (result),
-		  aopGet (AOP (right), offset, FALSE, FALSE, FALSE),
+		  aopGet (AOP (right), offset, FALSE, FALSE, NULL),
 		  offset);
 	  offset++;
 	}
@@ -11023,7 +11179,7 @@ genCast (iCode * ic)
   while (size--)
     {
       aopPut (AOP (result),
-	      aopGet (AOP (right), offset, FALSE, FALSE, FALSE),
+	      aopGet (AOP (right), offset, FALSE, FALSE, NULL),
 	      offset);
       offset++;
     }
@@ -11035,7 +11191,7 @@ genCast (iCode * ic)
   /* also, if the source is a bit, we don't need to sign extend, because
    * it can't possibly have set the sign bit.
    */
-  if (SPEC_USIGN (rtype) || !IS_SPEC (rtype) || AOP_TYPE (right) == AOP_CRY)
+  if (!IS_SPEC (rtype) || SPEC_USIGN (rtype) || AOP_TYPE (right) == AOP_CRY)
     {
       while (size--)
 	{
@@ -11045,9 +11201,8 @@ genCast (iCode * ic)
   else
     {
       /* we need to extend the sign :{ */
-      char *l = aopGet (AOP (right), AOP_SIZE (right) - 1,
-			FALSE, FALSE, TRUE);
-      MOVA (l);
+      MOVA (aopGet (AOP (right), AOP_SIZE (right) - 1,
+			FALSE, FALSE, NULL));
       emitcode ("rlc", "a");
       emitcode ("subb", "a,acc");
       while (size--)
@@ -11105,7 +11260,7 @@ genDjnz (iCode * ic, iCode * ifx)
        * the accumulator, we must explicitly write
        * it back after the decrement.
        */
-      char *rByte = aopGet(AOP(IC_RESULT(ic)), 0, FALSE, FALSE, TRUE);
+      char *rByte = aopGet(AOP(IC_RESULT(ic)), 0, FALSE, FALSE, NULL);
       
       if (strcmp(rByte, "a"))
       {
@@ -11125,13 +11280,13 @@ genDjnz (iCode * ic, iCode * ifx)
   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));
+		aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, NULL));
+      emitcode ("mov", "a,%s", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, FALSE, NULL));
       emitcode ("jnz", "!tlabel", lbl->key + 100);
     }
   else
     {
-      emitcode ("djnz", "%s,!tlabel", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, TRUE, FALSE),
+      emitcode ("djnz", "%s,!tlabel", aopGet (AOP (IC_RESULT (ic)), 0, FALSE, TRUE, NULL),
 		lbl->key + 100);
     }
   emitcode ("sjmp", "!tlabel", lbl1->key + 100);
@@ -11150,53 +11305,55 @@ genDjnz (iCode * ic, iCode * ifx)
 static void
 genReceive (iCode * ic)
 {
-
     int size = getSize (operandType (IC_RESULT (ic)));
     int offset = 0;
     int rb1off ;
     
-    D (emitcode (";", "genReceive ");
-       );
+    D (emitcode (";", "genReceive "););
 
-  if (ic->argreg == 1) { /* first parameter */
-      if (isOperandInFarSpace (IC_RESULT (ic)) &&
-	  (OP_SYMBOL (IC_RESULT (ic))->isspilt ||
-	   IS_TRUE_SYMOP (IC_RESULT (ic))))
-	  {
-	      offset = fReturnSizeDS390 - size;
-	      while (size--)
-		  {
-		      emitcode ("push", "%s", (strcmp (fReturn[fReturnSizeDS390 - offset - 1], "a") ?
-					       fReturn[fReturnSizeDS390 - offset - 1] : "acc"));
-		      offset++;
-		  }
-	      aopOp (IC_RESULT (ic), ic, FALSE, FALSE);
-	      size = AOP_SIZE (IC_RESULT (ic));
-	      offset = 0;
-	      while (size--)
-		  {
-		      emitcode ("pop", "acc");
-		      aopPut (AOP (IC_RESULT (ic)), "a", offset++);
-		  }
-	      
-	  } else {
-	      _G.accInUse++;
-	      aopOp (IC_RESULT (ic), ic, FALSE, FALSE);
-	      _G.accInUse--;
-	      assignResultValue (IC_RESULT (ic));
-	  }
-  } else { /* second receive onwards */
-      /* this gets a little tricky since unused recevies will be
+    if (ic->argreg == 1) 
+    {
+	/* first parameter */
+	if (AOP_IS_STR(IC_RESULT(ic)))
+	{
+	    /* Nothing to do: it's already in the proper place. */
+	    return;
+	}
+	else
+	{
+	    bool useDp2;
+	    
+	    useDp2 = isOperandInFarSpace (IC_RESULT (ic)) &&
+		(OP_SYMBOL (IC_RESULT (ic))->isspilt ||
+		 IS_TRUE_SYMOP (IC_RESULT (ic)));
+	    
+	    _G.accInUse++;
+	    aopOp (IC_RESULT (ic), ic, FALSE, useDp2);
+	    _G.accInUse--; 
+	    
+	    /* Sanity checking... */
+	    if (AOP_USESDPTR(IC_RESULT(ic)))
+	    {
+		werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
+			"genReceive got unexpected DPTR.");
+	    }
+	    assignResultValue (IC_RESULT (ic));
+	}
+    } 
+    else 
+    { 
+	/* second receive onwards */
+	/* this gets a little tricky since unused recevies will be
 	 eliminated, we have saved the reg in the type field . and
 	 we use that to figure out which register to use */
-      aopOp (IC_RESULT (ic), ic, FALSE, FALSE);
-      rb1off = ic->argreg;
-      while (size--) {
-	  aopPut (AOP (IC_RESULT (ic)), rb1regs[rb1off++ -5], offset++);
-      }
-      
-  }
-  freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
+	aopOp (IC_RESULT (ic), ic, FALSE, FALSE);
+	rb1off = ic->argreg;
+	while (size--) 
+	{
+	    aopPut (AOP (IC_RESULT (ic)), rb1regs[rb1off++ -5], offset++);
+	}
+    }
+    freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
@@ -11229,10 +11386,10 @@ static void genMemcpyX2X( iCode *ic, int nparms, operand **parms, int fromc)
     aopOp (from, ic->next, FALSE, FALSE);
 
     /* get from into DPTR1 */
-    emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, TRUE));
-    emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, TRUE));
+    emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, NULL));
+    emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, NULL));
     if (options.model == MODEL_FLAT24) {
-	emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, TRUE));
+	emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, NULL));
     }
 
     freeAsmop (from, NULL, ic, FALSE);
@@ -11243,22 +11400,22 @@ static void genMemcpyX2X( iCode *ic, int nparms, operand **parms, int fromc)
     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));
+	    emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, NULL));
+	    emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, NULL));
 	    if (options.model == MODEL_FLAT24)
-		emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE));
+		emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL));
 	    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));
+		emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, NULL));
 	    } 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));
+		emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, NULL));
+		emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, NULL));
 		if (options.model == MODEL_FLAT24) {
-		    emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE));
+		    emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL));
 		}
 	    }
 	    _endLazyDPSEvaluation ();
@@ -11272,7 +11429,7 @@ 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 ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE));
+	emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,NULL));
 	if (fromc) {
 	    emitcode ("lcall","__bi_memcpyc2x_s");
 	} else {
@@ -11283,8 +11440,8 @@ static void genMemcpyX2X( iCode *ic, int nparms, operand **parms, int fromc)
 	symbol *lbl1 = newiTempLabel(NULL);
 	
 	emitcode (";"," Auto increment but no djnz");
-	emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, TRUE));
-	emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, TRUE));
+	emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, NULL));
+	emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, NULL));
 	freeAsmop (count, NULL, ic, FALSE);
 	emitcode ("mov", "dps,#!constbyte",0x21); 	/* Select DPTR2 & auto-toggle. */
 	emitcode ("","!tlabeldef",lbl->key+100);
@@ -11344,10 +11501,10 @@ static void genMemcmpX2X( iCode *ic, int nparms, operand **parms, int fromc)
     aopOp (from, ic->next, FALSE, FALSE);
 
     /* get from into DPTR1 */
-    emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, TRUE));
-    emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, TRUE));
+    emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, NULL));
+    emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, NULL));
     if (options.model == MODEL_FLAT24) {
-	emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, TRUE));
+	emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, NULL));
     }
 
     freeAsmop (from, NULL, ic, FALSE);
@@ -11358,22 +11515,22 @@ static void genMemcmpX2X( iCode *ic, int nparms, operand **parms, int fromc)
     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));
+	    emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, NULL));
+	    emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, NULL));
 	    if (options.model == MODEL_FLAT24)
-		emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE));
+		emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL));
 	    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));
+		emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, NULL));
 	    } 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));
+		emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, NULL));
+		emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, NULL));
 		if (options.model == MODEL_FLAT24) {
-		    emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE));
+		    emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL));
 		}
 	    }
 	    _endLazyDPSEvaluation ();
@@ -11388,7 +11545,7 @@ static void genMemcmpX2X( iCode *ic, int nparms, operand **parms, int fromc)
     /* now for the actual compare */
     if (AOP_TYPE(count) == AOP_LIT && 
 	(int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) {
-	emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE));
+	emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,NULL));
 	if (fromc)
 	    emitcode("lcall","__bi_memcmpc2x_s");
 	else
@@ -11402,8 +11559,8 @@ static void genMemcmpX2X( iCode *ic, int nparms, operand **parms, int fromc)
 
 	emitcode("push","ar0"); 	
 	emitcode (";"," Auto increment but no djnz");
-	emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, TRUE));
-	emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, TRUE));
+	emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, NULL));
+	emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, NULL));
 	freeAsmop (count, NULL, ic, FALSE);
 	emitcode ("mov", "dps,#!constbyte",0x21); 	/* Select DPTR2 & auto-toggle. */
 	emitcode ("","!tlabeldef",lbl->key+100);
@@ -11475,10 +11632,10 @@ static void genInp( iCode *ic, int nparms, operand **parms)
     aopOp (from, ic->next, FALSE, FALSE);
 
     /* get from into DPTR1 */
-    emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, TRUE));
-    emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, TRUE));
+    emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, NULL));
+    emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, NULL));
     if (options.model == MODEL_FLAT24) {
-	emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, TRUE));
+	emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, NULL));
     }
 
     freeAsmop (from, NULL, ic, FALSE);
@@ -11489,22 +11646,22 @@ static void genInp( iCode *ic, int nparms, operand **parms)
     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));
+	    emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, NULL));
+	    emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, NULL));
 	    if (options.model == MODEL_FLAT24)
-		emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE));
+		emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL));
 	    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));
+		emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, NULL));
 	    } 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));
+		emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, NULL));
+		emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, NULL));
 		if (options.model == MODEL_FLAT24) {
-		    emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE));
+		    emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL));
 		}
 	    }
 	    _endLazyDPSEvaluation ();
@@ -11521,7 +11678,7 @@ static void genInp( iCode *ic, int nparms, operand **parms)
 	(int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) {
 	emitcode (";","OH  JOY auto increment with djnz (very fast)");
 	emitcode ("mov", "dps,#!constbyte",0x1); 	/* Select DPTR2 */
-	emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE));
+	emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,NULL));
 	freeAsmop (count, NULL, ic, FALSE);
 	emitcode ("","!tlabeldef",lbl->key+100);
 	emitcode ("movx", "a,@dptr");	/* read data from port */
@@ -11534,8 +11691,8 @@ static void genInp( iCode *ic, int nparms, operand **parms)
 	symbol *lbl1 = newiTempLabel(NULL);
 	
 	emitcode (";"," Auto increment but no djnz");
-	emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, TRUE));
-	emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, TRUE));
+	emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, NULL));
+	emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, NULL));
 	freeAsmop (count, NULL, ic, FALSE);
 	emitcode ("mov", "dps,#!constbyte",0x1); 	/* Select DPTR2 */
 	emitcode ("","!tlabeldef",lbl->key+100);
@@ -11596,10 +11753,10 @@ static void genOutp( iCode *ic, int nparms, operand **parms)
     aopOp (from, ic->next, FALSE, FALSE);
 
     /* get from into DPTR1 */
-    emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, TRUE));
-    emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, TRUE));
+    emitcode ("mov", "dpl1,%s", aopGet (AOP (from), 0, FALSE, FALSE, NULL));
+    emitcode ("mov", "dph1,%s", aopGet (AOP (from), 1, FALSE, FALSE, NULL));
     if (options.model == MODEL_FLAT24) {
-	emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, TRUE));
+	emitcode ("mov", "dpx1,%s", aopGet (AOP (from), 2, FALSE, FALSE, NULL));
     }
 
     freeAsmop (from, NULL, ic, FALSE);
@@ -11610,22 +11767,22 @@ static void genOutp( iCode *ic, int nparms, operand **parms)
     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));
+	    emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, NULL));
+	    emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, NULL));
 	    if (options.model == MODEL_FLAT24)
-		emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE));
+		emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL));
 	    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));
+		emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, NULL));
 	    } 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));
+		emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, NULL));
+		emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, NULL));
 		if (options.model == MODEL_FLAT24) {
-		    emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE));
+		    emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL));
 		}
 	    }
 	    _endLazyDPSEvaluation ();
@@ -11642,7 +11799,7 @@ static void genOutp( iCode *ic, int nparms, operand **parms)
 	(int)floatFromVal (AOP(count)->aopu.aop_lit) <= 256) {
 	emitcode (";","OH  JOY auto increment with djnz (very fast)");
 	emitcode ("mov", "dps,#!constbyte",0x0); 	/* Select DPTR */
-	emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,FALSE));
+	emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,NULL));
 	emitcode ("","!tlabeldef",lbl->key+100);
 	emitcode ("movx", "a,@dptr");	/* read data from port */
 	emitcode ("inc","dps");		/* switch to DPTR2 */
@@ -11655,8 +11812,8 @@ static void genOutp( iCode *ic, int nparms, operand **parms)
 	symbol *lbl1 = newiTempLabel(NULL);
 	
 	emitcode (";"," Auto increment but no djnz");
-	emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, TRUE));
-	emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, TRUE));
+	emitcode ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, NULL));
+	emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, NULL));
 	freeAsmop (count, NULL, ic, FALSE);
 	emitcode ("mov", "dps,#!constbyte",0x0); 	/* Select DPTR */
 	emitcode ("","!tlabeldef",lbl->key+100);
@@ -11698,9 +11855,9 @@ static void genSwapW(iCode *ic, int nparms, operand **parms)
     assert(getSize(operandType(src))==2);
 
     aopOp (src, ic, FALSE, FALSE);
-    emitcode ("mov","a,%s",aopGet(AOP(src),0,FALSE,FALSE,TRUE));
+    emitcode ("mov","a,%s",aopGet(AOP(src),0,FALSE,FALSE,NULL));
     _G.accInUse++;
-    emitcode ("mov","b,%s",aopGet(AOP(src),1,FALSE,FALSE,FALSE));
+    MOVB(aopGet(AOP(src),1,FALSE,FALSE,"b"));
     _G.accInUse--;
     freeAsmop (src, NULL, ic, FALSE);
     
@@ -11719,7 +11876,7 @@ static void genMemsetX(iCode *ic, int nparms, operand **parms)
     symbol *lbl;
     char *l;
     int i;
-    bitVect *rsave = NULL;
+    bitVect *rsave;
 
     /* we know it has to be 3 parameters */
     assert (nparms == 3);
@@ -11745,22 +11902,22 @@ static void genMemsetX(iCode *ic, int nparms, operand **parms)
     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));
+	    emitcode ("push", "%s", aopGet (AOP (to), 0, FALSE, TRUE, NULL));
+	    emitcode ("push", "%s", aopGet (AOP (to), 1, FALSE, TRUE, NULL));
 	    if (options.model == MODEL_FLAT24)
-		emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE));
+		emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL));
 	    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));
+		emitcode ("mov", "dptr,%s", aopGet (AOP (to), 0, TRUE, FALSE, NULL));
 	    } 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));
+		emitcode ("mov", "dpl,%s", aopGet (AOP (to), 0, FALSE, FALSE, NULL));
+		emitcode ("mov", "dph,%s", aopGet (AOP (to), 1, FALSE, FALSE, NULL));
 		if (options.model == MODEL_FLAT24) {
-		    emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, TRUE));
+		    emitcode ("mov", "dpx,%s", aopGet (AOP (to), 2, FALSE, FALSE, NULL));
 		}
 	    }
 	    _endLazyDPSEvaluation ();
@@ -11774,8 +11931,8 @@ static void genMemsetX(iCode *ic, int nparms, operand **parms)
     /* 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));
+	l = aopGet(AOP (val), 0, FALSE, FALSE, NULL);
+	emitcode ("mov", "b,%s",aopGet(AOP(count),0,FALSE,FALSE,NULL));
 	MOVA(l);
 	emitcode ("","!tlabeldef",lbl->key+100);
 	emitcode ("movx", "@dptr,a");
@@ -11784,11 +11941,10 @@ static void genMemsetX(iCode *ic, int nparms, operand **parms)
     } else {
 	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 ("mov","_ap,%s",aopGet (AOP (count), 0, FALSE, TRUE, NULL));
+	emitcode ("mov","b,%s",aopGet (AOP (count), 1, FALSE, TRUE, NULL));
 	emitcode ("","!tlabeldef",lbl->key+100);
-	l = aopGet(AOP (val), 0, FALSE, FALSE, TRUE);
-	MOVA(l);
+	MOVA (aopGet(AOP (val), 0, FALSE, FALSE, NULL));
 	emitcode ("movx", "@dptr,a");
 	emitcode ("inc", "dptr");
 	emitcode ("mov","a,b");
@@ -11823,7 +11979,7 @@ static void genNatLibLoadPrimitive(iCode *ic, int nparms, operand **parms,int si
     
 	pnum = parms[0]; 
 	aopOp (pnum, ic, FALSE, FALSE);
-	emitcode ("mov","a,%s",aopGet(AOP(pnum),0,FALSE,FALSE,FALSE));
+	emitcode ("mov","a,%s",aopGet(AOP(pnum),0,FALSE,FALSE,DP2_RESULT_REG));
 	freeAsmop (pnum, NULL, ic, FALSE);
 	emitcode ("lcall","NatLib_LoadPrimitive");
 	aopOp (result=IC_RESULT(ic), ic, FALSE, FALSE);
@@ -11833,7 +11989,8 @@ static void genNatLibLoadPrimitive(iCode *ic, int nparms, operand **parms,int si
 			emitcode ("push","a%s",javaRet[i]);
 		}
 		for (i=0; i < size ; i++ ) {
-			emitcode ("pop","a%s",aopGet(AOP(result),i,FALSE,FALSE,FALSE));
+			emitcode ("pop","a%s",
+				  aopGet(AOP(result),i,FALSE,FALSE,DP2_RESULT_REG));
 		}
 	} else {
 		for (i = 0 ; i < size ; i++ ) {
@@ -11861,7 +12018,7 @@ static void genNatLibLoadPointer(iCode *ic, int nparms, operand **parms)
     
 	pnum = parms[0]; 
 	aopOp (pnum, ic, FALSE, FALSE);
-	emitcode ("mov","a,%s",aopGet(AOP(pnum),0,FALSE,FALSE,FALSE));
+	emitcode ("mov","a,%s",aopGet(AOP(pnum),0,FALSE,FALSE,DP2_RESULT_REG));
 	freeAsmop (pnum, NULL, ic, FALSE);
 	emitcode ("lcall","NatLib_LoadPointer");
 	aopOp (result=IC_RESULT(ic), ic, FALSE, FALSE);
@@ -11894,12 +12051,13 @@ static void genNatLibInstallStateBlock(iCode *ic, int nparms,
 	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", "dptr,%s",
+			  aopGet (AOP (psb), 0, TRUE, FALSE, DP2_RESULT_REG));
 		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));
+		emitcode ("mov","dpl1,%s",aopGet(AOP(psb),0,FALSE,FALSE,DP2_RESULT_REG));
+		emitcode ("mov","dph1,%s",aopGet(AOP(psb),1,FALSE,FALSE,DP2_RESULT_REG));
+		emitcode ("mov","dpx1,%s",aopGet(AOP(psb),2,FALSE,FALSE,DP2_RESULT_REG));
 	}
 	freeAsmop (psb, NULL, ic, FALSE);
 
@@ -11909,13 +12067,13 @@ static void genNatLibInstallStateBlock(iCode *ic, int nparms,
 	/* 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 ("push","%s",aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode ("push","%s",aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG));
 		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));
+		emitcode ("mov","r2,%s",aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG));	
+		emitcode ("mov","r3,%s",aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG));
 	}
 	freeAsmop (psb, NULL, ic, FALSE);
 
@@ -11976,8 +12134,10 @@ static void genNatLibGetStateBlock(iCode *ic,int nparms,
 	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));
+		emitcode ("pop","%s",
+			  aopGet(AOP(IC_RESULT(ic)),0,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode ("pop","%s",
+			  aopGet(AOP(IC_RESULT(ic)),1,FALSE,TRUE,DP2_RESULT_REG));
 	} else {
 		aopPut(AOP(IC_RESULT(ic)),"r2",0);
 		aopPut(AOP(IC_RESULT(ic)),"r3",1);
@@ -12008,19 +12168,19 @@ static void genMMMalloc (iCode *ic,int nparms, operand **parms,
 
 	/* 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));
+		emitcode("push","%s",aopGet(AOP(bsize),0,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode("push","%s",aopGet(AOP(bsize),1,FALSE,TRUE,DP2_RESULT_REG));
 		if (size==3) {
-			emitcode("push","%s",aopGet(AOP(bsize),2,FALSE,TRUE,FALSE));
+			emitcode("push","%s",aopGet(AOP(bsize),2,FALSE,TRUE,DP2_RESULT_REG));
 			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));
+		emitcode ("mov","r2,%s",aopGet(AOP(bsize),0,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode ("mov","r3,%s",aopGet(AOP(bsize),1,FALSE,TRUE,DP2_RESULT_REG));
 		if (size==3) {
-			emitcode("mov","r4,%s",aopGet(AOP(bsize),2,FALSE,TRUE,FALSE));
+			emitcode("mov","r4,%s",aopGet(AOP(bsize),2,FALSE,TRUE,DP2_RESULT_REG));
 		}
 	}
 	freeAsmop (bsize, NULL, ic, FALSE);
@@ -12038,8 +12198,10 @@ static void genMMMalloc (iCode *ic,int nparms, operand **parms,
 		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));
+			emitcode ("pop","%s",
+				  aopGet(AOP(IC_RESULT(ic)),0,FALSE,TRUE,DP2_RESULT_REG));
+			emitcode ("pop","%s",
+				  aopGet(AOP(IC_RESULT(ic)),1,FALSE,TRUE,DP2_RESULT_REG));
 		} else {
 			aopPut(AOP(IC_RESULT(ic)),"r2",0);
 			aopPut(AOP(IC_RESULT(ic)),"r3",1);
@@ -12067,13 +12229,17 @@ static void genMMDeref (iCode *ic,int nparms, operand **parms)
 
 	/* 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("push","%s",
+			 aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode("push","%s",
+			 aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG));
 		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));
+		emitcode ("mov","r2,%s",
+			  aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode ("mov","r3,%s",
+			  aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG));
 	}
 	freeAsmop (handle, NULL, ic, FALSE);
 
@@ -12085,9 +12251,14 @@ static void genMMDeref (iCode *ic,int nparms, operand **parms)
 		if (rsym->liveFrom != rsym->liveTo) {			
 			aopOp (IC_RESULT(ic),ic,FALSE,FALSE);
 			if (AOP_TYPE(IC_RESULT(ic)) != AOP_STR) {
+			    _startLazyDPSEvaluation ();
+			    
 				aopPut(AOP(IC_RESULT(ic)),"dpl",0);
 				aopPut(AOP(IC_RESULT(ic)),"dph",1);
 				aopPut(AOP(IC_RESULT(ic)),"dpx",2);
+
+			    _endLazyDPSEvaluation ();
+			    
 			}
 		}
 	}
@@ -12113,13 +12284,17 @@ static void genMMUnrestrictedPersist(iCode *ic,int nparms, operand **parms)
 
 	/* 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("push","%s",
+			 aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode("push","%s",
+			 aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG));
 		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));
+		emitcode ("mov","r2,%s",
+			  aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode ("mov","r3,%s",
+			  aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG));
 	}
 	freeAsmop (handle, NULL, ic, FALSE);
 
@@ -12156,24 +12331,29 @@ static void genSystemExecJavaProcess(iCode *ic,int nparms, operand **parms)
 	/* 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("push","%s",
+			 aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode("push","%s",
+			 aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG));
 		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));
+		emitcode ("mov","r2,%s",
+			  aopGet(AOP(handle),0,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode ("mov","r3,%s",
+			  aopGet(AOP(handle),1,FALSE,TRUE,DP2_RESULT_REG));
 	}
 	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));		
+		emitcode ("mov", "dptr,%s",
+			  aopGet (AOP (pp), 0, TRUE, FALSE, NULL));
 	} 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));
+		emitcode ("mov","dpl,%s",aopGet(AOP(pp),0,FALSE,FALSE,NULL));
+		emitcode ("mov","dph,%s",aopGet(AOP(pp),1,FALSE,FALSE,NULL));
+		emitcode ("mov","dpx,%s",aopGet(AOP(pp),2,FALSE,FALSE,NULL));
 	}
 	freeAsmop (handle, NULL, ic, FALSE);
 
@@ -12212,12 +12392,16 @@ static void genSystemRTCRegisters(iCode *ic,int nparms, operand **parms,
 	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", "dptr,%s", 
+			  aopGet (AOP (pp), 0, TRUE, FALSE, NULL));
 		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));
+		emitcode ("mov","dpl1,%s",
+			  aopGet(AOP(pp),0,FALSE,FALSE,DP2_RESULT_REG));
+		emitcode ("mov","dph1,%s",
+			  aopGet(AOP(pp),1,FALSE,FALSE,DP2_RESULT_REG));
+		emitcode ("mov","dpx1,%s",
+			  aopGet(AOP(pp),2,FALSE,FALSE,DP2_RESULT_REG));
 	}
 	freeAsmop (pp, NULL, ic, FALSE);
 
@@ -12244,26 +12428,35 @@ static void genSystemThreadSleep(iCode *ic,int nparms, operand **parms, char *na
 	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 ("push","%s",
+			  aopGet(AOP(to),0,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode ("push","%s",
+			  aopGet(AOP(to),1,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode ("push","%s",
+			  aopGet(AOP(to),2,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode ("push","%s",
+			  aopGet(AOP(to),3,FALSE,TRUE,DP2_RESULT_REG));
 		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));
+		emitcode ("mov","r0,%s",
+			  aopGet(AOP(to),0,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode ("mov","r1,%s",
+			  aopGet(AOP(to),1,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode ("mov","r2,%s",
+			  aopGet(AOP(to),2,FALSE,TRUE,DP2_RESULT_REG));
+		emitcode ("mov","r3,%s",
+			  aopGet(AOP(to),3,FALSE,TRUE,DP2_RESULT_REG));
 	}
 	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));
+	emitcode ("mov","a,%s",
+		  aopGet(AOP(s),0,FALSE,TRUE,NULL));
 	freeAsmop (s, NULL, ic, FALSE);
 
 	/* make the call */
@@ -12290,12 +12483,14 @@ static void genSystemThreadResume(iCode *ic,int nparms, operand **parms)
 	
 	/* PID in R0 */
 	aopOp(pid,ic,FALSE,FALSE);
-	emitcode ("mov","r0,%s",aopGet(AOP(pid),0,FALSE,TRUE,FALSE));
+	emitcode ("mov","r0,%s",
+		  aopGet(AOP(pid),0,FALSE,TRUE,DP2_RESULT_REG));
 	freeAsmop (pid, NULL, ic, FALSE);
 	
 	/* tid into ACC */
 	aopOp(tid,ic,FALSE,FALSE);
-	emitcode ("mov","a,%s",aopGet(AOP(tid),0,FALSE,TRUE,FALSE));
+	emitcode ("mov","a,%s",
+		  aopGet(AOP(tid),0,FALSE,TRUE,DP2_RESULT_REG));
 	freeAsmop (tid, NULL, ic, FALSE);
 	
 	emitcode ("lcall","System_ThreadResume");
@@ -12329,7 +12524,8 @@ static void genSystemProcessResume(iCode *ic,int nparms, operand **parms)
 	
 	/* pid into ACC */
 	aopOp(pid,ic,FALSE,FALSE);
-	emitcode ("mov","a,%s",aopGet(AOP(pid),0,FALSE,TRUE,FALSE));
+	emitcode ("mov","a,%s",
+		  aopGet(AOP(pid),0,FALSE,TRUE,DP2_RESULT_REG));
 	freeAsmop (pid, NULL, ic, FALSE);
 	
 	emitcode ("lcall","System_ProcessResume");
@@ -12363,11 +12559,15 @@ static void genSystemPoll(iCode *ic,int nparms, operand **parms,char *name)
 	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));
+		emitcode ("mov", "dptr,%s", 
+			  aopGet (AOP (fp), 0, TRUE, FALSE, DP2_RESULT_REG));
 	} 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));
+		emitcode ("mov","dpl,%s",
+			  aopGet(AOP(fp),0,FALSE,FALSE,DP2_RESULT_REG));
+		emitcode ("mov","dph,%s",
+			  aopGet(AOP(fp),1,FALSE,FALSE,DP2_RESULT_REG));
+		emitcode ("mov","dpx,%s",
+			  aopGet(AOP(fp),2,FALSE,FALSE,DP2_RESULT_REG));
 	}
 	freeAsmop (fp, NULL, ic, FALSE);
 
@@ -12538,13 +12738,13 @@ gen390Code (iCode * lic)
   }
 #if 1
   /* print the allocation information */
-  if (allocInfo)
+  if (allocInfo && currFunc)
     printAllocInfo (currFunc, codeOutFile);
 #endif
   /* if debug information required */
   if (options.debug && currFunc)
     {
-      cdbSymbol (currFunc, cdbFile, FALSE, TRUE);
+      debugFile->writeFunction(currFunc);
       _G.debugLine = 1;
       if (IS_STATIC (currFunc->etype))
 	emitcode ("", "F%s$%s$0$0 ==.", moduleName, currFunc->name);
@@ -12773,9 +12973,11 @@ gen390Code (iCode * lic)
 	  else addSet (&_G.sendSet, ic);
 	  break;
 
+#if 0 // obsolete, and buggy for != xdata
 	case ARRAYINIT:
 	    genArrayInit(ic);
 	    break;
+#endif
 	    
 	default:
 	  ic = ic;