Skip to content

Commit

Permalink
auto merge of #6650 : crabtw/rust/mips-rt, r=sanxiyn
Browse files Browse the repository at this point in the history
Results of libcore and libstd tests

```
failures:
    rand::tests::test_rng_seeded_custom_seed2
    time::tests::run_tests
    uv_ll::test::test_uv_ll_struct_size_addrinfo
    uv_ll::test::test_uv_ll_struct_size_uv_timer_t

segfaults:
    stackwalk::test_simple
    stackwalk::test_simple_deep
```
  • Loading branch information
bors committed May 21, 2013
2 parents 329d8e2 + d86a32b commit dc7b83d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 3 additions & 1 deletion src/libcore/rt/context.rs
Expand Up @@ -183,7 +183,9 @@ fn new_regs() -> ~Registers { ~([0, .. 32]) }

#[cfg(target_arch = "mips")]
fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: *mut uint) {
let sp = mut_offset(sp, -1);
let sp = align_down(sp);
// sp of mips o32 is 8-byte aligned
let sp = mut_offset(sp, -2);

// The final return address. 0 indicates the bottom of the stack
unsafe { *sp = 0; }
Expand Down
6 changes: 4 additions & 2 deletions src/rt/arch/mips/context.cpp
Expand Up @@ -34,9 +34,11 @@ void context::call(void *f, void *arg, void *stack)

// set up the stack
uint32_t *sp = (uint32_t *)stack;
//sp = align_down(sp);
sp = align_down(sp);
// The final return address. 0 indicates the bottom of the stack
*--sp = 0;
// sp of mips o32 is 8-byte aligned
sp -= 2;
*sp = 0;

regs.data[4] = (uint32_t)arg;
regs.data[29] = (uint32_t)sp;
Expand Down

0 comments on commit dc7b83d

Please sign in to comment.