summaryrefslogtreecommitdiff
path: root/etc/oemu/test-00.s
diff options
context:
space:
mode:
authorIan Moffett <ian@osmora.org>2025-07-28 02:49:51 -0400
committerIan Moffett <ian@osmora.org>2025-07-28 03:31:25 -0400
commit3b834839d2328dc8d1f069cddee32f80a236c349 (patch)
tree4abf2b10a2d6f89427545cb8e08d5dc9a3e0c9de /etc/oemu/test-00.s
parent47560524a2d4f4992deff40bdca14437f5fb587d (diff)
etc: oemu: Add XOR example to test-00.s
Signed-off-by: Ian Moffett <ian@osmora.org>
Diffstat (limited to 'etc/oemu/test-00.s')
-rw-r--r--etc/oemu/test-00.s5
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/oemu/test-00.s b/etc/oemu/test-00.s
index c0dbeee..423bb0e 100644
--- a/etc/oemu/test-00.s
+++ b/etc/oemu/test-00.s
@@ -20,5 +20,10 @@ some_label: ! X
=======
and x1, #3 ! ~ 0x00000024
or x2, #7 ! ~ 0x00000028
+<<<<<<< HEAD
hlt ! ~ 0x0000002C
>>>>>>> 521cc2b (etc: oemu: Add example for 'OR' in test-00.s)
+=======
+ xor x2, #3 ! ~ 0x0000002C
+ hlt ! ~ 0x00000030
+>>>>>>> 5d27983 (etc: oemu: Add XOR example to test-00.s)