status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix MULMOD to avoid using mod in between

This commit is contained in:
nicksavers 2014-10-10 17:00:03 +02:00
parent 21e029c125
commit bfee3b2251
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ethereumj-core/src/main/java/org/ethereum/vm/DataWord.java
View File

@ -227,7 +227,6 @@ public class DataWord implements Comparable<DataWord> {
this.data = ByteUtil.copyToArray(result.and(MAX_VALUE));
}
// TODO: improve with no BigInteger
public void sMod(DataWord word) {
if (word.isZero()) {
@ -239,6 +238,17 @@ public class DataWord implements Comparable<DataWord> {
this.data = ByteUtil.copyToArray(result.and(MAX_VALUE));
}
public void addmod(DataWord word1, DataWord word2) {
this.add(word1);
BigInteger result = this.value().mod(word2.value());
this.data = ByteUtil.copyToArray(result.and(MAX_VALUE));
}
public void mulmod(DataWord word1, DataWord word2) {
BigInteger result = value().multiply(word1.value()).mod(word2.value());
this.data = ByteUtil.copyToArray(result.and(MAX_VALUE));
}
public String toString() {
return Hex.toHexString(data);
}

10
ethereumj-core/src/main/java/org/ethereum/vm/VM.java
View File

@ -476,16 +476,18 @@ public class VM {
case ADDMOD:{
program.stackRequire(3);
DataWord word1 = program.stackPop();
word1.add(program.stackPop());
word1.mod(program.stackPop());
DataWord word2 = program.stackPop();
DataWord word3 = program.stackPop();
word1.addmod(word2, word3);
program.stackPush(word1);
program.step();
} break;
case MULMOD:{
program.stackRequire(3);
DataWord word1 = program.stackPop();
word1.mul(program.stackPop());
word1.mod(program.stackPop());
DataWord word2 = program.stackPop();
DataWord word3 = program.stackPop();
word1.mulmod(word2, word3);
program.stackPush(word1);
program.step();
} break;