jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

refactor: rename method collectArgsWithoutLoading into collectArgNodes in MethodNode (#2142)

Browse Source
This commit is contained in:
Skylot
2024-04-07 23:09:02 +01:00
parent 0f52077c5c
commit dbadbb01fc
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
+1 -1
View File
@@ -253,7 +253,7 @@ public class MethodNode extends NotificationAttrNode implements IMethodDetails,
return mthInfo.getReturnType().equals(ArgType.VOID);
}
public List<VarNode> collectArgsWithoutLoading() {
public List<VarNode> collectArgNodes() {
ICodeInfo codeInfo = getTopParentClass().getCode();
int mthDefPos = getDefPosition();
int lineEndPos = CodeUtils.getLineEndForPos(codeInfo.getCodeStr(), mthDefPos);
jadx-gui/src/main/java/jadx/gui/ui/codearea/FridaAction.java
+1 -1
View File
@@ -85,7 +85,7 @@ public final class FridaAction extends JNodeAction {
} else {
overload = "";
}
List<String> argNames = mth.collectArgsWithoutLoading().stream()
List<String> argNames = mth.collectArgNodes().stream()
.map(VarNode::getName).collect(Collectors.toList());
String args = String.join(", ", argNames);
String logArgs;
jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/save/MappingExporter.java
+1 -1
View File
@@ -213,7 +213,7 @@ public class MappingExporter {
}
// Method args
int lvtIndex = mth.getAccessFlags().isStatic() ? 0 : 1;
List<VarNode> args = mth.collectArgsWithoutLoading();
List<VarNode> args = mth.collectArgNodes();
for (VarNode arg : args) {
Integer lvIndex = DalvikToJavaBytecodeUtils.getMethodArgLvIndex(arg);
if (lvIndex == null) {
jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/utils/DalvikToJavaBytecodeUtils.java
+3 -3
View File
@@ -22,7 +22,7 @@ public class DalvikToJavaBytecodeUtils {
if (lvIndex != null) {
return lvIndex;
}
List<VarNode> args = mth.collectArgsWithoutLoading();
List<VarNode> args = mth.collectArgNodes();
for (VarNode arg : args) {
lvIndex = arg.getReg() - args.get(0).getReg() + (mth.getAccessFlags().isStatic() ? 0 : 1);
if (arg.equals(methodArg)) {
@@ -53,7 +53,7 @@ public class DalvikToJavaBytecodeUtils {
return lvIndex;
}
Integer lastArgLvIndex = mth.getAccessFlags().isStatic() ? -1 : 0;
List<VarNode> args = mth.collectArgsWithoutLoading();
List<VarNode> args = mth.collectArgNodes();
if (!args.isEmpty()) {
lastArgLvIndex = getMethodArgLvIndex(args.get(args.size() - 1));
}
@@ -86,7 +86,7 @@ public class DalvikToJavaBytecodeUtils {
public static Integer getMethodArgLvtIndex(VarNode methodArg) {
MethodNode mth = methodArg.getMth();
int lvtIndex = mth.getAccessFlags().isStatic() ? 0 : 1;
List<VarNode> args = mth.collectArgsWithoutLoading();
List<VarNode> args = mth.collectArgNodes();
for (VarNode arg : args) {
if (arg.equals(methodArg)) {
return lvtIndex;
jadx-plugins/jadx-script/examples/scripts/gui/custom_frida.jadx.kts
+1 -1
View File
@@ -60,7 +60,7 @@ fun generateMethodSnippet(mthNode: MethodNode): String {
""
}
val shortClassName = mthNode.parentClass.name
val argNames = mthNode.collectArgsWithoutLoading().map { a -> a.name }
val argNames = mthNode.collectArgNodes().map { a -> a.name }
val args = argNames.joinToString(separator = ", ")
val logArgs = if (argNames.isNotEmpty()) {
argNames.joinToString(separator = " + ', ' + ", prefix = " + ', ' + ") { p -> "'$p: ' + $p" }