diff options
| author | Brian Anderson <[email protected]> | 2011-03-07 21:21:01 -0500 |
|---|---|---|
| committer | Brian Anderson <[email protected]> | 2011-03-07 21:21:01 -0500 |
| commit | 9fc4db6b89213afdf45c02fc2bd2be62b0ddc40c (patch) | |
| tree | 6c84574116273f91cbe89abd256b9f809adf97de /src/comp/back/abi.rs | |
| parent | Allow the else part of an expr_if to be either expr_if or expr_block (diff) | |
| parent | rustc: Cast the LLVM representations of tag types when constructing boxes. Un... (diff) | |
| download | rust-9fc4db6b89213afdf45c02fc2bd2be62b0ddc40c.tar.xz rust-9fc4db6b89213afdf45c02fc2bd2be62b0ddc40c.zip | |
Merge branch 'master' into recursive-elseif
Conflicts:
src/Makefile
src/comp/front/ast.rs
src/comp/front/parser.rs
src/comp/middle/fold.rs
src/comp/middle/trans.rs
Diffstat (limited to 'src/comp/back/abi.rs')
| -rw-r--r-- | src/comp/back/abi.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/comp/back/abi.rs b/src/comp/back/abi.rs index db17b942..dd058590 100644 --- a/src/comp/back/abi.rs +++ b/src/comp/back/abi.rs @@ -44,7 +44,8 @@ const int obj_field_vtbl = 0; const int obj_field_box = 1; const int obj_body_elt_tydesc = 0; -const int obj_body_elt_fields = 1; +const int obj_body_elt_typarams = 1; +const int obj_body_elt_fields = 2; const int fn_field_code = 0; const int fn_field_box = 1; @@ -59,6 +60,9 @@ const int worst_case_glue_call_args = 7; const int n_upcall_glues = 7; +const int abi_x86_rustboot_cdecl = 1; +const int abi_x86_rustc_fastcall = 2; + fn memcpy_glue_name() -> str { ret "rust_memcpy_glue"; } @@ -67,6 +71,10 @@ fn bzero_glue_name() -> str { ret "rust_bzero_glue"; } +fn vec_append_glue_name() -> str { + ret "rust_vec_append_glue"; +} + fn upcall_glue_name(int n) -> str { ret "rust_upcall_" + util.common.istr(n); } |