Commit b3d6f636 authored by Isaac Oscar Gariano's avatar Isaac Oscar Gariano

Formatting changes

parent ef88dd0e
...@@ -1428,7 +1428,7 @@ impl<'a> InstructionSelection { ...@@ -1428,7 +1428,7 @@ impl<'a> InstructionSelection {
trace!("instsel on THREADEXIT"); trace!("instsel on THREADEXIT");
// emit a call to swap_back_to_native_stack(sp_loc: Address) // emit a call to swap_back_to_native_stack(sp_loc: Address)
let tmp = make_temporary(f_context, UINT64_TYPE.clone(), vm); let tmp = make_temporary(f_context, UINT64_TYPE.clone(), vm);
// get thread local and add offset to get sp_loc // get thread local and add offset to get sp_loc
emit_load_base_offset( emit_load_base_offset(
self.backend.as_mut(), self.backend.as_mut(),
...@@ -4638,13 +4638,7 @@ impl<'a> InstructionSelection { ...@@ -4638,13 +4638,7 @@ impl<'a> InstructionSelection {
(WORD_SIZE * CALLEE_SAVED_COUNT) as u64 (WORD_SIZE * CALLEE_SAVED_COUNT) as u64
); );
emit_store_base_offset( emit_store_base_offset(self.backend.as_mut(), &SP, 64, &MU_TL, f_context, vm);
self.backend.as_mut(),
&SP,
64,
&MU_TL,
f_context,
vm);
// Throw an exception, don't call the swapee's resumption point // Throw an exception, don't call the swapee's resumption point
self.backend.emit_b_call( self.backend.emit_b_call(
......
...@@ -479,9 +479,13 @@ impl MuThread { ...@@ -479,9 +479,13 @@ impl MuThread {
// The conversions between boxes and ptrs are needed here as a '*mut MuThread* can't be // The conversions between boxes and ptrs are needed here as a '*mut MuThread* can't be
// sent between threads but a Box can. Also converting a Box to a ptr consumes it. // sent between threads but a Box can. Also converting a Box to a ptr consumes it.
let muthread_ptr = Box::into_raw(Box::new( let muthread_ptr = Box::into_raw(Box::new(MuThread::new(
MuThread::new(id, mm::new_mutator(), stack, user_tls, vm.clone()) id,
)); mm::new_mutator(),
stack,
user_tls,
vm.clone()
)));
let muthread = unsafe { Box::from_raw(muthread_ptr) }; let muthread = unsafe { Box::from_raw(muthread_ptr) };
let join_handle = match thread::Builder::new() let join_handle = match thread::Builder::new()
...@@ -498,9 +502,7 @@ impl MuThread { ...@@ -498,9 +502,7 @@ impl MuThread {
unsafe { unsafe {
match exception { match exception {
Some(e) => { Some(e) => muthread_start_exceptional(e, new_sp, sp_threadlocal_loc, addr),
muthread_start_exceptional(e, new_sp, sp_threadlocal_loc, addr)
}
None => muthread_start_normal(new_sp, sp_threadlocal_loc, addr) None => muthread_start_normal(new_sp, sp_threadlocal_loc, addr)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment