MC: alias registers for Mips

h0ne · Feb 12, 2019 · 3a463f6 · 3a463f6
1 parent 4986d4d
commit 3a463f6
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 63 deletions.
diff --git a/suite/MC/Mips/micromips-expansions.s.cs b/suite/MC/Mips/micromips-expansions.s.cs
@@ -2,19 +2,19 @@
 0xa0,0x50,0x7b,0x00 = ori $a1, $zero, 123
 0xc0,0x30,0xd7,0xf6 = addiu $a2, $zero, -2345
 0xa7,0x41,0x01,0x00 = lui $a3, 1
-0xe7,0x50,0x02,0x00 = ori $a3, $7, 2
+0xe7,0x50,0x02,0x00 = ori $a3, $a3, 2
 0x80,0x30,0x14,0x00 = addiu $a0, $zero, 20
 0xa7,0x41,0x01,0x00 = lui $a3, 1
-0xe7,0x50,0x02,0x00 = ori $a3, $7, 2
+0xe7,0x50,0x02,0x00 = ori $a3, $a3, 2
 0x85,0x30,0x14,0x00 = addiu $a0, $a1, 20
 0xa7,0x41,0x01,0x00 = lui $a3, 1
-0xe7,0x50,0x02,0x00 = ori $a3, $7, 2
-0x07,0x01,0x50,0x39 = addu $a3, $7, $t0
+0xe7,0x50,0x02,0x00 = ori $a3, $a3, 2
+0x07,0x01,0x50,0x39 = addu $a3, $a3, $t0
 0x8a,0x00,0x50,0x51 = addu $t2, $at0, $a0
-0x21,0x01,0x50,0x09 = addu $at, $1, $t1
+0x21,0x01,0x50,0x09 = addu $at, $at, $t1
 0xaa,0x41,0x0a,0x00 = lui $t2, 10
 0x8a,0x00,0x50,0x51 = addu $t2, $at0, $a0
 0x4a,0xfd,0x7b,0x00 = lw $t2, 123($at0)
 0xa1,0x41,0x02,0x00 = lui $at, 2
-0x21,0x01,0x50,0x09 = addu $at, $1, $t1
+0x21,0x01,0x50,0x09 = addu $at, $at, $t1
 0x41,0xf9,0x40,0xe2 = sw $t2, 57920($at)
diff --git a/suite/MC/Mips/mips-alu-instructions.s.cs b/suite/MC/Mips/mips-alu-instructions.s.cs
@@ -2,7 +2,7 @@
 0x24,0x48,0xc7,0x00 = and $t1, $a2, $a3
 0x67,0x45,0xc9,0x30 = andi $t1, $a2, 17767
 0x67,0x45,0xc9,0x30 = andi $t1, $a2, 17767
-0x67,0x45,0x29,0x31 = andi $t1, $9, 17767
+0x67,0x45,0x29,0x31 = andi $t1, $t1, 17767
 0x21,0x30,0xe6,0x70 = clo $a2, $a3
 0x20,0x30,0xe6,0x70 = clz $a2, $a3
 0x84,0x61,0x33,0x7d = ins $s3, $t1, 6, 7
@@ -34,7 +34,7 @@
 0x67,0x45,0xc9,0x20 = addi $t1, $a2, 17767
 0x67,0xc5,0xc9,0x24 = addiu $t1, $a2, -15001
 0x67,0x45,0xc9,0x20 = addi $t1, $a2, 17767
-0x67,0x45,0x29,0x21 = addi $t1, $9, 17767
+0x67,0x45,0x29,0x21 = addi $t1, $t1, 17767
 0x67,0xc5,0xc9,0x24 = addiu $t1, $a2, -15001
 0x28,0x00,0x6b,0x25 = addiu $t3, $at1, 40
 0x21,0x48,0xc7,0x00 = addu $t1, $a2, $a3

diff --git a/suite/MC/Mips/mips-expansions.s.cs b/suite/MC/Mips/mips-expansions.s.cs
@@ -2,19 +2,19 @@
 0x7b,0x00,0x05,0x34 = ori $a1, $zero, 123
 0xd7,0xf6,0x06,0x24 = addiu $a2, $zero, -2345
 0x01,0x00,0x07,0x3c = lui $a3, 1
-0x02,0x00,0xe7,0x34 = ori $a3, $7, 2
+0x02,0x00,0xe7,0x34 = ori $a3, $a3, 2
 0x14,0x00,0x04,0x24 = addiu $a0, $zero, 20
 0x01,0x00,0x07,0x3c = lui $a3, 1
