nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-31 22:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

rollup merge of #20124: klutzy/pprust-asm

Browse Source
This commit is contained in:
Alex Crichton 2014-12-22 12:48:07 -08:00
commit 55cf032f43
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libsyntax/print/pprust.rs
View File

@ -1787,11 +1787,7 @@ impl<'a> State<'a> {
}
}
ast::ExprInlineAsm(ref a) => {
if a.volatile {
try!(word(&mut self.s, "__volatile__ asm!"));
} else {
try!(word(&mut self.s, "asm!"));
}
try!(word(&mut self.s, "asm!"));
try!(self.popen());
try!(self.print_string(a.asm.get(), a.asm_str_style));
try!(self.word_space(":"));
@ -1829,6 +1825,28 @@ impl<'a> State<'a> {
try!(s.print_string(co.get(), ast::CookedStr));
Ok(())
}));
let mut options = vec!();
if a.volatile {
options.push("volatile");
}
if a.alignstack {
options.push("alignstack");
}
if a.dialect == ast::AsmDialect::AsmIntel {
options.push("intel");
}
if options.len() > 0 {
try!(space(&mut self.s));
try!(self.word_space(":"));
try!(self.commasep(Inconsistent, &*options,
|s, &co| {
try!(s.print_string(co, ast::CookedStr));
Ok(())
}));
}
try!(self.pclose());
}
ast::ExprMac(ref m) => try!(self.print_mac(m, token::Paren)),

21
src/test/pretty/asm-options.rs Normal file
View File

@ -0,0 +1,21 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(asm)]
// pp-exact
pub fn main() {
unsafe {
asm!("" : : : : "volatile");
asm!("" : : : : "alignstack");
asm!("" : : : : "intel");
}
}