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

Stringify runtime error option

This commit is contained in:
Roman Mandeleil 2015-03-31 12:48:53 +03:00
parent ebfdb860a8
commit 91ca027d80
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ethereumj-core/src/main/java/org/ethereum/vm/Program.java
View File

@ -902,6 +902,9 @@ public class Program {
OpCode op = OpCode.code(code[index]);
final byte[] continuedCode;
if (op == null) throw new IllegalOperationException("Invalid operation: " +
Hex.toHexString(code, index, 1));
switch(op) {
case PUSH1: case PUSH2: case PUSH3: case PUSH4: case PUSH5: case PUSH6: case PUSH7: case PUSH8:
case PUSH9: case PUSH10: case PUSH11: case PUSH12: case PUSH13: case PUSH14: case PUSH15: case PUSH16:
@ -975,7 +978,13 @@ public class Program {
}
@SuppressWarnings("serial")
public class IllegalOperationException extends RuntimeException {
public static class IllegalOperationException extends RuntimeException {
public IllegalOperationException(String message) {
super(message);
}
public IllegalOperationException() {
}
}
@SuppressWarnings("serial")

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

@ -80,7 +80,7 @@ public class VM {
try {
OpCode op = OpCode.code(program.getCurrentOp());
if (op == null)
throw program.new IllegalOperationException();
throw new Program.IllegalOperationException();
program.setLastOp(op.val());
program.stackRequire(op.require());