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

Fixing memory allocation

Browse Source
This commit is contained in:
Tomusdrw
2016-01-15 23:32:16 +01:00
parent f49afe1b6a
commit 9e7fea94bf
2 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/evm/interpreter.rs
View File

@@ -45,7 +45,7 @@ impl<S : fmt::Display> Stack<S> for Vec<S> {
let val = self.pop();
match val {
Some(x) => {
// println!("Poping from stack: {}", x);
println!("Poping from stack: {}", x);
x
},
None => panic!("Tried to pop from empty stack.")
@@ -62,7 +62,7 @@ impl<S : fmt::Display> Stack<S> for Vec<S> {
}
fn push(&mut self, elem: S) {
// println!("Pushing to stack: {}", elem);
println!("Pushing to stack: {}", elem);
self.push(elem);
}
@@ -216,14 +216,17 @@ impl evm::Evm for Interpreter {
reader.position += 1;
// Calculate gas cost
let gas_cost = try!(self.get_gas_cost_and_expand_mem(ext, instruction, &mut mem, &stack));
let (gas_cost, mem_size) = try!(self.get_gas_cost_mem(ext, instruction, &mut mem, &stack));
try!(self.verify_gas(&current_gas, &gas_cost));
mem.expand(mem_size);
current_gas = current_gas - gas_cost;
// println!("Executing: {} (0x{:x}) [Gas Cost: {} (Left: {})]",
// instructions::get_info(instruction).name, instruction,
// gas_cost,
// current_gas
// );
println!("Executing: {} (0x{:x}) [Gas Cost: {} (Left: {})]",
instructions::get_info(instruction).name, instruction,
gas_cost,
current_gas
);
// Execute instruction
let result = try!(self.exec_instruction(
current_gas, params, ext, instruction, &mut reader, &mut mem, &mut stack
@@ -254,12 +257,12 @@ impl evm::Evm for Interpreter {
impl Interpreter {
fn get_gas_cost_and_expand_mem(&self,
ext: &evm::Ext,
instruction: Instruction,
mem: &mut Memory,
stack: &Stack<U256>
) -> evm::Result {
fn get_gas_cost_mem(&self,
ext: &evm::Ext,
instruction: Instruction,
mem: &mut Memory,
stack: &Stack<U256>
) -> Result<(U256, usize), evm::Error> {
let schedule = ext.schedule();
let info = instructions::get_info(instruction);
@@ -367,14 +370,13 @@ impl Interpreter {
match cost {
InstructionCost::Gas(gas) => {
Ok(gas)
Ok((gas, 0))
},
InstructionCost::GasMem(gas, mem_size) => match mem_size {
RequiredMem::Mem(mem_size) => {
let (mem_gas, new_mem_size) = self.mem_gas_cost(schedule, mem.size(), &mem_size);
// Expand after calculating the cost
mem.expand(new_mem_size);
self.gas_add(gas, mem_gas)
let gas = try!(self.gas_add(gas, mem_gas));
Ok((gas, new_mem_size))
},
RequiredMem::OutOfMemory => Err(evm::Error::OutOfGas)
},
@@ -382,9 +384,8 @@ impl Interpreter {
RequiredMem::Mem(mem_size) => {
let (mem_gas, new_mem_size) = self.mem_gas_cost(schedule, mem.size(), &mem_size);
let copy_gas = U256::from(schedule.copy_gas) * (add_u256_usize(&copy, 31) / U256::from(32));
// Expand after calculating the cost
mem.expand(new_mem_size);
self.gas_add(try!(self.gas_add(gas, copy_gas)), mem_gas)
let gas = try!(self.gas_add(try!(self.gas_add(gas, copy_gas)), mem_gas));
Ok((gas, new_mem_size))
},
RequiredMem::OutOfMemory => Err(evm::Error::OutOfGas)
}