openrs2
/
jode
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some bug fixes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@832 379699f6-c40d-0410-875b-85095c16579e
stable
jochen 25 years ago
parent 361d712b01
commit cf499934d0
2 changed files with 73 additions and 38 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      jode/jode/jvm/Interpreter.j
  2. 104
      jode/jode/jvm/Interpreter.java

7
jode/jode/jvm/Interpreter.j
Unescape View File

@ -701,10 +701,11 @@ two_op_instr:
iand iand
iconst_2 iconst_2
swap swap
ifeq second_op_single ifne second_op_single
iinc 5 -1 iinc 5 -1
iconst_2 iconst_2
ishl ishl
second_op_single: second_op_single:
aload_3 aload_3
iload 5 iload 5
@ -716,7 +717,7 @@ second_op_done:
; opcode ; opcode
astore 7 astore 7
dup dup
bipush 0x0E38 sipush 0x0E38
iand iand
iinc 5 -1 iinc 5 -1
ifeq first_op_single ifeq first_op_single
@ -1844,7 +1845,7 @@ newarray_loop:
newarray_test: newarray_test:
iinc 7 -1 iinc 7 -1
iload 7 iload 7
ifne newarray_loop ifge newarray_loop
astore 7 astore 7
aload_3 aload_3
iload 5 iload 5

104
jode/jode/jvm/Interpreter.java
Unescape View File

