From 78d9764005afd4dcb21be5fd4fe1f95c51d5352f Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sun, 19 May 2019 10:45:11 -0400 Subject: [PATCH] zasm: can now assemble zasm/expr.asm! --- apps/zasm/expr.asm | 2 +- tools/tests/zasm/test7.asm | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/zasm/expr.asm b/apps/zasm/expr.asm index 41c8049..2b315fc 100644 --- a/apps/zasm/expr.asm +++ b/apps/zasm/expr.asm @@ -53,7 +53,7 @@ _resolveLeftAndRight: ; Now we have parsed everything to the left and we have its result in ; IX. What we need to do now is the same thing on (DE) and then apply ; the + operator. Let's save IX somewhere and parse this. - ex hl, de ; right expr now in HL + ex de, hl ; right expr now in HL push ix pop de ; numeric left expr result in DE jp parseExpr diff --git a/tools/tests/zasm/test7.asm b/tools/tests/zasm/test7.asm index 603740f..a3710a4 100644 --- a/tools/tests/zasm/test7.asm +++ b/tools/tests/zasm/test7.asm @@ -25,6 +25,7 @@ .equ DIREC_RAMSTART TOK_RAMEND #include "zasm/directive.asm" #include "zasm/instr.asm" +#include "zasm/expr.asm" zasmIsFirstPass: nop @@ -32,6 +33,3 @@ zasmIsFirstPass: zasmIsLocalPass: nop -parseExpr: - nop -