Pre 2.91

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

diff --git a/src/z80/gbz80.c b/src/z80/gbz80.c
index 84946032bd2698ae84a4a8117a1513f6d90e0022..85fab47a900c1c20959738363b878fefaf673202 100644 (file)
--- a/src/z80/gbz80.c
+++ b/src/z80/gbz80.c
@@ -62,11 +62,11 @@ static const char *_gbz80_getRegName(struct regs *reg)
     MUST be terminated with a NULL.
 */
 static const char *_linkCmd[] = {
-    "link-gb", "-nf", "$1", NULL
+    "link-gbz80", "-nf", "$1", NULL
 };
 
 static const char *_asmCmd[] = {
-    "as-gb", "-plosgff", "$1.o", "$1.asm", NULL
+    "as-gbz80", "-plosgff", "$1.o", "$1.asm", NULL
 };
 
 /* Globals */

diff --git a/src/z80/gen.c b/src/z80/gen.c
index 24a5d2c39f88595fb28729eff11162e1c09ffc9e..279811639bf4347595f7edf029f667a066556ebf 100644 (file)
--- a/src/z80/gen.c
+++ b/src/z80/gen.c
@@ -2170,9 +2170,8 @@ static void gencjneshort(operand *left, operand *right, symbol *lbl)
         /* right is a pointer reg need both a & b */
        /* PENDING: is this required? */
         while(size--) {
-            char *l = aopGet(AOP(left),offset,FALSE);
             MOVA(aopGet(AOP(right),offset,FALSE));
-           emitcode("cp", "%s ; 5", l);
+           emitcode("cp", "%s ; 5", aopGet(AOP(left), offset, FALSE));
            emitcode("jr", "nz," LABEL_STR, lbl->key+100);
             offset++;
         }