From: Petar Jovanovic <mips32r2@gmail.com>
Date: Thu, 11 May 2017 16:59:33 +0000 (+0000)
Subject: mips32: improve none/tests/mips32/MIPS32int
X-Git-Tag: svn/VALGRIND_3_13_0~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b3d356429e92f3272ac44b41bdb6d30eba95a99;p=thirdparty%2Fvalgrind.git

mips32: improve none/tests/mips32/MIPS32int

- Invalid memory access fixed;
- Inappropriate immediate value on ROTR test changed;
- Stricter tests for LWL/LWR instructions.

Patch by Aleksandar Rikalo.


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

diff --git a/none/tests/mips32/MIPS32int.c b/none/tests/mips32/MIPS32int.c
index d011a69058..02d0815608 100644
--- a/none/tests/mips32/MIPS32int.c
+++ b/none/tests/mips32/MIPS32int.c
@@ -101,9 +101,9 @@ const unsigned int mem[] = {
      instruction "\n\t" \
      "move %0, $" #RT "\n\t" \
      : "=&r" (out) \
-	 : "r" (mem), "r" (RTval) \
-	 : #RT, "cc", "memory" \
-	 ); \
+     : "r" (mem), "r" (RTval) \
+     : #RT, "cc", "memory" \
+   ); \
    printf("%s :: rt 0x%08x\n", \
           instruction, out); \
 }
@@ -120,9 +120,9 @@ const unsigned int mem[] = {
       "mfhi %0\n\t" \
       "mflo %1\n\t" \
      : "=&r" (HI), "=&r" (LO) \
-	 : "r" (RSval)\
-	 : "cc", "memory" \
-	 ); \
+     : "r" (RSval) \
+     : "cc", "memory" \
+   ); \
    printf("mfhi mflo :: HI: 0x%x, LO: 0x%x\n", \
           HI, LO); \
 }
@@ -662,7 +662,7 @@ int main(int argc, char **argv)
    TESTINSN5LOAD("lb $t0, 52($t1)", 0, 52, t0);
    TESTINSN5LOAD("lb $t0, 56($t1)", 0, 56, t0);
    TESTINSN5LOAD("lb $t0, 60($t1)", 0, 60, t0);
-   TESTINSN5LOAD("lb $t0, 64($t1)", 0, 64, t0);
+   TESTINSN5LOAD("lb $t0, 1($t1)", 0, 1, t0);
    TESTINSN5LOAD("lb $t0, 2($t1)", 0, 2, t0);
    TESTINSN5LOAD("lb $t0, 6($t1)", 0, 6, t0);
    TESTINSN5LOAD("lb $t0, 10($t1)", 0, 10, t0);
@@ -691,7 +691,7 @@ int main(int argc, char **argv)
    TESTINSN5LOAD("lbu $t0, 52($t1)", 0, 52, t0);
    TESTINSN5LOAD("lbu $t0, 56($t1)", 0, 56, t0);
    TESTINSN5LOAD("lbu $t0, 60($t1)", 0, 60, t0);
-   TESTINSN5LOAD("lbu $t0, 64($t1)", 0, 64, t0);
+   TESTINSN5LOAD("lbu $t0, 1($t1)", 0, 1, t0);
    TESTINSN5LOAD("lbu $t0, 2($t1)", 0, 2, t0);
    TESTINSN5LOAD("lbu $t0, 6($t1)", 0, 6, t0);
    TESTINSN5LOAD("lbu $t0, 10($t1)", 0, 10, t0);
@@ -720,7 +720,7 @@ int main(int argc, char **argv)
    TESTINSN5LOAD("lh $t0, 52($t1)", 0, 52, t0);
    TESTINSN5LOAD("lh $t0, 56($t1)", 0, 56, t0);
    TESTINSN5LOAD("lh $t0, 60($t1)", 0, 60, t0);
-   TESTINSN5LOAD("lh $t0, 64($t1)", 0, 64, t0);
+   TESTINSN5LOAD("lh $t0, 62($t1)", 0, 62, t0);
    TESTINSN5LOAD("lh $t0, 2($t1)", 0, 2, t0);
    TESTINSN5LOAD("lh $t0, 6($t1)", 0, 6, t0);
    TESTINSN5LOAD("lh $t0, 10($t1)", 0, 10, t0);
@@ -749,7 +749,7 @@ int main(int argc, char **argv)
    TESTINSN5LOAD("lhu $t0, 52($t1)", 0, 52, t0);
    TESTINSN5LOAD("lhu $t0, 56($t1)", 0, 56, t0);
    TESTINSN5LOAD("lhu $t0, 60($t1)", 0, 60, t0);
-   TESTINSN5LOAD("lhu $t0, 64($t1)", 0, 64, t0);
+   TESTINSN5LOAD("lhu $t0, 62($t1)", 0, 62, t0);
    TESTINSN5LOAD("lhu $t0, 2($t1)", 0, 2, t0);
    TESTINSN5LOAD("lhu $t0, 6($t1)", 0, 6, t0);
    TESTINSN5LOAD("lhu $t0, 10($t1)", 0, 10, t0);
@@ -786,7 +786,6 @@ int main(int argc, char **argv)
    TESTINSN5LOAD("lw $t0, 52($t1)", 0, 52, t0);
    TESTINSN5LOAD("lw $t0, 56($t1)", 0, 56, t0);
    TESTINSN5LOAD("lw $t0, 60($t1)", 0, 60, t0);
-   TESTINSN5LOAD("lw $t0, 64($t1)", 0, 64, t0);
    TESTINSN5LOAD("lw $t0, 2($t1)", 0, 2, t0);
    TESTINSN5LOAD("lw $t0, 6($t1)", 0, 6, t0);
    TESTINSN5LOAD("lw $t0, 10($t1)", 0, 10, t0);
@@ -799,62 +798,48 @@ int main(int argc, char **argv)
    TESTINSN5LOAD("lw $t0, 38($t1)", 0, 38, t0);
 
    printf("LWL\n");
-   TESTINSN5LOAD("lwl $t0, 0($t1)", 0, 0, t0);
-   TESTINSN5LOAD("lwl $t0, 4($t1)", 0, 4, t0);
-   TESTINSN5LOAD("lwl $t0, 8($t1)", 0, 8, t0);
+   TESTINSN5LOAD("lwl $t0, 3($t1)", 0, 3, t0);
+   TESTINSN5LOAD("lwl $t0, 6($t1)", 0, 6, t0);
+   TESTINSN5LOAD("lwl $t0, 9($t1)", 0, 9, t0);
    TESTINSN5LOAD("lwl $t0, 12($t1)", 0, 12, t0);
-   TESTINSN5LOAD("lwl $t0, 16($t1)", 0, 16, t0);
-   TESTINSN5LOAD("lwl $t0, 20($t1)", 0, 20, t0);
+   TESTINSN5LOAD("lwl $t0, 15($t1)", 0, 15, t0);
+   TESTINSN5LOAD("lwl $t0, 18($t1)", 0, 18, t0);
+   TESTINSN5LOAD("lwl $t0, 21($t1)", 0, 21, t0);
    TESTINSN5LOAD("lwl $t0, 24($t1)", 0, 24, t0);
