Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
42a1239a
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,发现更多精彩内容 >>
提交
42a1239a
编写于
8月 18, 2018
作者:
R
Ralf Jung
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avoid some redundant alignment checks
上级
e3b4f8e6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
7 deletion
+18
-7
src/librustc_mir/interpret/memory.rs
src/librustc_mir/interpret/memory.rs
+18
-7
未找到文件。
src/librustc_mir/interpret/memory.rs
浏览文件 @
42a1239a
//! The memory subsystem.
//!
//! Generally, we use `Pointer` to denote memory addresses. However, some operations
//! have a "size"-like parameter, and they take `Scalar` for the address because
//! if the size is 0, then the pointer can also be a (properly aligned, non-NULL)
//! integer. It is crucial that these operations call `check_align` *before*
//! short-circuiting the empty case!
use
std
::
collections
::
VecDeque
;
use
std
::
hash
::{
Hash
,
Hasher
};
use
std
::
ptr
;
...
...
@@ -16,6 +24,7 @@
use
super
::{
EvalContext
,
Machine
};
////////////////////////////////////////////////////////////////////////////////
// Allocations and pointers
////////////////////////////////////////////////////////////////////////////////
...
...
@@ -256,7 +265,8 @@ pub fn endianness(&self) -> layout::Endian {
self
.tcx.data_layout.endian
}
/// Check that the pointer is aligned AND non-NULL.
/// Check that the pointer is aligned AND non-NULL. This supports scalars
/// for the benefit of other parts of miri that need to check alignment even for ZST.
pub
fn
check_align
(
&
self
,
ptr
:
Scalar
,
required_align
:
Align
)
->
EvalResult
<
'tcx
>
{
// Check non-NULL/Undef, extract offset
let
(
offset
,
alloc_align
)
=
match
ptr
{
...
...
@@ -632,10 +642,10 @@ pub fn copy_repeatedly(
length
:
u64
,
nonoverlapping
:
bool
,
)
->
EvalResult
<
'tcx
>
{
// Empty accesses don't need to be valid pointers, but they should still be aligned
self
.check_align
(
src
,
src_align
)
?
;
self
.check_align
(
dest
,
dest_align
)
?
;
if
size
.bytes
()
==
0
{
// Nothing to do for ZST, other than checking alignment and non-NULLness.
self
.check_align
(
src
,
src_align
)
?
;
self
.check_align
(
dest
,
dest_align
)
?
;
return
Ok
(());
}
let
src
=
src
.to_ptr
()
?
;
...
...
@@ -661,6 +671,7 @@ pub fn copy_repeatedly(
new_relocations
};
// This also checks alignment.
let
src_bytes
=
self
.get_bytes_unchecked
(
src
,
size
,
src_align
)
?
.as_ptr
();
let
dest_bytes
=
self
.get_bytes_mut
(
dest
,
size
*
length
,
dest_align
)
?
.as_mut_ptr
();
...
...
@@ -718,8 +729,8 @@ pub fn read_c_str(&self, ptr: Pointer) -> EvalResult<'tcx, &[u8]> {
pub
fn
read_bytes
(
&
self
,
ptr
:
Scalar
,
size
:
Size
)
->
EvalResult
<
'tcx
,
&
[
u8
]
>
{
// Empty accesses don't need to be valid pointers, but they should still be non-NULL
let
align
=
Align
::
from_bytes
(
1
,
1
)
.unwrap
();
self
.check_align
(
ptr
,
align
)
?
;
if
size
.bytes
()
==
0
{
self
.check_align
(
ptr
,
align
)
?
;
return
Ok
(
&
[]);
}
self
.get_bytes
(
ptr
.to_ptr
()
?
,
size
,
align
)
...
...
@@ -728,8 +739,8 @@ pub fn read_bytes(&self, ptr: Scalar, size: Size) -> EvalResult<'tcx, &[u8]> {
pub
fn
write_bytes
(
&
mut
self
,
ptr
:
Scalar
,
src
:
&
[
u8
])
->
EvalResult
<
'tcx
>
{
// Empty accesses don't need to be valid pointers, but they should still be non-NULL
let
align
=
Align
::
from_bytes
(
1
,
1
)
.unwrap
();
self
.check_align
(
ptr
,
align
)
?
;
if
src
.is_empty
()
{
self
.check_align
(
ptr
,
align
)
?
;
return
Ok
(());
}
let
bytes
=
self
.get_bytes_mut
(
ptr
.to_ptr
()
?
,
Size
::
from_bytes
(
src
.len
()
as
u64
),
align
)
?
;
...
...
@@ -740,8 +751,8 @@ pub fn write_bytes(&mut self, ptr: Scalar, src: &[u8]) -> EvalResult<'tcx> {
pub
fn
write_repeat
(
&
mut
self
,
ptr
:
Scalar
,
val
:
u8
,
count
:
Size
)
->
EvalResult
<
'tcx
>
{
// Empty accesses don't need to be valid pointers, but they should still be non-NULL
let
align
=
Align
::
from_bytes
(
1
,
1
)
.unwrap
();
self
.check_align
(
ptr
,
align
)
?
;
if
count
.bytes
()
==
0
{
self
.check_align
(
ptr
,
align
)
?
;
return
Ok
(());
}
let
bytes
=
self
.get_bytes_mut
(
ptr
.to_ptr
()
?
,
count
,
align
)
?
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录