summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authormrb0nk500 <b0nk@b0nk.xyz>2020-12-08 10:42:10 -0500
committermrb0nk500 <b0nk@b0nk.xyz>2020-12-08 18:07:53 -0500
commit498756102a430d68018ff39502b568f93a110227 (patch)
tree89cda25b9bc95c96ec0e8415e76f99101da1ce0d /test
parent28202af458a42e83f06415fa33d193258535a86d (diff)
- Implemented support for the Orthogonal extension into
both the assembler, and the emulator. I finally figured out how I could get support for the Ortho extension implemented into the old assembler. The only reason for doing this, is to buy me some while I start work on the new assembler, and to help me get an idea for how to do the same in the new assembler.
Diffstat (limited to 'test')
-rw-r--r--test/ortho.s3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/ortho.s b/test/ortho.s
index 83f3554..4ca01f3 100644
--- a/test/ortho.s
+++ b/test/ortho.s
@@ -9,7 +9,10 @@ mem:
reset:
cps
lds.d #$3FFFF
+<<<<<<< HEAD
mov a, #10
+=======
+>>>>>>> 673efac... - Implemented support for the Orthogonal extension into
and #0
tay
xor b, b