-   TESTINSN5LOAD("lwl $t0, 28($t1)", 0, 28, t0);
-   TESTINSN5LOAD("lwl $t0, 32($t1)", 0, 32, t0);
+   TESTINSN5LOAD("lwl $t0, 27($t1)", 0, 27, t0);
+   TESTINSN5LOAD("lwl $t0, 30($t1)", 0, 30, t0);
+   TESTINSN5LOAD("lwl $t0, 33($t1)", 0, 33, t0);
    TESTINSN5LOAD("lwl $t0, 36($t1)", 0, 36, t0);
-   TESTINSN5LOAD("lwl $t0, 40($t1)", 0, 40, t0);
-   TESTINSN5LOAD("lwl $t0, 44($t1)", 0, 44, t0);
+   TESTINSN5LOAD("lwl $t0, 39($t1)", 0, 39, t0);
+   TESTINSN5LOAD("lwl $t0, 42($t1)", 0, 42, t0);
+   TESTINSN5LOAD("lwl $t0, 45($t1)", 0, 45, t0);
    TESTINSN5LOAD("lwl $t0, 48($t1)", 0, 48, t0);
-   TESTINSN5LOAD("lwl $t0, 52($t1)", 0, 52, t0);
-   TESTINSN5LOAD("lwl $t0, 56($t1)", 0, 56, t0);
+   TESTINSN5LOAD("lwl $t0, 51($t1)", 0, 51, t0);
+   TESTINSN5LOAD("lwl $t0, 54($t1)", 0, 54, t0);
+   TESTINSN5LOAD("lwl $t0, 57($t1)", 0, 57, t0);
    TESTINSN5LOAD("lwl $t0, 60($t1)", 0, 60, t0);
-   TESTINSN5LOAD("lwl $t0, 64($t1)", 0, 64, t0);
-   TESTINSN5LOAD("lwl $t0, 2($t1)", 0, 2, t0);
-   TESTINSN5LOAD("lwl $t0, 6($t1)", 0, 6, t0);
-   TESTINSN5LOAD("lwl $t0, 10($t1)", 0, 10, t0);
-   TESTINSN5LOAD("lwl $t0, 14($t1)", 0, 14, t0);
-   TESTINSN5LOAD("lwl $t0, 18($t1)", 0, 18, t0);
-   TESTINSN5LOAD("lwl $t0, 22($t1)", 0, 22, t0);
-   TESTINSN5LOAD("lwl $t0, 26($t1)", 0, 26, t0);
-   TESTINSN5LOAD("lwl $t0, 30($t1)", 0, 30, t0);
-   TESTINSN5LOAD("lwl $t0, 34($t1)", 0, 34, t0);
-   TESTINSN5LOAD("lwl $t0, 38($t1)", 0, 38, t0);
 
    printf("LWR\n");
-   TESTINSN5LOAD("lwr $t0, 0($t1)", 0, 0, t0);
-   TESTINSN5LOAD("lwr $t0, 4($t1)", 0, 4, t0);
-   TESTINSN5LOAD("lwr $t0, 8($t1)", 0, 8, t0);
+   TESTINSN5LOAD("lwr $t0, 3($t1)", 0, 0, t0);
+   TESTINSN5LOAD("lwr $t0, 6($t1)", 0, 4, t0);
+   TESTINSN5LOAD("lwr $t0, 9($t1)", 0, 8, t0);
    TESTINSN5LOAD("lwr $t0, 12($t1)", 0, 12, t0);
-   TESTINSN5LOAD("lwr $t0, 16($t1)", 0, 16, t0);
-   TESTINSN5LOAD("lwr $t0, 20($t1)", 0, 20, t0);
-   TESTINSN5LOAD("lwr $t0, 24($t1)", 0, 24, t0);
-   TESTINSN5LOAD("lwr $t0, 28($t1)", 0, 28, t0);
-   TESTINSN5LOAD("lwr $t0, 32($t1)", 0, 32, t0);
-   TESTINSN5LOAD("lwr $t0, 36($t1)", 0, 36, t0);
-   TESTINSN5LOAD("lwr $t0, 40($t1)", 0, 40, t0);
-   TESTINSN5LOAD("lwr $t0, 44($t1)", 0, 44, t0);
-   TESTINSN5LOAD("lwr $t0, 48($t1)", 0, 48, t0);
-   TESTINSN5LOAD("lwr $t0, 52($t1)", 0, 52, t0);
-   TESTINSN5LOAD("lwr $t0, 56($t1)", 0, 56, t0);
-   TESTINSN5LOAD("lwr $t0, 60($t1)", 0, 60, t0);
-   TESTINSN5LOAD("lwr $t0, 64($t1)", 0, 64, t0);
-   TESTINSN5LOAD("lwr $t0, 2($t1)", 0, 2, t0);
-   TESTINSN5LOAD("lwr $t0, 6($t1)", 0, 6, t0);
-   TESTINSN5LOAD("lwr $t0, 10($t1)", 0, 10, t0);
-   TESTINSN5LOAD("lwr $t0, 14($t1)", 0, 14, t0);
-   TESTINSN5LOAD("lwr $t0, 18($t1)", 0, 18, t0);
-   TESTINSN5LOAD("lwr $t0, 22($t1)", 0, 22, t0);
-   TESTINSN5LOAD("lwr $t0, 26($t1)", 0, 26, t0);
-   TESTINSN5LOAD("lwr $t0, 30($t1)", 0, 30, t0);
-   TESTINSN5LOAD("lwr $t0, 34($t1)", 0, 34, t0);
-   TESTINSN5LOAD("lwr $t0, 38($t1)", 0, 38, t0);
+   TESTINSN5LOAD("lwr $t0, 15($t1)", 0, 16, t0);
+   TESTINSN5LOAD("lwr $t0, 18($t1)", 0, 20, t0);
+   TESTINSN5LOAD("lwr $t0, 21($t1)", 0, 24, t0);
+   TESTINSN5LOAD("lwr $t0, 24($t1)", 0, 28, t0);
+   TESTINSN5LOAD("lwr $t0, 27($t1)", 0, 32, t0);
+   TESTINSN5LOAD("lwr $t0, 30($t1)", 0, 36, t0);
+   TESTINSN5LOAD("lwr $t0, 33($t1)", 0, 40, t0);
+   TESTINSN5LOAD("lwr $t0, 36($t1)", 0, 44, t0);
+   TESTINSN5LOAD("lwr $t0, 39($t1)", 0, 48, t0);
+   TESTINSN5LOAD("lwr $t0, 42($t1)", 0, 52, t0);
+   TESTINSN5LOAD("lwr $t0, 45($t1)", 0, 56, t0);
+   TESTINSN5LOAD("lwr $t0, 48($t1)", 0, 60, t0);
+   TESTINSN5LOAD("lwr $t0, 51($t1)", 0, 64, t0);
+   TESTINSN5LOAD("lwr $t0, 54($t1)", 0, 2, t0);
+   TESTINSN5LOAD("lwr $t0, 57($t1)", 0, 6, t0);
+   TESTINSN5LOAD("lwr $t0, 60($t1)", 0, 10, t0);
 
    printf("MADD\n");
    TESTINST3a("madd  $t0, $t1", 0x6, 0x2, t0, t1);
@@ -1211,8 +1196,8 @@ int main(int argc, char **argv)
    TESTINST2("rotr $t0, $t1, 0x0000000F", 0x31415927, 0x0000000F, t0, t1);
    TESTINST2("rotr $t0, $t1, 0x00000010", 0x31415927, 0x00000010, t0, t1);
    TESTINST2("rotr $t0, $t1, 0x0000001F", 0x31415927, 0x0000001F, t0, t1);
