Changeset 15283

Timestamp:

05/16/20 06:29:32 (3 years ago)

Author:

Mark Evenson

Message:

abcl-introspect: fernflower decompiler working
Adapted from (Alan Ruttenberg)

Location:

trunk/abcl/contrib/abcl-introspect

Files:

• fernflower.asd (modified) (1 diff)
• fernflower.lisp (modified) (1 diff)

trunk/abcl/contrib/abcl-introspect/fernflower.asd

@@ -1 +1 @@
 (defsystem fernflower
+  :depends-on (alexandria abcl-introspect)
   :homepage "https://github.com/fesh0r/fernflower"
-  :version "2.5.0"
+  :version "1.0.0.20271018"
   :description "An analytical decompiler for Java" :components
   ((:module mvn-libs :components
-            ((:mvn "org.jboss.windup.decompiler.fernflower/fernflower/2.5.0.Final")))
+      ((:mvn "org.jboss.windup.decompiler.fernflower/windup-fernflower/1.0.0.20171018")))
    (:module source
     :depends-on (mvn-libs)

trunk/abcl/contrib/abcl-introspect/fernflower.lisp

@@ -11 +11 @@
 
 (defun disassemble-class-bytes (object)
-  (let ((sys::*disassembler*
-          ;; FIXME: use same java that is hosting ABCL
-          ;; !!! unclear options; wants to write output to filesystem
-          (format nil "java -cp ~a org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler"
-                  (fernflower-classpath))))
-    (sys:disassemble-class-bytes object)))
+  (uiop/stream::with-temporary-file (:pathname p :type "class")
+    (ext::write-class object p)
+    (let* ((directory
+             (namestring (truename (make-pathname :directory (pathname-directory p)))))
+     (path
+             (namestring (truename p)))
+           (command 
+       (format nil "java -cp ~a org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler ~a ~a"
+                     (fernflower-classpath) p directory))
+           (output
+             (namestring (make-pathname :defaults p :type "java"))))
+      (uiop:run-program command)
+      (let ((result (alexandria:read-file-into-string output)))
+        (sys::print-lines-with-prefix result)))))
 
 (eval-when (:load-toplevel :execute)
   (pushnew `(:fernflower . abcl-introspect/jvm/tools/fernflower::disassemble-class-bytes)
            sys::*disassemblers*)
-  (format cl:*load-verbose* "~&; ~a: Successfully added fernflower disassembler.~%" *package*))
+  (format cl:*load-verbose* "~&; ~a: Successfully added fernflower decompiler.~%" *package*))