grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing memory read-write

Browse Source
This commit is contained in:
Tomusdrw 2016-01-15 22:46:29 +01:00
parent 24e86d4479
commit f49afe1b6a
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/evm/interpreter.rs
View File

@ -44,7 +44,10 @@ impl<S : fmt::Display> Stack<S> for Vec<S> {
fn pop_back(&mut self) -> S { fn pop_back(&mut self) -> S {
let val = self.pop(); let val = self.pop();
match val { match val {
Some(x) => x, Some(x) => {
// println!("Poping from stack: {}", x);
x
},
None => panic!("Tried to pop from empty stack.") None => panic!("Tried to pop from empty stack.")
} }
} }
@ -87,8 +90,17 @@ trait Memory {
fn read_slice(&self, offset: U256, size: U256) -> &[u8]; fn read_slice(&self, offset: U256, size: U256) -> &[u8];
/// Retrieve writeable part of memory /// Retrieve writeable part of memory
fn writeable_slice(&mut self, offset: U256, size: U256) -> &mut[u8]; fn writeable_slice(&mut self, offset: U256, size: U256) -> &mut[u8];
fn dump(&self);
} }
impl Memory for Vec<u8> { impl Memory for Vec<u8> {
fn dump(&self) {
println!("MemoryDump:");
for i in self.iter() {
print!("{:02x} ", i);
}
println!("");
}
fn size(&self) -> usize { fn size(&self) -> usize {
return self.len() return self.len()
} }
@ -124,7 +136,7 @@ impl Memory for Vec<u8> {
let mut val = value; let mut val = value;
let end = off + 32; let end = off + 32;
for pos in off..end { for pos in 0..32 {
self[end - pos - 1] = val.low_u64() as u8; self[end - pos - 1] = val.low_u64() as u8;
val = val >> 8; val = val >> 8;
} }
@ -157,7 +169,8 @@ impl<'a> CodeReader<'a> {
fn read(&mut self, no_of_bytes: usize) -> U256 { fn read(&mut self, no_of_bytes: usize) -> U256 {
let pos = self.position; let pos = self.position;
self.position += no_of_bytes; self.position += no_of_bytes;
U256::from(&self.code[pos..pos+no_of_bytes]) let max = cmp::min(pos + no_of_bytes, self.code.len());
U256::from(&self.code[pos..max])
} }
fn len (&self) -> usize { fn len (&self) -> usize {
@ -724,7 +737,7 @@ impl Interpreter {
fn verify_jump(&self, jump_u: U256, valid_jump_destinations: &HashSet<usize>) -> Result<usize, evm::Error> { fn verify_jump(&self, jump_u: U256, valid_jump_destinations: &HashSet<usize>) -> Result<usize, evm::Error> {
let jump = jump_u.low_u64() as usize; let jump = jump_u.low_u64() as usize;
if valid_jump_destinations.contains(&jump) { if valid_jump_destinations.contains(&jump) && jump_u < U256::from(!0 as usize) {
Ok(jump) Ok(jump)
} else { } else {
Err(evm::Error::BadJumpDestination { Err(evm::Error::BadJumpDestination {
@ -1037,13 +1050,13 @@ mod tests {
fn test_memory_read_and_write() { fn test_memory_read_and_write() {
// given // given
let mem : &mut super::Memory = &mut vec![]; let mem : &mut super::Memory = &mut vec![];
mem.resize(32); mem.resize(0x80 + 32);
// when // when
mem.write(U256::from(0x00), U256::from(0xabcdef)); mem.write(U256::from(0x80), U256::from(0xabcdef));
// then // then
assert_eq!(mem.read(U256::from(0x00)), U256::from(0xabcdef)); assert_eq!(mem.read(U256::from(0x80)), U256::from(0xabcdef));
} }
#[test] #[test]

4
src/tests/executive.rs
View File

@ -168,7 +168,7 @@ fn do_json_test_for(vm: &VMType, json_data: &[u8]) -> Vec<String> {
let json = Json::from_str(::std::str::from_utf8(json_data).unwrap()).expect("Json is invalid"); let json = Json::from_str(::std::str::from_utf8(json_data).unwrap()).expect("Json is invalid");
let mut failed = Vec::new(); let mut failed = Vec::new();
for (name, test) in json.as_object().unwrap() { for (name, test) in json.as_object().unwrap() {
// if name != "calldataload_BigOffset" { // if name != "for_loop1" {
// continue; // continue;
// } // }
println!("name: {:?}", name); println!("name: {:?}", name);
@ -242,7 +242,7 @@ fn do_json_test_for(vm: &VMType, json_data: &[u8]) -> Vec<String> {
match res { match res {
Err(_) => fail_unless(out_of_gas, "didn't expect to run out of gas."), Err(_) => fail_unless(out_of_gas, "didn't expect to run out of gas."),
Ok(gas_left) => { Ok(gas_left) => {
println!("name: {}, gas_left : {:?}", name, gas_left); // println!("name: {}, gas_left : {:?}", name, gas_left);
fail_unless(!out_of_gas, "expected to run out of gas."); fail_unless(!out_of_gas, "expected to run out of gas.");
fail_unless(gas_left == xjson!(&test["gas"]), "gas_left is incorrect"); fail_unless(gas_left == xjson!(&test["gas"]), "gas_left is incorrect");
fail_unless(output == Bytes::from_json(&test["out"]), "output is incorrect"); fail_unless(output == Bytes::from_json(&test["out"]), "output is incorrect");