From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Sun, 28 Dec 2008 11:00:58 +0000 (-0500)
Subject: Merge nyus:/storage/git/firearm
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/48775efdc0074dd9a772e37ae43adf58b5c9be8c?hp=171401a8d267c6359bf0dec25d3b3c1b2e38fd32

Merge nyus:/storage/git/firearm
---

diff --git a/ram.comments.hex b/ram.comments.hex
new file mode 100644
index 0000000..83f452c
--- /dev/null
+++ b/ram.comments.hex
@@ -0,0 +1,66 @@
+// test some lol
+E0012011  // and r2, r1, r1, lsl r0
+E0013038  // and r3, r1, r8, lsr r0
+E0014058  // and r4, r1, r8, asr r0
+// test rotate vs shift
+E0015031  // and r5, r1, r1, lsr r0
+E0016071  // and r6, r1, r1, ror r0
+// test arithmetic vs logical
+E0012138  // and r2, r1, r8, lsr r1
+E0013158  // and r3, r1, r8, lsr r1
+// test shift by 0
+E0014008  // and r4, r1, r8, lsl #0
+E0015028  // and r5, r1, r8, lsr #32
+E0016048  // and r6, r1, r8, asr #32
+E0017068  // and r7, r1, r8, ror #32
+// test constant rotate
+E00120E1  // and r2, r1, r1, ror #1
+E0013161  // and r3, r1, r1, ror #2
+E00141E1  // and r4, r1, r1, ror #3
+E0015261  // and r5, r1, r1, ror #4
+E00162E1  // and r6, r1, r1, ror #5
+E0017361  // and r7, r1, r1, ror #6
+E180F081
+E180F081
+E180F081
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+E0000000
+
diff --git a/ram.hex b/ram.hex
index 06b1cee..1a2028e 100644
--- a/ram.hex
+++ b/ram.hex
@@ -1,23 +1,23 @@
-e0012011
-e0013038
-e0014058
-e0015031
-e0016071
-e0012138
-e0013158
-e0014008
-e0015028
-e0016048
-e0017068
-e00120e1
-e0013161
-e00141e1
-e0015261
-e00162e1
-e0017361
-e180f081
-e180f081
-e180f081
+E0012011
+E0013038
+E0014058
+E0015031
+E0016071
+E0012138
+E0013158
+E0014008
+E0015028
+E0016048
+E0017068
+E00120E1
+E0013161
+E00141E1
+E0015261
+E00162E1
+E0017361
+E180F081
+E180F081
+E180F081
 E0000000
 E0000000
 E0000000
@@ -58,4 +58,3 @@ E0000000
 E0000000
 E0000000
 E0000000
-