-   TESTINST2("rotr $t0, $t1, 0x00000020", 0x31415927, 0x00000020, t0, t1);
-   TESTINST2("rotr $t0, $t1, 0x00000021", 0x31415927, 0x00000021, t0, t1);
+   TESTINST2("rotr $t0, $t1, 0x0000001A", 0x31415927, 0x0000001A, t0, t1);
+   TESTINST2("rotr $t0, $t1, 0x00000007", 0x31415927, 0x00000007, t0, t1);
    TESTINST2("rotr $t0, $t1, 0x00000000", 0x00088000, 0x00000000, t0, t1);
    TESTINST2("rotr $t0, $t1, 0x00000001", 0x00088000, 0x00000001, t0, t1);
    TESTINST2("rotr $t0, $t1, 31", 0x00088000, 31, t0, t1);
@@ -1220,7 +1205,7 @@ int main(int argc, char **argv)
    TESTINST2("rotr $t0, $t1, 17", 0x00010000, 17, t0, t1);
    TESTINST2("rotr $t0, $t1, 18", 0x00010000, 18, t0, t1);
    TESTINST2("rotr $t0, $t1, 0", 0, 0, t0, t1);
-   TESTINST2("rotr $t0, $t1, 0xffff", 0xffff, 0xffff, t0, t1);
+   TESTINST2("rotr $t0, $t1, 0x1F", 0xFFFF, 0x1F, t0, t1);
 #endif
 
 #if (__mips==32) && (__mips_isa_rev>=2)
diff --git a/none/tests/mips32/MIPS32int.stdout.exp-mips32-BE b/none/tests/mips32/MIPS32int.stdout.exp-mips32-BE
index 79bfb3e4bd..738d5252fe 100644
--- a/none/tests/mips32/MIPS32int.stdout.exp-mips32-BE
+++ b/none/tests/mips32/MIPS32int.stdout.exp-mips32-BE
@@ -125,7 +125,7 @@ lb $t0, 48($t1) :: rt 0x00000045
 lb $t0, 52($t1) :: rt 0x0000004e
 lb $t0, 56($t1) :: rt 0x00000047
 lb $t0, 60($t1) :: rt 0x0000004a
-lb $t0, 64($t1) :: rt 0x00000041
+lb $t0, 1($t1) :: rt 0x0000001f
 lb $t0, 2($t1) :: rt 0x0000001e
 lb $t0, 6($t1) :: rt 0x00000000
 lb $t0, 10($t1) :: rt 0x00000000
@@ -153,7 +153,7 @@ lbu $t0, 48($t1) :: rt 0x00000045
 lbu $t0, 52($t1) :: rt 0x0000004e
 lbu $t0, 56($t1) :: rt 0x00000047
 lbu $t0, 60($t1) :: rt 0x0000004a
-lbu $t0, 64($t1) :: rt 0x00000041
+lbu $t0, 1($t1) :: rt 0x0000001f
 lbu $t0, 2($t1) :: rt 0x0000001e
 lbu $t0, 6($t1) :: rt 0x00000000
 lbu $t0, 10($t1) :: rt 0x00000000
@@ -181,7 +181,7 @@ lh $t0, 48($t1) :: rt 0x0000454f
 lh $t0, 52($t1) :: rt 0x00004e46
 lh $t0, 56($t1) :: rt 0x0000474d
 lh $t0, 60($t1) :: rt 0x00004a48
-lh $t0, 64($t1) :: rt 0x00004144
+lh $t0, 62($t1) :: rt 0x00004a4c
 lh $t0, 2($t1) :: rt 0x00001e1f
 lh $t0, 6($t1) :: rt 0x00000000
 lh $t0, 10($t1) :: rt 0x00000003
@@ -209,7 +209,7 @@ lhu $t0, 48($t1) :: rt 0x0000454f
 lhu $t0, 52($t1) :: rt 0x00004e46
 lhu $t0, 56($t1) :: rt 0x0000474d
 lhu $t0, 60($t1) :: rt 0x00004a48
-lhu $t0, 64($t1) :: rt 0x00004144
+lhu $t0, 62($t1) :: rt 0x00004a4c
 lhu $t0, 2($t1) :: rt 0x00001e1f
 lhu $t0, 6($t1) :: rt 0x00000000
 lhu $t0, 10($t1) :: rt 0x00000003
@@ -244,7 +244,6 @@ lw $t0, 48($t1) :: rt 0x454f4e45
 lw $t0, 52($t1) :: rt 0x4e464d46
 lw $t0, 56($t1) :: rt 0x474d474c
 lw $t0, 60($t1) :: rt 0x4a484a4c
-lw $t0, 64($t1) :: rt 0x41444400
 lw $t0, 2($t1) :: rt 0x1e1f0000
 lw $t0, 6($t1) :: rt 0x00000000
 lw $t0, 10($t1) :: rt 0x0003ffff
@@ -256,61 +255,47 @@ lw $t0, 30($t1) :: rt 0x2d2a3f34
 lw $t0, 34($t1) :: rt 0x3f3e3e35
 lw $t0, 38($t1) :: rt 0x3d3c363a
 LWL
-lwl $t0, 0($t1) :: rt 0x121f1e1f
-lwl $t0, 4($t1) :: rt 0x00000000
-lwl $t0, 8($t1) :: rt 0x00000003
+lwl $t0, 3($t1) :: rt 0x1f000000
+lwl $t0, 6($t1) :: rt 0x00000000
+lwl $t0, 9($t1) :: rt 0x00000300
 lwl $t0, 12($t1) :: rt 0xffffffff
-lwl $t0, 16($t1) :: rt 0x232f2e2f
-lwl $t0, 20($t1) :: rt 0x242c2b2b
+lwl $t0, 15($t1) :: rt 0xff000000
+lwl $t0, 18($t1) :: rt 0x2e2f0000
+lwl $t0, 21($t1) :: rt 0x2c2b2b00
 lwl $t0, 24($t1) :: rt 0x252a2e2b
-lwl $t0, 28($t1) :: rt 0x262d2d2a
-lwl $t0, 32($t1) :: rt 0x3f343f3e
+lwl $t0, 27($t1) :: rt 0x2b000000
+lwl $t0, 30($t1) :: rt 0x2d2a0000
+lwl $t0, 33($t1) :: rt 0x343f3e00
 lwl $t0, 36($t1) :: rt 0x3e353d3c
-lwl $t0, 40($t1) :: rt 0x363a3c3b
-lwl $t0, 44($t1) :: rt 0x3b373b3a
+lwl $t0, 39($t1) :: rt 0x3c000000
+lwl $t0, 42($t1) :: rt 0x3c3b0000
+lwl $t0, 45($t1) :: rt 0x373b3a00
 lwl $t0, 48($t1) :: rt 0x454f4e45
-lwl $t0, 52($t1) :: rt 0x4e464d46
-lwl $t0, 56($t1) :: rt 0x474d474c
+lwl $t0, 51($t1) :: rt 0x45000000
+lwl $t0, 54($t1) :: rt 0x4d460000
+lwl $t0, 57($t1) :: rt 0x4d474c00
 lwl $t0, 60($t1) :: rt 0x4a484a4c
