From 6d078db952cf76b35bbd8577fe6a9f5d9e12c566 Mon Sep 17 00:00:00 2001 From: Luqman Aden Date: Tue, 12 Mar 2013 17:53:25 -0700 Subject: Actually pass inline asm operands around. --- src/libsyntax/ast.rs | 6 ++++-- src/libsyntax/ext/asm.rs | 3 ++- src/libsyntax/fold.rs | 9 ++++++++- src/libsyntax/print/pprust.rs | 20 ++++++++++++++++++-- src/libsyntax/visit.rs | 9 ++++++++- 5 files changed, 40 insertions(+), 7 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 298cb241bed..e5fb2ad153c 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -601,8 +601,10 @@ pub enum expr_ { expr_ret(Option<@expr>), expr_log(log_level, @expr, @expr), - /* asm, clobbers + constraints, volatile, align stack */ - expr_inline_asm(@~str, @~str, bool, bool), + expr_inline_asm(@~str, // asm + ~[(@~str, @expr)], // inputs + ~[(@~str, @expr)], // outputs + @~str, bool, bool), // clobbers, volatile, align stack expr_mac(mac), diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index 4f2fd68ff95..0110c186cfa 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -156,7 +156,8 @@ pub fn expand_asm(cx: @ext_ctxt, sp: span, tts: &[ast::token_tree]) MRExpr(@ast::expr { id: cx.next_id(), callee_id: cx.next_id(), - node: ast::expr_inline_asm(@asm, @cons, volatile, alignstack), + node: ast::expr_inline_asm(@asm, inputs, outputs, + @cons, volatile, alignstack), span: sp }) } diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 1626c55e721..a8952f313a5 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -560,7 +560,14 @@ pub fn noop_fold_expr(e: &expr_, fld: @ast_fold) -> expr_ { fld.fold_expr(e) ) } - expr_inline_asm(*) => copy *e, + expr_inline_asm(asm, ins, outs, c, v, a) => { + expr_inline_asm( + asm, + ins.map(|&(c, in)| (c, fld.fold_expr(in))), + outs.map(|&(c, out)| (c, fld.fold_expr(out))), + c, v, a + ) + } expr_mac(ref mac) => expr_mac(fold_mac((*mac))), expr_struct(path, ref fields, maybe_expr) => { expr_struct( diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 724e61daea7..370434010b2 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1403,7 +1403,7 @@ pub fn print_expr(s: @ps, &&expr: @ast::expr) { } } } - ast::expr_inline_asm(a, c, v, _) => { + ast::expr_inline_asm(a, in, out, c, v, _) => { if v { word(s.s, ~"__volatile__ asm!"); } else { @@ -1411,7 +1411,23 @@ pub fn print_expr(s: @ps, &&expr: @ast::expr) { } popen(s); print_string(s, *a); - word_space(s, ~","); + word_space(s, ~":"); + for out.each |&(co, o)| { + print_string(s, *co); + popen(s); + print_expr(s, o); + pclose(s); + word_space(s, ~","); + } + word_space(s, ~":"); + for in.each |&(co, o)| { + print_string(s, *co); + popen(s); + print_expr(s, o); + pclose(s); + word_space(s, ~","); + } + word_space(s, ~":"); print_string(s, *c); pclose(s); } diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index 95ab603f584..1fb81b5c702 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -562,7 +562,14 @@ pub fn visit_expr(ex: @expr, e: E, v: vt) { } expr_mac(ref mac) => visit_mac((*mac), e, v), expr_paren(x) => (v.visit_expr)(x, e, v), - expr_inline_asm(*) => (), + expr_inline_asm(_, ins, outs, _, _, _) => { + for ins.each |&(c, in)| { + (v.visit_expr)(in, e, v); + } + for outs.each |&(c, out)| { + (v.visit_expr)(out, e, v); + } + } } (v.visit_expr_post)(ex, e, v); } -- cgit 1.4.1-3-g733a5 From 9ead7dad934cc361f8e5e489238031c987ecfc82 Mon Sep 17 00:00:00 2001 From: Luqman Aden Date: Wed, 13 Mar 2013 10:11:36 -0700 Subject: Implicitly use addr_of for output operands in asm. --- src/librustc/middle/trans/expr.rs | 21 ++++++++++++++++++--- src/libsyntax/ext/asm.rs | 7 +++++++ 2 files changed, 25 insertions(+), 3 deletions(-) (limited to 'src/libsyntax') diff --git a/src/librustc/middle/trans/expr.rs b/src/librustc/middle/trans/expr.rs index 10462a65d06..75097e151aa 100644 --- a/src/librustc/middle/trans/expr.rs +++ b/src/librustc/middle/trans/expr.rs @@ -561,17 +561,32 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block { clobs, volatile, alignstack) => { let mut constraints = ~[]; let mut cleanups = ~[]; + let mut aoutputs = ~[]; let outputs = do outs.map |&(c, out)| { constraints.push(copy *c); - let outty = ty::arg { + let aoutty = ty::arg { mode: ast::expl(ast::by_val), ty: expr_ty(bcx, out) }; + aoutputs.push(unpack_result!(bcx, { + callee::trans_arg_expr(bcx, aoutty, out, &mut cleanups, + None, callee::DontAutorefArg) + })); + + let e = match out.node { + ast::expr_addr_of(_, e) => e, + _ => fail!(~"Expression must be addr of") + }; + + let outty = ty::arg { + mode: ast::expl(ast::by_val), + ty: expr_ty(bcx, e) + }; unpack_result!(bcx, { - callee::trans_arg_expr(bcx, outty, out, &mut cleanups, + callee::trans_arg_expr(bcx, outty, e, &mut cleanups, None, callee::DontAutorefArg) }) @@ -627,7 +642,7 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block { }; // TODO: Handle >1 outputs - let op = PointerCast(bcx, output, T_ptr(val_ty(output))); + let op = PointerCast(bcx, aoutputs[0], T_ptr(val_ty(output))); Store(bcx, r, op); return bcx; diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index 0110c186cfa..34cb743a727 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -75,6 +75,13 @@ pub fn expand_asm(cx: @ext_ctxt, sp: span, tts: &[ast::token_tree]) let out = p.parse_expr(); p.expect(&token::RPAREN); + let out = @ast::expr { + id: cx.next_id(), + callee_id: cx.next_id(), + span: out.span, + node: ast::expr_addr_of(ast::m_mutbl, out) + }; + outputs.push((constraint, out)); } } -- cgit 1.4.1-3-g733a5 From 3d56936be3c010829edf188475140dcb322da803 Mon Sep 17 00:00:00 2001 From: Luqman Aden Date: Wed, 13 Mar 2013 13:47:15 -0700 Subject: Tidy. --- src/librustc/middle/trans/expr.rs | 5 +++-- src/libsyntax/ext/asm.rs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/libsyntax') diff --git a/src/librustc/middle/trans/expr.rs b/src/librustc/middle/trans/expr.rs index 73cff97de95..8453b49f5c0 100644 --- a/src/librustc/middle/trans/expr.rs +++ b/src/librustc/middle/trans/expr.rs @@ -604,7 +604,7 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block { mode: ast::expl(ast::by_val), ty: expr_ty(bcx, in) }; - + unpack_result!(bcx, { callee::trans_arg_expr(bcx, inty, in, &mut cleanups, None, callee::DontAutorefArg) @@ -647,7 +647,8 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block { }; if outputs.len() == 1 { - let op = PointerCast(bcx, aoutputs[0], T_ptr(val_ty(outputs[0]))); + let op = PointerCast(bcx, aoutputs[0], + T_ptr(val_ty(outputs[0]))); Store(bcx, r, op); } else { for aoutputs.eachi |i, o| { diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index 34cb743a727..a014d8ccb8b 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -163,7 +163,7 @@ pub fn expand_asm(cx: @ext_ctxt, sp: span, tts: &[ast::token_tree]) MRExpr(@ast::expr { id: cx.next_id(), callee_id: cx.next_id(), - node: ast::expr_inline_asm(@asm, inputs, outputs, + node: ast::expr_inline_asm(@asm, inputs, outputs, @cons, volatile, alignstack), span: sp }) -- cgit 1.4.1-3-g733a5 From 83f2d4ab3dbd3b52ea60212a6698c73201b67a34 Mon Sep 17 00:00:00 2001 From: Luqman Aden Date: Fri, 15 Mar 2013 18:54:39 -0700 Subject: Fix type_use for inline asm. --- src/librustc/middle/moves.rs | 10 +--------- src/librustc/middle/trans/type_use.rs | 7 ++++++- src/libsyntax/visit.rs | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) (limited to 'src/libsyntax') diff --git a/src/librustc/middle/moves.rs b/src/librustc/middle/moves.rs index 372c54f2b09..9848c65ac43 100644 --- a/src/librustc/middle/moves.rs +++ b/src/librustc/middle/moves.rs @@ -558,15 +558,7 @@ pub impl VisitContext { self.use_expr(base, Read, visitor); } - expr_inline_asm(_, ref ins, ref outs, _, _, _) => { - for ins.each |&(c, in)| { - // XXX: Do something? - } - for outs.each |&(c, out)| { - // XXX: Do something? - } - } - + expr_inline_asm(*) | expr_break(*) | expr_again(*) | expr_lit(*) => {} diff --git a/src/librustc/middle/trans/type_use.rs b/src/librustc/middle/trans/type_use.rs index 8439d941c90..692dc392173 100644 --- a/src/librustc/middle/trans/type_use.rs +++ b/src/librustc/middle/trans/type_use.rs @@ -350,7 +350,12 @@ pub fn mark_for_expr(cx: Context, e: @expr) { } expr_inline_asm(_, ref ins, ref outs, _, _, _) => { - // XXX Do something, maybe? + for ins.each |&(_, in)| { + node_type_needs(cx, use_repr, in.id); + } + for outs.each |&(_, out)| { + node_type_needs(cx, use_repr, out.id); + } } expr_paren(e) => mark_for_expr(cx, e), diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index 1fb81b5c702..6a0f1a2ec46 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -563,10 +563,10 @@ pub fn visit_expr(ex: @expr, e: E, v: vt) { expr_mac(ref mac) => visit_mac((*mac), e, v), expr_paren(x) => (v.visit_expr)(x, e, v), expr_inline_asm(_, ins, outs, _, _, _) => { - for ins.each |&(c, in)| { + for ins.each |&(_, in)| { (v.visit_expr)(in, e, v); } - for outs.each |&(c, out)| { + for outs.each |&(_, out)| { (v.visit_expr)(out, e, v); } } -- cgit 1.4.1-3-g733a5