---

yaml
---
r: 48757
b: refs/heads/snap-stage3
c: d8ab47e
h: refs/heads/master
i:
  48755: fc406e5
v: v3

Author: luqmana

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 6d078db952cf76b35bbd8577fe6a9f5d9e12c566
+refs/heads/snap-stage3: d8ab47e7f9ed4c30c9ff3d4e2351b19992a380dd
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/build.rs

@@ -873,6 +873,7 @@ pub fn add_comment(bcx: block, text: &str) {
 }
 
 pub fn InlineAsmCall(cx: block, asm: *c_char, cons: *c_char,
+                     inputs: &[ValueRef],
                      volatile: bool, alignstack: bool,
                      dia: AsmDialect) -> ValueRef {
     unsafe {
@@ -883,11 +884,15 @@ pub fn InlineAsmCall(cx: block, asm: *c_char, cons: *c_char,
         let alignstack = if alignstack { lib::llvm::True }
                          else          { lib::llvm::False };
 
-        let llfty = T_fn(~[], T_void());
+        let argtys = do inputs.map |v| {
+            io::println(fmt!("ARG TYPE: %?", val_str(cx.ccx().tn, *v)));
+            val_ty(*v)
+        };
+        let llfty = T_fn(argtys, T_void());
         let v = llvm::LLVMInlineAsm(llfty, asm, cons, volatile,
                                     alignstack, dia as c_uint);
 
-        Call(cx, v, ~[])
+        Call(cx, v, inputs)
     }
 }
 

branches/snap-stage3/src/librustc/middle/trans/expr.rs

@@ -558,12 +558,51 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block {
             return trans_rvalue_stmt_unadjusted(bcx, a);
         }
         ast::expr_inline_asm(asm, ref ins, ref outs,
-                             cons, volatile, alignstack) => {
-            // XXX: cons doesn't actual contain ALL the stuff we should
-            // be passing since the constraints for in/outputs aren't included
+                             clobs, volatile, alignstack) => {
+            let mut constraints = ~[];
+            let mut cleanups = ~[];
+
+            // TODO: Handle outputs
+
+            let inputs = do ins.map |&(c, in)| {
+
+                constraints.push(copy *c);
+
+                let inty = ty::arg {
+                    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)
+                })
+
+            };
+
+            for cleanups.each |c| {
+                revoke_clean(bcx, *c);
+            }
+
+            let mut constraints = str::connect(constraints, ",");
+
+            // Add the clobbers
+            if *clobs != ~"" {
+                if constraints == ~"" {
+                    constraints += *clobs;
+                } else {
+                    constraints += ~"," + *clobs;
+                }
+            } else {
+                constraints += *clobs;
+            }
+
+            io::println(fmt!("Inputs: %?\nConstraints: %?\n", ins, constraints));
+
             do str::as_c_str(*asm) |a| {
-                do str::as_c_str(*cons) |c| {
-                    InlineAsmCall(bcx, a, c, volatile, alignstack,
+                do str::as_c_str(constraints) |c| {
+                    InlineAsmCall(bcx, a, c, inputs, volatile, alignstack,
                                   lib::llvm::AD_ATT);
                 }
             }