-lwl $t0, 64($t1) :: rt 0x41444400
-lwl $t0, 2($t1) :: rt 0x1e1f0000
-lwl $t0, 6($t1) :: rt 0x00000000
-lwl $t0, 10($t1) :: rt 0x00030000
-lwl $t0, 14($t1) :: rt 0xffff0000
-lwl $t0, 18($t1) :: rt 0x2e2f0000
-lwl $t0, 22($t1) :: rt 0x2b2b0000
-lwl $t0, 26($t1) :: rt 0x2e2b0000
-lwl $t0, 30($t1) :: rt 0x2d2a0000
-lwl $t0, 34($t1) :: rt 0x3f3e0000
-lwl $t0, 38($t1) :: rt 0x3d3c0000
 LWR
-lwr $t0, 0($t1) :: rt 0x00000012
-lwr $t0, 4($t1) :: rt 0x00000000
-lwr $t0, 8($t1) :: rt 0x00000000
+lwr $t0, 3($t1) :: rt 0x121f1e1f
+lwr $t0, 6($t1) :: rt 0x00000000
+lwr $t0, 9($t1) :: rt 0x00000000
 lwr $t0, 12($t1) :: rt 0x000000ff
-lwr $t0, 16($t1) :: rt 0x00000023
-lwr $t0, 20($t1) :: rt 0x00000024
+lwr $t0, 15($t1) :: rt 0xffffffff
+lwr $t0, 18($t1) :: rt 0x00232f2e
+lwr $t0, 21($t1) :: rt 0x0000242c
 lwr $t0, 24($t1) :: rt 0x00000025
-lwr $t0, 28($t1) :: rt 0x00000026
-lwr $t0, 32($t1) :: rt 0x0000003f
+lwr $t0, 27($t1) :: rt 0x252a2e2b
+lwr $t0, 30($t1) :: rt 0x00262d2d
+lwr $t0, 33($t1) :: rt 0x00003f34
 lwr $t0, 36($t1) :: rt 0x0000003e
-lwr $t0, 40($t1) :: rt 0x00000036
-lwr $t0, 44($t1) :: rt 0x0000003b
+lwr $t0, 39($t1) :: rt 0x3e353d3c
+lwr $t0, 42($t1) :: rt 0x00363a3c
+lwr $t0, 45($t1) :: rt 0x00003b37
 lwr $t0, 48($t1) :: rt 0x00000045
-lwr $t0, 52($t1) :: rt 0x0000004e
-lwr $t0, 56($t1) :: rt 0x00000047
+lwr $t0, 51($t1) :: rt 0x454f4e45
+lwr $t0, 54($t1) :: rt 0x004e464d
+lwr $t0, 57($t1) :: rt 0x0000474d
 lwr $t0, 60($t1) :: rt 0x0000004a
-lwr $t0, 64($t1) :: rt 0x00000041
-lwr $t0, 2($t1) :: rt 0x00121f1e
-lwr $t0, 6($t1) :: rt 0x00000000
-lwr $t0, 10($t1) :: rt 0x00000000
-lwr $t0, 14($t1) :: rt 0x00ffffff
-lwr $t0, 18($t1) :: rt 0x00232f2e
-lwr $t0, 22($t1) :: rt 0x00242c2b
-lwr $t0, 26($t1) :: rt 0x00252a2e
-lwr $t0, 30($t1) :: rt 0x00262d2d
-lwr $t0, 34($t1) :: rt 0x003f343f
-lwr $t0, 38($t1) :: rt 0x003e353d
 MADD
 madd  $t0, $t1 :: rs 0x00000006 rt 0x00000002 HI 0x00000000 LO 0x0000000c 
 madd  $t0, $t1 :: rs 0x00000055 rt 0x00000028 HI 0x00000000 LO 0x00000d48 
diff --git a/none/tests/mips32/MIPS32int.stdout.exp-mips32-LE b/none/tests/mips32/MIPS32int.stdout.exp-mips32-LE
index e7172e78b9..65d2b91f16 100644
--- a/none/tests/mips32/MIPS32int.stdout.exp-mips32-LE
+++ b/none/tests/mips32/MIPS32int.stdout.exp-mips32-LE
@@ -125,7 +125,7 @@ lb $t0, 48($t1) :: rt 0x00000045
 lb $t0, 52($t1) :: rt 0x00000046
 lb $t0, 56($t1) :: rt 0x0000004c
 lb $t0, 60($t1) :: rt 0x0000004c
-lb $t0, 64($t1) :: rt 0x00000041
+lb $t0, 1($t1) :: rt 0x0000001e
 lb $t0, 2($t1) :: rt 0x0000001f
 lb $t0, 6($t1) :: rt 0x00000000
 lb $t0, 10($t1) :: rt 0x00000000
@@ -153,7 +153,7 @@ lbu $t0, 48($t1) :: rt 0x00000045
 lbu $t0, 52($t1) :: rt 0x00000046
 lbu $t0, 56($t1) :: rt 0x0000004c
 lbu $t0, 60($t1) :: rt 0x0000004c
-lbu $t0, 64($t1) :: rt 0x00000041
+lbu $t0, 1($t1) :: rt 0x0000001e
 lbu $t0, 2($t1) :: rt 0x0000001f
 lbu $t0, 6($t1) :: rt 0x00000000
 lbu $t0, 10($t1) :: rt 0x00000000
@@ -181,7 +181,7 @@ lh $t0, 48($t1) :: rt 0x00004e45
 lh $t0, 52($t1) :: rt 0x00004d46
 lh $t0, 56($t1) :: rt 0x0000474c
 lh $t0, 60($t1) :: rt 0x00004a4c
-lh $t0, 64($t1) :: rt 0x00004441
+lh $t0, 62($t1) :: rt 0x00004a48
 lh $t0, 2($t1) :: rt 0x0000121f
 lh $t0, 6($t1) :: rt 0x00000000
 lh $t0, 10($t1) :: rt 0x00000000
@@ -209,7 +209,7 @@ lhu $t0, 48($t1) :: rt 0x00004e45
 lhu $t0, 52($t1) :: rt 0x00004d46
 lhu $t0, 56($t1) :: rt 0x0000474c
 lhu $t0, 60($t1) :: rt 0x00004a4c
-lhu $t0, 64($t1) :: rt 0x00004441
+lhu $t0, 62($t1) :: rt 0x00004a48
 lhu $t0, 2($t1) :: rt 0x0000121f
 lhu $t0, 6($t1) :: rt 0x00000000
 lhu $t0, 10($t1) :: rt 0x00000000
@@ -244,7 +244,6 @@ lw $t0, 48($t1) :: rt 0x454f4e45
 lw $t0, 52($t1) :: rt 0x4e464d46
 lw $t0, 56($t1) :: rt 0x474d474c
 lw $t0, 60($t1) :: rt 0x4a484a4c
-lw $t0, 64($t1) :: rt 0x00444441
 lw $t0, 2($t1) :: rt 0x0000121f
 lw $t0, 6($t1) :: rt 0x00030000
 lw $t0, 10($t1) :: rt 0xffff0000
@@ -256,61 +255,47 @@ lw $t0, 30($t1) :: rt 0x3f3e262d
 lw $t0, 34($t1) :: rt 0x3d3c3f34
 lw $t0, 38($t1) :: rt 0x3c3b3e35
 LWL