-0x02,0x00,0xe7,0x34 = ori $a3, $7, 2
+0x02,0x00,0xe7,0x34 = ori $a3, $a3, 2
 0x14,0x00,0xa4,0x24 = addiu $a0, $a1, 20
 0x01,0x00,0x07,0x3c = lui $a3, 1
-0x02,0x00,0xe7,0x34 = ori $a3, $7, 2
-0x21,0x38,0xe8,0x00 = addu $a3, $7, $t0
+0x02,0x00,0xe7,0x34 = ori $a3, $a3, 2
+0x21,0x38,0xe8,0x00 = addu $a3, $a3, $t0
 0x21,0x50,0x44,0x01 = addu $t2, $at0, $a0
-0x21,0x08,0x29,0x00 = addu $at, $1, $t1
+0x21,0x08,0x29,0x00 = addu $at, $at, $t1
 0x0a,0x00,0x0a,0x3c = lui $t2, 10
 0x21,0x50,0x44,0x01 = addu $t2, $at0, $a0
 0x7b,0x00,0x4a,0x8d = lw $t2, 123($at0)
 0x02,0x00,0x01,0x3c = lui $at, 2
-0x21,0x08,0x29,0x00 = addu $at, $1, $t1
+0x21,0x08,0x29,0x00 = addu $at, $at, $t1
 0x40,0xe2,0x2a,0xac = sw $t2, 57920($at)
diff --git a/suite/MC/Mips/mips-memory-instructions.s.cs b/suite/MC/Mips/mips-memory-instructions.s.cs
@@ -3,7 +3,7 @@
 0x10,0x00,0xa4,0xe0 = sc $a0, 16($a1)
 0x10,0x00,0xa4,0xa4 = sh $a0, 16($a1)
 0x10,0x00,0xa4,0xac = sw $a0, 16($a1)
-0x00,0x00,0xa7,0xac = sw $a3, 0($a1)
+0x00,0x00,0xa7,0xac = sw $a3, ($a1)
 0x10,0x00,0xa2,0xe4 = swc1 $f2, 16($a1)
 0x10,0x00,0xa4,0xa8 = swl $a0, 16($a1)
 0x04,0x00,0xa4,0x80 = lb $a0, 4($a1)
@@ -13,5 +13,5 @@
 0x04,0x00,0xa4,0x94 = lhu $a0, 4($a1)
 0x04,0x00,0xa4,0xc0 = ll $a0, 4($a1)
 0x04,0x00,0xa4,0x8c = lw $a0, 4($a1)
-0x00,0x00,0xe7,0x8c = lw $a3, 0($7)
+0x00,0x00,0xe7,0x8c = lw $a3, ($a3)
 0x10,0x00,0xa2,0x8f = lw $v0, 16($sp)
diff --git a/suite/MC/Mips/mips64-alu-instructions.s.cs b/suite/MC/Mips/mips64-alu-instructions.s.cs
@@ -31,9 +31,9 @@
 0x67,0x45,0xc9,0x60 = daddi $t1, $a2, 17767
 0x67,0xc5,0xc9,0x64 = daddiu $t1, $a2, -15001
 0x67,0x45,0xc9,0x60 = daddi $t1, $a2, 17767
-0x67,0x45,0x29,0x61 = daddi $t1, $9, 17767
+0x67,0x45,0x29,0x61 = daddi $t1, $t1, 17767
 0x67,0xc5,0xc9,0x64 = daddiu $t1, $a2, -15001
-0x67,0xc5,0x29,0x65 = daddiu $t1, $9, -15001
+0x67,0xc5,0x29,0x65 = daddiu $t1, $t1, -15001
 0x2d,0x48,0xc7,0x00 = daddu $t1, $a2, $a3
 0x3a,0x4d,0x26,0x00 = drotr $t1, $a2, 20
 0x3e,0x4d,0x26,0x00 = drotr32 $t1, $a2, 52

diff --git a/suite/MC/Mips/mips_directives.s.cs b/suite/MC/Mips/mips_directives.s.cs
@@ -9,4 +9,4 @@
 0x0c,0x00,0x01,0x4c = jal 1328
 0x00,0x00,0x00,0x00 = nop 
 0x46,0x00,0x39,0x85 = abs.s $f6, $f7
-0x01,0xef,0x18,0x24 = and $v1, $t7, $at5
+0x01,0xef,0x18,0x24 = and $v1, $t7, $t7
diff --git a/suite/MC/Mips/nabi-regs.s.cs b/suite/MC/Mips/nabi-regs.s.cs
@@ -1,12 +1,12 @@
 # CS_ARCH_MIPS, CS_MODE_MIPS64+CS_MODE_BIG_ENDIAN, None
