oysteikt/GhidRust
0
0
Fork 0
mirror of https://github.com/DMaroo/GhidRust.git synced 2025-09-10 04:53:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add decompilation support for function arguments

Browse Source
This commit is contained in:
Dhruv Maroo
2023-04-22 07:19:28 +05:30
parent c24ddf0a79
commit a206ec28f3
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ghidrust/decompiler/parser/Run.java
View File

@@ -4,6 +4,6 @@ import ghidrust.decompiler.parser.c.gen.CParser;
public class Run { public class Run {
public static void main(String[] args) { public static void main(String[] args) {
System.out.println(CParser.transpile("/* hello::return_0 */\n\n undefined8 hello::return_0(void)\n\n {\n return 0;\n }")); System.out.println(CParser.transpile("int main(int a, int b) { return 0; }"));
} }
} }

21
src/main/java/ghidrust/decompiler/parser/c/CVisitor.java
View File

@@ -49,7 +49,7 @@ public class CVisitor implements CParserVisitor {
String ret = (String) child.jjtAccept(this, data); String ret = (String) child.jjtAccept(this, data);
if (ret != null) { if (ret != null) {
sb.append(ret); sb.append(ret);
if (!ret.equals("")) { if (!ret.equals("") && i != child_count - 1) {
sb.append(" "); sb.append(" ");
} }
} }
@@ -141,7 +141,7 @@ public class CVisitor implements CParserVisitor {
String[] ret = new String[2]; String[] ret = new String[2];
ret[0] = (String) node.jjtGetChild(0).jjtAccept(this, data); ret[0] = (String) node.jjtGetChild(0).jjtAccept(this, data);
if (node.jjtGetNumChildren() == 1) { if (node.jjtGetNumChildren() == 1) {
ret[1] = "0"; ret[1] = null;
} else { } else {
ret[1] = (String) node.jjtGetChild(1).jjtAccept(this, data); ret[1] = (String) node.jjtGetChild(1).jjtAccept(this, data);
} }
@@ -195,12 +195,23 @@ public class CVisitor implements CParserVisitor {
} }
public Object visit(ASTParameterList node, Object data) { public Object visit(ASTParameterList node, Object data) {
return defaultVisit(node, data); StringBuilder sb = new StringBuilder("");
for (int i = 0; i < node.jjtGetNumChildren(); i++) {
if (i != 0) {
sb.append(", ");
}
sb.append(node.jjtGetChild(i).jjtAccept(this, data));
}
return sb.toString();
} }
public Object visit(ASTParameterDeclaration node, Object data) { public Object visit(ASTParameterDeclaration node, Object data) {
StringBuilder param = new StringBuilder((String) defaultSpacedVisit(node, data)); StringBuilder sb = new StringBuilder("");
return param.toString(); sb.append(node.jjtGetChild(1).jjtAccept(this, data));
sb.append(": ");
sb.append(node.jjtGetChild(0).jjtAccept(this, data));
return sb.toString();
} }
public Object visit(ASTIdentifierList node, Object data) { public Object visit(ASTIdentifierList node, Object data) {