-lwl $t0, 0($t1) :: rt 0x1f000000
-lwl $t0, 4($t1) :: rt 0x00000000
-lwl $t0, 8($t1) :: rt 0x03000000
+lwl $t0, 3($t1) :: rt 0x121f1e1f
+lwl $t0, 6($t1) :: rt 0x00000000
+lwl $t0, 9($t1) :: rt 0x00030000
 lwl $t0, 12($t1) :: rt 0xff000000
-lwl $t0, 16($t1) :: rt 0x2f000000
-lwl $t0, 20($t1) :: rt 0x2b000000
+lwl $t0, 15($t1) :: rt 0xffffffff
+lwl $t0, 18($t1) :: rt 0x2f2e2f00
+lwl $t0, 21($t1) :: rt 0x2b2b0000
 lwl $t0, 24($t1) :: rt 0x2b000000
-lwl $t0, 28($t1) :: rt 0x2a000000
-lwl $t0, 32($t1) :: rt 0x3e000000
+lwl $t0, 27($t1) :: rt 0x252a2e2b
+lwl $t0, 30($t1) :: rt 0x2d2d2a00
+lwl $t0, 33($t1) :: rt 0x3f3e0000
 lwl $t0, 36($t1) :: rt 0x3c000000
-lwl $t0, 40($t1) :: rt 0x3b000000
-lwl $t0, 44($t1) :: rt 0x3a000000
+lwl $t0, 39($t1) :: rt 0x3e353d3c
+lwl $t0, 42($t1) :: rt 0x3a3c3b00
+lwl $t0, 45($t1) :: rt 0x3b3a0000
 lwl $t0, 48($t1) :: rt 0x45000000
-lwl $t0, 52($t1) :: rt 0x46000000
-lwl $t0, 56($t1) :: rt 0x4c000000
+lwl $t0, 51($t1) :: rt 0x454f4e45
+lwl $t0, 54($t1) :: rt 0x464d4600
+lwl $t0, 57($t1) :: rt 0x474c0000
 lwl $t0, 60($t1) :: rt 0x4c000000
-lwl $t0, 64($t1) :: rt 0x41000000
-lwl $t0, 2($t1) :: rt 0x1f1e1f00
-lwl $t0, 6($t1) :: rt 0x00000000
-lwl $t0, 10($t1) :: rt 0x00000300
-lwl $t0, 14($t1) :: rt 0xffffff00
-lwl $t0, 18($t1) :: rt 0x2f2e2f00
-lwl $t0, 22($t1) :: rt 0x2c2b2b00
-lwl $t0, 26($t1) :: rt 0x2a2e2b00
-lwl $t0, 30($t1) :: rt 0x2d2d2a00
-lwl $t0, 34($t1) :: rt 0x343f3e00
-lwl $t0, 38($t1) :: rt 0x353d3c00
 LWR
-lwr $t0, 0($t1) :: rt 0x121f1e1f
-lwr $t0, 4($t1) :: rt 0x00000000
-lwr $t0, 8($t1) :: rt 0x00000003
+lwr $t0, 3($t1) :: rt 0x00000012
+lwr $t0, 6($t1) :: rt 0x00000000
+lwr $t0, 9($t1) :: rt 0x00000000
 lwr $t0, 12($t1) :: rt 0xffffffff
-lwr $t0, 16($t1) :: rt 0x232f2e2f
-lwr $t0, 20($t1) :: rt 0x242c2b2b
+lwr $t0, 15($t1) :: rt 0x000000ff
+lwr $t0, 18($t1) :: rt 0x0000232f
+lwr $t0, 21($t1) :: rt 0x00242c2b
 lwr $t0, 24($t1) :: rt 0x252a2e2b
-lwr $t0, 28($t1) :: rt 0x262d2d2a
-lwr $t0, 32($t1) :: rt 0x3f343f3e
+lwr $t0, 27($t1) :: rt 0x00000025
+lwr $t0, 30($t1) :: rt 0x0000262d
+lwr $t0, 33($t1) :: rt 0x003f343f
 lwr $t0, 36($t1) :: rt 0x3e353d3c
-lwr $t0, 40($t1) :: rt 0x363a3c3b
-lwr $t0, 44($t1) :: rt 0x3b373b3a
+lwr $t0, 39($t1) :: rt 0x0000003e
+lwr $t0, 42($t1) :: rt 0x0000363a
+lwr $t0, 45($t1) :: rt 0x003b373b
 lwr $t0, 48($t1) :: rt 0x454f4e45
-lwr $t0, 52($t1) :: rt 0x4e464d46
-lwr $t0, 56($t1) :: rt 0x474d474c
+lwr $t0, 51($t1) :: rt 0x00000045
+lwr $t0, 54($t1) :: rt 0x00004e46
+lwr $t0, 57($t1) :: rt 0x00474d47
 lwr $t0, 60($t1) :: rt 0x4a484a4c
-lwr $t0, 64($t1) :: rt 0x00444441
-lwr $t0, 2($t1) :: rt 0x0000121f
-lwr $t0, 6($t1) :: rt 0x00000000
-lwr $t0, 10($t1) :: rt 0x00000000
-lwr $t0, 14($t1) :: rt 0x0000ffff
-lwr $t0, 18($t1) :: rt 0x0000232f
-lwr $t0, 22($t1) :: rt 0x0000242c
-lwr $t0, 26($t1) :: rt 0x0000252a
-lwr $t0, 30($t1) :: rt 0x0000262d
-lwr $t0, 34($t1) :: rt 0x00003f34
-lwr $t0, 38($t1) :: rt 0x00003e35
 MADD
 madd  $t0, $t1 :: rs 0x00000006 rt 0x00000002 HI 0x00000000 LO 0x0000000c 
 madd  $t0, $t1 :: rs 0x00000055 rt 0x00000028 HI 0x00000000 LO 0x00000d48 
diff --git a/none/tests/mips32/MIPS32int.stdout.exp-mips32r2-BE b/none/tests/mips32/MIPS32int.stdout.exp-mips32r2-BE
index 62261f9d54..f57c563c68 100644
--- a/none/tests/mips32/MIPS32int.stdout.exp-mips32r2-BE
+++ b/none/tests/mips32/MIPS32int.stdout.exp-mips32r2-BE
@@ -511,7 +511,7 @@ lb $t0, 48($t1) :: rt 0x00000045
 lb $t0, 52($t1) :: rt 0x0000004e
 lb $t0, 56($t1) :: rt 0x00000047
 lb $t0, 60($t1) :: rt 0x0000004a
-lb $t0, 64($t1) :: rt 0x00000041
+lb $t0, 1($t1) :: rt 0x0000001f
 lb $t0, 2($t1) :: rt 0x0000001e
 lb $t0, 6($t1) :: rt 0x00000000
 lb $t0, 10($t1) :: rt 0x00000000
@@ -539,7 +539,7 @@ lbu $t0, 48($t1) :: rt 0x00000045
 lbu $t0, 52($t1) :: rt 0x0000004e
 lbu $t0, 56($t1) :: rt 0x00000047
 lbu $t0, 60($t1) :: rt 0x0000004a
-lbu $t0, 64($t1) :: rt 0x00000041
+lbu $t0, 1($t1) :: rt 0x0000001f
 lbu $t0, 2($t1) :: rt 0x0000001e
 lbu $t0, 6($t1) :: rt 0x00000000
 lbu $t0, 10($t1) :: rt 0x00000000
