Skip to content

Commit d82b244

Browse files
committed
Auto merge of #883 - RalfJung:gen_random, r=RalfJung
gen_random helper: move ptr argument to front This matches, for example, the `getrandom` syscall.
2 parents ed30152 + 0096a0d commit d82b244

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/helpers.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
7878
/// Generate some random bytes, and write them to `dest`.
7979
fn gen_random(
8080
&mut self,
81-
len: usize,
8281
ptr: Scalar<Tag>,
82+
len: usize,
8383
) -> InterpResult<'tcx> {
8484
let this = self.eval_context_mut();
8585

src/shims/dlsym.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
4141
GetEntropy => {
4242
let ptr = this.read_scalar(args[0])?.not_undef()?;
4343
let len = this.read_scalar(args[1])?.to_usize(this)?;
44-
this.gen_random(len as usize, ptr)?;
44+
this.gen_random(ptr, len as usize)?;
4545
this.write_null(dest)?;
4646
}
4747
}

src/shims/foreign_items.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
300300
// neither of which have any effect on our current PRNG
301301
let _flags = this.read_scalar(args[3])?.to_i32()?;
302302

303-
this.gen_random(len as usize, ptr)?;
303+
this.gen_random(ptr, len as usize)?;
304304
this.write_scalar(Scalar::from_uint(len, dest.layout.size), dest)?;
305305
}
306306
id => {
@@ -776,7 +776,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
776776
"SecRandomCopyBytes" => {
777777
let len = this.read_scalar(args[1])?.to_usize(this)?;
778778
let ptr = this.read_scalar(args[2])?.not_undef()?;
779-
this.gen_random(len as usize, ptr)?;
779+
this.gen_random(ptr, len as usize)?;
780780
this.write_null(dest)?;
781781
}
782782

@@ -938,7 +938,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
938938
"SystemFunction036" => {
939939
let ptr = this.read_scalar(args[0])?.not_undef()?;
940940
let len = this.read_scalar(args[1])?.to_u32()?;
941-
this.gen_random(len as usize, ptr)?;
941+
this.gen_random(ptr, len as usize)?;
942942
this.write_scalar(Scalar::from_bool(true), dest)?;
943943
}
944944

0 commit comments

Comments
 (0)