diff --git a/compiler/mips/mipsreg.dat b/compiler/mips/mipsreg.dat
index 75d3df7c80..d470956386 100644
--- a/compiler/mips/mipsreg.dat
+++ b/compiler/mips/mipsreg.dat
@@ -6,38 +6,38 @@
 ;
 NO,$00,$00,INVALID,INVALID,-1,-1
 
-R0,$01,$00,zero,r0,0,0
-R1,$01,$01,at,r1,1,1
-R2,$01,$02,v0,r2,2,2
-R3,$01,$03,v1,r3,3,3
-R4,$01,$04,a0,r4,4,4
-R5,$01,$05,a1,r5,5,5
-R6,$01,$06,a2,r6,6,6
-R7,$01,$07,a3,r7,7,7
-R8,$01,$08,t0,r8,8,8
-R9,$01,$09,t1,r9,9,9
-R10,$01,$0a,t2,r10,10,10
-R11,$01,$0b,t3,r11,11,11
-R12,$01,$0c,t4,r12,12,12
-R13,$01,$0d,t5,r13,13,13
-R14,$01,$0e,t6,r14,14,14
-R15,$01,$0f,t7,r15,15,15
-R16,$01,$10,s0,r16,16,16
-R17,$01,$11,s1,r17,17,17
-R18,$01,$12,s2,r18,18,18
-R19,$01,$13,s3,r19,19,19
-R20,$01,$14,s4,r20,20,20
-R21,$01,$15,s5,r21,21,21
-R22,$01,$16,s6,r22,22,22
-R23,$01,$17,s7,r23,23,23
-R24,$01,$18,t8,r24,24,24
-R25,$01,$19,t9,r25,25,25
-R26,$01,$1a,k0,r26,26,26
-R27,$01,$1b,k1,r27,27,27
-R28,$01,$1c,gp,r28,28,28
-R29,$01,$1d,sp,r29,29,29
-R30,$01,$1e,fp,r30,30,30
-R31,$01,$1f,ra,r31,31,31
+R0,$01,$00,zero,$0,0,0
+R1,$01,$01,at,$1,1,1
+R2,$01,$02,v0,$2,2,2
+R3,$01,$03,v1,$3,3,3
+R4,$01,$04,a0,$4,4,4
+R5,$01,$05,a1,$5,5,5
+R6,$01,$06,a2,$6,6,6
+R7,$01,$07,a3,$7,7,7
+R8,$01,$08,t0,$8,8,8
+R9,$01,$09,t1,$9,9,9
+R10,$01,$0a,t2,$10,10,10
+R11,$01,$0b,t3,$11,11,11
+R12,$01,$0c,t4,$12,12,12
+R13,$01,$0d,t5,$13,13,13
+R14,$01,$0e,t6,$14,14,14
+R15,$01,$0f,t7,$15,15,15
+R16,$01,$10,s0,$16,16,16
+R17,$01,$11,s1,$17,17,17
+R18,$01,$12,s2,$18,18,18
+R19,$01,$13,s3,$19,19,19
+R20,$01,$14,s4,$20,20,20
+R21,$01,$15,s5,$21,21,21
+R22,$01,$16,s6,$22,22,22
+R23,$01,$17,s7,$23,23,23
+R24,$01,$18,t8,$24,24,24
+R25,$01,$19,t9,$25,25,25
+R26,$01,$1a,k0,$26,26,26
+R27,$01,$1b,k1,$27,27,27
+R28,$01,$1c,gp,$28,28,28
+R29,$01,$1d,sp,$29,29,29
+R30,$01,$1e,fp,$30,30,30
+R31,$01,$1f,$a,$31,31,31
 
 F0,$02,$00,F0,f0,32,32
 F1,$02,$01,F1,f1,33,33
diff --git a/compiler/mips/rmipsgas.inc b/compiler/mips/rmipsgas.inc
index b81050d8c8..30ed1ea53f 100644
--- a/compiler/mips/rmipsgas.inc
+++ b/compiler/mips/rmipsgas.inc
@@ -1,37 +1,37 @@
 { don't edit, this file is generated from mipsreg.dat }
 'INVALID',
-'r0',
-'r1',
-'r2',
-'r3',
-'r4',
-'r5',
-'r6',
-'r7',
-'r8',
-'r9',
-'r10',
-'r11',
-'r12',
-'r13',
-'r14',
-'r15',
-'r16',
-'r17',
-'r18',
-'r19',
-'r20',
-'r21',
-'r22',
-'r23',
-'r24',
-'r25',
-'r26',
-'r27',
-'r28',
-'r29',
-'r30',
-'r31',
+'$0',
+'$1',
+'$2',
+'$3',
+'$4',
+'$5',
+'$6',
+'$7',
+'$8',
+'$9',
+'$10',
+'$11',
+'$12',
+'$13',
+'$14',
+'$15',
+'$16',
+'$17',
+'$18',
+'$19',
+'$20',
+'$21',
+'$22',
+'$23',
+'$24',
+'$25',
+'$26',
+'$27',
+'$28',
+'$29',
+'$30',
+'$31',
 'f0',
 'f1',
 'f2',
diff --git a/compiler/mips/rmipsgri.inc b/compiler/mips/rmipsgri.inc
index a52df4ffa7..6cd775f824 100644
--- a/compiler/mips/rmipsgri.inc
+++ b/compiler/mips/rmipsgri.inc
@@ -1,4 +1,36 @@
 { don't edit, this file is generated from mipsreg.dat }
+1,
+2,
+11,
+12,
+13,
+14,
+15,
+16,
+17,
+18,
+19,
+20,
+3,
+21,
+22,
+23,
+24,
+25,
+26,
+27,
+28,
+29,
+30,
+4,
+31,
+32,
+5,
+6,
+7,
+8,
+9,
+10,
 0,
 68,
 33,
@@ -40,36 +72,4 @@
 73,
 66,
 67,
-65,
-1,
-2,
-11,
-12,
-13,
-14,
-15,
-16,
-17,
-18,
-19,
-20,
-3,
-21,
-22,
-23,
-24,
-25,
-26,
-27,
-28,
-29,
-30,
-4,
-31,
-32,
-5,
-6,
-7,
-8,
-9,
-10
+65
diff --git a/compiler/mips/rmipssri.inc b/compiler/mips/rmipssri.inc
index 8cb7ecc8bc..84a19da2f2 100644
--- a/compiler/mips/rmipssri.inc
+++ b/compiler/mips/rmipssri.inc
@@ -1,4 +1,5 @@
 { don't edit, this file is generated from mipsreg.dat }
+32,
 68,
 33,
 34,
@@ -50,7 +51,6 @@
 29,
 27,
 28,
-32,
 17,
 18,
 19,
diff --git a/compiler/mips/rmipsstd.inc b/compiler/mips/rmipsstd.inc
index 889c4dd5a5..f03b0d33cb 100644
--- a/compiler/mips/rmipsstd.inc
+++ b/compiler/mips/rmipsstd.inc
@@ -31,7 +31,7 @@
 'gp',
 'sp',
 'fp',
-'ra',
+'$a',
 'F0',
 'F1',
 'F2',