bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix natives with user-specified link names, remove unused imports

Browse source
This commit is contained in:
Niko Matsakis 2011-11-15 11:31:48 -08:00
parent c572b793fe
commit 319f3b02f3
3 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/comp/back/upcall.rs
View file

@ -2,9 +2,9 @@
import driver::session; import driver::session;
import middle::trans; import middle::trans;
import middle::trans_common::{T_fn, T_i1, T_i8, T_i32, import middle::trans_common::{T_fn, T_i1, T_i8, T_i32,
T_i64, T_int, T_nil, T_int, T_nil,
T_opaque_vec, T_ptr, T_opaque_vec, T_ptr,
T_size_t, T_void, T_float}; T_size_t, T_void};
import lib::llvm::type_names; import lib::llvm::type_names;
import lib::llvm::llvm::ModuleRef; import lib::llvm::llvm::ModuleRef;
import lib::llvm::llvm::ValueRef; import lib::llvm::llvm::ValueRef;

21
src/comp/middle/trans.rs
View file

@ -24,7 +24,7 @@ import back::{link, abi, upcall};
import syntax::{ast, ast_util}; import syntax::{ast, ast_util};
import syntax::visit; import syntax::visit;
import syntax::codemap::span; import syntax::codemap::span;
import syntax::print::pprust::{expr_to_str, path_to_str, stmt_to_str}; import syntax::print::pprust::{expr_to_str, stmt_to_str};
import visit::vt; import visit::vt;
import util::common::*; import util::common::*;
import lib::llvm::{llvm, mk_target_data, mk_type_names}; import lib::llvm::{llvm, mk_target_data, mk_type_names};
@ -5393,7 +5393,9 @@ fn c_stack_tys(ccx: @crate_ctxt,
// } // }
// //
fn trans_native_mod(lcx: @local_ctxt, native_mod: ast::native_mod) { fn trans_native_mod(lcx: @local_ctxt, native_mod: ast::native_mod) {
fn build_shim_fn(lcx: @local_ctxt, native_item: @ast::native_item, fn build_shim_fn(lcx: @local_ctxt,
link_name: str,
native_item: @ast::native_item,
llshimfn: ValueRef) { llshimfn: ValueRef) {
let ccx = lcx_ccx(lcx); let ccx = lcx_ccx(lcx);
let span = native_item.span; let span = native_item.span;
@ -5401,8 +5403,7 @@ fn trans_native_mod(lcx: @local_ctxt, native_mod: ast::native_mod) {
let tys = c_stack_tys(ccx, span, id); let tys = c_stack_tys(ccx, span, id);
// Declare the "prototype" for the base function F: // Declare the "prototype" for the base function F:
let name = native_item.ident; let llbasefn = decl_cdecl_fn(ccx.llmod, link_name, tys.base_fn_ty);
let llbasefn = decl_cdecl_fn(ccx.llmod, name, tys.base_fn_ty);
// Declare the body of the shim function: // Declare the body of the shim function:
let fcx = new_fn_ctxt(lcx, span, llshimfn); let fcx = new_fn_ctxt(lcx, span, llshimfn);
@ -5430,17 +5431,25 @@ fn trans_native_mod(lcx: @local_ctxt, native_mod: ast::native_mod) {
finish_fn(fcx, lltop); finish_fn(fcx, lltop);
} }
fn select_link_name(user_name: option::t<str>, rust_name: str) -> str {
ret alt user_name {
some(n) { n }
none. { rust_name }
};
}
let ccx = lcx_ccx(lcx); let ccx = lcx_ccx(lcx);
alt native_mod.abi { alt native_mod.abi {
ast::native_abi_cdecl. { ast::native_abi_cdecl. {
for native_item in native_mod.items { for native_item in native_mod.items {
alt native_item.node { alt native_item.node {
ast::native_item_ty. {} ast::native_item_ty. {}
ast::native_item_fn(_, fn_decl, _) { ast::native_item_fn(name, fn_decl, _) {
let id = native_item.id; let id = native_item.id;
alt ccx.item_ids.find(id) { alt ccx.item_ids.find(id) {
some(llshimfn) { some(llshimfn) {
build_shim_fn(lcx, native_item, llshimfn); let link_name = select_link_name(name, native_item.ident);
build_shim_fn(lcx, link_name, native_item, llshimfn);
} }
none. { none. {

2
src/comp/middle/trans_build.rs
View file

@ -4,7 +4,7 @@ import lib::llvm::llvm;
import syntax::codemap::span; import syntax::codemap::span;
import llvm::{ValueRef, TypeRef, BasicBlockRef, BuilderRef, Opcode, import llvm::{ValueRef, TypeRef, BasicBlockRef, BuilderRef, Opcode,
ModuleRef}; ModuleRef};
import trans_common::{block_ctxt, T_ptr, T_nil, T_int, T_i8, T_i1, T_void, import trans_common::{block_ctxt, T_ptr, T_nil, T_i8, T_i1, T_void,
T_fn, val_ty, bcx_ccx, C_i32}; T_fn, val_ty, bcx_ccx, C_i32};
fn B(cx: @block_ctxt) -> BuilderRef { fn B(cx: @block_ctxt) -> BuilderRef {