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

Some fixes.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1290 379699f6-c40d-0410-875b-85095c16579e
master
hoenicke 24 years ago
parent 31b99cc4f0
commit 03a84b8f4f
1 changed files with 3 additions and 3 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. 6
      jode/jode/obfuscator/modules/ConstantAnalyzer.java

6
jode/jode/obfuscator/modules/ConstantAnalyzer.java
Unescape View File

@ -1451,7 +1451,7 @@ public class ConstantAnalyzer implements Opcodes, CodeAnalyzer {
ConstValue stacktop = info.getStack(size); ConstValue stacktop = info.getStack(size);
Object fieldVal = fi.getConstant(); Object fieldVal = fi.getConstant();
if (fieldVal == null) if (fieldVal == null)
fieldVal = runtime.getDefaultValue(ref.getType()); fieldVal = TypeSignature.getDefaultValue(ref.getType());
if (stacktop.value == null ? fieldVal == null if (stacktop.value == null ? fieldVal == null
: stacktop.value.equals(fieldVal)) { : stacktop.value.equals(fieldVal)) {
stacktop.addConstantListener(new ConstantListener() { stacktop.addConstantListener(new ConstantListener() {
@ -1654,7 +1654,7 @@ public class ConstantAnalyzer implements Opcodes, CodeAnalyzer {
Instruction replacement) { Instruction replacement) {
switch(instr.getOpcode()) { switch(instr.getOpcode()) {
case opc_jsr: case opc_jsr:
newCode.add(new ConstantInstruction(opc_ldc, null)); newCode.add(Instruction.forOpcode(opc_ldc, (Object) null));
break; break;
case opc_ldc: case opc_ldc:
case opc_ldc2_w: case opc_ldc2_w:
@ -1792,7 +1792,7 @@ public class ConstantAnalyzer implements Opcodes, CodeAnalyzer {
Instruction instr = oldCode[idx]; Instruction instr = oldCode[idx];
ConstantInfo info = (ConstantInfo) constantInfos.remove(instr); ConstantInfo info = (ConstantInfo) constantInfos.remove(instr);
if ((info.flags & CONSTANT) != 0) { if ((info.flags & CONSTANT) != 0) {
Instruction ldcInstr = new ConstantInstruction Instruction ldcInstr = Instruction.forOpcode
(info.constant instanceof Long (info.constant instanceof Long
|| info.constant instanceof Double || info.constant instanceof Double
? opc_ldc2_w : opc_ldc, info.constant); ? opc_ldc2_w : opc_ldc, info.constant);

Write Preview
Loading…
Cancel
Save