Add (well, actually, enable existing) test cases for Thumb2 ROR

(register) encoding T2.  See #284472.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12176

diff --git a/none/tests/arm/v6intThumb.c b/none/tests/arm/v6intThumb.c
index 6e3ff5f3c42a4455bf20b0a8f5fc1b4c5ff315e9..c721d3a2eae4481e3a187504c6f72156dd3791b7 100644 (file)
--- a/none/tests/arm/v6intThumb.c
+++ b/none/tests/arm/v6intThumb.c
@@ -5271,8 +5271,6 @@ int main ( void )
    TESTINST3("asr.w  r1, r2, r3", 0x91415927, 0x00000021, r1, r2, r3, cv);
    TESTCARRYEND
 
-#if 0
-   // not handled by vex
    printf("(T?) ROR{S}.W Rd, Rn, Rm\n");
    TESTCARRY
    TESTINST3("rors.w r1, r2, r3", 0x31415927, 0x00000000, r1, r2, r3, cv);
@@ -5292,7 +5290,6 @@ int main ( void )
    TESTINST3("ror.w  r1, r2, r3", 0x31415927, 0x00000020, r1, r2, r3, cv);
    TESTINST3("ror.w  r1, r2, r3", 0x31415927, 0x00000021, r1, r2, r3, cv);
    TESTCARRYEND
-#endif
 
    printf("MVN{S}.W Rd, Rn, shift,   and MOV{S}.W ditto\n");
    TESTCARRY

diff --git a/none/tests/arm/v6intThumb.stdout.exp b/none/tests/arm/v6intThumb.stdout.exp
index f18fd66d58a59fb2357f3cf93f40b5f53b86e987..af2f795f01d11d66dbdf1eec9af83399f12405d2 100644 (file)
--- a/none/tests/arm/v6intThumb.stdout.exp
+++ b/none/tests/arm/v6intThumb.stdout.exp
@@ -14826,6 +14826,71 @@ asr.w  r1, r2, r3 :: rd 0x00003141 rm 0x31415927, rn 0x00000010, c:v-in 3, cpsr
 asr.w  r1, r2, r3 :: rd 0xffffffff rm 0x91415927, rn 0x0000001f, c:v-in 3, cpsr 0xf0000000 NZCV
 asr.w  r1, r2, r3 :: rd 0x00000000 rm 0x31415927, rn 0x00000020, c:v-in 3, cpsr 0xf0000000 NZCV
 asr.w  r1, r2, r3 :: rd 0xffffffff rm 0x91415927, rn 0x00000021, c:v-in 3, cpsr 0xf0000000 NZCV