@@ -567,7 +567,7 @@ lh $t0, 48($t1) :: rt 0x0000454f
 lh $t0, 52($t1) :: rt 0x00004e46
 lh $t0, 56($t1) :: rt 0x0000474d
 lh $t0, 60($t1) :: rt 0x00004a48
-lh $t0, 64($t1) :: rt 0x00004144
+lh $t0, 62($t1) :: rt 0x00004a4c
 lh $t0, 2($t1) :: rt 0x00001e1f
 lh $t0, 6($t1) :: rt 0x00000000
 lh $t0, 10($t1) :: rt 0x00000003
@@ -595,7 +595,7 @@ lhu $t0, 48($t1) :: rt 0x0000454f
 lhu $t0, 52($t1) :: rt 0x00004e46
 lhu $t0, 56($t1) :: rt 0x0000474d
 lhu $t0, 60($t1) :: rt 0x00004a48
-lhu $t0, 64($t1) :: rt 0x00004144
+lhu $t0, 62($t1) :: rt 0x00004a4c
 lhu $t0, 2($t1) :: rt 0x00001e1f
 lhu $t0, 6($t1) :: rt 0x00000000
 lhu $t0, 10($t1) :: rt 0x00000003
@@ -630,7 +630,6 @@ lw $t0, 48($t1) :: rt 0x454f4e45
 lw $t0, 52($t1) :: rt 0x4e464d46
 lw $t0, 56($t1) :: rt 0x474d474c
 lw $t0, 60($t1) :: rt 0x4a484a4c
-lw $t0, 64($t1) :: rt 0x41444400
 lw $t0, 2($t1) :: rt 0x1e1f0000
 lw $t0, 6($t1) :: rt 0x00000000
 lw $t0, 10($t1) :: rt 0x0003ffff
@@ -642,61 +641,47 @@ lw $t0, 30($t1) :: rt 0x2d2a3f34
 lw $t0, 34($t1) :: rt 0x3f3e3e35
 lw $t0, 38($t1) :: rt 0x3d3c363a
 LWL
-lwl $t0, 0($t1) :: rt 0x121f1e1f
-lwl $t0, 4($t1) :: rt 0x00000000
-lwl $t0, 8($t1) :: rt 0x00000003
+lwl $t0, 3($t1) :: rt 0x1f000000
+lwl $t0, 6($t1) :: rt 0x00000000
+lwl $t0, 9($t1) :: rt 0x00000300
 lwl $t0, 12($t1) :: rt 0xffffffff
-lwl $t0, 16($t1) :: rt 0x232f2e2f
-lwl $t0, 20($t1) :: rt 0x242c2b2b
+lwl $t0, 15($t1) :: rt 0xff000000
+lwl $t0, 18($t1) :: rt 0x2e2f0000
+lwl $t0, 21($t1) :: rt 0x2c2b2b00
 lwl $t0, 24($t1) :: rt 0x252a2e2b
-lwl $t0, 28($t1) :: rt 0x262d2d2a
-lwl $t0, 32($t1) :: rt 0x3f343f3e
+lwl $t0, 27($t1) :: rt 0x2b000000
+lwl $t0, 30($t1) :: rt 0x2d2a0000
+lwl $t0, 33($t1) :: rt 0x343f3e00
 lwl $t0, 36($t1) :: rt 0x3e353d3c
-lwl $t0, 40($t1) :: rt 0x363a3c3b
-lwl $t0, 44($t1) :: rt 0x3b373b3a
+lwl $t0, 39($t1) :: rt 0x3c000000
+lwl $t0, 42($t1) :: rt 0x3c3b0000
+lwl $t0, 45($t1) :: rt 0x373b3a00
 lwl $t0, 48($t1) :: rt 0x454f4e45
-lwl $t0, 52($t1) :: rt 0x4e464d46
-lwl $t0, 56($t1) :: rt 0x474d474c
+lwl $t0, 51($t1) :: rt 0x45000000
+lwl $t0, 54($t1) :: rt 0x4d460000
+lwl $t0, 57($t1) :: rt 0x4d474c00
 lwl $t0, 60($t1) :: rt 0x4a484a4c
-lwl $t0, 64($t1) :: rt 0x41444400
-lwl $t0, 2($t1) :: rt 0x1e1f0000
-lwl $t0, 6($t1) :: rt 0x00000000
-lwl $t0, 10($t1) :: rt 0x00030000
-lwl $t0, 14($t1) :: rt 0xffff0000
-lwl $t0, 18($t1) :: rt 0x2e2f0000
-lwl $t0, 22($t1) :: rt 0x2b2b0000
-lwl $t0, 26($t1) :: rt 0x2e2b0000
-lwl $t0, 30($t1) :: rt 0x2d2a0000
-lwl $t0, 34($t1) :: rt 0x3f3e0000
-lwl $t0, 38($t1) :: rt 0x3d3c0000
 LWR
-lwr $t0, 0($t1) :: rt 0x00000012
-lwr $t0, 4($t1) :: rt 0x00000000
-lwr $t0, 8($t1) :: rt 0x00000000
+lwr $t0, 3($t1) :: rt 0x121f1e1f
+lwr $t0, 6($t1) :: rt 0x00000000
+lwr $t0, 9($t1) :: rt 0x00000000
 lwr $t0, 12($t1) :: rt 0x000000ff
-lwr $t0, 16($t1) :: rt 0x00000023
-lwr $t0, 20($t1) :: rt 0x00000024
+lwr $t0, 15($t1) :: rt 0xffffffff
+lwr $t0, 18($t1) :: rt 0x00232f2e
+lwr $t0, 21($t1) :: rt 0x0000242c
 lwr $t0, 24($t1) :: rt 0x00000025
-lwr $t0, 28($t1) :: rt 0x00000026
-lwr $t0, 32($t1) :: rt 0x0000003f
+lwr $t0, 27($t1) :: rt 0x252a2e2b
+lwr $t0, 30($t1) :: rt 0x00262d2d
+lwr $t0, 33($t1) :: rt 0x00003f34
 lwr $t0, 36($t1) :: rt 0x0000003e
-lwr $t0, 40($t1) :: rt 0x00000036
-lwr $t0, 44($t1) :: rt 0x0000003b
+lwr $t0, 39($t1) :: rt 0x3e353d3c
+lwr $t0, 42($t1) :: rt 0x00363a3c
+lwr $t0, 45($t1) :: rt 0x00003b37
 lwr $t0, 48($t1) :: rt 0x00000045
-lwr $t0, 52($t1) :: rt 0x0000004e
-lwr $t0, 56($t1) :: rt 0x00000047
+lwr $t0, 51($t1) :: rt 0x454f4e45
+lwr $t0, 54($t1) :: rt 0x004e464d
+lwr $t0, 57($t1) :: rt 0x0000474d
 lwr $t0, 60($t1) :: rt 0x0000004a
