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

Only one gc glue.

Browse Source
This commit is contained in:
Rafael Ávila de Espíndola 2011-05-24 18:52:31 -04:00
parent 31de8e15c0
commit de2e84e5b0
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -503,7 +503,7 @@ fn T_crate(&type_names tn) -> TypeRef {
T_int(), // size_t activate_glue
T_int(), // size_t yield_glue
T_int(), // size_t unwind_glue
T_int(), // size_t gc_glue
T_int(), // size_t pad
T_int(), // size_t pad
T_int(), // int n_rust_syms
T_int(), // int n_c_syms
@ -7668,10 +7668,10 @@ fn create_crate_constant(ValueRef crate_ptr, @glue_fns glues) {
C_null(T_int()), // ptrdiff_t debug_info_off
C_null(T_int()), // size_t debug_info_sz
C_null(T_int()), // size_t pad
C_null(T_int()), // size_t pad
C_null(T_int()), // size_t pad2
C_null(T_int()), // size_t gc_glue_off
C_null(T_int()), // size_t pad3
C_null(T_int()), // size_t pad4
C_null(T_int()), // size_t pad5
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_gc_glue() const {
return ((uintptr_t)this + gc_glue_off);
}
rust_crate::mem_area::mem_area(rust_dom *dom, uintptr_t pos, size_t sz)
: dom(dom),
base(pos),

5
src/rt/rust_internal.h
View File

@ -231,11 +231,11 @@ class rust_crate {
ptrdiff_t debug_info_off; // Offset from this to .debug_info.
size_t debug_info_sz; // Size of .debug_info.
ptrdiff_t activate_glue_off;
ptrdiff_t pad;
ptrdiff_t pad2;
ptrdiff_t gc_glue_off;
ptrdiff_t pad3;
ptrdiff_t pad4;
ptrdiff_t pad5;
public:
@ -247,7 +247,6 @@ public:
uintptr_t get_image_base() const;
ptrdiff_t get_relocation_diff() const;
uintptr_t get_gc_glue() const;
struct mem_area
{

2
src/rt/rust_task.cpp
View File

@ -380,7 +380,7 @@ rust_task::gc(size_t nargs)
{
DLOG(dom, task,
"task %s @0x%" PRIxPTR " garbage collecting", name, this);
run_after_return(nargs, dom->root_crate->get_gc_glue());
// run_after_return(nargs, rust_gc_glue);
}
void