@ -51,6 +51,9 @@ public class Interpreter implements Opcodes {
public static Object interpretMethod public static Object interpretMethod
(RuntimeEnvironment env, BytecodeInfo code, Value[] locals) (RuntimeEnvironment env, BytecodeInfo code, Value[] locals)
throws InterpreterException, InvocationTargetException { throws InterpreterException, InvocationTargetException {
if ((GlobalOptions.debuggingFlags
& GlobalOptions.DEBUG_INTERPRT) != 0)
System.err.println("Interpreting "+code.getMethodInfo());
Value[] stack = new Value[code.getMaxStack()]; Value[] stack = new Value[code.getMaxStack()];
for (int i=0; i< stack.length; i++) for (int i=0; i< stack.length; i++)
stack[i] = new Value(); stack[i] = new Value();
@ -63,7 +66,8 @@ public class Interpreter implements Opcodes {
Instruction instr = pc; Instruction instr = pc;
if ((GlobalOptions.debuggingFlags if ((GlobalOptions.debuggingFlags
& GlobalOptions.DEBUG_INTERPRT) != 0) { & GlobalOptions.DEBUG_INTERPRT) != 0) {
GlobalOptions.err.print(instr.addr+": ["); GlobalOptions.err.println(instr.getDescription());
GlobalOptions.err.print("stack: [");
for (int i=0; i<stacktop; i++) { for (int i=0; i<stacktop; i++) {
if (i>0) if (i>0)
GlobalOptions.err.print(","); GlobalOptions.err.print(",");
@ -90,10 +94,13 @@ public class Interpreter implements Opcodes {
stack[stacktop].setObject(instr.objData); stack[stacktop].setObject(instr.objData);
stacktop += 2; stacktop += 2;
break; break;
case opc_iload: case opc_lload: case opc_iload: case opc_fload: case opc_aload:
case opc_fload: case opc_dload: case opc_aload:
stack[stacktop++].setValue(locals[instr.localSlot]); stack[stacktop++].setValue(locals[instr.localSlot]);
break; break;
case opc_lload: case opc_dload:
stack[stacktop].setValue(locals[instr.localSlot]);
stacktop += 2;
break;
case opc_iaload: case opc_laload: case opc_iaload: case opc_laload:
case opc_faload: case opc_daload: case opc_aaload: case opc_faload: case opc_daload: case opc_aaload:
case opc_baload: case opc_caload: case opc_saload: { case opc_baload: case opc_caload: case opc_saload: {
@ -124,14 +131,21 @@ public class Interpreter implements Opcodes {
throw new InvocationTargetException(ex); throw new InvocationTargetException(ex);
} }
stack[stacktop++].setObject(result); stack[stacktop++].setObject(result);
if (opcode == opc_laload || opcode == opc_daload)
stacktop++;
break; break;
} }
case opc_istore: case opc_lstore: case opc_istore: case opc_fstore: case opc_astore:
case opc_fstore: case opc_dstore: case opc_astore:
locals[instr.localSlot].setValue(stack[--stacktop]); locals[instr.localSlot].setValue(stack[--stacktop]);
break; break;
case opc_iastore: case opc_lastore: case opc_lstore: case opc_dstore:
case opc_fastore: case opc_dastore: case opc_aastore: locals[instr.localSlot].setValue(stack[stacktop -= 2]);
break;
case opc_lastore: case opc_dastore:
stacktop--;
/* fall through */
case opc_iastore: case opc_fastore: case opc_aastore:
case opc_bastore: case opc_castore: case opc_sastore: { case opc_bastore: case opc_castore: case opc_sastore: {
Value value = stack[--stacktop]; Value value = stack[--stacktop];
int index = stack[--stacktop].intValue(); int index = stack[--stacktop].intValue();
@ -359,34 +373,34 @@ public class Interpreter implements Opcodes {
break; break;
case opc_lshl: case opc_lshl:
stack[stacktop-2].setLong(stack[stacktop-2].longValue() stack[stacktop-3].setLong(stack[stacktop-3].longValue()
<< stack[stacktop-1].longValue()); << stack[stacktop-1].intValue());
stacktop--; stacktop--;
break; break;
case opc_lshr: case opc_lshr:
stack[stacktop-2].setLong(stack[stacktop-2].longValue() stack[stacktop-3].setLong(stack[stacktop-3].longValue()
>> stack[stacktop-1].longValue()); >> stack[stacktop-1].intValue());
stacktop--; stacktop--;
break; break;
case opc_lushr: case opc_lushr:
stack[stacktop-2].setLong(stack[stacktop-2].longValue() stack[stacktop-3].setLong(stack[stacktop-3].longValue()
>>> stack[stacktop-1].longValue()); >>> stack[stacktop-1].intValue());
stacktop--; stacktop--;
break; break;
case opc_land: case opc_land:
stacktop-=2;
stack[stacktop-2].setLong(stack[stacktop-2].longValue() stack[stacktop-2].setLong(stack[stacktop-2].longValue()
& stack[stacktop-1].longValue()); & stack[stacktop].longValue());
stacktop--;
break; break;
case opc_lor : case opc_lor :
stacktop-=2;
stack[stacktop-2].setLong(stack[stacktop-2].longValue() stack[stacktop-2].setLong(stack[stacktop-2].longValue()
| stack[stacktop-1].longValue()); | stack[stacktop].longValue());
stacktop--;
break; break;
case opc_lxor: case opc_lxor:
stacktop-=2;
stack[stacktop-2].setLong(stack[stacktop-2].longValue() stack[stacktop-2].setLong(stack[stacktop-2].longValue()
^ stack[stacktop-1].longValue()); ^ stack[stacktop].longValue());
stacktop--;
break; break;
case opc_iinc: case opc_iinc:
@ -396,6 +410,7 @@ public class Interpreter implements Opcodes {
case opc_i2l: case opc_i2l:
stack[stacktop-1] stack[stacktop-1]
.setLong((long)stack[stacktop-1].intValue()); .setLong((long)stack[stacktop-1].intValue());
stacktop++;
break; break;
case opc_i2f: case opc_i2f:
stack[stacktop-1] stack[stacktop-1]
@ -404,19 +419,22 @@ public class Interpreter implements Opcodes {
case opc_i2d: case opc_i2d:
stack[stacktop-1] stack[stacktop-1]
.setDouble((double)stack[stacktop-1].intValue()); .setDouble((double)stack[stacktop-1].intValue());
stacktop++;
break; break;
case opc_l2i: case opc_l2i:
stacktop--;
stack[stacktop-1] stack[stacktop-1]
.setInt((int)stack[stacktop-1].longValue()); .setInt((int)stack[stacktop-1].longValue());
break; break;
case opc_l2f: case opc_l2f:
stacktop--;
stack[stacktop-1] stack[stacktop-1]
.setFloat((float)stack[stacktop-1].longValue()); .setFloat((float)stack[stacktop-1].longValue());
break; break;
case opc_l2d: case opc_l2d:
stack[stacktop-1] stack[stacktop-2]
.setDouble((double)stack[stacktop-1].longValue()); .setDouble((double)stack[stacktop-2].longValue());
break; break;
case opc_f2i: case opc_f2i:
@ -426,21 +444,25 @@ public class Interpreter implements Opcodes {
case opc_f2l: case opc_f2l:
stack[stacktop-1] stack[stacktop-1]
.setLong((long)stack[stacktop-1].floatValue()); .setLong((long)stack[stacktop-1].floatValue());
stacktop++;
break; break;
case opc_f2d: case opc_f2d:
stack[stacktop-1] stack[stacktop-1]
.setDouble((double)stack[stacktop-1].floatValue()); .setDouble((double)stack[stacktop-1].floatValue());
stacktop++;
break; break;
case opc_d2i: case opc_d2i:
stacktop--;
stack[stacktop-1] stack[stacktop-1]
.setInt((int)stack[stacktop-1].doubleValue()); .setInt((int)stack[stacktop-1].doubleValue());
break; break;
case opc_d2l: case opc_d2l:
stack[stacktop-1] stack[stacktop-2]
.setLong((long)stack[stacktop-1].doubleValue()); .setLong((long)stack[stacktop-2].doubleValue());
break; break;
case opc_d2f: case opc_d2f:
stacktop--;
stack[stacktop-1] stack[stacktop-1]
.setFloat((float)stack[stacktop-1].doubleValue()); .setFloat((float)stack[stacktop-1].doubleValue());
break; break;
@ -458,8 +480,9 @@ public class Interpreter implements Opcodes {
.setInt((short)stack[stacktop-1].intValue()); .setInt((short)stack[stacktop-1].intValue());
break; break;
case opc_lcmp: { case opc_lcmp: {
long val1 = stack[stacktop-2].longValue(); stacktop -= 3;
long val2 = stack[--stacktop].longValue(); long val1 = stack[stacktop-1].longValue();
long val2 = stack[stacktop+1].longValue();
stack[stacktop-1].setInt stack[stacktop-1].setInt
(val1 == val2 ? 0 : val1 < val2 ? -1 : 1); (val1 == val2 ? 0 : val1 < val2 ? -1 : 1);
break; break;
@ -475,8 +498,9 @@ public class Interpreter implements Opcodes {
break; break;
} }
case opc_dcmpl: case opc_dcmpg: { case opc_dcmpl: case opc_dcmpg: {
double val1 = stack[stacktop-2].doubleValue(); stacktop -= 3;
double val2 = stack[--stacktop].doubleValue(); double val1 = stack[stacktop-1].doubleValue();
double val2 = stack[stacktop+1].doubleValue();
stack[stacktop-1].setInt stack[stacktop-1].setInt
(val1 == val2 ? 0 (val1 == val2 ? 0
: ( opcode == opc_dcmpg : ( opcode == opc_dcmpg
@ -552,31 +576,41 @@ public class Interpreter implements Opcodes {
} }
break; break;
} }
case opc_ireturn: case opc_lreturn: case opc_ireturn: case opc_freturn: case opc_areturn:
case opc_freturn: case opc_dreturn: case opc_areturn:
return stack[--stacktop].objectValue(); return stack[--stacktop].objectValue();
case opc_lreturn: case opc_dreturn:
return stack[stacktop -= 2].objectValue();
case opc_return: case opc_return:
return Void.TYPE; return Void.TYPE;
case opc_getstatic: case opc_getstatic: {
stack[stacktop++].setObject Reference ref = (Reference) instr.objData;
stack[stacktop].setObject
(env.getField((Reference) instr.objData, null)); (env.getField((Reference) instr.objData, null));
stacktop += Type.tType(ref.getType()).stackSize();
break; break;
}
case opc_getfield: { case opc_getfield: {
Reference ref = (Reference) instr.objData;
Object cls = stack[--stacktop]; Object cls = stack[--stacktop];
if (cls == null) if (cls == null)
throw new InvocationTargetException throw new InvocationTargetException
(new NullPointerException()); (new NullPointerException());
stack[stacktop++].setObject stack[stacktop].setObject
(env.getField((Reference) instr.objData, cls)); (env.getField((Reference) instr.objData, cls));
stacktop += Type.tType(ref.getType()).stackSize();
break; break;
} }
case opc_putstatic: { case opc_putstatic: {
Object value = stack[--stacktop]; Reference ref = (Reference) instr.objData;
stacktop -= Type.tType(ref.getType()).stackSize();
Object value = stack[stacktop];
env.putField((Reference) instr.objData, null, value); env.putField((Reference) instr.objData, null, value);
break; break;
} }
case opc_putfield: { case opc_putfield: {
Object value = stack[--stacktop]; Reference ref = (Reference) instr.objData;
stacktop -= Type.tType(ref.getType()).stackSize();
Object value = stack[stacktop];
Object cls = stack[--stacktop]; Object cls = stack[--stacktop];
if (cls == null) if (cls == null)
throw new InvocationTargetException throw new InvocationTargetException
@ -706,7 +740,7 @@ public class Interpreter implements Opcodes {
int dimension = instr.intData; int dimension = instr.intData;
int[] dims = new int[dimension]; int[] dims = new int[dimension];
for (int i=dimension - 1; i >= 0; i--) for (int i=dimension - 1; i >= 0; i--)
dims[i-1] = stack[--stacktop].intValue(); dims[i] = stack[--stacktop].intValue();
try { try {
stack[stacktop++].setObject stack[stacktop++].setObject
(env.newArray((String) instr.objData, dims)); (env.newArray((String) instr.objData, dims));

Write Preview
Loading…
Cancel
Save