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

Implementing missing instructions

Browse Source
This commit is contained in:
Tomusdrw 2016-01-15 16:04:18 +01:00
parent 2d2e4fc838
commit 539fffaab9
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/evm/interpreter.rs
View File

@ -267,6 +267,8 @@ impl Interpreter {
let gas = if self.is_zero(&val) && !self.is_zero(newval) { let gas = if self.is_zero(&val) && !self.is_zero(newval) {
schedule.sstore_set_gas schedule.sstore_set_gas
} else if !self.is_zero(&val) && self.is_zero(newval) {
schedule.sstore_set_gas
} else { } else {
schedule.sstore_reset_gas schedule.sstore_reset_gas
}; };
@ -735,21 +737,29 @@ impl Interpreter {
}); });
}, },
instructions::SDIV => { instructions::SDIV => {
let (a, sign_a) = get_and_reset_sign(stack.pop_back()); let ua = stack.pop_back();
let (b, sign_b) = get_and_reset_sign(stack.pop_back()); let ub = stack.pop_back();
let (a, sign_a) = get_and_reset_sign(ua);
let (b, sign_b) = get_and_reset_sign(ub);
stack.push(if !self.is_zero(&b) { println!("Values: {}({}), {}({})", a, sign_a, b, sign_b);
let max = !U256::zero();
println!("Max: {}", max);
stack.push(if self.is_zero(&ub) {
U256::zero()
} else if ub == max || sign_a && self.is_zero(&a) {
max
} else {
let (c, _overflow) = a.overflowing_div(b); let (c, _overflow) = a.overflowing_div(b);
set_sign(c, sign_a ^ sign_b) set_sign(c, sign_a ^ sign_b)
} else {
U256::zero()
}); });
}, },
instructions::SMOD => { instructions::SMOD => {
let (a, sign_a) = get_and_reset_sign(stack.pop_back()); let (a, sign_a) = get_and_reset_sign(stack.pop_back());
let (b, sign_b) = get_and_reset_sign(stack.pop_back()); let ub = stack.pop_back();
let (b, sign_b) = get_and_reset_sign(ub);
stack.push(if !self.is_zero(&b) { stack.push(if !self.is_zero(&ub) {
let (c, _overflow) = a.overflowing_rem(b); let (c, _overflow) = a.overflowing_rem(b);
set_sign(c, sign_a ^ sign_b) set_sign(c, sign_a ^ sign_b)
} else { } else {
@ -835,9 +845,11 @@ impl Interpreter {
let c = stack.pop_back(); let c = stack.pop_back();
stack.push(if !self.is_zero(&c) { stack.push(if !self.is_zero(&c) {
let (res, _overflow) = a.overflowing_add(b); // upcast to 512
let (x, _overflow) = res.overflowing_rem(c); let a5 = U512::from(a);
x let (res, _overflow) = a5.overflowing_add(U512::from(b));
let (x, _overflow) = res.overflowing_rem(U512::from(c));
U256::from(x)
} else { } else {
U256::zero() U256::zero()
}); });
@ -848,9 +860,10 @@ impl Interpreter {
let c = stack.pop_back(); let c = stack.pop_back();
stack.push(if !self.is_zero(&c) { stack.push(if !self.is_zero(&c) {
let (res, _overflow) = a.overflowing_mul(b); let a5 = U512::from(a);
let (x, _overflow) = res.overflowing_rem(c); let (res, _overflow) = a5.overflowing_mul(U512::from(b));
x let (x, _overflow) = res.overflowing_rem(U512::from(c));
U256::from(x)
} else { } else {
U256::zero() U256::zero()
}); });

3
src/tests/executive.rs
View File

@ -167,6 +167,9 @@ 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 != "addmod1_overflow3" {
continue;
}
println!("name: {:?}", name); println!("name: {:?}", name);
// sync io is usefull when something crashes in jit // sync io is usefull when something crashes in jit
// ::std::io::stdout().write(&name.as_bytes()); // ::std::io::stdout().write(&name.as_bytes());