Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
ecccc0d6
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ecccc0d6
编写于
3月 09, 2013
作者:
L
Luqman Aden
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Parse inline assembly.
上级
4e350c7c
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
72 addition
and
8 deletion
+72
-8
src/etc/vim/syntax/rust.vim
src/etc/vim/syntax/rust.vim
+1
-1
src/librustc/lib/llvm.rs
src/librustc/lib/llvm.rs
+5
-0
src/librustc/middle/liveness.rs
src/librustc/middle/liveness.rs
+4
-2
src/librustc/middle/mem_categorization.rs
src/librustc/middle/mem_categorization.rs
+1
-1
src/librustc/middle/moves.rs
src/librustc/middle/moves.rs
+2
-1
src/librustc/middle/trans/build.rs
src/librustc/middle/trans/build.rs
+12
-1
src/librustc/middle/trans/expr.rs
src/librustc/middle/trans/expr.rs
+8
-0
src/librustc/middle/trans/type_use.rs
src/librustc/middle/trans/type_use.rs
+1
-1
src/librustc/middle/ty.rs
src/librustc/middle/ty.rs
+1
-0
src/librustc/middle/typeck/check/mod.rs
src/librustc/middle/typeck/check/mod.rs
+1
-0
src/librustc/middle/typeck/check/regionck.rs
src/librustc/middle/typeck/check/regionck.rs
+1
-0
src/libsyntax/ast.rs
src/libsyntax/ast.rs
+2
-0
src/libsyntax/fold.rs
src/libsyntax/fold.rs
+1
-0
src/libsyntax/parse/parser.rs
src/libsyntax/parse/parser.rs
+9
-1
src/libsyntax/parse/token.rs
src/libsyntax/parse/token.rs
+1
-0
src/libsyntax/print/pprust.rs
src/libsyntax/print/pprust.rs
+8
-0
src/libsyntax/visit.rs
src/libsyntax/visit.rs
+1
-0
src/rustllvm/RustWrapper.cpp
src/rustllvm/RustWrapper.cpp
+12
-0
src/rustllvm/rustllvm.def.in
src/rustllvm/rustllvm.def.in
+1
-0
未找到文件。
src/etc/vim/syntax/rust.vim
浏览文件 @
ecccc0d6
...
...
@@ -11,7 +11,7 @@ elseif exists("b:current_syntax")
endif
syn
match
rustAssert
"\<assert\(\w\)*"
syn
keyword rustKeyword
as
break
syn
keyword rustKeyword
__asm__
as
break
syn
keyword rustKeyword
copy
do
drop
else
extern
syn
keyword rustKeyword
for
if
impl
let
log
syn
keyword rustKeyword loop
match
mod
once priv pub pure
...
...
src/librustc/lib/llvm.rs
浏览文件 @
ecccc0d6
...
...
@@ -1433,6 +1433,11 @@ pub unsafe fn LLVMConstNamedStruct(S: TypeRef,
/** Enables LLVM debug output. */
pub
unsafe
fn
LLVMSetDebug
(
Enabled
:
c_int
);
/** Prepares inline assembly. */
pub
unsafe
fn
LLVMInlineAsm
(
Ty
:
TypeRef
,
AsmString
:
*
c_char
,
Constraints
:
*
c_char
,
SideEffects
:
Bool
,
AlignStack
:
Bool
)
->
ValueRef
;
}
}
...
...
src/librustc/middle/liveness.rs
浏览文件 @
ecccc0d6
...
...
@@ -620,7 +620,8 @@ fn visit_expr(expr: @expr, &&self: @mut IrMaps, vt: vt<@mut IrMaps>) {
expr_do_body
(
*
)
|
expr_cast
(
*
)
|
expr_unary
(
*
)
|
expr_break
(
_
)
|
expr_again
(
_
)
|
expr_lit
(
_
)
|
expr_ret
(
*
)
|
expr_block
(
*
)
|
expr_assign
(
*
)
|
expr_swap
(
*
)
|
expr_assign_op
(
*
)
|
expr_mac
(
*
)
|
expr_struct
(
*
)
|
expr_repeat
(
*
)
|
expr_paren
(
*
)
=>
{
expr_struct
(
*
)
|
expr_repeat
(
*
)
|
expr_paren
(
*
)
|
expr_inline_asm
(
*
)
=>
{
visit
::
visit_expr
(
expr
,
self
,
vt
);
}
}
...
...
@@ -1345,6 +1346,7 @@ fn propagate_through_expr(&self, expr: @expr, succ: LiveNode)
self
.propagate_through_expr
(
e
,
succ
)
}
expr_inline_asm
(
*
)
|
expr_lit
(
*
)
=>
{
succ
}
...
...
@@ -1618,7 +1620,7 @@ fn check_expr(expr: @expr, &&self: @Liveness, vt: vt<@Liveness>) {
expr_cast
(
*
)
|
expr_unary
(
*
)
|
expr_ret
(
*
)
|
expr_break
(
*
)
|
expr_again
(
*
)
|
expr_lit
(
_
)
|
expr_block
(
*
)
|
expr_swap
(
*
)
|
expr_mac
(
*
)
|
expr_addr_of
(
*
)
|
expr_struct
(
*
)
|
expr_repeat
(
*
)
|
expr_paren
(
*
)
=>
{
expr_paren
(
*
)
|
expr_inline_asm
(
*
)
=>
{
visit
::
visit_expr
(
expr
,
self
,
vt
);
}
}
...
...
src/librustc/middle/mem_categorization.rs
浏览文件 @
ecccc0d6
...
...
@@ -447,7 +447,7 @@ fn cat_expr_unadjusted(&self, expr: @ast::expr) -> cmt {
ast
::
expr_while
(
*
)
|
ast
::
expr_block
(
*
)
|
ast
::
expr_loop
(
*
)
|
ast
::
expr_match
(
*
)
|
ast
::
expr_lit
(
*
)
|
ast
::
expr_break
(
*
)
|
ast
::
expr_mac
(
*
)
|
ast
::
expr_again
(
*
)
|
ast
::
expr_struct
(
*
)
|
ast
::
expr_repeat
(
*
)
=>
{
ast
::
expr_repeat
(
*
)
|
ast
::
expr_inline_asm
(
*
)
=>
{
return
self
.cat_rvalue
(
expr
,
expr_ty
);
}
}
...
...
src/librustc/middle/moves.rs
浏览文件 @
ecccc0d6
...
...
@@ -560,7 +560,8 @@ fn use_expr(&self,
expr_break
(
*
)
|
expr_again
(
*
)
|
expr_lit
(
*
)
=>
{}
expr_lit
(
*
)
|
expr_inline_asm
(
*
)
=>
{}
expr_loop
(
ref
blk
,
_
)
=>
{
self
.consume_block
(
blk
,
visitor
);
...
...
src/librustc/middle/trans/build.rs
浏览文件 @
ecccc0d6
...
...
@@ -18,7 +18,7 @@
use
core
::
prelude
::
*
;
use
core
::
cast
;
use
core
::
libc
::{
c_uint
,
c_int
,
c_ulonglong
};
use
core
::
libc
::{
c_uint
,
c_int
,
c_ulonglong
,
c_char
};
use
core
::
libc
;
use
core
::
option
::
Some
;
use
core
::
ptr
;
...
...
@@ -872,6 +872,17 @@ pub fn add_comment(bcx: block, text: &str) {
}
}
pub
fn
InlineAsmCall
(
cx
:
block
,
asm
:
*
c_char
,
cons
:
*
c_char
)
->
ValueRef
{
unsafe
{
count_insn
(
cx
,
"inlineasm"
);
let
llfty
=
T_fn
(
~
[],
T_void
());
let
v
=
llvm
::
LLVMInlineAsm
(
llfty
,
asm
,
cons
,
False
,
False
);
Call
(
cx
,
v
,
~
[])
}
}
pub
fn
Call
(
cx
:
block
,
Fn
:
ValueRef
,
Args
:
&
[
ValueRef
])
->
ValueRef
{
if
cx
.unreachable
{
return
_
UndefReturn
(
cx
,
Fn
);
}
unsafe
{
...
...
src/librustc/middle/trans/expr.rs
浏览文件 @
ecccc0d6
...
...
@@ -691,6 +691,14 @@ fn trans_rvalue_dps_unadjusted(bcx: block, expr: @ast::expr,
ast
::
expr_assign_op
(
op
,
dst
,
src
)
=>
{
return
trans_assign_op
(
bcx
,
expr
,
op
,
dst
,
src
);
}
ast
::
expr_inline_asm
(
asm
,
cons
)
=>
{
do
str
::
as_c_str
(
*
asm
)
|
a
|
{
do
str
::
as_c_str
(
*
cons
)
|
c
|
{
InlineAsmCall
(
bcx
,
a
,
c
);
}
}
return
bcx
;
}
_
=>
{
bcx
.tcx
()
.sess
.span_bug
(
expr
.span
,
...
...
src/librustc/middle/trans/type_use.rs
浏览文件 @
ecccc0d6
...
...
@@ -353,7 +353,7 @@ pub fn mark_for_expr(cx: Context, e: @expr) {
expr_match
(
*
)
|
expr_block
(
_
)
|
expr_if
(
*
)
|
expr_while
(
*
)
|
expr_break
(
_
)
|
expr_again
(
_
)
|
expr_unary
(
_
,
_
)
|
expr_lit
(
_
)
|
expr_mac
(
_
)
|
expr_addr_of
(
_
,
_
)
|
expr_ret
(
_
)
|
expr_loop
(
_
,
_
)
|
expr_loop_body
(
_
)
|
expr_do_body
(
_
)
=>
()
expr_loop_body
(
_
)
|
expr_do_body
(
_
)
|
expr_inline_asm
(
*
)
=>
()
}
}
...
...
src/librustc/middle/ty.rs
浏览文件 @
ecccc0d6
...
...
@@ -3076,6 +3076,7 @@ pub fn expr_kind(tcx: ctxt,
ast
::
expr_block
(
*
)
|
ast
::
expr_copy
(
*
)
|
ast
::
expr_repeat
(
*
)
|
ast
::
expr_inline_asm
(
*
)
|
ast
::
expr_lit
(
@
codemap
::
spanned
{
node
:
lit_str
(
_
),
_
})
|
ast
::
expr_vstore
(
_
,
ast
::
expr_vstore_slice
)
|
ast
::
expr_vstore
(
_
,
ast
::
expr_vstore_mut_slice
)
|
...
...
src/librustc/middle/typeck/check/mod.rs
浏览文件 @
ecccc0d6
...
...
@@ -2303,6 +2303,7 @@ fn check_loop_body(fcx: @mut FnCtxt,
let
region_lb
=
ty
::
re_scope
(
expr
.id
);
instantiate_path
(
fcx
,
pth
,
tpt
,
expr
.span
,
expr
.id
,
region_lb
);
}
ast
::
expr_inline_asm
(
*
)
=>
{
fcx
.write_nil
(
id
);
}
ast
::
expr_mac
(
_
)
=>
tcx
.sess
.bug
(
~
"unexpanded macro"
),
ast
::
expr_break
(
_
)
=>
{
fcx
.write_bot
(
id
);
bot
=
true
;
}
ast
::
expr_again
(
_
)
=>
{
fcx
.write_bot
(
id
);
bot
=
true
;
}
...
...
src/librustc/middle/typeck/check/regionck.rs
浏览文件 @
ecccc0d6
...
...
@@ -682,6 +682,7 @@ fn guarantor(rcx: @mut Rcx, expr: @ast::expr) -> Option<ty::Region> {
// All of these expressions are rvalues and hence their
// value is not guaranteed by a region pointer.
ast
::
expr_inline_asm
(
*
)
|
ast
::
expr_mac
(
*
)
|
ast
::
expr_lit
(
_
)
|
ast
::
expr_unary
(
*
)
|
...
...
src/libsyntax/ast.rs
浏览文件 @
ecccc0d6
...
...
@@ -600,6 +600,8 @@ pub enum expr_ {
expr_again
(
Option
<
ident
>
),
expr_ret
(
Option
<@
expr
>
),
expr_log
(
log_level
,
@
expr
,
@
expr
),
expr_inline_asm
(
@~
str
/* asm */
,
@~
str
/* constraints */
),
expr_mac
(
mac
),
...
...
src/libsyntax/fold.rs
浏览文件 @
ecccc0d6
...
...
@@ -560,6 +560,7 @@ fn fold_field_(field: field, fld: @ast_fold) -> field {
fld
.fold_expr
(
e
)
)
}
expr_inline_asm
(
*
)
=>
copy
*
e
,
expr_mac
(
ref
mac
)
=>
expr_mac
(
fold_mac
((
*
mac
))),
expr_struct
(
path
,
ref
fields
,
maybe_expr
)
=>
{
expr_struct
(
...
...
src/libsyntax/parse/parser.rs
浏览文件 @
ecccc0d6
...
...
@@ -27,7 +27,7 @@
use
ast
::{
expr_lit
,
expr_log
,
expr_loop
,
expr_loop_body
,
expr_mac
};
use
ast
::{
expr_method_call
,
expr_paren
,
expr_path
,
expr_repeat
};
use
ast
::{
expr_ret
,
expr_swap
,
expr_struct
,
expr_tup
,
expr_unary
};
use
ast
::{
expr_vec
,
expr_vstore
,
expr_vstore_mut_box
};
use
ast
::{
expr_vec
,
expr_vstore
,
expr_vstore_mut_box
,
expr_inline_asm
};
use
ast
::{
expr_vstore_fixed
,
expr_vstore_slice
,
expr_vstore_box
};
use
ast
::{
expr_vstore_mut_slice
,
expr_while
,
extern_fn
,
field
,
fn_decl
};
use
ast
::{
expr_vstore_uniq
,
TyClosure
,
TyBareFn
,
Onceness
,
Once
,
Many
};
...
...
@@ -1184,6 +1184,14 @@ fn parse_bottom_expr(&self) -> @expr {
}
}
hi
=
self
.span.hi
;
}
else
if
self
.eat_keyword
(
&~
"__asm__"
)
{
self
.expect
(
&
token
::
LPAREN
);
let
asm
=
self
.parse_str
();
self
.expect
(
&
token
::
COMMA
);
let
cons
=
self
.parse_str
();
ex
=
expr_inline_asm
(
asm
,
cons
);
hi
=
self
.span.hi
;
self
.expect
(
&
token
::
RPAREN
);
}
else
if
self
.eat_keyword
(
&~
"log"
)
{
self
.expect
(
&
token
::
LPAREN
);
let
lvl
=
self
.parse_expr
();
...
...
src/libsyntax/parse/token.rs
浏览文件 @
ecccc0d6
...
...
@@ -488,6 +488,7 @@ pub fn temporary_keyword_table() -> HashMap<~str, ()> {
pub
fn
strict_keyword_table
()
->
HashMap
<~
str
,
()
>
{
let
words
=
HashMap
();
let
keys
=
~
[
~
"__asm__"
,
~
"as"
,
~
"assert"
,
~
"break"
,
~
"const"
,
~
"copy"
,
...
...
src/libsyntax/print/pprust.rs
浏览文件 @
ecccc0d6
...
...
@@ -1398,6 +1398,14 @@ fn print_field(s: @ps, field: ast::field) {
}
}
}
ast
::
expr_inline_asm
(
a
,
c
)
=>
{
word
(
s
.s
,
~
"__asm__"
);
popen
(
s
);
print_string
(
s
,
*
a
);
word_space
(
s
,
~
", "
);
print_string
(
s
,
*
c
);
pclose
(
s
);
}
ast
::
expr_mac
(
ref
m
)
=>
print_mac
(
s
,
(
*
m
)),
ast
::
expr_paren
(
e
)
=>
{
popen
(
s
);
...
...
src/libsyntax/visit.rs
浏览文件 @
ecccc0d6
...
...
@@ -562,6 +562,7 @@ pub fn visit_expr<E>(ex: @expr, e: E, v: vt<E>) {
}
expr_mac
(
ref
mac
)
=>
visit_mac
((
*
mac
),
e
,
v
),
expr_paren
(
x
)
=>
(
v
.visit_expr
)(
x
,
e
,
v
),
expr_inline_asm
(
*
)
=>
(),
}
(
v
.visit_expr_post
)(
ex
,
e
,
v
);
}
...
...
src/rustllvm/RustWrapper.cpp
浏览文件 @
ecccc0d6
...
...
@@ -15,6 +15,7 @@
//
//===----------------------------------------------------------------------===
#include "llvm/InlineAsm.h"
#include "llvm/LLVMContext.h"
#include "llvm/Linker.h"
#include "llvm/PassManager.h"
...
...
@@ -539,3 +540,14 @@ extern "C" void LLVMSetDebug(int Enabled) {
DebugFlag
=
Enabled
;
#endif
}
extern
"C"
LLVMValueRef
LLVMInlineAsm
(
LLVMTypeRef
Ty
,
char
*
AsmString
,
char
*
Constraints
,
LLVMBool
HasSideEffects
,
LLVMBool
IsAlignStack
)
{
return
wrap
(
InlineAsm
::
get
(
unwrap
<
FunctionType
>
(
Ty
),
AsmString
,
Constraints
,
HasSideEffects
,
IsAlignStack
));
// IsAlignStack, InlineAsm::AD_Intel));
}
src/rustllvm/rustllvm.def.in
浏览文件 @
ecccc0d6
...
...
@@ -583,3 +583,4 @@ LLVMX86MMXTypeInContext
LLVMConstNamedStruct
LLVMStructCreateNamed
LLVMStructSetBody
LLVMInlineAsm
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录