user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #883 - RalfJung:gen_random, r=RalfJung

Browse source 
gen_random helper: move ptr argument to front

This matches, for example, the `getrandom` syscall.
This commit is contained in:
bors 2019-08-04 12:57:16 +00:00
commit d82b24422d
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/helpers.rs
View file

@ -78,8 +78,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
/// Generate some random bytes, and write them to `dest`.
fn gen_random(
&mut self,
len: usize,
ptr: Scalar<Tag>,
len: usize,
) -> InterpResult<'tcx> {
let this = self.eval_context_mut();

2
src/shims/dlsym.rs
View file

@ -41,7 +41,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
GetEntropy => {
let ptr = this.read_scalar(args[0])?.not_undef()?;
let len = this.read_scalar(args[1])?.to_usize(this)?;
this.gen_random(len as usize, ptr)?;
this.gen_random(ptr, len as usize)?;
this.write_null(dest)?;
}
}

6
src/shims/foreign_items.rs
View file

@ -300,7 +300,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
// neither of which have any effect on our current PRNG
let _flags = this.read_scalar(args[3])?.to_i32()?;
this.gen_random(len as usize, ptr)?;
this.gen_random(ptr, len as usize)?;
this.write_scalar(Scalar::from_uint(len, dest.layout.size), dest)?;
}
id => {
@ -776,7 +776,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
"SecRandomCopyBytes" => {
let len = this.read_scalar(args[1])?.to_usize(this)?;
let ptr = this.read_scalar(args[2])?.not_undef()?;
this.gen_random(len as usize, ptr)?;
this.gen_random(ptr, len as usize)?;
this.write_null(dest)?;
}
@ -938,7 +938,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
"SystemFunction036" => {
let ptr = this.read_scalar(args[0])?.not_undef()?;
let len = this.read_scalar(args[1])?.to_u32()?;
this.gen_random(len as usize, ptr)?;
this.gen_random(ptr, len as usize)?;
this.write_scalar(Scalar::from_bool(true), dest)?;
}