-lwr $t0, 64($t1) :: rt 0x00000041
-lwr $t0, 2($t1) :: rt 0x00121f1e
-lwr $t0, 6($t1) :: rt 0x00000000
-lwr $t0, 10($t1) :: rt 0x00000000
-lwr $t0, 14($t1) :: rt 0x00ffffff
-lwr $t0, 18($t1) :: rt 0x00232f2e
-lwr $t0, 22($t1) :: rt 0x00242c2b
-lwr $t0, 26($t1) :: rt 0x00252a2e
-lwr $t0, 30($t1) :: rt 0x00262d2d
-lwr $t0, 34($t1) :: rt 0x003f343f
-lwr $t0, 38($t1) :: rt 0x003e353d
 MADD
 madd  $t0, $t1 :: rs 0x00000006 rt 0x00000002 HI 0x00000000 LO 0x0000000c 
 madd  $t0, $t1 :: rs 0x00000055 rt 0x00000028 HI 0x00000000 LO 0x00000d48 
@@ -1034,8 +1019,8 @@ rotr $t0, $t1, 0x00000002 :: rt 0xcc505649 rs 0x31415927, imm 0x00000002
 rotr $t0, $t1, 0x0000000F :: rt 0xb24e6282 rs 0x31415927, imm 0x0000000f
 rotr $t0, $t1, 0x00000010 :: rt 0x59273141 rs 0x31415927, imm 0x00000010
 rotr $t0, $t1, 0x0000001F :: rt 0x6282b24e rs 0x31415927, imm 0x0000001f
-rotr $t0, $t1, 0x00000020 :: rt 0x31415927 rs 0x31415927, imm 0x00000020
-rotr $t0, $t1, 0x00000021 :: rt 0x98a0ac93 rs 0x31415927, imm 0x00000021
+rotr $t0, $t1, 0x0000001A :: rt 0x505649cc rs 0x31415927, imm 0x0000001a
+rotr $t0, $t1, 0x00000007 :: rt 0x4e6282b2 rs 0x31415927, imm 0x00000007
 rotr $t0, $t1, 0x00000000 :: rt 0x00088000 rs 0x00088000, imm 0x00000000
 rotr $t0, $t1, 0x00000001 :: rt 0x00044000 rs 0x00088000, imm 0x00000001
 rotr $t0, $t1, 31 :: rt 0x00110000 rs 0x00088000, imm 0x0000001f
@@ -1043,7 +1028,7 @@ rotr $t0, $t1, 16 :: rt 0x00000001 rs 0x00010000, imm 0x00000010
 rotr $t0, $t1, 17 :: rt 0x80000000 rs 0x00010000, imm 0x00000011
 rotr $t0, $t1, 18 :: rt 0x40000000 rs 0x00010000, imm 0x00000012
 rotr $t0, $t1, 0 :: rt 0x00000000 rs 0x00000000, imm 0x00000000
-rotr $t0, $t1, 0xffff :: rt 0x0001fffe rs 0x0000ffff, imm 0x0000ffff
+rotr $t0, $t1, 0x1F :: rt 0x0001fffe rs 0x0000ffff, imm 0x0000001f
 ROTRV
 rotrv $t0, $t1, $t2 :: rd 0x6282b24e rs 0x31415927, rt 0xffffffff
 rotrv $t0, $t1, $t2 :: rd 0x31415927 rs 0x31415927, rt 0xee00ee00
diff --git a/none/tests/mips32/MIPS32int.stdout.exp-mips32r2-LE b/none/tests/mips32/MIPS32int.stdout.exp-mips32r2-LE
index cfbae0df11..4b61ae613f 100644
--- a/none/tests/mips32/MIPS32int.stdout.exp-mips32r2-LE
+++ b/none/tests/mips32/MIPS32int.stdout.exp-mips32r2-LE
@@ -511,7 +511,7 @@ lb $t0, 48($t1) :: rt 0x00000045
 lb $t0, 52($t1) :: rt 0x00000046
 lb $t0, 56($t1) :: rt 0x0000004c
 lb $t0, 60($t1) :: rt 0x0000004c
-lb $t0, 64($t1) :: rt 0x00000041
+lb $t0, 1($t1) :: rt 0x0000001e
 lb $t0, 2($t1) :: rt 0x0000001f
 lb $t0, 6($t1) :: rt 0x00000000
 lb $t0, 10($t1) :: rt 0x00000000
@@ -539,7 +539,7 @@ lbu $t0, 48($t1) :: rt 0x00000045
 lbu $t0, 52($t1) :: rt 0x00000046
 lbu $t0, 56($t1) :: rt 0x0000004c
 lbu $t0, 60($t1) :: rt 0x0000004c
-lbu $t0, 64($t1) :: rt 0x00000041
+lbu $t0, 1($t1) :: rt 0x0000001e
 lbu $t0, 2($t1) :: rt 0x0000001f
 lbu $t0, 6($t1) :: rt 0x00000000
 lbu $t0, 10($t1) :: rt 0x00000000
@@ -567,7 +567,7 @@ lh $t0, 48($t1) :: rt 0x00004e45
 lh $t0, 52($t1) :: rt 0x00004d46
 lh $t0, 56($t1) :: rt 0x0000474c
 lh $t0, 60($t1) :: rt 0x00004a4c
-lh $t0, 64($t1) :: rt 0x00004441
+lh $t0, 62($t1) :: rt 0x00004a48
 lh $t0, 2($t1) :: rt 0x0000121f
 lh $t0, 6($t1) :: rt 0x00000000
 lh $t0, 10($t1) :: rt 0x00000000
@@ -595,7 +595,7 @@ lhu $t0, 48($t1) :: rt 0x00004e45
 lhu $t0, 52($t1) :: rt 0x00004d46
 lhu $t0, 56($t1) :: rt 0x0000474c
 lhu $t0, 60($t1) :: rt 0x00004a4c
-lhu $t0, 64($t1) :: rt 0x00004441
+lhu $t0, 62($t1) :: rt 0x00004a48
 lhu $t0, 2($t1) :: rt 0x0000121f
 lhu $t0, 6($t1) :: rt 0x00000000
 lhu $t0, 10($t1) :: rt 0x00000000
@@ -630,7 +630,6 @@ lw $t0, 48($t1) :: rt 0x454f4e45
 lw $t0, 52($t1) :: rt 0x4e464d46
 lw $t0, 56($t1) :: rt 0x474d474c
 lw $t0, 60($t1) :: rt 0x4a484a4c
-lw $t0, 64($t1) :: rt 0x00444441
 lw $t0, 2($t1) :: rt 0x0000121f
 lw $t0, 6($t1) :: rt 0x00030000
 lw $t0, 10($t1) :: rt 0xffff0000
@@ -642,61 +641,47 @@ lw $t0, 30($t1) :: rt 0x3f3e262d
 lw $t0, 34($t1) :: rt 0x3d3c3f34
 lw $t0, 38($t1) :: rt 0x3c3b3e35
 LWL
-lwl $t0, 0($t1) :: rt 0x1f000000
-lwl $t0, 4($t1) :: rt 0x00000000
-lwl $t0, 8($t1) :: rt 0x03000000
+lwl $t0, 3($t1) :: rt 0x121f1e1f
+lwl $t0, 6($t1) :: rt 0x00000000
+lwl $t0, 9($t1) :: rt 0x00030000
 lwl $t0, 12($t1) :: rt 0xff000000
-lwl $t0, 16($t1) :: rt 0x2f000000
-lwl $t0, 20($t1) :: rt 0x2b000000
+lwl $t0, 15($t1) :: rt 0xffffffff
+lwl $t0, 18($t1) :: rt 0x2f2e2f00
+lwl $t0, 21($t1) :: rt 0x2b2b0000
 lwl $t0, 24($t1) :: rt 0x2b000000