-0x02,0x04,0x80,0x20 = add $s0, $at6, $a0
-0x02,0x06,0x80,0x20 = add $s0, $at6, $a2
-0x02,0x07,0x80,0x20 = add $s0, $at6, $a3
-0x02,0x08,0x80,0x20 = add $s0, $at6, $t0
-0x02,0x09,0x80,0x20 = add $s0, $at6, $t1
-0x02,0x0a,0x80,0x20 = add $s0, $at6, $t2
-0x02,0x0b,0x80,0x20 = add $s0, $at6, $t3
-0x02,0x0c,0x80,0x20 = add $s0, $at6, $t4
-0x02,0x0d,0x80,0x20 = add $s0, $at6, $t5
-0x02,0x0e,0x80,0x20 = add $s0, $at6, $t6
-0x02,0x0f,0x80,0x20 = add $s0, $at6, $t7
+0x02,0x04,0x80,0x20 = add $s0, $s0, $a0
+0x02,0x06,0x80,0x20 = add $s0, $s0, $a2
+0x02,0x07,0x80,0x20 = add $s0, $s0, $a3
+0x02,0x08,0x80,0x20 = add $s0, $s0, $t0
+0x02,0x09,0x80,0x20 = add $s0, $s0, $t1
+0x02,0x0a,0x80,0x20 = add $s0, $s0, $t2
+0x02,0x0b,0x80,0x20 = add $s0, $s0, $t3
+0x02,0x0c,0x80,0x20 = add $s0, $s0, $t4
+0x02,0x0d,0x80,0x20 = add $s0, $s0, $t5
+0x02,0x0e,0x80,0x20 = add $s0, $s0, $t6
+0x02,0x0f,0x80,0x20 = add $s0, $s0, $t7
diff --git a/suite/MC/Mips/test_ctrlregs.s.cs b/suite/MC/Mips/test_ctrlregs.s.cs
@@ -1,33 +1,33 @@
 # CS_ARCH_MIPS, CS_MODE_MIPS32+CS_MODE_BIG_ENDIAN, None
 0x78,0x7e,0x00,0x59 = cfcmsa $at, $0
 0x78,0x7e,0x00,0x59 = cfcmsa $at, $0
