Changeset 265 for trunk/softs/tests_ccvcache_v4/test_llsc

Timestamp:

Oct 17, 2012, 12:03:39 PM (12 years ago)

Author:

bouyer

Message:

Update/add 2 new tests, from tests_mips32_vcache:
test_llsc: check basic functionnality of ll/sc
test_sc_no_ll: check that a sc without prior ll fails as expected

Location:

trunk/softs/tests_ccvcache_v4/test_llsc

Files:

• run (modified) (2 diffs)
• test.S (modified) (3 diffs)

trunk/softs/tests_ccvcache_v4/test_llsc/run

@@ -1 +1 @@
 #!/bin/sh 
+
+. ../common/common.sh
 
 check_output()
 {
-        egrep "^0x00000000 0xAC4000FF 0xAC4000FF 0x00000000$" run.out > /dev/null
+        egrep "^0x0000DEAD 0x0000DEAD 0x0000BEEF 0x0000DEAD$" run.out > /dev/null
         if [ $? -eq 0 ]; then
                 return 0;
@@ -12 +14 @@
 
 make --quiet || exit 1
-../platform/simulation.x > run.out 2>&1 
+${SIMUL} > run.out 2>&1 
 if [ $? -eq 0 ]; then
         if check_output; then

trunk/softs/tests_ccvcache_v4/test_llsc/test.S

@@ -31 +31 @@
         PUTCHAR(' ')
 
-        /* now write to myvar via ll/sc
+        /* now write to myvar via ll/sc */
         la      s1, myvar 
 1:
@@ -37 +37 @@
         li      a1, MAGIC2
         sc      a1, 0(s1)
-        beqz    a1, 2b
+        beqz    a1, 1b
         nop
 
+        PRINTX /* print what we read with ll */
+        PUTCHAR(' ')
+
+        la      s1, myvar 
+        lw      a0, 0(s1) /* print the new value */
+        PRINTX
+        PUTCHAR(' ')
+
         /* restore myvar value via normal write */
+        la      s1, myvar 
         li      a1, MAGIC1
         sw      a1, 0(s1)
@@ -93 +102 @@
 pte1:
         .align 13
-        .word PTE1_V | PTE1_C | PTE1_W | 0x0 /* map PA 0 at VA 0 */
+        .word PTE1_V | PTE1_W | 0x0 /* map PA 0 at VA 0 */
         .org pte1 + (BOOT_ADDRESS >> 21) * 4
         .word PTE1_V | PTE1_C | PTE1_X | (BOOT_ADDRESS >> 21) /* map PA 0xbfc00000 at VA 0xbfc00000 */