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

rt: Add constructors and destructors for stacks

Browse Source
This commit is contained in:
Brian Anderson 2012-02-08 20:47:52 -08:00
parent b98df86c09
commit ae8ea4a78b
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rt/rust_stack.h
View File

@ -1,3 +1,6 @@
#ifndef RUST_STACK_H
#define RUST_STACK_H
struct stk_seg {
stk_seg *prev;
stk_seg *next;
@ -10,6 +13,19 @@ struct stk_seg {
uint8_t data[];
};
template <class T>
stk_seg *
create_stack(T allocer, size_t sz) {
size_t total_sz = sizeof(stk_seg) + sz;
return (stk_seg *)allocer->malloc(total_sz, "stack");
}
template <class T>
void
destroy_stack(T allocer, stk_seg *stk) {
allocer->free(stk);
}
void
config_valgrind_stack(stk_seg *stk);
@ -21,3 +37,5 @@ add_stack_canary(stk_seg *stk);
void
check_stack_canary(stk_seg *stk);
#endif /* RUST_STACK_H */

6
src/rt/rust_task.cpp
View File

@ -538,7 +538,7 @@ void
rust_task::free_stack(stk_seg *stk) {
LOGPTR(thread, "freeing stk segment", (uintptr_t)stk);
total_stack_sz -= user_stack_size(stk);
free(stk);
destroy_stack(this, stk);
}
void
@ -581,8 +581,8 @@ rust_task::new_stack(size_t requested_sz) {
fail();
}
size_t sz = sizeof(stk_seg) + rust_stk_sz + RED_ZONE_SIZE;
stk_seg *new_stk = (stk_seg *)malloc(sz, "stack");
size_t sz = rust_stk_sz + RED_ZONE_SIZE;
stk_seg *new_stk = create_stack(this, sz);
LOGPTR(thread, "new stk", (uintptr_t)new_stk);
memset(new_stk, 0, sizeof(stk_seg));
add_stack_canary(new_stk);