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

Remove dead code for unwind_glue.

Browse Source
This commit is contained in:
Rafael Ávila de Espíndola 2011-05-24 17:28:37 -04:00
parent 0fc91b6ecc
commit b1292580b9
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/comp/middle/trans.rs
View File

@ -7672,9 +7672,9 @@ fn create_crate_constant(ValueRef crate_ptr, @glue_fns glues) {
C_null(T_int()), // size_t debug_info_sz
C_null(T_int()), // size_t pad
yield_glue_off, // size_t yield_glue_off
C_null(T_int()), // size_t unwind_glue_off
C_null(T_int()), // size_t gc_glue_off
C_null(T_int()), // size_t pad
C_null(T_int()), // size_t gc_glue_off
C_null(T_int()), // size_t pad2
C_null(T_int()), // int n_rust_syms
C_null(T_int()), // int n_c_syms
C_null(T_int()) // int n_libs

5
src/rt/rust_crate.cpp
View File

@ -11,11 +11,6 @@ rust_crate::get_relocation_diff() const {
return ((uintptr_t)this - self_addr);
}
uintptr_t
rust_crate::get_unwind_glue() const {
return ((uintptr_t)this + unwind_glue_off);
}
uintptr_t
rust_crate::get_gc_glue() const {
return ((uintptr_t)this + gc_glue_off);

5
src/rt/rust_internal.h
View File

@ -233,9 +233,9 @@ class rust_crate {
ptrdiff_t activate_glue_off;
ptrdiff_t yield_glue_off;
ptrdiff_t unwind_glue_off;
ptrdiff_t gc_glue_off;
ptrdiff_t pad;
ptrdiff_t gc_glue_off;
ptrdiff_t pad2;
public:
@ -248,7 +248,6 @@ public:
uintptr_t get_image_base() const;
ptrdiff_t get_relocation_diff() const;
uintptr_t get_yield_glue() const;
uintptr_t get_unwind_glue() const;
uintptr_t get_gc_glue() const;
struct mem_area

4
src/rt/rust_task.cpp
View File

@ -349,7 +349,7 @@ rust_task::kill() {
dom->fail();
LOG(this, task, "preparing to unwind task: 0x%" PRIxPTR, this);
run_on_resume(dom->root_crate->get_unwind_glue());
// run_on_resume(rust_unwind_glue);
}
void
@ -361,7 +361,7 @@ rust_task::fail(size_t nargs) {
unblock();
if (this == dom->root_task)
dom->fail();
run_after_return(nargs, dom->root_crate->get_unwind_glue());
// run_after_return(nargs, rust_unwind_glue);
if (supervisor) {
DLOG(dom, task,
"task %s @0x%" PRIxPTR