implement extend() and remove one TODO

This commit is contained in:
Guanqun Lu 2018-08-02 16:04:43 +08:00
parent 438eab9ada
commit b3cf9ccb9d
1 changed files with 41 additions and 5 deletions

View File

@ -1,5 +1,6 @@
use std::ops;
use std::{u32, usize};
use std::cmp;
use std::fmt;
use std::iter::repeat;
use parity_wasm::elements::Local;
@ -1109,11 +1110,7 @@ impl FunctionContext {
.map(RuntimeValue::default)
.collect::<Vec<_>>();
// TODO: Replace with extend.
for local in locals {
value_stack.push(local)
.map_err(|_| TrapKind::StackOverflow)?;
}
value_stack.extend(&locals)?;
self.is_initialized = true;
Ok(())
@ -1263,8 +1260,47 @@ impl ValueStack {
Ok(())
}
#[inline]
fn extend(&mut self, values: &[RuntimeValue]) -> Result<(), TrapKind> {
let len = cmp::min(values.len(), self.buf.len() - self.sp);
self.buf[self.sp..(self.sp+len)].copy_from_slice(&values[..len]);
self.sp += len;
if len < values.len() {
Err(TrapKind::StackOverflow)
} else {
Ok(())
}
}
#[inline]
fn len(&self) -> usize {
self.sp
}
}
#[cfg(test)]
mod tests {
use super::ValueStack;
use value::RuntimeValue;
#[test]
fn test_stack_extend() {
let mut stack = ValueStack::with_limit(5);
let values = vec![RuntimeValue::I32(1), RuntimeValue::I32(2), RuntimeValue::I32(3),
RuntimeValue::I32(4), RuntimeValue::I32(5)];
assert!(stack.extend(&values).is_ok());
assert_eq!(stack.len(), 5);
assert!(stack.push(RuntimeValue::I32(6)).is_err());
// check each elements
assert_eq!(stack.pop(), RuntimeValue::I32(5));
assert_eq!(stack.pop(), RuntimeValue::I32(4));
assert_eq!(stack.pop(), RuntimeValue::I32(3));
assert_eq!(stack.pop(), RuntimeValue::I32(2));
assert_eq!(stack.pop(), RuntimeValue::I32(1));
assert_eq!(stack.len(), 0);
}
}