diff --git a/README.md b/README.md index 846bcf0..5a7cfd9 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ This is a work-in-progress feature as of now. It requires parsing the decompiled The decompiler panel can be accessed by clicking `GhidRust -> Open decompiler`. It looks as follows. -![](./media/return_0.png) +![](./media/decomp_muladd.png) ## Building diff --git a/media/decomp_muladd.png b/media/decomp_muladd.png new file mode 100644 index 0000000..e657f68 Binary files /dev/null and b/media/decomp_muladd.png differ diff --git a/media/return_0.png b/media/return_0.png deleted file mode 100644 index 63bfcb7..0000000 Binary files a/media/return_0.png and /dev/null differ diff --git a/src/main/java/ghidrust/decompiler/RustDecProvider.java b/src/main/java/ghidrust/decompiler/RustDecProvider.java index 7cf772c..5f00e22 100644 --- a/src/main/java/ghidrust/decompiler/RustDecProvider.java +++ b/src/main/java/ghidrust/decompiler/RustDecProvider.java @@ -24,7 +24,7 @@ import java.awt.event.ActionEvent; import docking.ComponentProvider; import ghidra.util.task.ConsoleTaskMonitor; import resources.ResourceManager; - +import ghidrust.decompiler.parser.c.CFormatter; import ghidrust.decompiler.parser.c.gen.CParser; public class RustDecProvider extends ComponentProvider { @@ -136,7 +136,7 @@ public class RustDecProvider extends ComponentProvider { String rust_code = ""; try { - rust_code = CParser.transpile(decompiled); + rust_code = CFormatter.format(CParser.transpile(decompiled)); } catch (Exception e) { rust_code = "/* [!] Failed to transpile " + func.getName() + " */\n" + decompiled; }