bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Simplify some Repr code.

Browse source
This commit is contained in:
Scott Olson 2016-03-17 02:53:03 -06:00
parent aa791a4085
commit a1fc284559
2 changed files with 74 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

85
src/interpreter.rs
View file

@ -142,18 +142,18 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
let mut locals = Vec::with_capacity(num_args + num_vars + num_temps); let mut locals = Vec::with_capacity(num_args + num_vars + num_temps);
for (arg_decl, arg_operand) in mir.arg_decls.iter().zip(args) { for (arg_decl, arg_operand) in mir.arg_decls.iter().zip(args) {
let repr = self.ty_to_repr(arg_decl.ty); let size = self.ty_to_repr(arg_decl.ty).size();
let dest = self.memory.allocate(repr.size()); let dest = self.memory.allocate(size);
let src = try!(self.eval_operand(arg_operand)); let src = try!(self.eval_operand(arg_operand));
try!(self.memory.copy(src, dest, repr.size())); try!(self.memory.copy(src, dest, size));
locals.push(dest); locals.push(dest);
} }
let var_tys = mir.var_decls.iter().map(|v| v.ty); let var_tys = mir.var_decls.iter().map(|v| v.ty);
let temp_tys = mir.temp_decls.iter().map(|t| t.ty); let temp_tys = mir.temp_decls.iter().map(|t| t.ty);
locals.extend(var_tys.chain(temp_tys).map(|ty| { locals.extend(var_tys.chain(temp_tys).map(|ty| {
let repr = self.ty_to_repr(ty).size(); let size = self.ty_to_repr(ty).size();
self.memory.allocate(repr) self.memory.allocate(size)
})); }));
self.stack.push(Frame { self.stack.push(Frame {
@ -189,15 +189,15 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
SwitchInt { ref discr, ref values, ref targets, .. } => { SwitchInt { ref discr, ref values, ref targets, .. } => {
let discr_ptr = try!(self.eval_lvalue(discr)); let discr_ptr = try!(self.eval_lvalue(discr));
let discr_repr = self.lvalue_repr(discr); let discr_size = self.lvalue_repr(discr).size();
let discr_val = try!(self.memory.read_primval(discr_ptr, &discr_repr)); let discr_val = try!(self.memory.read_uint(discr_ptr, discr_size));
// Branch to the `otherwise` case by default, if no match is found. // Branch to the `otherwise` case by default, if no match is found.
let mut target_block = targets[targets.len() - 1]; let mut target_block = targets[targets.len() - 1];
for (index, val_const) in values.iter().enumerate() { for (index, val_const) in values.iter().enumerate() {
let ptr = try!(self.const_to_ptr(val_const)); let ptr = try!(self.const_to_ptr(val_const));
let val = try!(self.memory.read_primval(ptr, &discr_repr)); let val = try!(self.memory.read_uint(ptr, discr_size));
if discr_val == val { if discr_val == val {
target_block = targets[index]; target_block = targets[index];
break; break;
@ -210,12 +210,12 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
Switch { ref discr, ref targets, .. } => { Switch { ref discr, ref targets, .. } => {
let adt_ptr = try!(self.eval_lvalue(discr)); let adt_ptr = try!(self.eval_lvalue(discr));
let adt_repr = self.lvalue_repr(discr); let adt_repr = self.lvalue_repr(discr);
let discr_repr = match adt_repr { let discr_size = match adt_repr {
Repr::Sum { ref discr, .. } => discr, Repr::Sum { discr_size, .. } => discr_size,
_ => panic!("attmpted to switch on non-sum type"), _ => panic!("attmpted to switch on non-sum type"),
}; };
let discr_val = try!(self.memory.read_primval(adt_ptr, &discr_repr)); let discr_val = try!(self.memory.read_uint(adt_ptr, discr_size));
TerminatorTarget::Block(targets[discr_val.to_usize()]) TerminatorTarget::Block(targets[discr_val as usize])
} }
Call { ref func, ref args, ref destination, .. } => { Call { ref func, ref args, ref destination, .. } => {
@ -332,16 +332,21 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
} }
BinaryOp(bin_op, ref left, ref right) => { BinaryOp(bin_op, ref left, ref right) => {
let (left_ptr, left_repr) = try!(self.eval_operand_and_repr(left)); let left_ptr = try!(self.eval_operand(left));
let (right_ptr, right_repr) = try!(self.eval_operand_and_repr(right)); let left_ty = self.operand_ty(left);
let left_val = try!(self.memory.read_primval(left_ptr, &left_repr)); let left_val = try!(self.memory.read_primval(left_ptr, left_ty));
let right_val = try!(self.memory.read_primval(right_ptr, &right_repr));
let right_ptr = try!(self.eval_operand(right));
let right_ty = self.operand_ty(right);
let right_val = try!(self.memory.read_primval(right_ptr, right_ty));
self.memory.write_primval(dest, primval::binary_op(bin_op, left_val, right_val)) self.memory.write_primval(dest, primval::binary_op(bin_op, left_val, right_val))
} }
UnaryOp(un_op, ref operand) => { UnaryOp(un_op, ref operand) => {
let (ptr, repr) = try!(self.eval_operand_and_repr(operand)); let ptr = try!(self.eval_operand(operand));
let val = try!(self.memory.read_primval(ptr, &repr)); let ty = self.operand_ty(operand);
let val = try!(self.memory.read_primval(ptr, ty));
self.memory.write_primval(dest, primval::unary_op(un_op, val)) self.memory.write_primval(dest, primval::unary_op(un_op, val))
} }
@ -354,13 +359,13 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
ty::AdtKind::Struct => self.assign_to_product(dest, &dest_repr, operands), ty::AdtKind::Struct => self.assign_to_product(dest, &dest_repr, operands),
ty::AdtKind::Enum => match dest_repr { ty::AdtKind::Enum => match dest_repr {
Repr::Sum { ref discr, ref variants, .. } => { Repr::Sum { discr_size, ref variants, .. } => {
if discr.size() > 0 { if discr_size > 0 {
let discr_val = PrimVal::from_usize(variant_idx, discr); let discr = variant_idx as u64;
try!(self.memory.write_primval(dest, discr_val)); try!(self.memory.write_uint(dest, discr, discr_size));
} }
self.assign_to_product( self.assign_to_product(
dest.offset(discr.size() as isize), dest.offset(discr_size as isize),
&variants[variant_idx], &variants[variant_idx],
operands operands
) )
@ -450,6 +455,10 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
} }
} }
fn operand_ty(&self, operand: &mir::Operand<'tcx>) -> ty::Ty<'tcx> {
self.current_frame().mir.operand_ty(self.tcx, operand)
}
fn eval_operand(&mut self, op: &mir::Operand<'tcx>) -> EvalResult<Pointer> { fn eval_operand(&mut self, op: &mir::Operand<'tcx>) -> EvalResult<Pointer> {
self.eval_operand_and_repr(op).map(|(p, _)| p) self.eval_operand_and_repr(op).map(|(p, _)| p)
} }
@ -503,7 +512,7 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
}, },
Downcast(..) => match base_repr { Downcast(..) => match base_repr {
Repr::Sum { ref discr, .. } => base_ptr.offset(discr.size() as isize), Repr::Sum { discr_size, .. } => base_ptr.offset(discr_size as isize),
_ => panic!("variant downcast on non-sum type"), _ => panic!("variant downcast on non-sum type"),
}, },
@ -585,16 +594,12 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
ty::TyEnum(adt_def, substs) => { ty::TyEnum(adt_def, substs) => {
let num_variants = adt_def.variants.len(); let num_variants = adt_def.variants.len();
let discr = if num_variants <= 1 { let discr_size = match num_variants {
Repr::Product { size: 0, fields: vec![] } n if n <= 1 => 0,
} else if num_variants <= 1 << 8 { n if n <= 1 << 8 => 1,
Repr::U8 n if n <= 1 << 16 => 2,
} else if num_variants <= 1 << 16 { n if n <= 1 << 32 => 4,
Repr::U16 _ => 8,
} else if num_variants <= 1 << 32 {
Repr::U32
} else {
Repr::U64
}; };
let variants: Vec<Repr> = adt_def.variants.iter().map(|v| { let variants: Vec<Repr> = adt_def.variants.iter().map(|v| {
@ -602,7 +607,7 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
}).collect(); }).collect();
Repr::Sum { Repr::Sum {
discr: Box::new(discr), discr_size: discr_size,
max_variant_size: variants.iter().map(Repr::size).max().unwrap_or(0), max_variant_size: variants.iter().map(Repr::size).max().unwrap_or(0),
variants: variants, variants: variants,
} }
@ -710,10 +715,10 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
println!("{:?} {:?}", mth.method.def_id, mth.substs); println!("{:?} {:?}", mth.method.def_id, mth.substs);
(mth.method.def_id, mth.substs) (mth.method.def_id, mth.substs)
} }
traits::VtableClosure(vtable_closure) => { traits::VtableClosure(_vtable_closure) => {
// The substitutions should have no type parameters remaining after passing // The substitutions should have no type parameters remaining after passing
// through fulfill_obligation // through fulfill_obligation
let trait_closure_kind = self.tcx.lang_items.fn_trait_kind(trait_id).unwrap(); let _trait_closure_kind = self.tcx.lang_items.fn_trait_kind(trait_id).unwrap();
unimplemented!() unimplemented!()
// vtable_closure.closure_def_id // vtable_closure.closure_def_id
// vtable_closure.substs // vtable_closure.substs
@ -727,8 +732,8 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
// }; // };
// Callee::ptr(immediate_rvalue(llfn, fn_ptr_ty)) // Callee::ptr(immediate_rvalue(llfn, fn_ptr_ty))
} }
traits::VtableFnPointer(fn_ty) => { traits::VtableFnPointer(_fn_ty) => {
let trait_closure_kind = self.tcx.lang_items.fn_trait_kind(trait_id).unwrap(); let _trait_closure_kind = self.tcx.lang_items.fn_trait_kind(trait_id).unwrap();
unimplemented!() unimplemented!()
// let llfn = trans_fn_pointer_shim(ccx, trait_closure_kind, fn_ty); // let llfn = trans_fn_pointer_shim(ccx, trait_closure_kind, fn_ty);
@ -740,7 +745,7 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
// }; // };
// Callee::ptr(immediate_rvalue(llfn, fn_ptr_ty)) // Callee::ptr(immediate_rvalue(llfn, fn_ptr_ty))
} }
traits::VtableObject(ref data) => { traits::VtableObject(ref _data) => {
unimplemented!() unimplemented!()
// Callee { // Callee {
// data: Virtual(traits::get_vtable_index_of_object_method( // data: Virtual(traits::get_vtable_index_of_object_method(

44
src/memory.rs
View file

@ -1,4 +1,5 @@
use byteorder::{self, ByteOrder}; use byteorder::{self, ByteOrder, NativeEndian, ReadBytesExt, WriteBytesExt};
use rustc::middle::ty;
use std::collections::{BTreeMap, HashMap}; use std::collections::{BTreeMap, HashMap};
use std::collections::Bound::{Included, Excluded}; use std::collections::Bound::{Included, Excluded};
use std::mem; use std::mem;
@ -56,10 +57,14 @@ pub enum Repr {
/// The representation for a sum type, i.e. a Rust enum. /// The representation for a sum type, i.e. a Rust enum.
Sum { Sum {
/// The size of the discriminant (an integer). Should be between 0 and 8.
discr_size: usize,
/// The size of the largest variant in bytes. /// The size of the largest variant in bytes.
max_variant_size: usize, max_variant_size: usize,
/// The represenations of the contents of each variant.
variants: Vec<Repr>, variants: Vec<Repr>,
discr: Box<Repr>,
}, },
Array { Array {
@ -167,18 +172,19 @@ impl Memory {
Ok(()) Ok(())
} }
pub fn read_primval(&self, ptr: Pointer, repr: &Repr) -> EvalResult<PrimVal> { pub fn read_primval(&self, ptr: Pointer, ty: ty::Ty) -> EvalResult<PrimVal> {
match *repr { use syntax::ast::{IntTy, UintTy};
Repr::Bool => self.read_bool(ptr).map(PrimVal::Bool), match ty.sty {
Repr::I8 => self.read_i8(ptr).map(PrimVal::I8), ty::TyBool => self.read_bool(ptr).map(PrimVal::Bool),
Repr::I16 => self.read_i16(ptr).map(PrimVal::I16), ty::TyInt(IntTy::I8) => self.read_i8(ptr).map(PrimVal::I8),
Repr::I32 => self.read_i32(ptr).map(PrimVal::I32), ty::TyInt(IntTy::I16) => self.read_i16(ptr).map(PrimVal::I16),
Repr::I64 => self.read_i64(ptr).map(PrimVal::I64), ty::TyInt(IntTy::I32) => self.read_i32(ptr).map(PrimVal::I32),
Repr::U8 => self.read_u8(ptr).map(PrimVal::U8), ty::TyInt(IntTy::I64) => self.read_i64(ptr).map(PrimVal::I64),
Repr::U16 => self.read_u16(ptr).map(PrimVal::U16), ty::TyUint(UintTy::U8) => self.read_u8(ptr).map(PrimVal::U8),
Repr::U32 => self.read_u32(ptr).map(PrimVal::U32), ty::TyUint(UintTy::U16) => self.read_u16(ptr).map(PrimVal::U16),
Repr::U64 => self.read_u64(ptr).map(PrimVal::U64), ty::TyUint(UintTy::U32) => self.read_u32(ptr).map(PrimVal::U32),
_ => panic!("primitive read of non-primitive: {:?}", repr), ty::TyUint(UintTy::U64) => self.read_u64(ptr).map(PrimVal::U64),
_ => panic!("primitive read of non-primitive type: {:?}", ty),
} }
} }
@ -286,6 +292,14 @@ impl Memory {
byteorder::NativeEndian::write_u64(bytes, n); byteorder::NativeEndian::write_u64(bytes, n);
Ok(()) Ok(())
} }
pub fn read_uint(&self, ptr: Pointer, size: usize) -> EvalResult<u64> {
self.get_bytes(ptr, size).map(|mut b| b.read_uint::<NativeEndian>(size).unwrap())
}
pub fn write_uint(&mut self, ptr: Pointer, n: u64, size: usize) -> EvalResult<()> {
self.get_bytes_mut(ptr, size).map(|mut b| b.write_uint::<NativeEndian>(n, size).unwrap())
}
} }
impl Allocation { impl Allocation {
@ -359,7 +373,7 @@ impl Repr {
Repr::I32 | Repr::U32 => 4, Repr::I32 | Repr::U32 => 4,
Repr::I64 | Repr::U64 => 8, Repr::I64 | Repr::U64 => 8,
Repr::Product { size, .. } => size, Repr::Product { size, .. } => size,
Repr::Sum { ref discr, max_variant_size, .. } => discr.size() + max_variant_size, Repr::Sum { discr_size, max_variant_size, .. } => discr_size + max_variant_size,
Repr::Array { ref elem, length } => elem.size() * length, Repr::Array { ref elem, length } => elem.size() * length,
Repr::Pointer => POINTER_SIZE, Repr::Pointer => POINTER_SIZE,
Repr::FatPointer => POINTER_SIZE * 2, Repr::FatPointer => POINTER_SIZE * 2,