From: johanknol <johanknol@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Thu, 26 Jul 2001 14:33:02 +0000 (+0000)
Subject: partial fix for bug #444507
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8a018a461930756688efd32c5190fe095ba1b73b;p=fw%2Fsdcc

partial fix for bug #444507


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

diff --git a/src/ds390/gen.c b/src/ds390/gen.c
index c4bee0dd..718eb818 100644
--- a/src/ds390/gen.c
+++ b/src/ds390/gen.c
@@ -5349,9 +5349,14 @@ genAnd (iCode * ic, iCode * ifx)
 	    emitcode ("setb", "c");
 	  while (sizer--)
 	    {
-	      MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
-	      emitcode ("anl", "a,%s",
-			aopGet (AOP (left), offset, FALSE, FALSE, FALSE));
+	      if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) {
+		emitcode ("anl", "a,%s",
+			  aopGet (AOP (right), offset, FALSE, FALSE, FALSE));
+	      } else {
+		MOVA (aopGet (AOP (right), offset, FALSE, FALSE, TRUE));
+		emitcode ("anl", "a,%s",
+			  aopGet (AOP (left), offset, FALSE, FALSE, FALSE));
+	      }
 	      emitcode ("jnz", "%05d$", tlbl->key + 100);
 	      offset++;
 	    }
diff --git a/src/mcs51/gen.c b/src/mcs51/gen.c
index 47793dc3..90cb2c0d 100644
--- a/src/mcs51/gen.c
+++ b/src/mcs51/gen.c
@@ -4592,9 +4592,14 @@ genAnd (iCode * ic, iCode * ifx)
 	    emitcode ("setb", "c");
 	  while (sizer--)
 	    {
-	      MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
-	      emitcode ("anl", "a,%s",
-			aopGet (AOP (left), offset, FALSE, FALSE));
+	      if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) {
+		emitcode ("anl", "a,%s",
+			  aopGet (AOP (right), offset, FALSE, FALSE));
+	      } else {
+		MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
+		emitcode ("anl", "a,%s",
+			  aopGet (AOP (left), offset, FALSE, FALSE));
+	      }
 	      emitcode ("jnz", "%05d$", tlbl->key + 100);
 	      offset++;
 	    }
@@ -4861,9 +4866,14 @@ genOr (iCode * ic, iCode * ifx)
 	    emitcode ("setb", "c");
 	  while (sizer--)
 	    {
-	      MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
-	      emitcode ("orl", "a,%s",
-			aopGet (AOP (left), offset, FALSE, FALSE));
+	      if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) {
+		emitcode ("orl", "a,%s",
+			  aopGet (AOP (right), offset, FALSE, FALSE));
+	      } else {
+		MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
+		emitcode ("orl", "a,%s",
+			  aopGet (AOP (left), offset, FALSE, FALSE));
+	      }
 	      emitcode ("jnz", "%05d$", tlbl->key + 100);
 	      offset++;
 	    }
@@ -5113,9 +5123,14 @@ genXor (iCode * ic, iCode * ifx)
 		}
 	      else
 		{
-		  MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
-		  emitcode ("xrl", "a,%s",
-			    aopGet (AOP (left), offset, FALSE, FALSE));
+		  if (AOP_TYPE(right)==AOP_REG && AOP_TYPE(left)==AOP_ACC) {
+		    emitcode ("xrl", "a,%s",
+			      aopGet (AOP (right), offset, FALSE, FALSE));
+		  } else {
+		    MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
+		    emitcode ("xrl", "a,%s",
+			      aopGet (AOP (left), offset, FALSE, FALSE));
+		  }
 		}
 	      emitcode ("jnz", "%05d$", tlbl->key + 100);
 	      offset++;