mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unnest integer reprs.

Browse Source
This commit is contained in:
Scott Olson 2016-03-13 01:48:07 -06:00
parent 6b4d2b11a6
commit dad5edd4f3
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/interpreter.rs
View File

@ -5,7 +5,7 @@ use rustc::mir::repr as mir;
use std::error::Error;
use std::fmt;
use memory::{FieldRepr, IntRepr, Memory, Pointer, Repr};
use memory::{FieldRepr, Memory, Pointer, Repr};
use primval;
const TRACE_EXECUTION: bool = true;
@ -416,10 +416,10 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
ty::TyBool => Repr::Bool,
ty::TyInt(IntTy::Is) => unimplemented!(),
ty::TyInt(IntTy::I8) => Repr::Int(IntRepr::I8),
ty::TyInt(IntTy::I16) => Repr::Int(IntRepr::I16),
ty::TyInt(IntTy::I32) => Repr::Int(IntRepr::I32),
ty::TyInt(IntTy::I64) => Repr::Int(IntRepr::I64),
ty::TyInt(IntTy::I8) => Repr::I8,
ty::TyInt(IntTy::I16) => Repr::I16,
ty::TyInt(IntTy::I32) => Repr::I32,
ty::TyInt(IntTy::I64) => Repr::I64,
ty::TyTuple(ref fields) => self.make_product_repr(fields.iter().cloned()),

24
src/memory.rs
View File

@ -26,9 +26,6 @@ pub struct Pointer {
pub offset: usize,
}
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum IntRepr { I8, I16, I32, I64 }
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct FieldRepr {
pub offset: usize,
@ -38,7 +35,10 @@ pub struct FieldRepr {
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum Repr {
Bool,
Int(IntRepr),
I8,
I16,
I32,
I64,
/// The representation for product types including tuples, structs, and the contents of enum
/// variants.
@ -123,10 +123,10 @@ impl Memory {
pub fn read_primval(&self, ptr: Pointer, repr: &Repr) -> EvalResult<PrimVal> {
match *repr {
Repr::Bool => self.read_bool(ptr).map(PrimVal::Bool),
Repr::Int(IntRepr::I8) => self.read_i8(ptr).map(PrimVal::I8),
Repr::Int(IntRepr::I16) => self.read_i16(ptr).map(PrimVal::I16),
Repr::Int(IntRepr::I32) => self.read_i32(ptr).map(PrimVal::I32),
Repr::Int(IntRepr::I64) => self.read_i64(ptr).map(PrimVal::I64),
Repr::I8 => self.read_i8(ptr).map(PrimVal::I8),
Repr::I16 => self.read_i16(ptr).map(PrimVal::I16),
Repr::I32 => self.read_i32(ptr).map(PrimVal::I32),
Repr::I64 => self.read_i64(ptr).map(PrimVal::I64),
_ => panic!("primitive read of non-primitive: {:?}", repr),
}
}
@ -216,10 +216,10 @@ impl Repr {
pub fn size(&self) -> usize {
match *self {
Repr::Bool => 1,
Repr::Int(IntRepr::I8) => 1,
Repr::Int(IntRepr::I16) => 2,
Repr::Int(IntRepr::I32) => 4,
Repr::Int(IntRepr::I64) => 8,
Repr::I8 => 1,
Repr::I16 => 2,
Repr::I32 => 4,
Repr::I64 => 8,
Repr::Product { size, .. } => size,
Repr::Sum { discr_size, max_variant_size, .. } => discr_size + max_variant_size,
}