mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rt: Rename new_stack to next_stack, del_stack to prev_stack

Browse Source
This commit is contained in:
Brian Anderson 2012-02-08 18:04:14 -08:00
parent 889a783494
commit 4bd8f8d936
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rt/rust_task.cpp
View File

@ -634,7 +634,7 @@ extern "C" CDECL void
record_sp(void *limit);
void *
rust_task::new_stack(size_t stk_sz, void *args_addr, size_t args_sz) {
rust_task::next_stack(size_t stk_sz, void *args_addr, size_t args_sz) {
stk_seg *stk_seg = new_stk(thread, this, stk_sz + args_sz);
A(thread, stk_seg->end - (uintptr_t)stk_seg->data >= stk_sz + args_sz,
@ -643,13 +643,17 @@ rust_task::new_stack(size_t stk_sz, void *args_addr, size_t args_sz) {
// Push the function arguments to the new stack
new_sp = align_down(new_sp - args_sz);
memcpy(new_sp, args_addr, args_sz);
A(thread, rust_task_thread::get_task() == this,
"Recording the stack limit for the wrong thread");
record_stack_limit();
return new_sp;
}
void
rust_task::del_stack() {
rust_task::prev_stack() {
del_stk(this, stk);
A(thread, rust_task_thread::get_task() == this,
"Recording the stack limit for the wrong thread");
record_stack_limit();
}

4
src/rt/rust_task.h
View File

@ -167,8 +167,8 @@ public:
void notify(bool success);
void *new_stack(size_t stk_sz, void *args_addr, size_t args_sz);
void del_stack();
void *next_stack(size_t stk_sz, void *args_addr, size_t args_sz);
void prev_stack();
void record_stack_limit();
void reset_stack_limit();
bool on_rust_stack();

8
src/rt/rust_upcall.cpp
View File

@ -660,9 +660,9 @@ struct s_new_stack_args {
extern "C" CDECL void
upcall_s_new_stack(struct s_new_stack_args *args) {
rust_task *task = rust_task_thread::get_task();
args->result = task->new_stack(args->stk_sz,
args->args_addr,
args->args_sz);
args->result = task->next_stack(args->stk_sz,
args->args_addr,
args->args_sz);
}
extern "C" CDECL void *
@ -675,7 +675,7 @@ upcall_new_stack(size_t stk_sz, void *args_addr, size_t args_sz) {
extern "C" CDECL void
upcall_s_del_stack() {
rust_task *task = rust_task_thread::get_task();
task->del_stack();
task->prev_stack();
}
extern "C" CDECL void