tType instead of tClassOrArray

remove opc_a?newarray


git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@575 379699f6-c40d-0410-875b-85095c16579e
stable
jochen 26 years ago
parent 66ae46e04f
commit 4c0325ed22
  1. 30
      jode/jode/decompiler/Opcodes.java

@ -319,34 +319,10 @@ public abstract class Opcodes implements jode.bytecode.Opcodes {
return block; return block;
} }
case opc_new: { case opc_new: {
Type type = Type.tClassOrArray((String) instr.objData); Type type = Type.tType((String) instr.objData);
type.useType(); type.useType();
return createNormal(ca, instr, new NewOperator(type)); return createNormal(ca, instr, new NewOperator(type));
} }
case opc_newarray: {
Type type;
switch (instr.intData) {
case 4: type = Type.tBoolean; break;
case 5: type = Type.tChar ; break;
case 6: type = Type.tFloat ; break;
case 7: type = Type.tDouble ; break;
case 8: type = Type.tByte ; break;
case 9: type = Type.tShort ; break;
case 10: type = Type.tInt ; break;
case 11: type = Type.tLong ; break;
default:
throw new ClassFormatError("Invalid newarray operand");
}
type.useType();
return createNormal
(ca, instr, new NewArrayOperator(Type.tArray(type), 1));
}
case opc_anewarray: {
Type type = Type.tClassOrArray((String) instr.objData);
type.useType();
return createNormal
(ca, instr, new NewArrayOperator(Type.tArray(type), 1));
}
case opc_arraylength: case opc_arraylength:
return createNormal return createNormal
(ca, instr, new ArrayLengthOperator()); (ca, instr, new ArrayLengthOperator());
@ -355,13 +331,13 @@ public abstract class Opcodes implements jode.bytecode.Opcodes {
(ca, instr, (ca, instr,
new ThrowBlock(new NopOperator(Type.tUObject))); new ThrowBlock(new NopOperator(Type.tUObject)));
case opc_checkcast: { case opc_checkcast: {
Type type = Type.tClassOrArray((String) instr.objData); Type type = Type.tType((String) instr.objData);
type.useType(); type.useType();
return createNormal return createNormal
(ca, instr, new CheckCastOperator(type)); (ca, instr, new CheckCastOperator(type));
} }
case opc_instanceof: { case opc_instanceof: {
Type type = Type.tClassOrArray((String) instr.objData); Type type = Type.tType((String) instr.objData);
type.useType(); type.useType();
return createNormal return createNormal
(ca, instr, new InstanceOfOperator(type)); (ca, instr, new InstanceOfOperator(type));

Loading…
Cancel
Save