-lwl $t0, 28($t1) :: rt 0x2a000000
-lwl $t0, 32($t1) :: rt 0x3e000000
+lwl $t0, 27($t1) :: rt 0x252a2e2b
+lwl $t0, 30($t1) :: rt 0x2d2d2a00
+lwl $t0, 33($t1) :: rt 0x3f3e0000
 lwl $t0, 36($t1) :: rt 0x3c000000
-lwl $t0, 40($t1) :: rt 0x3b000000
-lwl $t0, 44($t1) :: rt 0x3a000000
+lwl $t0, 39($t1) :: rt 0x3e353d3c
+lwl $t0, 42($t1) :: rt 0x3a3c3b00
+lwl $t0, 45($t1) :: rt 0x3b3a0000
 lwl $t0, 48($t1) :: rt 0x45000000
-lwl $t0, 52($t1) :: rt 0x46000000
-lwl $t0, 56($t1) :: rt 0x4c000000
+lwl $t0, 51($t1) :: rt 0x454f4e45
+lwl $t0, 54($t1) :: rt 0x464d4600
+lwl $t0, 57($t1) :: rt 0x474c0000
 lwl $t0, 60($t1) :: rt 0x4c000000
-lwl $t0, 64($t1) :: rt 0x41000000
-lwl $t0, 2($t1) :: rt 0x1f1e1f00
-lwl $t0, 6($t1) :: rt 0x00000000
-lwl $t0, 10($t1) :: rt 0x00000300
-lwl $t0, 14($t1) :: rt 0xffffff00
-lwl $t0, 18($t1) :: rt 0x2f2e2f00
-lwl $t0, 22($t1) :: rt 0x2c2b2b00
-lwl $t0, 26($t1) :: rt 0x2a2e2b00
-lwl $t0, 30($t1) :: rt 0x2d2d2a00
-lwl $t0, 34($t1) :: rt 0x343f3e00
-lwl $t0, 38($t1) :: rt 0x353d3c00
 LWR
-lwr $t0, 0($t1) :: rt 0x121f1e1f
-lwr $t0, 4($t1) :: rt 0x00000000
-lwr $t0, 8($t1) :: rt 0x00000003
+lwr $t0, 3($t1) :: rt 0x00000012
+lwr $t0, 6($t1) :: rt 0x00000000
+lwr $t0, 9($t1) :: rt 0x00000000
 lwr $t0, 12($t1) :: rt 0xffffffff
-lwr $t0, 16($t1) :: rt 0x232f2e2f
-lwr $t0, 20($t1) :: rt 0x242c2b2b
+lwr $t0, 15($t1) :: rt 0x000000ff
+lwr $t0, 18($t1) :: rt 0x0000232f
+lwr $t0, 21($t1) :: rt 0x00242c2b
 lwr $t0, 24($t1) :: rt 0x252a2e2b
-lwr $t0, 28($t1) :: rt 0x262d2d2a
-lwr $t0, 32($t1) :: rt 0x3f343f3e
+lwr $t0, 27($t1) :: rt 0x00000025
+lwr $t0, 30($t1) :: rt 0x0000262d
+lwr $t0, 33($t1) :: rt 0x003f343f
 lwr $t0, 36($t1) :: rt 0x3e353d3c
-lwr $t0, 40($t1) :: rt 0x363a3c3b
-lwr $t0, 44($t1) :: rt 0x3b373b3a
+lwr $t0, 39($t1) :: rt 0x0000003e
+lwr $t0, 42($t1) :: rt 0x0000363a
+lwr $t0, 45($t1) :: rt 0x003b373b
 lwr $t0, 48($t1) :: rt 0x454f4e45
-lwr $t0, 52($t1) :: rt 0x4e464d46
-lwr $t0, 56($t1) :: rt 0x474d474c
+lwr $t0, 51($t1) :: rt 0x00000045
+lwr $t0, 54($t1) :: rt 0x00004e46
+lwr $t0, 57($t1) :: rt 0x00474d47
 lwr $t0, 60($t1) :: rt 0x4a484a4c
-lwr $t0, 64($t1) :: rt 0x00444441
-lwr $t0, 2($t1) :: rt 0x0000121f
-lwr $t0, 6($t1) :: rt 0x00000000
-lwr $t0, 10($t1) :: rt 0x00000000
-lwr $t0, 14($t1) :: rt 0x0000ffff
-lwr $t0, 18($t1) :: rt 0x0000232f
-lwr $t0, 22($t1) :: rt 0x0000242c
-lwr $t0, 26($t1) :: rt 0x0000252a
-lwr $t0, 30($t1) :: rt 0x0000262d
-lwr $t0, 34($t1) :: rt 0x00003f34
-lwr $t0, 38($t1) :: rt 0x00003e35
 MADD
 madd  $t0, $t1 :: rs 0x00000006 rt 0x00000002 HI 0x00000000 LO 0x0000000c 
 madd  $t0, $t1 :: rs 0x00000055 rt 0x00000028 HI 0x00000000 LO 0x00000d48 
@@ -1034,8 +1019,8 @@ rotr $t0, $t1, 0x00000002 :: rt 0xcc505649 rs 0x31415927, imm 0x00000002
 rotr $t0, $t1, 0x0000000F :: rt 0xb24e6282 rs 0x31415927, imm 0x0000000f
 rotr $t0, $t1, 0x00000010 :: rt 0x59273141 rs 0x31415927, imm 0x00000010
 rotr $t0, $t1, 0x0000001F :: rt 0x6282b24e rs 0x31415927, imm 0x0000001f
-rotr $t0, $t1, 0x00000020 :: rt 0x31415927 rs 0x31415927, imm 0x00000020
-rotr $t0, $t1, 0x00000021 :: rt 0x98a0ac93 rs 0x31415927, imm 0x00000021
+rotr $t0, $t1, 0x0000001A :: rt 0x505649cc rs 0x31415927, imm 0x0000001a
+rotr $t0, $t1, 0x00000007 :: rt 0x4e6282b2 rs 0x31415927, imm 0x00000007
 rotr $t0, $t1, 0x00000000 :: rt 0x00088000 rs 0x00088000, imm 0x00000000
 rotr $t0, $t1, 0x00000001 :: rt 0x00044000 rs 0x00088000, imm 0x00000001
 rotr $t0, $t1, 31 :: rt 0x00110000 rs 0x00088000, imm 0x0000001f
@@ -1043,7 +1028,7 @@ rotr $t0, $t1, 16 :: rt 0x00000001 rs 0x00010000, imm 0x00000010
 rotr $t0, $t1, 17 :: rt 0x80000000 rs 0x00010000, imm 0x00000011
 rotr $t0, $t1, 18 :: rt 0x40000000 rs 0x00010000, imm 0x00000012
 rotr $t0, $t1, 0 :: rt 0x00000000 rs 0x00000000, imm 0x00000000
-rotr $t0, $t1, 0xffff :: rt 0x0001fffe rs 0x0000ffff, imm 0x0000ffff
+rotr $t0, $t1, 0x1F :: rt 0x0001fffe rs 0x0000ffff, imm 0x0000001f
 ROTRV
 rotrv $t0, $t1, $t2 :: rd 0x6282b24e rs 0x31415927, rt 0xffffffff
 rotrv $t0, $t1, $t2 :: rd 0x31415927 rs 0x31415927, rt 0xee00ee00