---

yaml
---
r: 48121
b: refs/heads/incoming
c: 314605f
h: refs/heads/master
i:
  48119: f29850b
v: v3

Author: crabtw

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: c2a61d7df33acc606209b0b020208c7f20212394
+refs/heads/incoming: 314605f94844dcff0b1fc5f94f195ab042023002
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rt/arch/mips/_context.S

@@ -78,4 +78,5 @@ swap_registers:
         lw $31, 31 * 4($5)
 
         jr $31
+        nop
 .end swap_registers

branches/incoming/src/rt/arch/mips/ccall.S

@@ -8,5 +8,22 @@
 __morestack:
         .set noreorder
         .set nomacro
+        move $7, $29
+        move $29, $6
 
+        sw $7, 0($29)
+        sw $31, -4($29)
+
+        addiu $29, $29, -24
+        move $25, $5
+        jalr $25
+        nop
+        addiu $29, $29, 24
+
+        lw $31, -4($29)
+        lw $7, 0($29)
+
+        move $29, $7
+        jr $31
+        nop
 .end __morestack

branches/incoming/src/rt/arch/mips/gpr.h

@@ -21,10 +21,10 @@ class rust_gpr : public rust_gpr_base {
     uintptr_t r24, r25, r26, r27, r28, r29, r30, r31;
 
     inline uintptr_t get_fp() { return r30; }
-    inline uintptr_t get_ip() { return r0; }
+    inline uintptr_t get_ip() { return r31; }
 
     inline void set_fp(uintptr_t new_fp) { r30 = new_fp; }
-    inline void set_ip(uintptr_t new_ip) { r0 = new_ip; }
+    inline void set_ip(uintptr_t new_ip) { r31 = new_ip; }
 
     void load();
 };

branches/incoming/src/rt/arch/mips/record_sp.S

@@ -14,6 +14,7 @@ record_sp_limit:
         addiu $3, $3, -0x7008
         sw $4, 4($3)
         jr $31
+        nop
 .end record_sp_limit
 
 .globl get_sp_limit
@@ -30,6 +31,7 @@ get_sp_limit:
         addiu $3, $3, -0x7008
         lw $2, 4($3)
         jr $31
+        nop
 .end get_sp_limit
 
 .globl get_sp
@@ -41,4 +43,5 @@ get_sp:
         .set nomacro
         move $2, $29
         jr $31
+        nop
 .end get_sp