file preOutName was unlinked before closed. This seems to be OK on UNIX and cygwin

[fw/sdcc] / src / xa51 / gen.c

diff --git a/src/xa51/gen.c b/src/xa51/gen.c
index 25dcc5dc550166b7925540f42bca22a943695e41..49ada9502543cddf153ce20f8c4dc122cece1d7b 100755 (executable)
--- a/src/xa51/gen.c
+++ b/src/xa51/gen.c
@@ -213,9 +213,9 @@ static asmop *aopForSym(symbol *sym,
          sprintf (aop->name[0], "r0");
          return aop;
        case 3:
-         emitcode ("mov.w", "r0,[%s] ;aopForSym:stack:3", getStackOffset(sym->stack));
+         emitcode ("mov.w", "r0,[%s] ;aopForSym:stack:3.w", getStackOffset(sym->stack));
          sprintf (aop->name[0], "r0");
-         emitcode ("mov.b", "r1l,[%s] ;aopForSym:stack:3", getStackOffset(sym->stack+2));
+         emitcode ("mov.b", "r1l,[%s] ;aopForSym:stack:3.b", getStackOffset(sym->stack+2));
          sprintf (aop->name[1], "r1l");
          return aop;
        case 4:
@@ -1105,15 +1105,16 @@ static void genCmp (iCode * ic, char *trueInstr, char *falseInstr) {
   char *instr;
   int jlbl;
 
-  if (!ifx) {
-    bailOut("genCmp: no ifx");
-  } else {
-    ifx->generated=1;
-  }
 
   size=aopOp(left, TRUE, TRUE);
   aopOp(right, !aopIsPtr(left), TRUE);
 
+  if (size==1) {
+    instr="cmp.b";
+  } else {
+    instr="cmp.w";
+  }
+
   if (IC_TRUE(ifx)) {
     isTrue=TRUE;
     jlbl=IC_TRUE(ifx)->key+100;
@@ -1121,17 +1122,25 @@ static void genCmp (iCode * ic, char *trueInstr, char *falseInstr) {
     isTrue=FALSE;
     jlbl=IC_FALSE(ifx)->key+100;
   }
-
-  if (size==1) {
-    instr="cmp.b";
+  
+  if (!ifx) {
+    aopOp(IC_RESULT(ic), !aopIsPtr(left), TRUE);
+    jlbl=newiTempLabel(NULL)->key+100;
+    emitcode("mov", "%s,#-1", AOP_NAME(IC_RESULT(ic))[0]);
+    emitcode(instr, "%s,%s", AOP_NAME(left)[0], AOP_NAME(right)[0]);
+    emitcode(isTrue ? trueInstr : falseInstr, "%05d$", jlbl);
+    emitcode("cpl", "%s", AOP_NAME(IC_RESULT(ic))[0]);
+    emitcode("", "%05d$:", jlbl);
   } else {
-    instr="cmp.w";
+    emitcode(instr, "%s,%s", AOP_NAME(left)[0], AOP_NAME(right)[0]);
+    emitcode(isTrue ? trueInstr : falseInstr, "%05d$", jlbl);
+    ifx->generated=1;
   }
-  emitcode(instr, "%s,%s", AOP_NAME(left)[0], AOP_NAME(right)[0]);
-  emitcode(isTrue ? trueInstr : falseInstr, "%05d$", jlbl);
+
   if (size>2) {
     bailOut("genCmp: size > 2");
   }
+
 }
 
 /*-----------------------------------------------------------------*/