-0x78,0x7e,0x08,0x99 = cfcmsa $v0, $at
-0x78,0x7e,0x08,0x99 = cfcmsa $v0, $at
-0x78,0x7e,0x10,0xd9 = cfcmsa $v1, $v0
-0x78,0x7e,0x10,0xd9 = cfcmsa $v1, $v0
-0x78,0x7e,0x19,0x19 = cfcmsa $a0, $v1
-0x78,0x7e,0x19,0x19 = cfcmsa $a0, $v1
-0x78,0x7e,0x21,0x59 = cfcmsa $a1, $a0
-0x78,0x7e,0x21,0x59 = cfcmsa $a1, $a0
-0x78,0x7e,0x29,0x99 = cfcmsa $a2, $a1
-0x78,0x7e,0x29,0x99 = cfcmsa $a2, $a1
-0x78,0x7e,0x31,0xd9 = cfcmsa $a3, $a2
-0x78,0x7e,0x31,0xd9 = cfcmsa $a3, $a2
-0x78,0x7e,0x3a,0x19 = cfcmsa $t0, $a3
-0x78,0x7e,0x3a,0x19 = cfcmsa $t0, $a3
-0x78,0x3e,0x08,0x19 = ctcmsa $0, $at
-0x78,0x3e,0x08,0x19 = ctcmsa $0, $at
-0x78,0x3e,0x10,0x59 = ctcmsa $at, $v0
-0x78,0x3e,0x10,0x59 = ctcmsa $at, $v0
-0x78,0x3e,0x18,0x99 = ctcmsa $v0, $v1
-0x78,0x3e,0x18,0x99 = ctcmsa $v0, $v1
-0x78,0x3e,0x20,0xd9 = ctcmsa $v1, $a0
-0x78,0x3e,0x20,0xd9 = ctcmsa $v1, $a0
-0x78,0x3e,0x29,0x19 = ctcmsa $a0, $a1
-0x78,0x3e,0x29,0x19 = ctcmsa $a0, $a1
-0x78,0x3e,0x31,0x59 = ctcmsa $a1, $a2
-0x78,0x3e,0x31,0x59 = ctcmsa $a1, $a2
-0x78,0x3e,0x39,0x99 = ctcmsa $a2, $a3
-0x78,0x3e,0x39,0x99 = ctcmsa $a2, $a3
-0x78,0x3e,0x41,0xd9 = ctcmsa $a3, $t0
-0x78,0x3e,0x41,0xd9 = ctcmsa $a3, $t0
+0x78,0x7e,0x08,0x99 = cfcmsa $v0, $1
+0x78,0x7e,0x08,0x99 = cfcmsa $v0, $1
+0x78,0x7e,0x10,0xd9 = cfcmsa $v1, $2
+0x78,0x7e,0x10,0xd9 = cfcmsa $v1, $2
+0x78,0x7e,0x19,0x19 = cfcmsa $a0, $3
+0x78,0x7e,0x19,0x19 = cfcmsa $a0, $3
+0x78,0x7e,0x21,0x59 = cfcmsa $a1, $4
+0x78,0x7e,0x21,0x59 = cfcmsa $a1, $4
+0x78,0x7e,0x29,0x99 = cfcmsa $a2, $5
+0x78,0x7e,0x29,0x99 = cfcmsa $a2, $5
+0x78,0x7e,0x31,0xd9 = cfcmsa $a3, $6
+0x78,0x7e,0x31,0xd9 = cfcmsa $a3, $6
+0x78,0x7e,0x3a,0x19 = cfcmsa $t0, $7
+0x78,0x7e,0x3a,0x19 = cfcmsa $t0, $7
+0x78,0x3e,0x08,0x19 = ctcmsa $0, $1
+0x78,0x3e,0x08,0x19 = ctcmsa $0, $1
+0x78,0x3e,0x10,0x59 = ctcmsa $at, $2
+0x78,0x3e,0x10,0x59 = ctcmsa $at, $2
+0x78,0x3e,0x18,0x99 = ctcmsa $v0, $3
+0x78,0x3e,0x18,0x99 = ctcmsa $v0, $3
+0x78,0x3e,0x20,0xd9 = ctcmsa $v1, $4
+0x78,0x3e,0x20,0xd9 = ctcmsa $v1, $4
+0x78,0x3e,0x29,0x19 = ctcmsa $a0, $5
+0x78,0x3e,0x29,0x19 = ctcmsa $a0, $5
+0x78,0x3e,0x31,0x59 = ctcmsa $a1, $6
+0x78,0x3e,0x31,0x59 = ctcmsa $a1, $6
+0x78,0x3e,0x39,0x99 = ctcmsa $a2, $7
+0x78,0x3e,0x39,0x99 = ctcmsa $a2, $7
+0x78,0x3e,0x41,0xd9 = ctcmsa $a3, $8
+0x78,0x3e,0x41,0xd9 = ctcmsa $a3, $8
diff --git a/suite/MC/Mips/test_mi10.s.cs b/suite/MC/Mips/test_mi10.s.cs
@@ -1,10 +1,10 @@
 # CS_ARCH_MIPS, CS_MODE_MIPS32+CS_MODE_BIG_ENDIAN, None
 0x7a,0x00,0x08,0x20 = ld.b $w0, -512($at)
-0x78,0x00,0x10,0x60 = ld.b $w1, 0($v0)
+0x78,0x00,0x10,0x60 = ld.b $w1, ($v0)
 0x79,0xff,0x18,0xa0 = ld.b $w2, 511($v1)
 0x7a,0x00,0x20,0xe1 = ld.h $w3, -1024($a0)
 0x7b,0x00,0x29,0x21 = ld.h $w4, -512($a1)
-0x78,0x00,0x31,0x61 = ld.h $w5, 0($a2)
+0x78,0x00,0x31,0x61 = ld.h $w5, ($a2)
 0x79,0x00,0x39,0xa1 = ld.h $w6, 512($a3)
 0x79,0xff,0x41,0xe1 = ld.h $w7, 1022($t0)
 0x7a,0x00,0x4a,0x22 = ld.w $w8, -2048($t1)
@@ -17,7 +17,7 @@
 0x7b,0x00,0x83,0xe3 = ld.d $w15, -2048($s0)
 0x7b,0x80,0x8c,0x23 = ld.d $w16, -1024($s1)
 0x7b,0xc0,0x94,0x63 = ld.d $w17, -512($s2)
-0x78,0x00,0x9c,0xa3 = ld.d $w18, 0($s3)
+0x78,0x00,0x9c,0xa3 = ld.d $w18, ($s3)
 0x78,0x40,0xa4,0xe3 = ld.d $w19, 512($s4)
 0x78,0x80,0xad,0x23 = ld.d $w20, 1024($s5)
 0x79,0x00,0xb5,0x63 = ld.d $w21, 2048($s6)