Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv31101
Modified Files:
Tag: blob_1_0_9_hack
testmem.S testmem2.S
Log Message:
fix the obvious "duh" bug (s/si/r4/)
Index: testmem.S
===================================================================
RCS file: /cvsroot/blob/blob/src/Attic/testmem.S,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- testmem.S 2001/07/08 22:34:14 1.1.2.1
+++ testmem.S 2001/07/16 23:20:25 1.1.2.2
@@ -32,25 +32,25 @@
.text
.globl testram
- @ r0 = address to test
- @ returns r0 = 0 - ram present, r0 = 1 - no ram
+ @ r0 = address to test
+ @ returns r0 = 0 - ram present, r0 = 1 - no ram
@ clobbers r1 - r4
testram:
- ldmia r0, {r1, r2}
- mov r3, #0x55 @ write 0x55 to first word
- mov ip, #0xaa @ 0xaa to second
- stmia r0, {r3, ip}
- ldmia r0, {r3, ip} @ read it back
- teq r3, #0x55 @ do the values match
+ ldmia r0, {r1, r2} @ store current value in r1 and r2
+ mov r3, #0x55 @ write 0x55 to first word
+ mov r4, #0xaa @ 0xaa to second
+ stmia r0, {r3, r4}
+ ldmia r0, {r3, r4} @ read it back
+ teq r3, #0x55 @ do the values match
teqeq r4, #0xaa
- bne bad @ oops, no
- mov r3, #0xaa @ write 0xaa to first word
- mov r4, #0x55 @ 0x55 to second
- stmia r0, {r3, ip}
- ldmia r0, {r3, ip} @ read it back
- teq r3, #0xaa @ do the values match
+ bne bad @ oops, no
+ mov r3, #0xaa @ write 0xaa to first word
+ mov r4, #0x55 @ 0x55 to second
+ stmia r0, {r3, r4}
+ ldmia r0, {r3, r4} @ read it back
+ teq r3, #0xaa @ do the values match
teqeq r4, #0x55
-bad: stmia r0, {r1, r2} @ in any case, restore old data
- moveq r0, #0 @ ok - all values matched
- movne r0, #1 @ no ram at this location
+bad: stmia r0, {r1, r2} @ in any case, restore old data
+ moveq r0, #0 @ ok - all values matched
+ movne r0, #1 @ no ram at this location
mov pc, lr
Index: testmem2.S
===================================================================
RCS file: /cvsroot/blob/blob/src/Attic/testmem2.S,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- testmem2.S 2001/07/08 22:34:14 1.1.2.1
+++ testmem2.S 2001/07/16 23:20:25 1.1.2.2
@@ -31,26 +31,26 @@
.text
.globl testram
- @ r0 = address to test
- @ returns r0 = 0 - ram present, r0 = 1 - no ram
+ @ r0 = address to test
+ @ returns r0 = 0 - ram present, r0 = 1 - no ram
@ doesnt clobber r1 - r4
testram:
stmdb sp!, {r1-r4, lr}
ldmia r0, {r1, r2}
- mov r3, #0x55 @ write 0x55 to first word
- mov ip, #0xaa @ 0xaa to second
- stmia r0, {r3, ip}
- ldmia r0, {r3, ip} @ read it back
- teq r3, #0x55 @ do the values match
+ mov r3, #0x55 @ write 0x55 to first word
+ mov r4, #0xaa @ 0xaa to second
+ stmia r0, {r3, r4}
+ ldmia r0, {r3, r4} @ read it back
+ teq r3, #0x55 @ do the values match
teqeq r4, #0xaa
- bne bad @ oops, no
- mov r3, #0xaa @ write 0xaa to first word
- mov r4, #0x55 @ 0x55 to second
- stmia r0, {r3, ip}
- ldmia r0, {r3, ip} @ read it back
- teq r3, #0xaa @ do the values match
+ bne bad @ oops, no
+ mov r3, #0xaa @ write 0xaa to first word
+ mov r4, #0x55 @ 0x55 to second
+ stmia r0, {r3, r4}
+ ldmia r0, {r3, r4} @ read it back
+ teq r3, #0xaa @ do the values match
teqeq r4, #0x55
-bad: stmia r0, {r1, r2} @ in any case, restore old data
- moveq r0, #0 @ ok - all values matched
- movne r0, #1 @ no ram at this location
+bad: stmia r0, {r1, r2} @ in any case, restore old data
+ moveq r0, #0 @ ok - all values matched
+ movne r0, #1 @ no ram at this location
ldmia sp!, {r1-r4, pc}
|
