OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix "offset" intrinsic

Browse Source 
It didn't multiply the offset given by the pointee type size.
This commit is contained in:
bjorn3 2019-02-11 18:49:59 +01:00
parent 91385ba0fc
commit 5b3867430f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/intrinsics.rs
View File

@ -127,6 +127,9 @@ pub fn codegen_intrinsic_call<'a, 'tcx: 'a>(
likely | unlikely, (c a) {
ret.write_cvalue(fx, a);
};
breakpoint, () {
fx.bcx.ins().debugtrap();
};
copy | copy_nonoverlapping, <elem_ty> (v src, v dst, v count) {
let elem_size: u64 = fx.layout_of(elem_ty).size.bytes();
let elem_size = fx
@ -286,8 +289,12 @@ pub fn codegen_intrinsic_call<'a, 'tcx: 'a>(
let res = fx.bcx.ins().rotr(x, y);
ret.write_cvalue(fx, CValue::ByVal(res, layout));
};
offset, (v base, v offset) {
let res = fx.bcx.ins().iadd(base, offset);
offset, (c base, v offset) {
let pointee_ty = base.layout().ty.builtin_deref(true).unwrap().ty;
let pointee_size = fx.layout_of(pointee_ty).size.bytes();
let ptr_diff = fx.bcx.ins().imul_imm(offset, pointee_size as i64);
let base_val = base.load_scalar(fx);
let res = fx.bcx.ins().iadd(base_val, ptr_diff);
ret.write_cvalue(fx, CValue::ByVal(res, args[0].layout()));
};
transmute, <src_ty, dst_ty> (c from) {