summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ortho.s4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/ortho.s b/test/ortho.s
index 4ca01f3..312c8eb 100644
--- a/test/ortho.s
+++ b/test/ortho.s
@@ -9,10 +9,7 @@ mem:
reset:
cps
lds.d #$3FFFF
-<<<<<<< HEAD
mov a, #10
-=======
->>>>>>> 673efac... - Implemented support for the Orthogonal extension into
and #0
tay
xor b, b
@@ -26,6 +23,7 @@ loop:
inc.q count
; mov.q e, count
mov (b+e), b
+ set a, eq
mov a, (b+e)
bra loop