bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Support SwitchInt for integer types.

Browse source
This commit is contained in:
Scott Olson 2016-03-07 08:22:18 -06:00
parent e41af43dbf
commit 0cb7e3fae0
3 changed files with 43 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/interpreter.rs
View file

@ -171,8 +171,26 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
If { ref cond, targets: (then_target, else_target) } => {
let cond_ptr = try!(self.operand_to_ptr(cond));
let cond = try!(self.memory.read_bool(cond_ptr));
current_block = if cond { then_target } else { else_target };
let cond_val = try!(self.memory.read_bool(cond_ptr));
current_block = if cond_val { then_target } else { else_target };
}
SwitchInt { ref discr, ref values, ref targets, .. } => {
// FIXME(tsion): Handle non-integer switch types.
let discr_ptr = try!(self.lvalue_to_ptr(discr));
let discr_val = try!(self.memory.read_int(discr_ptr));
// Branch to the `otherwise` case by default, if no match is found.
current_block = targets[targets.len() - 1];
for (index, val_const) in values.iter().enumerate() {
let ptr = try!(self.const_to_ptr(val_const));
let val = try!(self.memory.read_int(ptr));
if discr_val == val {
current_block = targets[index];
break;
}
}
}
// Call { ref func, ref args, ref destination, .. } => {
@ -203,15 +221,6 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
// }
// }
// SwitchInt { ref discr, ref values, ref targets, .. } => {
// let discr_val = self.read_lvalue(discr);
// let index = values.iter().position(|v| discr_val == self.const_to_ptr(v))
// .expect("discriminant matched no values");
// current_block = targets[index];
// }
// Switch { ref discr, ref targets, .. } => {
// let discr_val = self.read_lvalue(discr);