ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-20 07:57:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix DebugItems in the new builder stuff

Browse Source
This commit is contained in:
Ben Gruver 2013-09-21 14:33:46 -07:00
parent edd961477e
commit 84be16bf51
10 changed files with 24 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderDebugItem.java
View File

@ -33,14 +33,12 @@ package org.jf.dexlib2.builder;
import org.jf.dexlib2.iface.debug.DebugItem; import org.jf.dexlib2.iface.debug.DebugItem;
import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public abstract class BuilderDebugItem implements DebugItem { public abstract class BuilderDebugItem implements DebugItem {
@Nullable MethodLocation location; @Nullable MethodLocation location;
public BuilderDebugItem(@Nonnull MethodLocation location) { public BuilderDebugItem() {
this.location = location;
} }
@Override public int getCodeAddress() { @Override public int getCodeAddress() {

14
dexlib2/src/main/java/org/jf/dexlib2/builder/MethodLocation.java
View File

@ -183,31 +183,31 @@ public class MethodLocation {
} }
public void addLineNumber(int lineNumber) { public void addLineNumber(int lineNumber) {
debugItems.add(new BuilderLineNumber(this, lineNumber)); getDebugItems().add(new BuilderLineNumber(lineNumber));
} }
public void addStartLocal(int registerNumber, @Nullable StringReference name, @Nullable TypeReference type, public void addStartLocal(int registerNumber, @Nullable StringReference name, @Nullable TypeReference type,
@Nullable StringReference signature) { @Nullable StringReference signature) {
debugItems.add(new BuilderStartLocal(this, registerNumber, name, type, signature)); getDebugItems().add(new BuilderStartLocal(registerNumber, name, type, signature));
} }
public void addEndLocal(int registerNumber) { public void addEndLocal(int registerNumber) {
debugItems.add(new BuilderEndLocal(this, registerNumber)); getDebugItems().add(new BuilderEndLocal(registerNumber));
} }
public void addRestartLocal(int registerNumber) { public void addRestartLocal(int registerNumber) {
debugItems.add(new BuilderRestartLocal(this, registerNumber)); getDebugItems().add(new BuilderRestartLocal(registerNumber));
} }
public void addPrologue() { public void addPrologue() {
debugItems.add(new BuilderPrologueEnd(this)); getDebugItems().add(new BuilderPrologueEnd());
} }
public void addEpilogue() { public void addEpilogue() {
debugItems.add(new BuilderEpilogueBegin(this)); getDebugItems().add(new BuilderEpilogueBegin());
} }
public void addSetSourceFile(@Nullable BuilderStringReference sourceFile) { public void addSetSourceFile(@Nullable BuilderStringReference sourceFile) {
debugItems.add(new BuilderSetSourceFile(this, sourceFile)); getDebugItems().add(new BuilderSetSourceFile(sourceFile));
} }
} }

18
dexlib2/src/main/java/org/jf/dexlib2/builder/MutableMethodImplementation.java
View File

@ -106,7 +106,7 @@ public class MutableMethodImplementation implements MethodImplementation {
int debugCodeAddress = debugItem.getCodeAddress(); int debugCodeAddress = debugItem.getCodeAddress();
int locationIndex = mapCodeAddressToIndex(codeAddressToIndex, debugCodeAddress); int locationIndex = mapCodeAddressToIndex(codeAddressToIndex, debugCodeAddress);
MethodLocation debugLocation = instructionList.get(locationIndex); MethodLocation debugLocation = instructionList.get(locationIndex);
BuilderDebugItem builderDebugItem = convertDebugItem(debugLocation, debugItem); BuilderDebugItem builderDebugItem = convertDebugItem(debugItem);
debugLocation.getDebugItems().add(builderDebugItem); debugLocation.getDebugItems().add(builderDebugItem);
builderDebugItem.location = debugLocation; builderDebugItem.location = debugLocation;
} }
@ -909,32 +909,32 @@ public class MutableMethodImplementation implements MethodImplementation {
} }
@Nonnull @Nonnull
private BuilderDebugItem convertDebugItem(@Nonnull MethodLocation location, @Nonnull DebugItem debugItem) { private BuilderDebugItem convertDebugItem(@Nonnull DebugItem debugItem) {
switch (debugItem.getDebugItemType()) { switch (debugItem.getDebugItemType()) {
case DebugItemType.START_LOCAL: { case DebugItemType.START_LOCAL: {
StartLocal startLocal = (StartLocal)debugItem; StartLocal startLocal = (StartLocal)debugItem;
return new BuilderStartLocal(location, startLocal.getRegister(), startLocal.getNameReference(), return new BuilderStartLocal(startLocal.getRegister(), startLocal.getNameReference(),
startLocal.getTypeReference(), startLocal.getSignatureReference()); startLocal.getTypeReference(), startLocal.getSignatureReference());
} }
case DebugItemType.END_LOCAL: { case DebugItemType.END_LOCAL: {
EndLocal endLocal = (EndLocal)debugItem; EndLocal endLocal = (EndLocal)debugItem;
return new BuilderEndLocal(location, endLocal.getRegister()); return new BuilderEndLocal(endLocal.getRegister());
} }
case DebugItemType.RESTART_LOCAL: { case DebugItemType.RESTART_LOCAL: {
RestartLocal restartLocal = (RestartLocal)debugItem; RestartLocal restartLocal = (RestartLocal)debugItem;
return new BuilderRestartLocal(location, restartLocal.getRegister()); return new BuilderRestartLocal(restartLocal.getRegister());
} }
case DebugItemType.PROLOGUE_END: case DebugItemType.PROLOGUE_END:
return new BuilderPrologueEnd(location); return new BuilderPrologueEnd();
case DebugItemType.EPILOGUE_BEGIN: case DebugItemType.EPILOGUE_BEGIN:
return new BuilderEpilogueBegin(location); return new BuilderEpilogueBegin();
case DebugItemType.LINE_NUMBER: { case DebugItemType.LINE_NUMBER: {
LineNumber lineNumber = (LineNumber)debugItem; LineNumber lineNumber = (LineNumber)debugItem;
return new BuilderLineNumber(location, lineNumber.getLineNumber()); return new BuilderLineNumber(lineNumber.getLineNumber());
} }
case DebugItemType.SET_SOURCE_FILE: { case DebugItemType.SET_SOURCE_FILE: {
SetSourceFile setSourceFile = (SetSourceFile)debugItem; SetSourceFile setSourceFile = (SetSourceFile)debugItem;
return new BuilderSetSourceFile(location, setSourceFile.getSourceFileReference()); return new BuilderSetSourceFile(setSourceFile.getSourceFileReference());
} }
default: default:
throw new ExceptionWithContext("Invalid debug item type: " + debugItem.getDebugItemType()); throw new ExceptionWithContext("Invalid debug item type: " + debugItem.getDebugItemType());

6
dexlib2/src/main/java/org/jf/dexlib2/builder/debug/BuilderEndLocal.java
View File

@ -33,18 +33,14 @@ package org.jf.dexlib2.builder.debug;
import org.jf.dexlib2.DebugItemType; import org.jf.dexlib2.DebugItemType;
import org.jf.dexlib2.builder.BuilderDebugItem; import org.jf.dexlib2.builder.BuilderDebugItem;
import org.jf.dexlib2.builder.MethodLocation;
import org.jf.dexlib2.iface.debug.EndLocal; import org.jf.dexlib2.iface.debug.EndLocal;
import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class BuilderEndLocal extends BuilderDebugItem implements EndLocal { public class BuilderEndLocal extends BuilderDebugItem implements EndLocal {
private final int register; private final int register;
public BuilderEndLocal(@Nonnull MethodLocation location, public BuilderEndLocal(int register) {
int register) {
super(location);
this.register = register; this.register = register;
} }

6
dexlib2/src/main/java/org/jf/dexlib2/builder/debug/BuilderEpilogueBegin.java
View File

@ -33,14 +33,10 @@ package org.jf.dexlib2.builder.debug;
import org.jf.dexlib2.DebugItemType; import org.jf.dexlib2.DebugItemType;
import org.jf.dexlib2.builder.BuilderDebugItem; import org.jf.dexlib2.builder.BuilderDebugItem;
import org.jf.dexlib2.builder.MethodLocation;
import org.jf.dexlib2.iface.debug.EpilogueBegin; import org.jf.dexlib2.iface.debug.EpilogueBegin;
import javax.annotation.Nonnull;
public class BuilderEpilogueBegin extends BuilderDebugItem implements EpilogueBegin { public class BuilderEpilogueBegin extends BuilderDebugItem implements EpilogueBegin {
public BuilderEpilogueBegin(@Nonnull MethodLocation location) { public BuilderEpilogueBegin() {
super(location);
} }
@Override public int getDebugItemType() { return DebugItemType.EPILOGUE_BEGIN; } @Override public int getDebugItemType() { return DebugItemType.EPILOGUE_BEGIN; }

7
dexlib2/src/main/java/org/jf/dexlib2/builder/debug/BuilderLineNumber.java
View File

@ -33,17 +33,12 @@ package org.jf.dexlib2.builder.debug;
import org.jf.dexlib2.DebugItemType; import org.jf.dexlib2.DebugItemType;
import org.jf.dexlib2.builder.BuilderDebugItem; import org.jf.dexlib2.builder.BuilderDebugItem;
import org.jf.dexlib2.builder.MethodLocation;
import org.jf.dexlib2.iface.debug.LineNumber; import org.jf.dexlib2.iface.debug.LineNumber;
import javax.annotation.Nonnull;
public class BuilderLineNumber extends BuilderDebugItem implements LineNumber { public class BuilderLineNumber extends BuilderDebugItem implements LineNumber {
private final int lineNumber; private final int lineNumber;
public BuilderLineNumber(@Nonnull MethodLocation location, public BuilderLineNumber(int lineNumber) {
int lineNumber) {
super(location);
this.lineNumber = lineNumber; this.lineNumber = lineNumber;
} }

6
dexlib2/src/main/java/org/jf/dexlib2/builder/debug/BuilderPrologueEnd.java
View File

@ -33,14 +33,10 @@ package org.jf.dexlib2.builder.debug;
import org.jf.dexlib2.DebugItemType; import org.jf.dexlib2.DebugItemType;
import org.jf.dexlib2.builder.BuilderDebugItem; import org.jf.dexlib2.builder.BuilderDebugItem;
import org.jf.dexlib2.builder.MethodLocation;
import org.jf.dexlib2.iface.debug.PrologueEnd; import org.jf.dexlib2.iface.debug.PrologueEnd;
import javax.annotation.Nonnull;
public class BuilderPrologueEnd extends BuilderDebugItem implements PrologueEnd { public class BuilderPrologueEnd extends BuilderDebugItem implements PrologueEnd {
public BuilderPrologueEnd(@Nonnull MethodLocation location) { public BuilderPrologueEnd() {
super(location);
} }
@Override public int getDebugItemType() { return DebugItemType.PROLOGUE_END; } @Override public int getDebugItemType() { return DebugItemType.PROLOGUE_END; }

6
dexlib2/src/main/java/org/jf/dexlib2/builder/debug/BuilderRestartLocal.java
View File

@ -33,18 +33,14 @@ package org.jf.dexlib2.builder.debug;
import org.jf.dexlib2.DebugItemType; import org.jf.dexlib2.DebugItemType;
import org.jf.dexlib2.builder.BuilderDebugItem; import org.jf.dexlib2.builder.BuilderDebugItem;
import org.jf.dexlib2.builder.MethodLocation;
import org.jf.dexlib2.iface.debug.RestartLocal; import org.jf.dexlib2.iface.debug.RestartLocal;
import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class BuilderRestartLocal extends BuilderDebugItem implements RestartLocal { public class BuilderRestartLocal extends BuilderDebugItem implements RestartLocal {
private final int register; private final int register;
public BuilderRestartLocal(@Nonnull MethodLocation location, public BuilderRestartLocal(int register) {
int register) {
super(location);
this.register = register; this.register = register;
} }

6
dexlib2/src/main/java/org/jf/dexlib2/builder/debug/BuilderSetSourceFile.java
View File

@ -33,20 +33,16 @@ package org.jf.dexlib2.builder.debug;
import org.jf.dexlib2.DebugItemType; import org.jf.dexlib2.DebugItemType;
import org.jf.dexlib2.builder.BuilderDebugItem; import org.jf.dexlib2.builder.BuilderDebugItem;
import org.jf.dexlib2.builder.MethodLocation;
import org.jf.dexlib2.iface.debug.SetSourceFile; import org.jf.dexlib2.iface.debug.SetSourceFile;
import org.jf.dexlib2.iface.reference.StringReference; import org.jf.dexlib2.iface.reference.StringReference;
import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class BuilderSetSourceFile extends BuilderDebugItem implements SetSourceFile { public class BuilderSetSourceFile extends BuilderDebugItem implements SetSourceFile {
@Nullable @Nullable
private final StringReference sourceFile; private final StringReference sourceFile;
public BuilderSetSourceFile(@Nonnull MethodLocation location, public BuilderSetSourceFile(@Nullable StringReference sourceFile) {
@Nullable StringReference sourceFile) {
super(location);
this.sourceFile = sourceFile; this.sourceFile = sourceFile;
} }

6
dexlib2/src/main/java/org/jf/dexlib2/builder/debug/BuilderStartLocal.java
View File

@ -33,12 +33,10 @@ package org.jf.dexlib2.builder.debug;
import org.jf.dexlib2.DebugItemType; import org.jf.dexlib2.DebugItemType;
import org.jf.dexlib2.builder.BuilderDebugItem; import org.jf.dexlib2.builder.BuilderDebugItem;
import org.jf.dexlib2.builder.MethodLocation;
import org.jf.dexlib2.iface.debug.StartLocal; import org.jf.dexlib2.iface.debug.StartLocal;
import org.jf.dexlib2.iface.reference.StringReference; import org.jf.dexlib2.iface.reference.StringReference;
import org.jf.dexlib2.iface.reference.TypeReference; import org.jf.dexlib2.iface.reference.TypeReference;
import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class BuilderStartLocal extends BuilderDebugItem implements StartLocal { public class BuilderStartLocal extends BuilderDebugItem implements StartLocal {
@ -47,12 +45,10 @@ public class BuilderStartLocal extends BuilderDebugItem implements StartLocal {
@Nullable private final TypeReference type; @Nullable private final TypeReference type;
@Nullable private final StringReference signature; @Nullable private final StringReference signature;
public BuilderStartLocal(@Nonnull MethodLocation location, public BuilderStartLocal(int register,
int register,
@Nullable StringReference name, @Nullable StringReference name,
@Nullable TypeReference type, @Nullable TypeReference type,
@Nullable StringReference signature) { @Nullable StringReference signature) {
super(location);
this.register = register; this.register = register;
this.name = name; this.name = name;
this.type = type; this.type = type;