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

Merge branch 'evm' into evm_factory_parametrized

Browse Source
This commit is contained in:
Tomusdrw 2016-01-14 16:32:55 +01:00
commit 3825e7043d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/evm/interpreter.rs
View File

@ -311,7 +311,8 @@ impl Interpreter {
InstructionCost::GasMem(gas, self.mem_needed(stack.peek(0), stack.peek(1))) InstructionCost::GasMem(gas, self.mem_needed(stack.peek(0), stack.peek(1)))
}, },
instructions::CALL | instructions::CALLCODE => { instructions::CALL | instructions::CALLCODE => {
let gas = add_u256_usize(stack.peek(0), schedule.call_gas); // [todr] we actuall call gas_cost is calculated in ext
let gas = U256::from(schedule.call_gas);
let mem = cmp::max( let mem = cmp::max(
self.mem_needed(stack.peek(5), stack.peek(6)), self.mem_needed(stack.peek(5), stack.peek(6)),
self.mem_needed(stack.peek(3), stack.peek(4)) self.mem_needed(stack.peek(3), stack.peek(4))
@ -534,7 +535,7 @@ impl Interpreter {
ext.sstore(key, word); ext.sstore(key, word);
}, },
instructions::PC => { instructions::PC => {
stack.push(U256::from(code.position)); stack.push(U256::from(code.position - 1));
}, },
instructions::GAS => { instructions::GAS => {
stack.push(gas.clone()); stack.push(gas.clone());