@@ -35,6 +35,7 @@ (:use "6502" "CL") (:shadow "COMPILE" "CONSTANTP" "VARIABLEP" "BREAK" "IF" "+" "-" "1+" "1-" "NOT" "LOOP" ;; "PROG" + "FOR" ;; "WHEN" "UNLESS" ; candidates for control macros ) (:export "COMPILE" "INIT" "*MEM*" "RELOCATE" @@ -1066,7 +1067,7 @@ it with a conditional backward branch. (define-cmacro for ((for ?v ?from ?to . ?body) - `(seq ,(append '(l) from) ,(append '(st) ?v) + `(seq ,(append '(l) ?from) ,(append '(st) ?v) (while (seq ,(append '(c) ?to) llt) (seq ,(append '(seq) ?body) ,(append '(1+) ?v) comfy-6502.lisp @@ -8,6 +8,7 @@ (:use "COMMON-LISP" "6502" "COMFY-6502" #+sbcl "SB-RT" #-sbcl "RT") (:shadowing-import-from "COMFY-6502" "COMPILE" "1+" "1-" "+" "-" "IF" "NOT" "LOOP" + "FOR" "BREAK")) (in-package "COMFY-6502-TESTS") @@ -278,6 +279,42 @@ (INX) ; [4] (JMP :ABSOLUTE) (:LONG-BRANCH -12))) ; [3] +(deftest forj-1 (progn + (defparameter *code* 11) + (compile-code (forj (\# 6) (\# 12) + (l j (lisp *code*)) + (lxor \# 127) + (st j (lisp *code*))) -10 -20)) + ((LDY :IMMEDIATE) (:BYTE 6) ; [18] + (CPY :IMMEDIATE) (:BYTE 12) ; [16] + (BCS) (:BRANCH 23) ; [14] BCS -10 --> win + (LDA :ABSOLUTE-Y) (:ABSOLUTE 11) ; [12] (l j *code*) + (EOR :IMMEDIATE) (:BYTE 127) ; [9] (lxor \# 127) + (STA :ABSOLUTE-Y) (:ABSOLUTE 11) ; [7] (st j *code*) + (INY) ; [4] + (JMP :ABSOLUTE) (:LONG-BRANCH -14))) ; [3] -> to CPY + +(deftest for-1 (code-result + (equ code 13) ; buffer 13..25 + (equ ptr 26) + (comfy-6502:compile + '(for (ptr) (\# 6) (\# 12) + (li ptr) + (l i code) + (lxor \# 127) + (st i code)) -10 -20)) + ((LDA :IMMEDIATE) (:BYTE 6) ; [23] + (STA :ZERO-PAGE) (:ZERO-PAGE 26) ; [21] + (CMP :IMMEDIATE) (:BYTE 12) ; [19] + (BCS) (:BRANCH 26) ; [17] BCS -10 --> win + (LDX :ZERO-PAGE) (:ZERO-PAGE 26) ; [15] + (LDA :ZERO-PAGE-X) (:ZERO-PAGE 13) ; [13] (l j *code*) + (EOR :IMMEDIATE) (:BYTE 127) ; [11] (lxor \# 127) + (STA :ZERO-PAGE-X) (:ZERO-PAGE 13) ; [9] (st j *code*) + (INC :ZERO-PAGE) (:ZERO-PAGE 26) ; [7] + (LDA :ZERO-PAGE) (:ZERO-PAGE 26) ; [5] + (JMP :ABSOLUTE) (:LONG-BRANCH -17))) ; [3] -> to CMP + (deftest upc-example (code-result ;; (defparameter *upctable* comfy-tests.lisp 4f60b2a1d493f731f4702d29439112b31fa76f03 jaoswald josephoswald@gmail.com http://github.com/jaoswald/cl-comfy-6502/commit/fb6c51f99ea8a9f1adb300823af469231b45e800 fb6c51f99ea8a9f1adb300823af469231b45e800 2008-05-16T12:38:18-07:00 2008-05-16T12:38:18-07:00 Fix FOR macro Fix typo in FOR macro, export FOR symbol from COMFY-6502 package. Added test coverage. d5a2e01bbd2a3dd8300fcd23f14761e87d51e740 jaoswald josephoswald@gmail.com