X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fcodeent.c;h=8c73081b6705f6416fbf1d0a42f9dcf0646b9cf8;hb=112ae0e3db511ddd92e769c11328646ebe2a6240;hp=aed401d88a0214e86c7424d309d39818ba88f7b9;hpb=82b998117aac8b470e0250458b61d7e804c9ca93;p=cc65

diff --git a/src/cc65/codeent.c b/src/cc65/codeent.c
index aed401d88..8c73081b6 100644
--- a/src/cc65/codeent.c
+++ b/src/cc65/codeent.c
@@ -531,33 +531,36 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
 
 	case OP65_AND:
        	    if (RegValIsKnown (In->RegA)) {
-		if (CE_IsConstImm (E)) {
-		    Out->RegA = In->RegA & (short) E->Num;
-		} else if (E->AM == AM65_ZP) {
-		    switch (GetKnownReg (E->Use & REG_ZP, In)) {
-		    	case REG_TMP1:
-		    	    Out->RegA = In->RegA & In->Tmp1;
-		    	    break;
-			case REG_PTR1_LO:
-			    Out->RegA = In->RegA & In->Ptr1Lo;
-			    break;
-			case REG_PTR1_HI:
-			    Out->RegA = In->RegA & In->Ptr1Hi;
-			    break;
-			case REG_SREG_LO:
-			    Out->RegA = In->RegA & In->SRegLo;
-			    break;
-			case REG_SREG_HI:
-			    Out->RegA = In->RegA & In->SRegHi;
-			    break;
-		    	default:
-		    	    Out->RegA = UNKNOWN_REGVAL;
-		     	    break;
-		    }
-		} else {
-		    Out->RegA = UNKNOWN_REGVAL;
-		}
-	    }
+	    	if (CE_IsConstImm (E)) {
+	    	    Out->RegA = In->RegA & (short) E->Num;
+	    	} else if (E->AM == AM65_ZP) {
+	    	    switch (GetKnownReg (E->Use & REG_ZP, In)) {
+	    	    	case REG_TMP1:
+	    	    	    Out->RegA = In->RegA & In->Tmp1;
+	    	    	    break;
+	    		case REG_PTR1_LO:
+	    		    Out->RegA = In->RegA & In->Ptr1Lo;
+	    		    break;
+	    		case REG_PTR1_HI:
+	    		    Out->RegA = In->RegA & In->Ptr1Hi;
+	    		    break;
+	    		case REG_SREG_LO:
+	    		    Out->RegA = In->RegA & In->SRegLo;
+	    		    break;
+	    		case REG_SREG_HI:
+	    		    Out->RegA = In->RegA & In->SRegHi;
+	    		    break;
+	    	    	default:
+	    	    	    Out->RegA = UNKNOWN_REGVAL;
+	    	     	    break;
+	    	    }
+                } else {
+	    	    Out->RegA = UNKNOWN_REGVAL;
+	    	}
+	    } else if (CE_IsKnownImm (E, 0)) {
+                /* A and $00 does always give zero */
+                Out->RegA = 0;
+            }
 	    break;
 
 	case OP65_ASL:
@@ -663,7 +666,7 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
 			break;
 		    case REG_SREG_LO:
 			Out->SRegLo = (In->SRegLo - 1) & 0xFF;
-			break;
+	     		break;
 		    case REG_SREG_HI:
 			Out->SRegHi = (In->SRegHi - 1) & 0xFF;
 			break;
@@ -822,7 +825,7 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
 		if (In->RegA == 0xFF) {
 		    Out->RegA = 0xFF;
 		}
-		if (In->RegX == 0xFF) {
+	     	if (In->RegX == 0xFF) {
                     Out->RegX = 0xFF;
                 }
             } else if (FindBoolCmpCond (E->Arg) != CMP_INV) {
@@ -875,7 +878,7 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
 			Out->RegX = In->Tmp1;
 			break;
 		    case REG_PTR1_LO:
-			Out->RegX = In->Ptr1Lo;
+	     		Out->RegX = In->Ptr1Lo;
 			break;
 		    case REG_PTR1_HI:
 			Out->RegX = In->Ptr1Hi;
@@ -928,7 +931,7 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
 
 	case OP65_LSR:
 	    if (E->AM == AM65_ACC && RegValIsKnown (In->RegA)) {
-		Out->RegA = (In->RegA >> 1) & 0xFF;
+	     	Out->RegA = (In->RegA >> 1) & 0xFF;
 	    } else if (E->AM == AM65_ZP) {
 		switch (GetKnownReg (E->Chg & REG_ZP, In)) {
 		    case REG_TMP1:
@@ -981,11 +984,14 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
 	 	    	    Out->RegA = UNKNOWN_REGVAL;
 	 	    	    break;
 	 	    }
-	 	} else {
-	 	    /* A is now unknown */
-	 	    Out->RegA = UNKNOWN_REGVAL;
-	 	}
-	    }
+	     	} else {
+	     	    /* A is now unknown */
+	     	    Out->RegA = UNKNOWN_REGVAL;
+	     	}
+	    } else if (CE_IsKnownImm (E, 0xFF)) {
+                /* ORA with 0xFF does always give 0xFF */
+                Out->RegA = 0xFF;
+            }
 	    break;
 
 	case OP65_PHA:
@@ -1034,7 +1040,7 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs)
 			Out->SRegLo = UNKNOWN_REGVAL;
 			break;
 		    case REG_SREG_HI:
-			Out->SRegHi = UNKNOWN_REGVAL;
+	     		Out->SRegHi = UNKNOWN_REGVAL;
 			break;
 		}
 	    } else if (E->AM == AM65_ZPX) {
@@ -1367,6 +1373,7 @@ void CE_Output (const CodeEntry* E)
 {
     const OPCDesc* D;
     unsigned Chars;
+    int Space;
     const char* Target;
 
     /* If we have a label, print that */
@@ -1381,6 +1388,9 @@ void CE_Output (const CodeEntry* E)
 
     /* Print the mnemonic */
     Chars = WriteOutput ("\t%s", D->Mnemo);
+              
+    /* Space to leave before the operand */
+    Space = 9 - Chars;
 
     /* Print the operand */
     switch (E->AM) {
@@ -1391,50 +1401,50 @@ void CE_Output (const CodeEntry* E)
 
     	case AM65_ACC:
     	    /* accumulator */
-    	    Chars += WriteOutput ("%*sa", 9-Chars, "");
+    	    Chars += WriteOutput ("%*sa", Space, "");
     	    break;
 
 	case AM65_IMM:
     	    /* immidiate */
-    	    Chars += WriteOutput ("%*s#%s", 9-Chars, "", E->Arg);
+    	    Chars += WriteOutput ("%*s#%s", Space, "", E->Arg);
     	    break;
 
     	case AM65_ZP:
     	case AM65_ABS:
 	    /* zeropage and absolute */
-	    Chars += WriteOutput ("%*s%s", 9-Chars, "", E->Arg);
+	    Chars += WriteOutput ("%*s%s", Space, "", E->Arg);
        	    break;
 
 	case AM65_ZPX:
 	case AM65_ABSX:
 	    /* zeropage,X and absolute,X */
-	    Chars += WriteOutput ("%*s%s,x", 9-Chars, "", E->Arg);
+	    Chars += WriteOutput ("%*s%s,x", Space, "", E->Arg);
 	    break;
 
 	case AM65_ABSY:
 	    /* absolute,Y */
-	    Chars += WriteOutput ("%*s%s,y", 9-Chars, "", E->Arg);
+	    Chars += WriteOutput ("%*s%s,y", Space, "", E->Arg);
 	    break;
 
 	case AM65_ZPX_IND:
 	    /* (zeropage,x) */
-       	    Chars += WriteOutput ("%*s(%s,x)", 9-Chars, "", E->Arg);
+       	    Chars += WriteOutput ("%*s(%s,x)", Space, "", E->Arg);
 	    break;
 
 	case AM65_ZP_INDY:
 	    /* (zeropage),y */
-       	    Chars += WriteOutput ("%*s(%s),y", 9-Chars, "", E->Arg);
+       	    Chars += WriteOutput ("%*s(%s),y", Space, "", E->Arg);
 	    break;
 
 	case AM65_ZP_IND:
 	    /* (zeropage) */
-       	    Chars += WriteOutput ("%*s(%s)", 9-Chars, "", E->Arg);
+       	    Chars += WriteOutput ("%*s(%s)", Space, "", E->Arg);
 	    break;
 
 	case AM65_BRA:
 	    /* branch */
 	    Target = E->JumpTo? E->JumpTo->Name : E->Arg;
-	    Chars += WriteOutput ("%*s%s", 9-Chars, "", Target);
+	    Chars += WriteOutput ("%*s%s", Space, "", Target);
 	    break;
 
 	default:
@@ -1443,11 +1453,11 @@ void CE_Output (const CodeEntry* E)
     }
 
     /* Print usage info if requested by the debugging flag */
-    if (Debug) {
+    if (Debug) {                    
 	char Use [128];
 	char Chg [128];
        	WriteOutput ("%*s; USE: %-12s CHG: %-12s SIZE: %u",
-       	       	     30-Chars, "",
+       	       	     (int)(30-Chars), "",
 	    	     RegInfoDesc (E->Use, Use),
 	    	     RegInfoDesc (E->Chg, Chg),
 	       	     E->Size);