+(T?) ROR{S}.W Rd, Rn, Rm
+rors.w r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000000, c:v-in 0, cpsr 0x00000000     
+rors.w r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000001, c:v-in 0, cpsr 0xa0000000 N C 
+rors.w r1, r2, r3 :: rd 0xcc505649 rm 0x31415927, rn 0x00000002, c:v-in 0, cpsr 0xa0000000 N C 
+rors.w r1, r2, r3 :: rd 0xb24e6282 rm 0x31415927, rn 0x0000000f, c:v-in 0, cpsr 0xa0000000 N C 
+rors.w r1, r2, r3 :: rd 0x59273141 rm 0x31415927, rn 0x00000010, c:v-in 0, cpsr 0x00000000     
+rors.w r1, r2, r3 :: rd 0x6282b24e rm 0x31415927, rn 0x0000001f, c:v-in 0, cpsr 0x00000000     
+rors.w r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000020, c:v-in 0, cpsr 0x00000000     
+rors.w r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000021, c:v-in 0, cpsr 0xa0000000 N C 
+ror.w  r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000000, c:v-in 0, cpsr 0xc0000000 NZ  
+ror.w  r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000001, c:v-in 0, cpsr 0xc0000000 NZ  
+ror.w  r1, r2, r3 :: rd 0xcc505649 rm 0x31415927, rn 0x00000002, c:v-in 0, cpsr 0xc0000000 NZ  
+ror.w  r1, r2, r3 :: rd 0xb24e6282 rm 0x31415927, rn 0x0000000f, c:v-in 0, cpsr 0xc0000000 NZ  
+ror.w  r1, r2, r3 :: rd 0x59273141 rm 0x31415927, rn 0x00000010, c:v-in 0, cpsr 0xc0000000 NZ  
+ror.w  r1, r2, r3 :: rd 0x6282b24e rm 0x31415927, rn 0x0000001f, c:v-in 0, cpsr 0xc0000000 NZ  
+ror.w  r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000020, c:v-in 0, cpsr 0xc0000000 NZ  
+ror.w  r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000021, c:v-in 0, cpsr 0xc0000000 NZ  
+rors.w r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000000, c:v-in 1, cpsr 0x10000000    V
+rors.w r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000001, c:v-in 1, cpsr 0xb0000000 N CV
+rors.w r1, r2, r3 :: rd 0xcc505649 rm 0x31415927, rn 0x00000002, c:v-in 1, cpsr 0xb0000000 N CV
+rors.w r1, r2, r3 :: rd 0xb24e6282 rm 0x31415927, rn 0x0000000f, c:v-in 1, cpsr 0xb0000000 N CV
+rors.w r1, r2, r3 :: rd 0x59273141 rm 0x31415927, rn 0x00000010, c:v-in 1, cpsr 0x10000000    V
+rors.w r1, r2, r3 :: rd 0x6282b24e rm 0x31415927, rn 0x0000001f, c:v-in 1, cpsr 0x10000000    V
+rors.w r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000020, c:v-in 1, cpsr 0x10000000    V
+rors.w r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000021, c:v-in 1, cpsr 0xb0000000 N CV
+ror.w  r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000000, c:v-in 1, cpsr 0xd0000000 NZ V
+ror.w  r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000001, c:v-in 1, cpsr 0xd0000000 NZ V
+ror.w  r1, r2, r3 :: rd 0xcc505649 rm 0x31415927, rn 0x00000002, c:v-in 1, cpsr 0xd0000000 NZ V
+ror.w  r1, r2, r3 :: rd 0xb24e6282 rm 0x31415927, rn 0x0000000f, c:v-in 1, cpsr 0xd0000000 NZ V
+ror.w  r1, r2, r3 :: rd 0x59273141 rm 0x31415927, rn 0x00000010, c:v-in 1, cpsr 0xd0000000 NZ V
+ror.w  r1, r2, r3 :: rd 0x6282b24e rm 0x31415927, rn 0x0000001f, c:v-in 1, cpsr 0xd0000000 NZ V
+ror.w  r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000020, c:v-in 1, cpsr 0xd0000000 NZ V
+ror.w  r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000021, c:v-in 1, cpsr 0xd0000000 NZ V
+rors.w r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000000, c:v-in 2, cpsr 0x20000000   C 
+rors.w r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000001, c:v-in 2, cpsr 0xa0000000 N C 
+rors.w r1, r2, r3 :: rd 0xcc505649 rm 0x31415927, rn 0x00000002, c:v-in 2, cpsr 0xa0000000 N C 
+rors.w r1, r2, r3 :: rd 0xb24e6282 rm 0x31415927, rn 0x0000000f, c:v-in 2, cpsr 0xa0000000 N C 
+rors.w r1, r2, r3 :: rd 0x59273141 rm 0x31415927, rn 0x00000010, c:v-in 2, cpsr 0x00000000     
+rors.w r1, r2, r3 :: rd 0x6282b24e rm 0x31415927, rn 0x0000001f, c:v-in 2, cpsr 0x00000000     
+rors.w r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000020, c:v-in 2, cpsr 0x00000000     
+rors.w r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000021, c:v-in 2, cpsr 0xa0000000 N C 
+ror.w  r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000000, c:v-in 2, cpsr 0xe0000000 NZC 
+ror.w  r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000001, c:v-in 2, cpsr 0xe0000000 NZC 
+ror.w  r1, r2, r3 :: rd 0xcc505649 rm 0x31415927, rn 0x00000002, c:v-in 2, cpsr 0xe0000000 NZC 
+ror.w  r1, r2, r3 :: rd 0xb24e6282 rm 0x31415927, rn 0x0000000f, c:v-in 2, cpsr 0xe0000000 NZC 
+ror.w  r1, r2, r3 :: rd 0x59273141 rm 0x31415927, rn 0x00000010, c:v-in 2, cpsr 0xe0000000 NZC 
+ror.w  r1, r2, r3 :: rd 0x6282b24e rm 0x31415927, rn 0x0000001f, c:v-in 2, cpsr 0xe0000000 NZC 
+ror.w  r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000020, c:v-in 2, cpsr 0xe0000000 NZC 
+ror.w  r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000021, c:v-in 2, cpsr 0xe0000000 NZC 
+rors.w r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000000, c:v-in 3, cpsr 0x30000000   CV
+rors.w r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000001, c:v-in 3, cpsr 0xb0000000 N CV
+rors.w r1, r2, r3 :: rd 0xcc505649 rm 0x31415927, rn 0x00000002, c:v-in 3, cpsr 0xb0000000 N CV
+rors.w r1, r2, r3 :: rd 0xb24e6282 rm 0x31415927, rn 0x0000000f, c:v-in 3, cpsr 0xb0000000 N CV
+rors.w r1, r2, r3 :: rd 0x59273141 rm 0x31415927, rn 0x00000010, c:v-in 3, cpsr 0x10000000    V
+rors.w r1, r2, r3 :: rd 0x6282b24e rm 0x31415927, rn 0x0000001f, c:v-in 3, cpsr 0x10000000    V
+rors.w r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000020, c:v-in 3, cpsr 0x10000000    V
+rors.w r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000021, c:v-in 3, cpsr 0xb0000000 N CV
+ror.w  r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000000, c:v-in 3, cpsr 0xf0000000 NZCV
+ror.w  r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000001, c:v-in 3, cpsr 0xf0000000 NZCV
+ror.w  r1, r2, r3 :: rd 0xcc505649 rm 0x31415927, rn 0x00000002, c:v-in 3, cpsr 0xf0000000 NZCV
+ror.w  r1, r2, r3 :: rd 0xb24e6282 rm 0x31415927, rn 0x0000000f, c:v-in 3, cpsr 0xf0000000 NZCV
+ror.w  r1, r2, r3 :: rd 0x59273141 rm 0x31415927, rn 0x00000010, c:v-in 3, cpsr 0xf0000000 NZCV
+ror.w  r1, r2, r3 :: rd 0x6282b24e rm 0x31415927, rn 0x0000001f, c:v-in 3, cpsr 0xf0000000 NZCV
+ror.w  r1, r2, r3 :: rd 0x31415927 rm 0x31415927, rn 0x00000020, c:v-in 3, cpsr 0xf0000000 NZCV
+ror.w  r1, r2, r3 :: rd 0x98a0ac93 rm 0x31415927, rn 0x00000021, c:v-in 3, cpsr 0xf0000000 NZCV
 MVN{S}.W Rd, Rn, shift,   and MOV{S}.W ditto
 lsls.w   r1, r2, #0  :: rd 0x7fffffff rm 0x7fffffff, c:v-in 0, cpsr 0x00000000     
 lsls.w   r1, r2, #1  :: rd 0xfffffffe rm 0x7fffffff, c:v-in 0, cpsr 0x80000000 N