diff --git a/jode/ChangeLog b/jode/ChangeLog index dc3bf72..e135202 100644 --- a/jode/ChangeLog +++ b/jode/ChangeLog @@ -1,3 +1,104 @@ +2001-05-27 Jochen Hoenicke + + * configure.in: Set version to 1.1. + + * jode/decompiler/Main.java (main): Also use bootclasspath if no + classpath given. + * jode/swingui/Main.java (main): Likewise. + + * jode/decompiler/MethodAnalyzer.java.in (skipWriting): Don't skip + empty constructor that have a throws clause. + + * configure.in: Determine whether jdk1.1 resp. jdk1.2. Call jcpp + in config.status. + + * jode/expr/Expression.java.in (makeInitializer): Now takes the + type of the initialization. Changed all callers. + * jode/expr/ConstantArrayOperator.java (makeInitializer): Check + that type is our array type, otherwise we can't omit new Array[]. + + * jode/decompiler/LocalInfo.java (markFinal): Don't check that + only one write is present. If two writes are in an then and an + else branch of an if, the local can still be final. + + * jode/type/ArrayType.java (getSubType): Handle array of integer + types correctly: byte[] is something completely different than + int[]. + (getSuperType): Likewise. + + * jode/expr/FieldOperator.java.in (getFieldInfo): New function. + (needsCast): A cast is also needed if the field is private or + package scope and the current type can't access the field. + + * jode/expr/InvokeOperator.java.in (getMethodInfo): New function. + (needsCast): A cast is also needed if the method is private or + package scope and the current type can't access the method. + + * jode/expr/ArrayStoreOperator.java (dumpExpression): Check if a + cast of the array expression is needed. + + * jode/expr/TransformConstructors.java + (transformFieldInitializers): Don't allow moving method invocations + that throw a checked exception. + + * jode/bytecode/MethodInfo.java (readAttribute): Read Exceptions + attribute even when not all attributes should be read. They are + needed by TransformConstructors, see above. + +2001-05-26 Jochen Hoenicke + + * jode/decompiler/TabbedPrintWriter.java (saveOps): Don't allow + line breaks in not completed expressions since implicit parentheses + would destroy the syntax. No need to put line break option on stack. + (restoreOps): Adapted Stack format. + + * jode/decompiler/ClassAnalyzer.java.in (dumpDeclaration): Moved + Code from dumpSource here. Don't put a line break after closing + brace. + (dumpSource): call dumpDeclaration and add a line break. + (dumpBlock): Moved dropInfo(ATTRIBS) here. + + * jode/decompiler/ClassAnalyzer.java.in (STRICTFP): New Constant. + (isStrictFP): New function. + (initialize): Set strictfp modifier if a constructor has it set. + (dumpSource): Handle strictfp modifier. + + * jode/decompiler/MethodAnalyzer.java.in (STRICTFP): New Constant. + (isStrictFP): New function. + (dumpSource): Handle strictfp modifier. + + * jode/jvm/SyntheticAnalyzer.java.in (checkAccess): Check for a + special putfield access, where the set value is returned. Allow + the modifier of field/method to be protected and the class to be + a superclass. + (checkStaticAccess): Likewise. + (ACCESSDUPPUTFIELD): New Constant. + (ACCESSDUPPUTSTATIC): New Constant. + + * jode/expr/InvokeOperator.java.in (simplifyAccess): Handle new + synthetics. + + * jode/flow/SpecialBlock.java (removePop): Remove pop also for + non void store instructions. + + * jode/decompiler/MethodAnalyzer.java.in (skipWriting): Also skip + the new synthetics. + + * jode/decompiler/Main.java (main): Call System.exit() after + everything was compiled. + + * jode/flow/TransformExceptionHandlers.java.in (removeJSR): + Renamed back from removeBadJSR (see patch from 2001-02-04). The + checkAndRemove* functions mustn't change the successors while they + iterate over them. Instead of removing good jsr they mark them as + good and removeJSR will finally remove them. + (checkAndRemoveJSR): See above. + (checkAndRemoveMonitorExit): See above. + + * jode/flow/JsrBlock.java (good): New variable, see above. + (setGood): New method. + (isGood): New method. + 2001-05-08 Jochen Hoenicke * jode/jvm/CodeVerifier.java.in (doVerify): Don't check for @@ -10,6 +111,27 @@ * jode/obfuscator/modules/ConstantAnalyzer.java.in (handleOpcode): Added divide by zero checks for opc_irem and opc_lrem. +2001-04-11 Jochen Hoenicke + + * jode/type/ClassInterfacesType.java (keywords): Reworked keyword + list. + + * jode/decompiler/OuterValues.java (implicitOuterClass): New field. + (isImplicitOuterClass): new Method. + (setImplicitOuterClass): new Method. + + * jode/flow/TransformConstructors.java (checkAnonymousConstructor): + Check for implicitOuterClass, a new javac 1.3 construct. + + * jode/expr/FieldOperator.java.in (dumpSource): Removed this + simplification nonesense. Now Outer.this is never printed as + this. + + * jode/expr/InvokeOperator.java.in (dumpSource): Removed this + simplification nonesense. Now Outer.this is never printed as + this. + Handle implicitOuterClass. + 2001-04-10 Jochen Hoenicke * jode/decompiler/Main.java (usage): Reworked usage message. diff --git a/jode/INSTALL b/jode/INSTALL index 8fcc65d..117bf0a 100644 --- a/jode/INSTALL +++ b/jode/INSTALL @@ -1,12 +1,15 @@ -Before installing, make sure you have a java compiler (e.g javac or -jikes) and the java 1.1 runtime class library installed. If you want -to run this program you need at least a 1.1 compatible java virtual -machine. There are some bugs in javac included in the SUN JDK 1.1, it -won't work. +Before installing, make sure you have at least version 1.1 of the java +developement kit installed. If you want to run this program you only +need the java runtime environment. Version 1.1 is quite old, I +recommend using Java 2 (jdk1.2 or above). This package was designed to use the GNU standard for configuration and makefiles. To build and install do the following: +0). If you have downloaded the code from the CVS repository create +configure and Makefile.in with autoconf-2.13 and automake-1.4. Type +"aclocal; automake -a; autoconf". + 1). You need a java development kit (at least version 1.1), some unix tools and some java packages. Make sure that you have all java packages that are needed in your classpath. This are gnu.getopt, and @@ -40,7 +43,3 @@ give a path to the directory where it resides, otherwise it is searched in the path. 3). Type "make" to build the package. - -4). Type "make install" to install the package. This doesn't work yet. - - Jochen diff --git a/jode/Makefile.am b/jode/Makefile.am index b0ee681..bf0e886 100644 --- a/jode/Makefile.am +++ b/jode/Makefile.am @@ -1,5 +1,5 @@ ## Input file for automake to generate the Makefile.in used by configure -SUBDIRS = jode bin doc test +SUBDIRS = bin doc jode test -EXTRA_DIST = TODO +EXTRA_DIST = jcpp diff --git a/jode/NEWS b/jode/NEWS index 2d2bc84..6c64557 100644 --- a/jode/NEWS +++ b/jode/NEWS @@ -1,6 +1,7 @@ -New in 1.0.94 +New in 1.1 * break long lines -* small bug fixes +* handle most of javac v8 constructs (jdk 1.3) +* bug fixes New in 1.0.93 * anonymous and inner class decompilation reworked. diff --git a/jode/README b/jode/README index 16c3d0a..8ebabf2 100644 --- a/jode/README +++ b/jode/README @@ -1,12 +1,17 @@ JODE (Java Optimize and Decompile Environment) -This is a decompiler and optimizer for java I have written in my spare -time. The decompiler takes class files as input and produces -something similar to the original java file. Of course this can't be -perfect: There is no way to produce the comments or the names of local -variables (except when the java files were compiled with `-g') and -there are often more ways to write the same thing. But jode does its -job quite well. +JODE is a java package containing a decompiler and an optimizer for +java. This package is freely available under the GNU General Public +License. + +The decompiler reads in class files and produces something similar to +the original java file. Of course this can't be perfect: There is no +way to produce the comments or the names of local variables (except +when the java files were compiled with `-g') and there are often more +ways to write the same thing. However, jode does its job quite well. + +The optimizer transforms class files in various ways with +can be controlled by a script file. Please note that most software licenses forbid to decompile class files. Use this decompiler only, if you have legal rights to @@ -25,6 +30,15 @@ The features of the decompilers are: Known bugs of the decompiler: + - Some jdk1.3 synthetic access functions aren't understood. The + produced source contains access$xxx functions, but it still compiles. + + - There may be other bugs, that cause Exceptions or invalid code. + If you have such a problems don't hesitate to issue a bug report. + Please include the class file if possible. + +Limitations: + - If not all dependent classes can be found, the verifier (which is run before decompilation starts) may exit with a type error. You can decompile it with --verify=off, but take the warning serious, @@ -40,18 +54,6 @@ Known bugs of the decompiler: happen when you compile with `-O' flag and javac has inlined some methods. - - Sometimes this program may exit with an Exception or produce - incorrect code. If it produced incorrect code the code probably - can't be compiled, so that the error can be easily spotted. If you - have one of these problems (they are very rare now), I would be - very interested in a bug report (including the .class file, if - possible). - - - Sometimes it generates some GOTO expression and labels. This - shouldn't happen any more with code produced by javac or jikes. - But some flow obfuscator likes Zelix Klassmaster may provoke this. - In that case you can run the Obfuscator first (to optimize away the - flow obfuscation ;-). The features of the obfuscator are: * Modular design, you can plug the obfuscation transformation you need @@ -66,62 +68,23 @@ The features of the obfuscator are: PRELIMINARIES: -You need java jdk1.2 or above, and the gnu getopt package. - -You should also have the jode-x.x.xx.jar file. Read INSTALL how to -compile it yourself. - -Jode also works with jdk1.1, but you need the sun collection classes -and swing in that case. - -Here are some URLs for the tools and packages you may need: - - CYGWIN (unix tools for win95/NT): - http://sourceware.cygnus.com/cygwin/ - - JDK 1.1: - http://java.sun.com/products/jdk/1.1/index.htm - - Collection classes and Swing for JDK 1.1: - http://java.sun.com/beans/infobus/#DOWNLOAD_COLLECTIONS - http://java.sun.com/products/jfc/index.html#download-swing - - JDK 1.2: - http://java.sun.com/products/jdk/1.2/index.html - - Getopt: - http://www.urbanophile.com/arenn/hacking/download.html#getopt +See INSTALL for installation instructions. USAGE: -First set the classpath. It should contain the jar file -jode-x.x.xx.jar, the gnu getopt package and the sun collection package -for 1.1. For the swingui program you also need swing in you classpath. +First set the classpath. It should contain the jar file jode-1.1.jar, +the gnu getopt package and the sun collection package for 1.1. For +the swingui program you also need swing in you classpath. You can then decompile a class file with: - java jode.decompiler.Main --classpath jarfile1.jar,jarfile2.jar org.package.Class + java jode.decompiler.Main --classpath program.jar,libfoo.jar org.package.Class +or a complete package with + java jode.decompiler.Main --classpath libfoo.jar program.jar For a graphical user interface based on swing try: java jode.swingui.Main --classpath jarfile1.jar -The obfuscator/deobfuscator can be run with: +The obfuscator/deobfuscator can be run with a script: java jode.obfuscator.Main obfuscation.jos -See XXXX for more information about the script syntax. - -HISTORY: - -Someday I found guavad, a disassembler for java byte code (it does -similar things like `javap -c'). I used it on a class file, and found -that it was possible to reconstruct the original java code. First I -did it by hand on some small routines, but I soon realized that it was -a rather stupid task, and that I could write a perl script, that does -the same. At the end of the next day I had the first working -decompiler. - -Now while it was working, it was not easy to use. You had to -decompile the code first with a disassembler, cut the method, you -wanted to decompile and then run the perl script on it. So I decided -to get some information of the class files and do this all -automatically. I decided to write it in java now, because it suited -best. +See the web documents for more information about the script syntax. diff --git a/jode/TODO b/jode/TODO index 429373d..d200981 100644 --- a/jode/TODO +++ b/jode/TODO @@ -8,6 +8,9 @@ Decompiler: Obfuscator: - flow obfuscation/optimization. - warn about Class.forName and list occurences. + - detect Class.forName on constant strings and handle appropriately. + - work around Class.forName, by creating a new version using a hash + table that maps md5 sums of old names to obfuscated names. DeObfuscator: - generate nice names: @@ -27,5 +30,6 @@ User Interface: Internal: - clean up package hierarchy, esp. expr, flow and decompiler. + - move to net.sf.jode package. - make the class names more precise, e.g. StructuredBlock is Statement, FlowBlock is BasicBlock. diff --git a/jode/configure.in b/jode/configure.in index 3aea654..749f2af 100644 --- a/jode/configure.in +++ b/jode/configure.in @@ -1,18 +1,10 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT() -AM_INIT_AUTOMAKE(jode, 1.0.94) +AM_INIT_AUTOMAKE(jode, 1.1) dnl Checks for programs. -dnl AC_PROG_CXX -dnl AC_PROG_AWK -dnl AC_PROG_CC -dnl AC_PROG_CPP -dnl AC_PROG_INSTALL -dnl AC_PROG_LN_S AC_PROG_MAKE_SET -dnl AC_PROG_RANLIB -dnl AC_PATH_PROG(ZIP, zip) AC_PATH_PROG(PERL, perl) AC_PATH_PROG(CYGPATH, cygpath) @@ -114,6 +106,13 @@ JODE_CHECK_CLASS(java.lang.Object, $CLASSLIB, [ AC_MSG_RESULT(no) AC_MSG_ERROR(Please specify location of core java class library) ]) +AC_MSG_CHECKING(for java.lang.ref.WeakReference) +JODE_CHECK_CLASS(java.lang.ref.WeakReference, $CLASSLIB, + [ AC_MSG_RESULT(yes) + JCPPFLAGS="-DJDK12" ], + [ AC_MSG_RESULT(no) + JCPPFLAGS="-DJDK11" ]) + AC_MSG_CHECKING(for collection classes) JODE_CHECK_CLASS(java.util.Set, $CLASSPATH:$CLASSLIB, [ COLLECTIONS="java.util" @@ -241,4 +240,11 @@ bin/jode bin/jode.bat doc/Makefile test/Makefile, -[chmod 755 javaDependencies.pl bin/jode]) +[chmod 755 javaDependencies.pl bin/jode], +[for i in \$CONFIG_FILES; do +changequote(, )dnl + if [ \$i != \${i%.java} ]; then +changequote([, ])dnl + $PERL $srcdir/jcpp $JCPPFLAGS \$i + fi +done]) diff --git a/jode/doc/.cvsignore b/jode/doc/.cvsignore index 282522d..2f083ef 100644 --- a/jode/doc/.cvsignore +++ b/jode/doc/.cvsignore @@ -1,2 +1,3 @@ Makefile Makefile.in +*.html diff --git a/jode/doc/Makefile.am b/jode/doc/Makefile.am index b0ce2fe..0cbf19c 100644 --- a/jode/doc/Makefile.am +++ b/jode/doc/Makefile.am @@ -1,14 +1,43 @@ ## Input file for automake to generate the Makefile.in used by configure -EXTRA_DIST = \ -applet.html \ -download.html.in \ -history.html \ -jode.html \ -license.html \ -links.html \ -usage.html \ +PHP_FILES = \ +applet.php \ +bluesky.php \ +download.php \ +faq.php \ +feedback.php \ +history.php \ +index.php \ +license.php \ +links.php \ +usage.php + +HTML_FILES = $(PHP_FILES:%.php=$(srcdir)/%.html) +noinst_DATA = $(HTML_FILES) + +EXTRA_DIST = $(PHP_FILES) $(notdir $(HTML_FILES)) \ +a-logo.gif \ myproject.jos \ dasm_to_java.perl \ gimp/jode-logo.xcf \ jode-logo.gif + +.PHONY: public_html_symlink + +# The following rules require that you have an apache with php on +# localhost with standard user public_html directories and +# FollowSymLink enabled. + +PUBLIC_HTML=$(HOME)/public_html +JODE_PHP_DIR=jode_php + +public_html_symlink: + rm -f $(PUBLIC_HTML)/$(JODE_PHP_DIR) + @RELDIR=`pwd | sed s!^$(HOME)!..!`; \ + ln -sf $$RELDIR/$(srcdir) $(PUBLIC_HTML)/$(JODE_PHP_DIR); \ + echo Created symlink to $$RELDIR/$(srcdir). + +footer.inc: public_html_symlink + +$(srcdir)/%.html: %.php footer.inc header.inc menu.inc + lynx -source http://localhost/~$(LOGNAME)/$(JODE_PHP_DIR)/$(notdir $<)?extension=.html > $@ diff --git a/jode/doc/applet.html b/jode/doc/applet.html index c8b5034..72253f6 100644 --- a/jode/doc/applet.html +++ b/jode/doc/applet.html @@ -2,69 +2,74 @@ Java Optimize and Decompile Environment (JODE) - + + - - - - - - - - -
- JODE
- - - - - - - - -
Jode
-Home
-Project page
-
-Applet
-Download
-Documentation
-License
-History
-Links
-Blue Sky
Feedback
-Bug Tracking
-Public Forums
-Mailing List
-Private Mail
Download
-FTP server
-Source releases

Powered by
-SourceForge
-
Best viewed with
-Any Browser
-
-		 + + +
JODEPowered by SourceForge
Best viewed with Any + Browser
+ + + + +
+Home | +Project page | +Applet | +Download | +FAQ | +Feedback | +Documentation | +License | +History | +Links | +Blue Sky

+

The JODE Applet

-Please be patience, loading the applet may take some time.

+

Please be patience, loading the applet may take some time.

- +

Sorry you need a java enabled browser to test a java applet ;-)

Don't read the rest, it only contains information about the applet.

-Press the start button to decompile Press the start button to decompile Michael's Plasma applet (and give the decompiler some time to download the -jar file).

+jar file).

You may change the classpath to point to a zip or jar file of your choice, using a similar syntax. Use %3a instead of a @@ -75,20 +80,19 @@ multiple entries in the class path field separated by a comma.

You can't use this applet for local files; the class files must be on a server that is accessible from sourceforge. You can try to give -local filenames directly without the load.html wrapper, but that is +local filenames directly without the load.php wrapper, but that is probably forbidden by your browser. Most browser only allow loading files from the same server as the applet, and this is the reason why you have to use such a cryptic URL.

Save probably doesn't work, because it is forbidden by your browser.

-
- +
-
+ All trademarks and copyrights on this page are properties of their respective owners.
- Last updated on 8-May-2000, - Copyright © 1998-2000 by Jochen Hoenicke. + Last updated on 27-May-2001, + Copyright © 1998-2001 by Jochen Hoenicke. + Canonic URL is http://jode.sourceforge.net/
diff --git a/jode/doc/applet.php b/jode/doc/applet.php index a523e35..cd6b70a 100644 --- a/jode/doc/applet.php +++ b/jode/doc/applet.php @@ -1,7 +1,7 @@

The JODE Applet

-Please be patience, loading the applet may take some time.

+

Please be patience, loading the applet may take some time.

@@ -13,10 +13,10 @@ Please be patience, loading the applet may take some time.

-Press the start button to decompile Press the start button to decompile Michael's Plasma applet (and give the decompiler some time to download the -jar file).

+jar file).

You may change the classpath to point to a zip or jar file of your choice, using a similar syntax. Use %3a instead of a diff --git a/jode/doc/bluesky.html b/jode/doc/bluesky.html index 81c3537..5379cd9 100644 --- a/jode/doc/bluesky.html +++ b/jode/doc/bluesky.html @@ -2,51 +2,56 @@ Java Optimize and Decompile Environment (JODE) - + + - - - - - - - - -
- JODE
- - - - - - - - -
Jode
-Home
-Project page
-
-Applet
-Download
-Documentation
-License
-History
-Links
-Blue Sky
Feedback
-Bug Tracking
-Public Forums
-Mailing List
-Private Mail
Download
-FTP server
-Source releases

Powered by
-SourceForge
-
Best viewed with
-Any Browser
-
-		 + + +
JODEPowered by SourceForge
Best viewed with Any + Browser
+ + + + +
+Home | +Project page | +Applet | +Download | +FAQ | +Feedback | +Documentation | +License | +History | +Links | +Blue Sky

+

Blue Sky

This section contains features that I think would be great to have, @@ -117,14 +122,13 @@ copy them back into the java code.

This doesn't need to be built into the decompiler. A script that takes the javadoc pages and the decompiled code can easily merge them.

-
- +
-
+ All trademarks and copyrights on this page are properties of their respective owners.
- Last updated on 8-May-2000, - Copyright © 1998-2000 by Jochen Hoenicke. + Last updated on 27-May-2001, + Copyright © 1998-2001 by Jochen Hoenicke. + Canonic URL is http://jode.sourceforge.net/
diff --git a/jode/doc/download.html b/jode/doc/download.html index 674563f..044f6c2 100644 --- a/jode/doc/download.html +++ b/jode/doc/download.html @@ -2,88 +2,95 @@ Java Optimize and Decompile Environment (JODE) - + + - - - - - - - - -
- JODE
- - - - - - - - -
Jode
-Home
-Project page
-
-Applet
-Download
-Documentation
-License
-History
-Links
-Blue Sky
Feedback
-Bug Tracking
-Public Forums
-Mailing List
-Private Mail
Download
-FTP server
-Source releases

Powered by
-SourceForge
-
Best viewed with
-Any Browser
-
-		 -

Download

- -The latest source code of JODE is available at the project page. -You need several other packages to build JODE, check the links page.

- -The simplest way to get it, especially for non unix users, is in + + +
JODEPowered by SourceForge
Best viewed with Any + Browser
+ + + + +
+Home | +Project page | +Applet | +Download | +FAQ | +Feedback | +Documentation | +License | +History | +Links | +Blue Sky

+ +

Download

+ +

Jode is available in the download section. Click here to download the latest +released source code of JODE + +

If you download the source code, you need several other packages to +build JODE, check the links +page.

+ +

The simplest way to get it, especially for non unix users, is in precompiled form, though. I have two jar archives at the ftp server. You may +href="ftp://jode.sourceforge.net/pub/jode">xftp server. You may need to press shift while clicking on the link, depending on your browser. -

  • jode-1.0.93-1.1.jar is for JDK 1.1. It already -contains Getopt and the collection classes from the GNU Classpath -project. If you want to use the swing interface, you have to download -swing separately.
    • +
    • jode-1.1-1.1.jar is for JDK 1.1. It contains +the collection classes from the GNU Classpath project. If you want to +use the swing interface, you have to download swing separately.
      • -
    • jode-1.0.93-1.2.jar is for JDK 1.2. It already -contains Getopt, so you don't need any other package.
    +
  • jode-1.1-1.2.jar is for JDK 1.2 or better.
+

-

CVS Repository

+

CVS Repository

-You can get the latest sources from the CVS repository. +

You can get the latest sources from the CVS repository. Follow the instruction on that page; use jode as modulename. Then change to the directory jode and run 

aclocal && automake -a && autoconf
-Afterwards follow the instruction in the INSTALL file. -
- +Afterwards follow the instruction in the INSTALL file.

+
-
+ All trademarks and copyrights on this page are properties of their respective owners.
- Last updated on 8-May-2000, - Copyright © 1998-2000 by Jochen Hoenicke. + Last updated on 27-May-2001, + Copyright © 1998-2001 by Jochen Hoenicke. + Canonic URL is http://jode.sourceforge.net/
diff --git a/jode/doc/download.php b/jode/doc/download.php index d8c5001..da17ef8 100644 --- a/jode/doc/download.php +++ b/jode/doc/download.php @@ -1,14 +1,17 @@ -

Download

+

Download

-The latest source code of JODE is available at the project page. -You need several other packages to build JODE, check the links page.

+

Jode is available in the download section. Click here to download the latest +released source code of JODE -The simplest way to get it, especially for non unix users, is in +

If you download the source code, you need several other packages to +build JODE, check the links +page.

+ +

The simplest way to get it, especially for non unix users, is in precompiled form, though. I have two jar archives at the ftp server. You may +href="ftp://jode.sourceforge.net/pub/jode">xftp server. You may need to press shift while clicking on the link, depending on your browser. @@ -19,22 +22,21 @@ function jarlink($what) { echo ".jar\">jode-".$version.$what.".jar"; } ?> -

  • is for JDK 1.1. It already -contains Getopt and the collection classes from the GNU Classpath -project. If you want to use the swing interface, you have to download -swing separately.
    • +
    • is for JDK 1.1. It contains +the collection classes from the GNU Classpath project. If you want to +use the swing interface, you have to download swing separately.
      • -
    • is for JDK 1.2. It already -contains Getopt, so you don't need any other package.
    +
  • is for JDK 1.2 or better.
+

-

CVS Repository

+

CVS Repository

-You can get the latest sources from the +

You can get the latest sources from the CVS repository. Follow the instruction on that page; use jode as modulename. Then change to the directory jode and run 

aclocal && automake -a && autoconf
-Afterwards follow the instruction in the INSTALL file. +Afterwards follow the instruction in the INSTALL file.

diff --git a/jode/doc/footer.inc b/jode/doc/footer.inc index 01862e5..9e16f05 100644 --- a/jode/doc/footer.inc +++ b/jode/doc/footer.inc @@ -1,11 +1,10 @@ - - - +
-
+ All trademarks and copyrights on this page are properties of their respective owners.
- Last updated on 30-Jun-2000, - Copyright © 1998-2000 by Jochen Hoenicke. + Last updated on 27-May-2001, + Copyright © 1998-2001 by Jochen Hoenicke. + Canonic URL is http://jode.sourceforge.net/
diff --git a/jode/doc/header.inc b/jode/doc/header.inc index eb6bc8e..67e9113 100644 --- a/jode/doc/header.inc +++ b/jode/doc/header.inc @@ -1,13 +1,17 @@ Java Optimize and Decompile Environment (JODE) - + + - - - - - - - -
-Under Construction,
-beware broken links */ ?> -		 JODE
+ + +
JODEPowered by SourceForge
Best viewed with Any + Browser
+ -		 + diff --git a/jode/doc/history.html b/jode/doc/history.html index d093ec8..580f8f3 100644 --- a/jode/doc/history.html +++ b/jode/doc/history.html @@ -2,52 +2,57 @@ Java Optimize and Decompile Environment (JODE) - + + - - - - - - - - -
- JODE
- - - - - - - - -
Jode
-Home
-Project page
-
-Applet
-Download
-Documentation
-License
-History
-Links
-Blue Sky
Feedback
-Bug Tracking
-Public Forums
-Mailing List
-Private Mail
Download
-FTP server
-Source releases

Powered by
-SourceForge
-
Best viewed with
-Any Browser
-
-		 -

History

+ + +
JODEPowered by SourceForge
Best viewed with Any + Browser
+ + + + +
+Home | +Project page | +Applet | +Download | +FAQ | +Feedback | +Documentation | +License | +History | +Links | +Blue Sky

+ +

History

Someday I found guavad, a disassembler for java byte code (it does similar things like javap -c). I used @@ -67,14 +72,13 @@ now, because it suited best.

Just for the records: the java code is now more than 50 times bigger than the original perl script and is still growing.

-
- +
-
+ All trademarks and copyrights on this page are properties of their respective owners.
- Last updated on 8-May-2000, - Copyright © 1998-2000 by Jochen Hoenicke. + Last updated on 27-May-2001, + Copyright © 1998-2001 by Jochen Hoenicke. + Canonic URL is http://jode.sourceforge.net/
diff --git a/jode/doc/history.php b/jode/doc/history.php index de602ca..9ed1962 100644 --- a/jode/doc/history.php +++ b/jode/doc/history.php @@ -1,5 +1,5 @@ -

History

+

History

Someday I found guavad, a disassembler for java byte code (it does similar things like javap -c). I used diff --git a/jode/doc/index.html b/jode/doc/index.html index 51dff88..b9743e7 100644 --- a/jode/doc/index.html +++ b/jode/doc/index.html @@ -2,64 +2,68 @@ Java Optimize and Decompile Environment (JODE) - + + - - - - - - - - -
- JODE
- - - - - - - - -
Jode
-Home
-Project page
-
-Applet
-Download
-Documentation
-License
-History
-Links
-Blue Sky
Feedback
-Bug Tracking
-Public Forums
-Mailing List
-Private Mail
Download
-FTP server
-Source releases

Powered by
-SourceForge
-
Best viewed with
-Any Browser
-
-		 + + +
JODEPowered by SourceForge
Best viewed with Any + Browser
+ + + + +
+Home | +Project page | +Applet | +Download | +FAQ | +Feedback | +Documentation | +License | +History | +Links | +Blue Sky

+

JODE is a java package containing a decompiler and an -optimizer for java. This package is freely available under the GPL -(see license).

+optimizer for java. This package is freely available under the GNU GPL.

-

The decompiler takes class files as input and produces -something similar to the original java file. Of course this -can't be perfect: There is no way to produce the comments or the names -of local variables (except when compiled with debuging) and there are -often more ways to write the same thing. But JODE does its job -quite well, so you should give it a try: start -the applet.

+

The decompiler reads in class files and produces something +similar to the original java file. Of course this can't be +perfect: There is no way to produce the comments or the names of local +variables (except when compiled with debuging) and there are often +more ways to write the same thing. However, JODE does its job quite +well, so you should give it a try and start the +applet.

The optimizer transforms class files in various ways with can be controlled by a script file. It supports the following @@ -77,14 +81,23 @@ fields

News

    +
  • JODE 1.1 is out. With support for javac v8 (jdk 1.3).
  • JODE is now hosted by SourceForge.
    • -
  • The latest CVS version breaks long lines
    • -
  • I can now decompile inner and anonymous classes.
    • +
  • Now long lines are automatically broken.
    • +
  • Inner and anonymous classes are automatically decompiled.
  • The optimizer (aka obfuscator) can be customized via a small config file
    • -
  • Jode is autoconfigured.
+

Known bugs of the decompiler

+ +

Some jdk1.3 synthetic access functions aren't understood. The + produced source contains access$xxx functions, but it still compiles.

+ +

There may be other bugs, that cause Exceptions or invalid code. + If you have such a problems don't hesitate to issue a bug report. + Please include the class file if possible.

+

Limitations

If not all dependent classes can be found, the verifier (which is @@ -104,25 +117,13 @@ the code should still be compileable. This does especially happen when you compile with `-O' flag and javac has inlined some methods.

-

Sometimes this program may exit with an Exception or -produce incorrect code. Most time the code can't be compiled, so that -it can be easily spotted. If you have one of these problems (except -those that occur on some of the jode.test files, I would -be very interested in a bug report (including the class -file, if possible).

- -

Sometimes JODE generates some GOTO expression and labels. -This shouldn't happen any more with code produced by javac or jikes. -But some flow obfuscator may provoke this. In that case you can run -the Obfuscator first (to optimize away the flow obfuscation ;-).

-
- +
-
+ All trademarks and copyrights on this page are properties of their respective owners.
- Last updated on 8-May-2000, - Copyright © 1998-2000 by Jochen Hoenicke. + Last updated on 27-May-2001, + Copyright © 1998-2001 by Jochen Hoenicke. + Canonic URL is http://jode.sourceforge.net/
diff --git a/jode/doc/index.php b/jode/doc/index.php index 98addb1..7f6467b 100644 --- a/jode/doc/index.php +++ b/jode/doc/index.php @@ -1,16 +1,16 @@

JODE is a java package containing a decompiler and an -optimizer for java. This package is freely available under the GPL -(see license).

+optimizer for java. This package is freely available under the GNU GPL.

-

The decompiler takes class files as input and produces -something similar to the original java file. Of course this -can't be perfect: There is no way to produce the comments or the names -of local variables (except when compiled with debuging) and there are -often more ways to write the same thing. But JODE does its job -quite well, so you should give it a try: start -the applet.

+

The decompiler reads in class files and produces something +similar to the original java file. Of course this can't be +perfect: There is no way to produce the comments or the names of local +variables (except when compiled with debuging) and there are often +more ways to write the same thing. However, JODE does its job quite +well, so you should give it a try and start the +applet.

The optimizer transforms class files in various ways with can be controlled by a script file. It supports the following @@ -28,14 +28,23 @@ fields

News

    +
  • JODE 1.1 is out. With support for javac v8 (jdk 1.3).
  • JODE is now hosted by SourceForge.
    • -
  • The latest CVS version breaks long lines
    • -
  • I can now decompile inner and anonymous classes.
    • +
  • Now long lines are automatically broken.
    • +
  • Inner and anonymous classes are automatically decompiled.
  • The optimizer (aka obfuscator) can be customized via a small config file
    • -
  • Jode is autoconfigured.
+

Known bugs of the decompiler

+ +

Some jdk1.3 synthetic access functions aren't understood. The + produced source contains access$xxx functions, but it still compiles.

+ +

There may be other bugs, that cause Exceptions or invalid code. + If you have such a problems don't hesitate to issue a bug report. + Please include the class file if possible.

+

Limitations

If not all dependent classes can be found, the verifier (which is @@ -55,15 +64,4 @@ the code should still be compileable. This does especially happen when you compile with `-O' flag and javac has inlined some methods.

-

Sometimes this program may exit with an Exception or -produce incorrect code. Most time the code can't be compiled, so that -it can be easily spotted. If you have one of these problems (except -those that occur on some of the jode.test files, I would -be very interested in a bug report (including the class -file, if possible).

- -

Sometimes JODE generates some GOTO expression and labels. -This shouldn't happen any more with code produced by javac or jikes. -But some flow obfuscator may provoke this. In that case you can run -the Obfuscator first (to optimize away the flow obfuscation ;-).

diff --git a/jode/doc/license.html b/jode/doc/license.html index c4a5636..df2947a 100644 --- a/jode/doc/license.html +++ b/jode/doc/license.html @@ -2,72 +2,77 @@ Java Optimize and Decompile Environment (JODE) - + + - - - - - - - - -
- JODE
- - - - - - - - -
Jode
-Home
-Project page
-
-Applet
-Download
-Documentation
-License
-History
-Links
-Blue Sky
Feedback
-Bug Tracking
-Public Forums
-Mailing List
-Private Mail
Download
-FTP server
-Source releases

Powered by
-SourceForge
-
Best viewed with
-Any Browser
-
-		 + + +
JODEPowered by SourceForge
Best viewed with Any + Browser
+ + + + +
+Home | +Project page | +Applet | +Download | +FAQ | +Feedback | +Documentation | +License | +History | +Links | +Blue Sky

+ +

License

JODE is Copyright © 1998-2000 by Jochen Hoenicke.

-This program is free software; you can redistribute it and/or modify +

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version.

+version 2 of the License, or (at your option) any later version.

-This program is distributed in the hope that it will be useful, +

This program is distributed in the hope that it will be useful, but without any warranty; without even the implied warranty of merchantability or fitness for a particular purpose. See the -GNU General Public License for more details. +GNU General Public License for more details.

-
- +
-
+ All trademarks and copyrights on this page are properties of their respective owners.
- Last updated on 8-May-2000, - Copyright © 1998-2000 by Jochen Hoenicke. + Last updated on 27-May-2001, + Copyright © 1998-2001 by Jochen Hoenicke. + Canonic URL is http://jode.sourceforge.net/
diff --git a/jode/doc/license.php b/jode/doc/license.php index 76ae787..ad283f7 100644 --- a/jode/doc/license.php +++ b/jode/doc/license.php @@ -1,15 +1,16 @@ +

License

JODE is Copyright © 1998-2000 by Jochen Hoenicke.

-This program is free software; you can redistribute it and/or modify +

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version.

+version 2 of the License, or (at your option) any later version.

-This program is distributed in the hope that it will be useful, +

This program is distributed in the hope that it will be useful, but without any warranty; without even the implied warranty of merchantability or fitness for a particular purpose. See the -GNU General Public License for more details. +GNU General Public License for more details.

diff --git a/jode/doc/links.html b/jode/doc/links.html index 9b4e626..efe02e2 100644 --- a/jode/doc/links.html +++ b/jode/doc/links.html @@ -2,51 +2,56 @@ Java Optimize and Decompile Environment (JODE) - + + - - - - - - - - -
- JODE
- - - - - - - - -
Jode
-Home
-Project page
-
-Applet
-Download
-Documentation
-License
-History
-Links
-Blue Sky
Feedback
-Bug Tracking
-Public Forums
-Mailing List
-Private Mail
Download
-FTP server
-Source releases

Powered by
-SourceForge
-
Best viewed with
-Any Browser
-
-		 + + +
JODEPowered by SourceForge
Best viewed with Any + Browser
+ + + + +
+Home | +Project page | +Applet | +Download | +FAQ | +Feedback | +Documentation | +License | +History | +Links | +Blue Sky

+

JODE Links

Other decompilers

    @@ -100,20 +105,21 @@ href="http://jedit.standmed.com/plugins/JavaInsight">JavaInsight plugin for
    Collection Classes:
    I have written a small script that puts the collection classes -from the GNU Classpath Project into -its own package (org.gnu.java.util.collections). You can -download the source code (including -the script), or a precompiled jar file. +from the GNU Classpath Project +into its own package (gnu.java.util.collections). This +script is now part of GNU classpath. For your convenience I have put a +precompiled jar +file on this server.
    -
- +
-
+ All trademarks and copyrights on this page are properties of their respective owners.
- Last updated on 8-May-2000, - Copyright © 1998-2000 by Jochen Hoenicke. + Last updated on 27-May-2001, + Copyright © 1998-2001 by Jochen Hoenicke. + Canonic URL is http://jode.sourceforge.net/
diff --git a/jode/doc/links.php b/jode/doc/links.php index 14ee011..4e8b1d6 100644 --- a/jode/doc/links.php +++ b/jode/doc/links.php @@ -52,10 +52,12 @@ href="http://jedit.standmed.com/plugins/JavaInsight">JavaInsight plugin for
Collection Classes:
I have written a small script that puts the collection classes -from the GNU Classpath Project into -its own package (org.gnu.java.util.collections). You can -download the source code (including -the script), or a precompiled jar file. +from the GNU Classpath Project +into its own package (gnu.java.util.collections). This +script is now part of GNU classpath. For your convenience I have put a +precompiled jar +file on this server.
diff --git a/jode/doc/menu.inc b/jode/doc/menu.inc index fff205f..0e6bfa5 100644 --- a/jode/doc/menu.inc +++ b/jode/doc/menu.inc @@ -1,115 +1,47 @@ Home" , "selflink", "jode", +$menu = + array("Home" , "selflink", "index", "Project page" , "sflink", "project/", - "-", "-", "-", "Applet" , "selflink", "applet", "Download" , "selflink", "download", + "FAQ" , "selflink", "faq", + "Feedback" , "selflink", "feedback", "Documentation", "selflink", "usage", "License" , "selflink", "license", "History" , "selflink", "history", "Links" , "selflink", "links", - "Blue Sky" , "selflink", "bluesky"), - "Feedback", - array("Bug Tracking" , "sflink", "bugs/", - "Public Forums" , "sflink", "forum/", - "Mailing List" , "link", - "http://lists.sourceforge.net/mailman/listinfo/jode-users", - "Private Mail" , "link", - "http://sourceforge.net/sendmessage.php?touser=18252"), - "Download", - array("FTP server", "link", "ftp://jode.sourceforge.net/pub/jode/", - "Source releases", "sflink", "project/filelist.php")); - -$images = array( - "Powered by ", "http://sourceforge.net/sflogo.php?group_id=3790&type=1", - "SourceForge", "http://sourceforge.net", - "Best viewed with ", "a-logo.gif", - "Any Browser", "http://www.anybrowser.org/campaign/"); - -if (eregi("^Lynx", $HTTP_USER_AGENT)) { - - reset($menu); - while (list($dummy, $header) = each($menu)) { - list($dummy, $subitems) = each($menu); - - echo "$header:\n"; - reset($subitems); - while (list($dummy, $name) = each($subitems)) { - list($dummy, $type) = each($subitems); - list($dummy, $link) = each($subitems); - if ($type == "selflink") { - selflink($link); - } else if ($type == "sflink") { - sflink($link); - } else if ($type == "-") { - echo "
\n"; - continue; - } else if ($type == "link") { - echo ""; - } - $name = ereg_replace(" ", " ", $name); - echo "$name"; - if (current($subitems)) { - echo " |\n"; - } - } - echo "
\n\n"; - } - echo "\n"; - reset($images); - while (list($dummy, $label) = each($images)) { - list($dummy, $src) = each($images); - list($dummy, $alt) = each($images); - list($dummy, $link) = each($images); - echo "$label\"$alt\"\n"; - } - echo "\n"; -} else { - echo "\n"; + "Blue Sky" , "selflink", "bluesky"); +?> - reset($menu); - while (list($dummy, $header) = each($menu)) { - list($dummy, $subitems) = each($menu); - echo "\n\n"; - echo " +
"; - echo "$header
\n"; - reset($subitems); - while (list($dummy, $name) = each($subitems)) { - list($dummy, $type) = each($subitems); - list($dummy, $link) = each($subitems); - if ($type == "selflink") { - selflink($link); - } else if ($type == "sflink") { - sflink($link); - } else if ($type == "-") { - echo "
\n"; - continue; - } else if ($type == "link") { - echo ""; - } - $name = ereg_replace(" ", " ", $name); + +\n"; - echo "
+"; - if (current($subitems)) { - echo "
\n"; - } } + } else if ($type == "sflink") { + sflink($link); + echo "$name"; + } else if ($type == "-") { + echo "
\n"; + continue; + } else if ($type == "link") { + echo "$name"; } - echo "
"; - - reset($images); - while (list($dummy, $label) = each($images)) { - list($dummy, $src) = each($images); - list($dummy, $alt) = each($images); - list($dummy, $link) = each($images); - echo "
$label
\n"; - echo "\"$alt\"
\n"; + if (current($menu)) { + echo " |\n"; } - echo "
\n"; } ?> +

diff --git a/jode/doc/usage.html b/jode/doc/usage.html index e04302e..e83f7a0 100644 --- a/jode/doc/usage.html +++ b/jode/doc/usage.html @@ -2,73 +2,80 @@ Java Optimize and Decompile Environment (JODE) - + + - - - - - - - - -
- JODE
- - - - - - - - -
Jode
-Home
-Project page
-
-Applet
-Download
-Documentation
-License
-History
-Links
-Blue Sky
Feedback
-Bug Tracking
-Public Forums
-Mailing List
-Private Mail
Download
-FTP server
-Source releases

Powered by
-SourceForge
-
Best viewed with
-Any Browser
-
-		 + + +
JODEPowered by SourceForge
Best viewed with Any + Browser
+ + + + +
+Home | +Project page | +Applet | +Download | +FAQ | +Feedback | +Documentation | +License | +History | +Links | +Blue Sky

+

Using the Decompiler

 -After you have downloaded the necessary -packages, put them into your CLASSPATH: +

After you have downloaded the jar archive +put it into your CLASSPATH. The package +swingall.jar is also needed if you are using JDK 1.1.

  • Under Windows you have to start a MSDOS session and type something like: 
    -set CLASSPATH=C:\download\jode-xxx.jar;C:\swing\swingall.jar
+set CLASSPATH=C:\download\jode-1.1.jar;C:\swing\swingall.jar
    -
  • Under Unix you start a shell and type (for bourne shell): -
    export CLASSPATH=/tmp/jode-xxx.jar:/usr/local/swing/swingall.jar
    + +
  • Under Unix you start a shell and type (for bourne shell): +
    export CLASSPATH=/tmp/jode-1.1.jar:/usr/local/swing/swingall.jar
    or for csh: -
    setenv CLASSPATH /tmp/jode-xxx.jar:/usr/local/swing/swingall.jar
    +
    setenv CLASSPATH /tmp/jode-1.1.jar:/usr/local/swing/swingall.jar

There is also a batch file for windows and a script file for unix, -that you can use. Adapt the CLASSPATH in the file and put it to a -convenient location. +that you can use. You can extract it with the following command: 
-  jar -xvf jode-xxx.jar bin/jode.bat resp. bin/jode
+  jar -xvf jode-1.1-jdk1.1.jar bin/jode.bat resp. bin/jode
+Edit the file to adapt it to your paths and put it to a convenient location.

Command Line Interface

 @@ -81,10 +88,17 @@ following command will give a complete list of the available commands: 
java jode.decompiler.Main --help
+If you want to decompile a jar package you can do it this way: + +
java jode.decompiler.Main --dest srcdir program.jar
+ +If you have installed the batch file/script, you can use it like this: +
jode --dest srcdir program.jar
+

AWT Interface

 -The AWT Interface looks exactly like the applet. In fact the applet uses the AWT Interface. You start it -after setting the CLASSPATH (see above), with +The AWT Interface looks exactly like the applet. In fact the applet uses the AWT Interface. You start it +after setting the CLASSPATH (see above), with 
java jode.decompiler.Window
@@ -97,44 +111,45 @@ appear. You can save it via the save button.

Swing Interface

 For the swing interface you need java version 1.2 or the separately -available swing package (see link -page. You can invoke it like this: +available swing package (see link +page. You can invoke it with the following command: 
-java jode.swingui.Main --classpath classes.jar
+java jode.swingui.Main classes.jar
+resp. jode swi classes.jar
-The swing interface will show the package hierarchie of all classes +

The swing interface will show the package hierarchie of all classes in the classpath on the left side. You can now select a class and the decompiled code will appear on the right side. Via the menu, you may change the classpath or switch between package hierarchie tree and -class inheritence tree.
+class inheritence tree.

-The swing interface is very useful to browse through class files if +

The swing interface is very useful to browse through class files if you don't have the source code. You can also use it to trace bugs in library code. It is not meant to generate java files and so -you won't find a save option there.
+you won't find a save option there.

Java Interface

 -If you want to integrate JODE into your own java program, you -can use the If you want to integrate JODE into your own java program, +you can use the jode.decompiler.Decompiler class. Note that the GPL only allows you to integrate JODE -into GPL programs. Please contact me if you use JODE in this -way.
+into GPL programs. Please tell me if you use JODE in this +way.

-You may use this You may use this stripped -down jar archive containing all necessary classes. +down jar archive containing all necessary classes.

Using the Obfuscator

-To use the obfuscator you should first create a script file, say To use the obfuscator you should first create a script file, say myproject.jos. Then you can invoke the obfuscator with: 
 java jode.obfuscator.Main myproject.jos
-
+

The script file should contain the following options:

@@ -265,14 +280,13 @@ change the bytecode interface.

 post = new LocalOptimizer, new RemovePopAnalyzer
-
- +
-
+ All trademarks and copyrights on this page are properties of their respective owners.
- Last updated on 8-May-2000, - Copyright © 1998-2000 by Jochen Hoenicke. + Last updated on 27-May-2001, + Copyright © 1998-2001 by Jochen Hoenicke. + Canonic URL is http://jode.sourceforge.net/
diff --git a/jode/doc/usage.php b/jode/doc/usage.php index 5ea9192..b1bfd98 100644 --- a/jode/doc/usage.php +++ b/jode/doc/usage.php @@ -9,26 +9,28 @@ */ ?>

Using the Decompiler

 -After you have downloaded the necessary -packages, put them into your CLASSPATH: +

After you have downloaded the jar archive +put it into your CLASSPATH. The package +swingall.jar is also needed if you are using JDK 1.1.

  • Under Windows you have to start a MSDOS session and type something like: 
    -set CLASSPATH=C:\download\jode-xxx.jar;C:\swing\swingall.jar
+set CLASSPATH=C:\download\jode-.jar;C:\swing\swingall.jar
    -
  • Under Unix you start a shell and type (for bourne shell): -
    export CLASSPATH=/tmp/jode-xxx.jar:/usr/local/swing/swingall.jar
    + +
  • Under Unix you start a shell and type (for bourne shell): +
    export CLASSPATH=/tmp/jode-.jar:/usr/local/swing/swingall.jar
    or for csh: -
    setenv CLASSPATH /tmp/jode-xxx.jar:/usr/local/swing/swingall.jar
    +
    setenv CLASSPATH /tmp/jode-.jar:/usr/local/swing/swingall.jar

There is also a batch file for windows and a script file for unix, -that you can use. Adapt the CLASSPATH in the file and put it to a -convenient location. +that you can use. You can extract it with the following command: 
-  jar -xvf jode-xxx.jar bin/jode.bat resp. bin/jode
+  jar -xvf jode-.jar bin/jode.bat resp. bin/jode
+Edit the file to adapt it to your paths and put it to a convenient location.

Command Line Interface

 @@ -41,6 +43,13 @@ following command will give a complete list of the available commands: 
java jode.decompiler.Main --help
+If you want to decompile a jar package you can do it this way: + +
java jode.decompiler.Main --dest srcdir program.jar
+ +If you have installed the batch file/script, you can use it like this: +
jode --dest srcdir program.jar
+

AWT Interface

 The AWT Interface looks exactly like the @@ -60,43 +69,44 @@ appear. You can save it via the save button. For the swing interface you need java version 1.2 or the separately available swing package (see link -page. You can invoke it like this: +page. You can invoke it with the following command: 
-java jode.swingui.Main --classpath classes.jar
+java jode.swingui.Main classes.jar
+resp. jode swi classes.jar
-The swing interface will show the package hierarchie of all classes +

The swing interface will show the package hierarchie of all classes in the classpath on the left side. You can now select a class and the decompiled code will appear on the right side. Via the menu, you may change the classpath or switch between package hierarchie tree and -class inheritence tree.
+class inheritence tree.

-The swing interface is very useful to browse through class files if +

The swing interface is very useful to browse through class files if you don't have the source code. You can also use it to trace bugs in library code. It is not meant to generate java files and so -you won't find a save option there.
+you won't find a save option there.

Java Interface

 -If you want to integrate JODE into your own java program, you -can use the If you want to integrate JODE into your own java program, +you can use the jode.decompiler.Decompiler class. Note that the GPL only allows you to integrate JODE -into GPL programs. Please contact me if you use JODE in this -way.
+into GPL programs. Please tell me if you use JODE in this +way.

-You may use this You may use this stripped -down jar archive containing all necessary classes. +down jar archive containing all necessary classes.

Using the Obfuscator

-To use the obfuscator you should first create a script file, say To use the obfuscator you should first create a script file, say myproject.jos. Then you can invoke the obfuscator with: 
 java jode.obfuscator.Main myproject.jos
-
+

The script file should contain the following options:

diff --git a/jode/jode/bytecode/ClassInfo.java.in b/jode/jode/bytecode/ClassInfo.java.in index 35adcbd..687bf94 100644 --- a/jode/jode/bytecode/ClassInfo.java.in +++ b/jode/jode/bytecode/ClassInfo.java.in @@ -617,9 +617,6 @@ public class ClassInfo extends BinaryInfo { String message = ex.getMessage(); if ((howMuch & ~(FIELDS|METHODS|HIERARCHY |INNERCLASSES|OUTERCLASSES)) != 0) { - GlobalOptions.err.println - ("Can't read class " + name + "."); - ex.printStackTrace(GlobalOptions.err); throw new NoClassDefFoundError(name); } // Try getting the info through the reflection interface diff --git a/jode/jode/bytecode/MethodInfo.java b/jode/jode/bytecode/MethodInfo.java index 8c52c5f..da52e1e 100644 --- a/jode/jode/bytecode/MethodInfo.java +++ b/jode/jode/bytecode/MethodInfo.java @@ -54,8 +54,7 @@ public class MethodInfo extends BinaryInfo { if ((howMuch & KNOWNATTRIBS) != 0 && name.equals("Code")) { bytecode = new BytecodeInfo(this); bytecode.read(cp, input); - } else if ((howMuch & KNOWNATTRIBS) != 0 - && name.equals("Exceptions")) { + } else if (name.equals("Exceptions")) { int count = input.readUnsignedShort(); exceptions = new String[count]; for (int i=0; i< count; i++) diff --git a/jode/jode/decompiler/ClassAnalyzer.java.in b/jode/jode/decompiler/ClassAnalyzer.java.in index 58f292e..1fec998 100644 --- a/jode/jode/decompiler/ClassAnalyzer.java.in +++ b/jode/jode/decompiler/ClassAnalyzer.java.in @@ -57,6 +57,12 @@ public class ClassAnalyzer * The minimal visible complexity. */ private static double STEP_COMPLEXITY = 0.03; + /** + * The value of the strictfp modifier. + * JDK1.1 doesn't define it. + */ + private static int STRICTFP = 0x800; + double methodComplexity = 0.0; double innerComplexity = 0.0; @@ -126,6 +132,10 @@ public class ClassAnalyzer return Modifier.isStatic(modifiers); } + public final boolean isStrictFP() { + return (modifiers & STRICTFP) != 0; + } + public FieldAnalyzer getField(int index) { return fields[index]; } @@ -231,6 +241,17 @@ public class ClassAnalyzer staticConstructor = methods[j]; else constrVector.addElement(methods[j]); + + /* Java bytecode can't have strictfp modifier for + * classes, while java can't have strictfp modifier + * for constructors. We handle the difference here. + * + * If only a few constructors are strictfp and the + * methods aren't this would add too much strictfp, + * but that isn't really dangerous. + */ + if (methods[j].isStrictFP()) + modifiers |= STRICTFP; } methodComplexity += methods[j].getComplexity(); } @@ -400,9 +421,78 @@ public class ClassAnalyzer public void dumpDeclaration(TabbedPrintWriter writer) throws IOException { - dumpSource(writer); + dumpDeclaration(writer, null, 0.0, 0.0); } + public void dumpDeclaration(TabbedPrintWriter writer, + ProgressListener pl, double done, double scale) + throws IOException + { + if (fields == null) { + /* This means that the class could not be loaded. + * give up. + */ + return; + } + + writer.startOp(writer.NO_PAREN, 0); + /* Clear the SUPER bit, which is also used as SYNCHRONIZED bit. */ + int modifiedModifiers = modifiers & ~(Modifier.SYNCHRONIZED + | STRICTFP); + if (clazz.isInterface()) + /* interfaces are implicitily abstract */ + modifiedModifiers &= ~Modifier.ABSTRACT; + if (parent instanceof MethodAnalyzer) { + /* method scope classes are implicitly private */ + modifiedModifiers &= ~Modifier.PRIVATE; + /* anonymous classes are implicitly final */ + if (name == null) + modifiedModifiers &= ~Modifier.FINAL; + } + String modif = Modifier.toString(modifiedModifiers); + if (modif.length() > 0) + writer.print(modif + " "); + if (isStrictFP()) { + /* The STRICTFP modifier is set. + * We handle it, since java.lang.reflect.Modifier is too dumb. + */ + writer.print("strictfp "); + } + /* interface is in modif */ + if (!clazz.isInterface()) + writer.print("class "); + writer.print(name); + ClassInfo superClazz = clazz.getSuperclass(); + if (superClazz != null && + superClazz != ClassInfo.javaLangObject) { + writer.breakOp(); + writer.print(" extends " + (writer.getClassString + (superClazz, Scope.CLASSNAME))); + } + ClassInfo[] interfaces = clazz.getInterfaces(); + if (interfaces.length > 0) { + writer.breakOp(); + writer.print(clazz.isInterface() ? " extends " : " implements "); + writer.startOp(writer.EXPL_PAREN, 1); + for (int i=0; i < interfaces.length; i++) { + if (i > 0) { + writer.print(", "); + writer.breakOp(); + } + writer.print(writer.getClassString + (interfaces[i], Scope.CLASSNAME)); + } + writer.endOp(); + } + writer.println(); + + writer.openBraceClass(); + writer.tab(); + dumpBlock(writer, pl, done, scale); + writer.untab(); + writer.closeBraceClass(); + } + public void dumpBlock(TabbedPrintWriter writer) throws IOException { @@ -501,6 +591,7 @@ public class ClassAnalyzer needNewLine = true; } writer.popScope(); + clazz.dropInfo(clazz.KNOWNATTRIBS | clazz.UNKNOWNATTRIBS); } public void dumpSource(TabbedPrintWriter writer) @@ -513,64 +604,8 @@ public class ClassAnalyzer ProgressListener pl, double done, double scale) throws IOException { - if (fields == null) { - /* This means that the class could not be loaded. - * give up. - */ - return; - } - - writer.startOp(writer.NO_PAREN, 0); - /* Clear the SUPER bit, which is also used as SYNCHRONIZED bit. */ - int modifiedModifiers = modifiers & ~Modifier.SYNCHRONIZED; - if (clazz.isInterface()) - /* interfaces are implicitily abstract */ - modifiedModifiers &= ~Modifier.ABSTRACT; - if (parent instanceof MethodAnalyzer) { - /* method scope classes are implicitly private */ - modifiedModifiers &= ~Modifier.PRIVATE; - /* anonymous classes are implicitly final */ - if (name == null) - modifiedModifiers &= ~Modifier.FINAL; - } - String modif = Modifier.toString(modifiedModifiers); - if (modif.length() > 0) - writer.print(modif + " "); - /* interface is in modif */ - if (!clazz.isInterface()) - writer.print("class "); - writer.print(name); - ClassInfo superClazz = clazz.getSuperclass(); - if (superClazz != null && - superClazz != ClassInfo.javaLangObject) { - writer.breakOp(); - writer.print(" extends " + (writer.getClassString - (superClazz, Scope.CLASSNAME))); - } - ClassInfo[] interfaces = clazz.getInterfaces(); - if (interfaces.length > 0) { - writer.breakOp(); - writer.print(clazz.isInterface() ? " extends " : " implements "); - writer.startOp(writer.EXPL_PAREN, 1); - for (int i=0; i < interfaces.length; i++) { - if (i > 0) { - writer.print(", "); - writer.breakOp(); - } - writer.print(writer.getClassString - (interfaces[i], Scope.CLASSNAME)); - } - writer.endOp(); - } + dumpDeclaration(writer, pl, done, scale); writer.println(); - - writer.openBraceClass(); - writer.tab(); - dumpBlock(writer, pl, done, scale); - writer.untab(); - writer.closeBraceClass(); - writer.println(); - clazz.dropInfo(clazz.KNOWNATTRIBS | clazz.UNKNOWNATTRIBS); } public void dumpJavaFile(TabbedPrintWriter writer) @@ -608,7 +643,11 @@ public class ClassAnalyzer } public boolean conflicts(String name, int usageType) { - ClassInfo info = clazz; + return conflicts(clazz, name, usageType); + } + + private static boolean conflicts(ClassInfo info, + String name, int usageType) { while (info != null) { if (usageType == NOSUPERMETHODNAME || usageType == METHODNAME) { MethodInfo[] minfos = info.getMethods(); @@ -636,6 +675,11 @@ public class ClassAnalyzer if (usageType == NOSUPERFIELDNAME || usageType == NOSUPERMETHODNAME) return false; + + ClassInfo[] ifaces = info.getInterfaces(); + for (int i = 0; i < ifaces.length; i++) + if (conflicts(ifaces[i], name, usageType)) + return true; info = info.getSuperclass(); } return false; diff --git a/jode/jode/decompiler/FieldAnalyzer.java.in b/jode/jode/decompiler/FieldAnalyzer.java.in index 0ac9c4f..78fbcdc 100644 --- a/jode/jode/decompiler/FieldAnalyzer.java.in +++ b/jode/jode/decompiler/FieldAnalyzer.java.in @@ -57,7 +57,7 @@ public class FieldAnalyzer implements Analyzer { if (fd.getConstant() != null) { constant = new ConstOperator(fd.getConstant()); constant.setType(type); - constant.makeInitializer(); + constant.makeInitializer(type); } } @@ -107,7 +107,7 @@ public class FieldAnalyzer implements Analyzer { } analyzedSynthetic(); } else - expr.makeInitializer(); + expr.makeInitializer(type); constant = expr; return true; diff --git a/jode/jode/decompiler/LocalInfo.java b/jode/jode/decompiler/LocalInfo.java index 9c462a2..88cdaf4 100644 --- a/jode/jode/decompiler/LocalInfo.java +++ b/jode/jode/decompiler/LocalInfo.java @@ -383,8 +383,7 @@ public class LocalInfo implements Declarable { if (((LocalVarOperator) enum.nextElement()).isWrite()) writes++; } - if (writes > 1) - return false; + /* FIXME: Check if declaring final is okay */ li.isFinal = true; return true; } diff --git a/jode/jode/decompiler/Main.java b/jode/jode/decompiler/Main.java index f46496b..72e0e93 100644 --- a/jode/jode/decompiler/Main.java +++ b/jode/jode/decompiler/Main.java @@ -19,7 +19,6 @@ package jode.decompiler; import jode.bytecode.ClassInfo; -import jode.bytecode.SearchPath; import jode.GlobalOptions; import java.io.BufferedOutputStream; @@ -103,7 +102,7 @@ public class Main extends Options { err.println(" -D, --debug=... "+ "use --debug=help for more information."); - err.println("The following options can be turned on or off with `yes' or `no' argument."); + err.println("NOTE: The following options can be turned on or off with `yes' or `no'."); err.println("The options tagged with (default) are normally on. Omitting the yes/no"); err.println("argument will toggle the option, e.g. --verify is equivalent to --verify=no."); err.println(" --inner "+ @@ -200,13 +199,35 @@ public class Main extends Options { } public static void main(String[] params) { + try { + decompile(params); + } catch (ExceptionInInitializerError ex) { + ex.getException().printStackTrace(); + } catch (Throwable ex) { + ex.printStackTrace(); + } + /* When AWT applications are compiled with insufficient + * classpath the type guessing by reflection code can + * generate an awt thread that will prevent normal + * exiting. + */ + System.exit(0); + } + + public static void decompile(String[] params) { if (params.length == 0) { usage(); return; } String classPath = System.getProperty("java.class.path") - .replace(File.pathSeparatorChar, SearchPath.altPathSeparatorChar); + .replace(File.pathSeparatorChar, Decompiler.altPathSeparatorChar); + String bootClassPath = System.getProperty("sun.boot.class.path"); + if (bootClassPath != null) + classPath += Decompiler.altPathSeparatorChar + + bootClassPath.replace(File.pathSeparatorChar, + Decompiler.altPathSeparatorChar); + String destDir = null; int importPackageLimit = ImportHandler.DEFAULT_PACKAGE_LIMIT; @@ -337,7 +358,7 @@ public class Main extends Options { * Lets do him a pleasure and allow this. */ ClassInfo.setClassPath(params[i] - + SearchPath.altPathSeparatorChar + + Decompiler.altPathSeparatorChar + classPath); Enumeration enum = new ZipFile(params[i]).entries(); while (enum.hasMoreElements()) { diff --git a/jode/jode/decompiler/MethodAnalyzer.java.in b/jode/jode/decompiler/MethodAnalyzer.java.in index 1a1e07f..724f08d 100644 --- a/jode/jode/decompiler/MethodAnalyzer.java.in +++ b/jode/jode/decompiler/MethodAnalyzer.java.in @@ -81,6 +81,11 @@ public class MethodAnalyzer implements Scope, ClassDeclarer { * The minimal visible complexity. */ private static double STEP_COMPLEXITY = 0.01; + /** + * The value of the strictfp modifier. + * JDK1.1 doesn't define it. + */ + private static int STRICTFP = 0x800; /** * The import handler where we should register our types. */ @@ -317,6 +322,14 @@ public class MethodAnalyzer implements Scope, ClassDeclarer { return minfo.isSynthetic(); } + /** + * Checks if this method is strictfp + * @return true, iff this method is synthetic. + */ + public final boolean isStrictFP() { + return (minfo.getModifiers() & STRICTFP) != 0; + } + /** * Tells if this method is the constructor$xx method generated by jikes. * @param value true, iff this method is the jikes constructor. @@ -594,7 +607,7 @@ public class MethodAnalyzer implements Scope, ClassDeclarer { CodeVerifier verifier = new CodeVerifier(getClazz(), minfo, code); try { - verifier.verify(); + verifier.verify(); } catch (VerifyException ex) { ex.printStackTrace(GlobalOptions.err); throw new jode.AssertError("Verification error"); @@ -720,7 +733,7 @@ public class MethodAnalyzer implements Scope, ClassDeclarer { if (synth.getKind() == synth.GETCLASS) return true; if (synth.getKind() >= synth.ACCESSGETFIELD - && synth.getKind() <= synth.ACCESSCONSTRUCTOR + && synth.getKind() <= synth.ACCESSDUPPUTSTATIC && (Options.options & Options.OPTION_INNER) != 0 && (Options.options & Options.OPTION_ANON) != 0) return true; @@ -747,10 +760,12 @@ public class MethodAnalyzer implements Scope, ClassDeclarer { if (isJikesBlockInitializer) return true; - /* The default constructor must be empty of course */ + /* The default constructor must be empty + * and mustn't throw exceptions */ if (getMethodHeader() == null || !(getMethodHeader().getBlock() instanceof jode.flow.EmptyBlock) - || !getMethodHeader().hasNoJumps()) + || !getMethodHeader().hasNoJumps() + || exceptions.length > 0) return false; if (declareAsConstructor @@ -840,6 +855,7 @@ public class MethodAnalyzer implements Scope, ClassDeclarer { if (isConstructor() && isStatic()) modifiedModifiers &= ~(Modifier.FINAL | Modifier.PUBLIC | Modifier.PROTECTED | Modifier.PRIVATE); + modifiedModifiers &= ~STRICTFP; writer.startOp(writer.NO_PAREN, 1); String delim = ""; @@ -848,11 +864,28 @@ public class MethodAnalyzer implements Scope, ClassDeclarer { delim = " "; } + String modif = Modifier.toString(modifiedModifiers); if (modif.length() > 0) { writer.print(delim + modif); delim = " "; } + if (isStrictFP()) { + /* The STRICTFP modifier is set. + * We handle it, since java.lang.reflect.Modifier is too dumb. + */ + + /* If STRICTFP is already set for class don't set it for method. + * And don't set STRICTFP for native methods or constructors. + */ + if (!classAnalyzer.isStrictFP() + && !isConstructor() + && (modifiedModifiers & Modifier.NATIVE) == 0) { + writer.print(delim + "strictfp"); + delim = " "; + } + } + if (isConstructor && (isStatic() || (classAnalyzer.getName() == null diff --git a/jode/jode/decompiler/OuterValues.java b/jode/jode/decompiler/OuterValues.java index 580c7f5..d38f3fd 100644 --- a/jode/jode/decompiler/OuterValues.java +++ b/jode/jode/decompiler/OuterValues.java @@ -71,6 +71,7 @@ public class OuterValues private Expression[] head; private Vector ovListeners; private boolean jikesAnonymousInner; + private boolean implicitOuterClass; /** * The maximal number of parameters used for outer values. @@ -270,6 +271,17 @@ public class OuterValues return jikesAnonymousInner; } + /** + * Javac 1.3 doesn't give an outer class reference for anonymous + * classes that extend inner classes, provided the outer class is + * the normal this parameter. Instead it takes a normal outer + * value parameter for this. This method tells if this is such a + * class. + */ + public boolean isImplicitOuterClass() { + return implicitOuterClass; + } + public void addOuterValueListener(OuterValueListener l) { if (ovListeners == null) ovListeners = new Vector(); @@ -285,6 +297,10 @@ public class OuterValues jikesAnonymousInner = value; } + public void setImplicitOuterClass(boolean value) { + implicitOuterClass = value; + } + private static int countSlots(Expression[] exprs, int length) { int slots = 0; for (int i=0; i < length; i++) @@ -346,8 +362,8 @@ public class OuterValues } if (jikesAnonymousInner) sb.append("!jikesAnonymousInner"); + if (implicitOuterClass) + sb.append("!implicitOuterClass"); return sb.append("]").toString(); } } - - diff --git a/jode/jode/decompiler/TabbedPrintWriter.java b/jode/jode/decompiler/TabbedPrintWriter.java index e0bb801..b4cbbe9 100644 --- a/jode/jode/decompiler/TabbedPrintWriter.java +++ b/jode/jode/decompiler/TabbedPrintWriter.java @@ -101,11 +101,8 @@ public class TabbedPrintWriter { } public void startOp(int opts, int penalty, int pos) { - if (startPos != -1) { - System.err.println("WARNING: missing breakOp"); - Thread.dumpStack(); - return; - } + if (startPos != -1) + throw new InternalError("missing breakOp"); startPos = pos; options = opts; breakPenalty = penalty; @@ -539,8 +536,9 @@ public class TabbedPrintWriter { Stack state = new Stack(); int pos = currentLine.length(); while (currentBP.parentBP != null) { - state.push(new Integer(currentBP.options)); state.push(new Integer(currentBP.breakPenalty)); + /* We don't want parentheses or unconventional line breaking */ + currentBP.options = DONT_BREAK; currentBP.endPos = pos; currentBP = currentBP.parentBP; } @@ -551,8 +549,7 @@ public class TabbedPrintWriter { Stack state = (Stack) s; while (!state.isEmpty()) { int penalty = ((Integer) state.pop()).intValue(); - int options = ((Integer) state.pop()).intValue(); - startOp(options, penalty); + startOp(DONT_BREAK, penalty); } } diff --git a/jode/jode/expr/ArrayStoreOperator.java b/jode/jode/expr/ArrayStoreOperator.java index 796262b..3f1e736 100644 --- a/jode/jode/expr/ArrayStoreOperator.java +++ b/jode/jode/expr/ArrayStoreOperator.java @@ -32,4 +32,29 @@ public class ArrayStoreOperator extends ArrayLoadOperator public boolean matches(Operator loadop) { return loadop instanceof ArrayLoadOperator; } + + public void dumpExpression(TabbedPrintWriter writer) + throws java.io.IOException { + Type arrType = subExpressions[0].getType().getHint(); + if (arrType instanceof ArrayType) { + Type elemType = ((ArrayType) arrType).getElementType(); + if (!elemType.isOfType(getType())) { + /* We need an explicit widening cast */ + writer.print("("); + writer.startOp(writer.EXPL_PAREN, 1); + writer.print("("); + writer.printType(Type.tArray(getType().getHint())); + writer.print(") "); + writer.breakOp(); + subExpressions[0].dumpExpression(writer, 700); + writer.print(")"); + writer.breakOp(); + writer.print("["); + subExpressions[1].dumpExpression(writer, 0); + writer.print("]"); + return; + } + } + super.dumpExpression(writer); + } } diff --git a/jode/jode/expr/ConstOperator.java b/jode/jode/expr/ConstOperator.java index 9cfcb9b..f9ac42d 100644 --- a/jode/jode/expr/ConstOperator.java +++ b/jode/jode/expr/ConstOperator.java @@ -109,7 +109,7 @@ public class ConstOperator extends NoArgOperator { return false; } - public void makeInitializer() { + public void makeInitializer(Type type) { isInitializer = true; } diff --git a/jode/jode/expr/ConstantArrayOperator.java b/jode/jode/expr/ConstantArrayOperator.java index 0a3be5a..eb9269e 100644 --- a/jode/jode/expr/ConstantArrayOperator.java +++ b/jode/jode/expr/ConstantArrayOperator.java @@ -48,7 +48,7 @@ public class ConstantArrayOperator extends Operator { empty = new ConstOperator(emptyVal); empty.setType(argType); - empty.makeInitializer(); + empty.makeInitializer(argType); initOperands(size); for (int i=0; i < subExpressions.length; i++) setSubExpressions(i, empty); @@ -74,7 +74,7 @@ public class ConstantArrayOperator extends Operator { setType(Type.tSuperType(Type.tArray(value.getType()))); subExpressions[index] = value; value.parent = this; - value.makeInitializer(); + value.makeInitializer(argType); return true; } @@ -82,8 +82,9 @@ public class ConstantArrayOperator extends Operator { return 200; } - public void makeInitializer() { - isInitializer = true; + public void makeInitializer(Type type) { + if (type.getHint().isOfType(getType())) + isInitializer = true; } public Expression simplify() { diff --git a/jode/jode/expr/Expression.java.in b/jode/jode/expr/Expression.java.in index ad6ed84..d7127da 100644 --- a/jode/jode/expr/Expression.java.in +++ b/jode/jode/expr/Expression.java.in @@ -208,7 +208,7 @@ public abstract class Expression { return null; } - public void makeInitializer() { + public void makeInitializer(Type type) { } public boolean isConstant() { diff --git a/jode/jode/expr/FieldOperator.java.in b/jode/jode/expr/FieldOperator.java.in index 951f874..7d24ba1 100644 --- a/jode/jode/expr/FieldOperator.java.in +++ b/jode/jode/expr/FieldOperator.java.in @@ -25,6 +25,7 @@ import jode.bytecode.FieldInfo; import jode.bytecode.ClassInfo; import jode.bytecode.Reference; import jode.bytecode.InnerClassInfo; +import jode.bytecode.TypeSignature; import jode.decompiler.MethodAnalyzer; import jode.decompiler.ClassAnalyzer; import jode.decompiler.MethodAnalyzer; @@ -33,6 +34,7 @@ import jode.decompiler.Options; import jode.decompiler.TabbedPrintWriter; import jode.decompiler.Scope; +import java.lang.reflect.Modifier; import @COLLECTIONS@.Collection; /** @@ -120,6 +122,33 @@ public abstract class FieldOperator extends Operator { return Type.tType(ref.getType()); } + private static FieldInfo getFieldInfo(ClassInfo clazz, + String name, String type) { + while (clazz != null) { + FieldInfo field = clazz.findField(name, type); + if (field != null) + return field; + + ClassInfo[] ifaces = clazz.getInterfaces(); + for (int i = 0; i < ifaces.length; i++) { + field = getFieldInfo(ifaces[i], name, type); + if (field != null) + return field; + } + + clazz = clazz.getSuperclass(); + } + return null; + } + public FieldInfo getFieldInfo() { + ClassInfo clazz; + if (ref.getClazz().charAt(0) == '[') + clazz = ClassInfo.javaLangObject; + else + clazz = TypeSignature.getClassInfo(ref.getClazz()); + return getFieldInfo(clazz, ref.getName(), ref.getType()); + } + public boolean needsCast(Type type) { if (type instanceof NullType) return true; @@ -129,6 +158,37 @@ public abstract class FieldOperator extends Operator { ClassInfo clazz = ((ClassInterfacesType) classType).getClassInfo(); ClassInfo parClazz = ((ClassInterfacesType) type).getClassInfo(); + FieldInfo field = clazz.findField(ref.getName(), ref.getType()); + + find_field: + while (field == null) { + ClassInfo ifaces[] = clazz.getInterfaces(); + for (int i = 0; i < ifaces.length; i++) { + field = ifaces[i].findField(ref.getName(), ref.getType()); + if (field != null) + break find_field; + } + clazz = clazz.getSuperclass(); + if (clazz == null) + /* Weird, field not existing? */ + return false; + field = clazz.findField(ref.getName(), ref.getType()); + } + if (Modifier.isPrivate(field.getModifiers())) + return parClazz != clazz; + else if ((field.getModifiers() + & (Modifier.PROTECTED | Modifier.PUBLIC)) == 0) { + /* Field is protected. We need a cast if parClazz is in + * other package than clazz. + */ + int lastDot = clazz.getName().lastIndexOf('.'); + if (lastDot == -1 + || lastDot != parClazz.getName().lastIndexOf('.') + || !(parClazz.getName() + .startsWith(clazz.getName().substring(0,lastDot)))) + return true; + } + while (clazz != parClazz && clazz != null) { FieldInfo[] fields = parClazz.getFields(); for (int i = 0; i < fields.length; i++) { @@ -216,20 +276,8 @@ public abstract class FieldOperator extends Operator { */ getField() == null && writer.conflicts(fieldName, null, - Scope.NOSUPERFIELDNAME))) { - - ClassAnalyzer ana = methodAnalyzer.getClassAnalyzer(); - while (ana.getParent() instanceof ClassAnalyzer - && ana != scope) - ana = (ClassAnalyzer) ana.getParent(); - if (ana == scope) - // For a simple outer class we can say this - writer.print("this"); - else { - // For a class that owns a method that owns - // us, we have to give the full class name - thisOp.dumpExpression(writer, 950); - } + Scope.NOSUPERFIELDNAME))) { + thisOp.dumpExpression(writer, 950); writer.breakOp(); writer.print("."); } diff --git a/jode/jode/expr/InvokeOperator.java.in b/jode/jode/expr/InvokeOperator.java.in index aaffa4b..ec2d71e 100644 --- a/jode/jode/expr/InvokeOperator.java.in +++ b/jode/jode/expr/InvokeOperator.java.in @@ -58,6 +58,7 @@ public final class InvokeOperator extends Operator int methodFlag; MethodType methodType; String methodName; + Reference ref; int skippedArgs; Type classType; Type[] hints; @@ -127,6 +128,7 @@ public final class InvokeOperator extends Operator public InvokeOperator(MethodAnalyzer methodAnalyzer, int methodFlag, Reference reference) { super(Type.tUnknown, 0); + this.ref = reference; this.methodType = Type.tMethod(reference.getType()); this.methodName = reference.getName(); this.classType = Type.tType(reference.getClazz()); @@ -166,6 +168,25 @@ public final class InvokeOperator extends Operator return methodName; } + private static MethodInfo getMethodInfo(ClassInfo clazz, + String name, String type) { + while (clazz != null) { + MethodInfo method = clazz.findMethod(name, type); + if (method != null) + return method; + clazz = clazz.getSuperclass(); + } + return null; + } + public MethodInfo getMethodInfo() { + ClassInfo clazz; + if (ref.getClazz().charAt(0) == '[') + clazz = ClassInfo.javaLangObject; + else + clazz = TypeSignature.getClassInfo(ref.getClazz()); + return getMethodInfo(clazz, ref.getName(), ref.getType()); + } + public Type getClassType() { return classType; } @@ -586,14 +607,20 @@ public final class InvokeOperator extends Operator synth.getReference()); break; case SyntheticAnalyzer.ACCESSPUTFIELD: + case SyntheticAnalyzer.ACCESSDUPPUTFIELD: op = new StoreInstruction (new PutFieldOperator(methodAnalyzer, false, synth.getReference())); + if (synth.getKind() == synth.ACCESSDUPPUTFIELD) + ((StoreInstruction) op).makeNonVoid(); break; case SyntheticAnalyzer.ACCESSPUTSTATIC: + case SyntheticAnalyzer.ACCESSDUPPUTSTATIC: op = new StoreInstruction (new PutFieldOperator(methodAnalyzer, true, synth.getReference())); + if (synth.getKind() == synth.ACCESSDUPPUTSTATIC) + ((StoreInstruction) op).makeNonVoid(); break; case SyntheticAnalyzer.ACCESSMETHOD: op = new InvokeOperator(methodAnalyzer, ACCESSSPECIAL, @@ -636,9 +663,35 @@ public final class InvokeOperator extends Operator Type realClassType; if (methodFlag == STATIC) realClassType = classType; - else { - if (param == 0) - return paramTypes[0] instanceof NullType; + else if (param == 0) { + if (paramTypes[0] instanceof NullType) + return true; + if (!(paramTypes[0] instanceof ClassInterfacesType + && classType instanceof ClassInterfacesType)) + return false; + + ClassInfo clazz = ((ClassInterfacesType) classType).getClassInfo(); + ClassInfo parClazz + = ((ClassInterfacesType) paramTypes[0]).getClassInfo(); + MethodInfo method = getMethodInfo(); + if (method == null) + /* This is a NoSuchMethodError */ + return false; + if (Modifier.isPrivate(method.getModifiers())) + return parClazz != clazz; + else if ((method.getModifiers() + & (Modifier.PROTECTED | Modifier.PUBLIC)) == 0) { + /* Method is protected. We need a cast if parClazz is in + * other package than clazz. + */ + int lastDot = clazz.getName().lastIndexOf('.'); + if (lastDot != parClazz.getName().lastIndexOf('.') + || !(parClazz.getName() + .startsWith(clazz.getName().substring(0,lastDot+1)))) + return true; + } + return false; + } else { realClassType = paramTypes[0]; } @@ -731,6 +784,7 @@ public final class InvokeOperator extends Operator int arg = 1; int length = subExpressions.length; boolean jikesAnonymousInner = false; + boolean implicitOuterClass = false; if ((Options.options & Options.OPTION_ANON) != 0 && clazzAna != null @@ -739,6 +793,7 @@ public final class InvokeOperator extends Operator OuterValues ov = clazzAna.getOuterValues(); arg += ov.getCount(); jikesAnonymousInner = ov.isJikesAnonymousInner(); + implicitOuterClass = ov.isImplicitOuterClass(); for (int i=1; i< arg; i++) { Expression expr = subExpressions[i]; @@ -768,7 +823,9 @@ public final class InvokeOperator extends Operator if ((Options.options & Options.OPTION_INNER) != 0 && outer != null && outer.outer != null && outer.name != null - && !Modifier.isStatic(outer.modifiers)) { + && !Modifier.isStatic(outer.modifiers) + && !implicitOuterClass + && arg < length) { Expression outerExpr = jikesAnonymousInner ? subExpressions[--length] @@ -830,6 +887,7 @@ public final class InvokeOperator extends Operator boolean qualifiedNew = false; boolean jikesAnonymousInner = false; + boolean implicitOuterClass = false; /* Check if this is an anonymous constructor. In this case @@ -851,6 +909,7 @@ public final class InvokeOperator extends Operator OuterValues ov = clazzAna.getOuterValues(); arg += ov.getCount(); jikesAnonymousInner = ov.isJikesAnonymousInner(); + implicitOuterClass = ov.isImplicitOuterClass(); if (outer.name == null) { /* This is an anonymous class */ @@ -893,47 +952,54 @@ public final class InvokeOperator extends Operator (Options.OPTION_INNER | Options.OPTION_CONTRAFO)) == 0) { - Expression outerExpr = jikesAnonymousInner - ? subExpressions[--length] + if (implicitOuterClass) { + /* Outer class is "this" and is not given + * explicitly. No need to print something. + */ + } else if (arg < length) { + Expression outerExpr = jikesAnonymousInner + ? subExpressions[--length] : subExpressions[arg++]; - if (outerExpr instanceof CheckNullOperator) { - CheckNullOperator cno = (CheckNullOperator) outerExpr; - outerExpr = cno.subExpressions[0]; - } else if (!(outerExpr instanceof ThisOperator)) { - if (!jikesAnonymousInner) - // Bug in jikes: it doesn't do a check null. - // We don't complain here. - writer.print("MISSING CHECKNULL "); - } + if (outerExpr instanceof CheckNullOperator) { + CheckNullOperator cno = (CheckNullOperator) outerExpr; + outerExpr = cno.subExpressions[0]; + } else { + /* We used to complain about MISSING CHECKNULL + * here except for ThisOperators. But javac + * v8 doesn't seem to create CHECKNULL ops. + */ + } - if (outerExpr instanceof ThisOperator) { - Scope scope = writer.getScope - (((ThisOperator) outerExpr).getClassInfo(), - Scope.CLASSSCOPE); - if (writer.conflicts(outer.name, scope, Scope.CLASSNAME)) { + if (outerExpr instanceof ThisOperator) { + Scope scope = writer.getScope + (((ThisOperator) outerExpr).getClassInfo(), + Scope.CLASSSCOPE); + if (writer.conflicts(outer.name, scope, Scope.CLASSNAME)) { + qualifiedNew = true; + outerExpr.dumpExpression(writer, 950); + writer.breakOp(); + writer.print("."); + } + } else { qualifiedNew = true; - outerExpr.dumpExpression(writer, 950); + if (outerExpr.getType() instanceof NullType) { + writer.print("("); + writer.startOp(writer.EXPL_PAREN, 1); + writer.print("("); + writer.printType(Type.tClass + (ClassInfo.forName(outer.outer))); + writer.print(") "); + writer.breakOp(); + outerExpr.dumpExpression(writer, 700); + writer.endOp(); + writer.print(")"); + } else + outerExpr.dumpExpression(writer, 950); writer.breakOp(); writer.print("."); } - } else { - qualifiedNew = true; - if (outerExpr.getType() instanceof NullType) { - writer.print("("); - writer.startOp(writer.EXPL_PAREN, 1); - writer.print("("); - writer.printType(Type.tClass - (ClassInfo.forName(outer.outer))); - writer.print(") "); - writer.breakOp(); - outerExpr.dumpExpression(writer, 700); - writer.endOp(); - writer.print(")"); - } else - outerExpr.dumpExpression(writer, 950); - writer.breakOp(); - writer.print("."); - } + } else + writer.print("MISSING OUTEREXPR "); } if (subExpressions[0] instanceof NewOperator @@ -1062,10 +1128,10 @@ public final class InvokeOperator extends Operator Scope scope = writer.getScope(thisOp.getClassInfo(), Scope.CLASSSCOPE); if (writer.conflicts(methodName, scope, Scope.METHODNAME) - || (/* This field is inherited from the parent of + || (/* This method is inherited from the parent of * an outer class, or it is inherited from the * parent of this class and there is a conflicting - * field in some outer class. + * method in some outer class. */ getMethodAnalyzer() == null && (!isThis() || diff --git a/jode/jode/flow/CaseBlock.java b/jode/jode/flow/CaseBlock.java index b176261..0c7f607 100644 --- a/jode/jode/flow/CaseBlock.java +++ b/jode/jode/flow/CaseBlock.java @@ -19,6 +19,7 @@ package jode.flow; import jode.expr.ConstOperator; +import jode.type.Type; /** * This block represents a case instruction. A case instruction is a @@ -173,8 +174,9 @@ public class CaseBlock extends StructuredBlock { writer.untab(); } ConstOperator constOp = new ConstOperator(new Integer(value)); - constOp.setType(((SwitchBlock)outer).getInstruction().getType()); - constOp.makeInitializer(); + Type type = ((SwitchBlock)outer).getInstruction().getType(); + constOp.setType(type); + constOp.makeInitializer(type); writer.print("case " + constOp.toString() + ":"); } if (subBlock != null) { diff --git a/jode/jode/flow/InstructionBlock.java.in b/jode/jode/flow/InstructionBlock.java.in index ad8a4dc..dc710d2 100644 --- a/jode/jode/flow/InstructionBlock.java.in +++ b/jode/jode/flow/InstructionBlock.java.in @@ -116,7 +116,6 @@ public class InstructionBlock extends InstructionContainer { * change this to a initializing variable declaration. */ isDeclaration = true; - storeOp.getSubExpressions()[1].makeInitializer(); declareSet.remove(local); } } @@ -144,6 +143,7 @@ public class InstructionBlock extends InstructionContainer { local.dumpDeclaration(writer); writer.breakOp(); writer.print(" = "); + store.getSubExpressions()[1].makeInitializer(local.getType()); store.getSubExpressions()[1].dumpExpression(writer.IMPL_PAREN, writer); writer.endOp(); diff --git a/jode/jode/flow/JsrBlock.java b/jode/jode/flow/JsrBlock.java index 6bf2491..7e10b1d 100644 --- a/jode/jode/flow/JsrBlock.java +++ b/jode/jode/flow/JsrBlock.java @@ -33,14 +33,22 @@ public class JsrBlock extends StructuredBlock { * The inner block that jumps to the subroutine. */ StructuredBlock innerBlock; + boolean good = false; public JsrBlock(Jump subroutine, Jump next) { innerBlock = new EmptyBlock(subroutine); innerBlock.outer = this; setJump(next); } - + public void setGood(boolean g) { + good = g; + } + + public boolean isGood() { + return good; + } + /* The implementation of getNext[Flow]Block is the standard * implementation */ diff --git a/jode/jode/flow/LoopBlock.java.in b/jode/jode/flow/LoopBlock.java.in index 0d050bc..b5f4d1f 100644 --- a/jode/jode/flow/LoopBlock.java.in +++ b/jode/jode/flow/LoopBlock.java.in @@ -265,7 +265,6 @@ public class LoopBlock extends StructuredBlock implements BreakableBlock { * change this to a initializing variable declaration. */ isDeclaration = true; - storeOp.getSubExpressions()[1].makeInitializer(); declareSet.remove(local); } } @@ -332,6 +331,8 @@ public class LoopBlock extends StructuredBlock implements BreakableBlock { local.dumpDeclaration(writer); writer.breakOp(); writer.print(" = "); + store.getSubExpressions()[1] + .makeInitializer(local.getType()); store.getSubExpressions()[1].dumpExpression(writer, 100); writer.endOp(); } else diff --git a/jode/jode/flow/Makefile.am b/jode/jode/flow/Makefile.am index fe0175d..35bbdce 100644 --- a/jode/jode/flow/Makefile.am +++ b/jode/jode/flow/Makefile.am @@ -41,6 +41,7 @@ MY_JAVA_FILES = \ RetBlock.java \ ReturnBlock.java \ SequentialBlock.java \ + SlotSet.java \ SpecialBlock.java \ StructuredBlock.java \ SwitchBlock.java \ diff --git a/jode/jode/flow/SpecialBlock.java b/jode/jode/flow/SpecialBlock.java index fc7916b..5110d5d 100644 --- a/jode/jode/flow/SpecialBlock.java +++ b/jode/jode/flow/SpecialBlock.java @@ -148,6 +148,9 @@ public class SpecialBlock extends StructuredBlock { * to: * method_invocation() * + * With java1.3 due to access$ methods the method_invocation can + * already be a non void store instruction. + * * PUSH arg1 * PUSH arg2 * POP2 @@ -174,7 +177,8 @@ public class SpecialBlock extends StructuredBlock { if (instr.getType().stackSize() == count) { StructuredBlock newBlock; - if (instr instanceof InvokeOperator) { + if (instr instanceof InvokeOperator + || instr instanceof StoreInstruction) { Expression newExpr = new PopOperator(instr.getType()).addOperand(instr); prev.setInstruction(newExpr); diff --git a/jode/jode/flow/TransformConstructors.java b/jode/jode/flow/TransformConstructors.java index ac140db..2a1df7c 100644 --- a/jode/jode/flow/TransformConstructors.java +++ b/jode/jode/flow/TransformConstructors.java @@ -33,6 +33,7 @@ import jode.type.MethodType; import jode.type.Type; import jode.bytecode.ClassInfo; import jode.bytecode.InnerClassInfo; +import jode.bytecode.MethodInfo; import java.util.Vector; import java.util.Enumeration; @@ -318,7 +319,18 @@ public class TransformConstructors { } } - if (minSuperOuter > 0) { + if (minSuperOuter == 1 + && superAna.getParent() instanceof ClassAnalyzer) { + /* Check if this is the implicit Outer Class */ + LocalLoadOperator llop = (LocalLoadOperator) subExpr[start]; + if (outerValues.getValueBySlot(llop.getLocalInfo().getSlot()) + instanceof ThisOperator) { + minSuperOuter = 0; + outerValues.setImplicitOuterClass(true); + } + } + + if (minSuperOuter > 0) { if (superOV == null || superOV.getCount() < minSuperOuter) { if ((GlobalOptions.debuggingFlags & GlobalOptions.DEBUG_CONSTRS) != 0) @@ -602,6 +614,24 @@ public class TransformConstructors { fo.getFieldType()) >= fieldSlot) return null; } + if (expr instanceof InvokeOperator) { + /* Don't allow method invocations that can throw a checked + * exception to leave the constructor. + */ + MethodInfo method = ((InvokeOperator) expr).getMethodInfo(); + String[] excs = method == null ? null : method.getExceptions(); + if (excs != null) { + ClassInfo runtimeException + = ClassInfo.forName("java.lang.RuntimeException"); + ClassInfo error = ClassInfo.forName("java.lang.Error"); + for (int i = 0; i < excs.length; i++) { + ClassInfo exClass = ClassInfo.forName(excs[i]); + if (!runtimeException.superClassOf(exClass) + && !error.superClassOf(exClass)) + return null; + } + } + } if (expr instanceof Operator) { Operator op = (Operator) expr; Expression[] subExpr = op.getSubExpressions(); diff --git a/jode/jode/flow/TransformExceptionHandlers.java.in b/jode/jode/flow/TransformExceptionHandlers.java.in index e90d6ab..17f2e14 100644 --- a/jode/jode/flow/TransformExceptionHandlers.java.in +++ b/jode/jode/flow/TransformExceptionHandlers.java.in @@ -205,7 +205,7 @@ public class TransformExceptionHandlers { * @param tryFlow the FlowBLock of the try block. * @param subRoutine the FlowBlock of the sub routine. */ - private void removeBadJSR(FlowBlock tryFlow, StructuredBlock catchBlock, + private void removeJSR(FlowBlock tryFlow, StructuredBlock catchBlock, FlowBlock subRoutine) { Jump nextJump; for (Jump jumps = tryFlow.getJumps(subRoutine); @@ -215,18 +215,27 @@ public class TransformExceptionHandlers { nextJump = jumps.next; if (prev instanceof EmptyBlock && prev.outer instanceof JsrBlock) { + JsrBlock jsr = (JsrBlock) prev.outer; if (prev.outer == catchBlock) { /* This is the mandatory jsr in the catch block */ continue; } - /* We have a JSR to the subroutine, which is badly placed. - * We complain here. - */ - DescriptionBlock msg - = new DescriptionBlock("ERROR: JSR FINALLY BLOCK!"); + tryFlow.removeSuccessor(jumps); prev.removeJump(); - msg.replace(prev.outer); + if (jsr.isGood()) { + StructuredBlock next = jsr.getNextBlock(); + jsr.removeBlock(); + if (next instanceof ReturnBlock) + removeReturnLocal((ReturnBlock) next); + } else { + /* We have a JSR to the subroutine, which is badly placed. + * We complain here. + */ + DescriptionBlock msg + = new DescriptionBlock("ERROR: JSR FINALLY BLOCK!"); + msg.replace(prev.outer); + } } else { /* We have a jump to the subroutine, that is wrong. * We complain here. @@ -331,18 +340,15 @@ public class TransformExceptionHandlers { StructuredBlock pred = skipFinExitChain(prev); if (pred instanceof JsrBlock) { - StructuredBlock jsrInner = ((JsrBlock) pred).innerBlock; + JsrBlock jsr = (JsrBlock) pred; + StructuredBlock jsrInner = jsr.innerBlock; if (jsrInner instanceof EmptyBlock && jsrInner.jump != null && jsrInner.jump.destination == subRoutine) { - /* The jump is preceeded by the right jsr. Remove - * the jsr. + /* The jump is preceeded by the right jsr. Mark the + * jsr as good. */ - tryFlow.removeSuccessor(jsrInner.jump); - jsrInner.removeJump(); - pred.removeBlock(); - if (prev instanceof ReturnBlock) - removeReturnLocal((ReturnBlock) prev); + jsr.setGood(true); continue; } } @@ -388,7 +394,7 @@ public class TransformExceptionHandlers { } } if (tryFlow.getSuccessors().contains(subRoutine)) - removeBadJSR(tryFlow, catchBlock, subRoutine); + removeJSR(tryFlow, catchBlock, subRoutine); } private void checkAndRemoveMonitorExit(FlowBlock tryFlow, @@ -420,7 +426,8 @@ public class TransformExceptionHandlers { } StructuredBlock pred = skipFinExitChain(prev); if (pred instanceof JsrBlock) { - StructuredBlock jsrInner = ((JsrBlock) pred).innerBlock; + JsrBlock jsr = (JsrBlock) pred; + StructuredBlock jsrInner = jsr.innerBlock; if (jsrInner instanceof EmptyBlock && jsrInner.jump != null) { FlowBlock dest = jsrInner.jump.destination; @@ -434,14 +441,10 @@ public class TransformExceptionHandlers { } if (dest == subRoutine) { - /* The jump is preceeded by the right jsr. Remove - * the jsr. + /* The jump is preceeded by the right jsr. + * Mark it as good. */ - tryFlow.removeSuccessor(jsrInner.jump); - jsrInner.removeJump(); - pred.removeBlock(); - if (prev instanceof ReturnBlock) - removeReturnLocal((ReturnBlock) prev); + jsr.setGood(true); continue; } } @@ -507,7 +510,7 @@ public class TransformExceptionHandlers { if (subRoutine != null) { if (tryFlow.getSuccessors().contains(subRoutine)) - removeBadJSR(tryFlow, catchBlock, subRoutine); + removeJSR(tryFlow, catchBlock, subRoutine); tryFlow.mergeAddr(subRoutine); } } diff --git a/jode/jode/jvm/SyntheticAnalyzer.java.in b/jode/jode/jvm/SyntheticAnalyzer.java.in index a6d13d1..4bf52ef 100644 --- a/jode/jode/jvm/SyntheticAnalyzer.java.in +++ b/jode/jode/jvm/SyntheticAnalyzer.java.in @@ -45,6 +45,8 @@ public class SyntheticAnalyzer implements Opcodes { public final static int ACCESSPUTSTATIC = 6; public final static int ACCESSSTATICMETHOD = 7; public final static int ACCESSCONSTRUCTOR = 8; + public final static int ACCESSDUPPUTFIELD = 9; + public final static int ACCESSDUPPUTSTATIC = 10; int kind = UNKNOWN; Reference reference; @@ -141,25 +143,23 @@ public class SyntheticAnalyzer implements Opcodes { return true; } - private final int modifierMask = (Modifier.PRIVATE | Modifier.PROTECTED | - Modifier.PUBLIC | Modifier.STATIC); + private final int modifierMask = Modifier.PUBLIC | Modifier.STATIC; public boolean checkStaticAccess() { ClassInfo clazzInfo = method.getClazzInfo(); BytecodeInfo bytecode = method.getBytecode(); Iterator iter = bytecode.getInstructions().iterator(); + boolean dupSeen = false; Instruction instr = (Instruction) iter.next(); if (instr.getOpcode() == opc_getstatic) { Reference ref = instr.getReference(); - String refClazz = ref.getClazz().substring(1); - if (!(refClazz.substring(0, refClazz.length()-1) - .equals(clazzInfo.getName().replace('.','/')))) + ClassInfo refClazz = TypeSignature.getClassInfo(ref.getClazz()); + if (!refClazz.superClassOf(clazzInfo)) return false; FieldInfo refField - = clazzInfo.findField(ref.getName(), ref.getType()); - if ((refField.getModifiers() & modifierMask) != - (Modifier.PRIVATE | Modifier.STATIC)) + = refClazz.findField(ref.getName(), ref.getType()); + if ((refField.getModifiers() & modifierMask) != Modifier.STATIC) return false; instr = (Instruction) iter.next(); if (instr.getOpcode() < opc_ireturn @@ -179,38 +179,50 @@ public class SyntheticAnalyzer implements Opcodes { || instr.getOpcode() == opc_dload) ? 2 : 1; instr = (Instruction) iter.next(); } + if (instr.getOpcode() == (opc_dup - 3) + 3 * slot) { + /* This is probably a opc_dup or opc_dup2, + * preceding a opc_putstatic + */ + instr = (Instruction) iter.next(); + if (instr.getOpcode() != opc_putstatic) + return false; + dupSeen = true; + } if (instr.getOpcode() == opc_putstatic) { if (params != 1) return false; /* For valid bytecode the type of param matches automatically */ Reference ref = instr.getReference(); - String refClazz = ref.getClazz().substring(1); - if (!(refClazz.substring(0, refClazz.length()-1) - .equals(clazzInfo.getName().replace('.','/')))) + ClassInfo refClazz = TypeSignature.getClassInfo(ref.getClazz()); + if (!refClazz.superClassOf(clazzInfo)) return false; FieldInfo refField - = clazzInfo.findField(ref.getName(), ref.getType()); - if ((refField.getModifiers() & modifierMask) != - (Modifier.PRIVATE | Modifier.STATIC)) + = refClazz.findField(ref.getName(), ref.getType()); + if ((refField.getModifiers() & modifierMask) != Modifier.STATIC) return false; instr = (Instruction) iter.next(); - if (instr.getOpcode() != opc_return) - return false; + if (dupSeen) { + if (instr.getOpcode() < opc_ireturn + || instr.getOpcode() > opc_areturn) + return false; + kind = ACCESSDUPPUTSTATIC; + } else { + if (instr.getOpcode() != opc_return) + return false; + kind = ACCESSPUTSTATIC; + } reference = ref; - kind = ACCESSPUTSTATIC; return true; } if (instr.getOpcode() == opc_invokestatic) { Reference ref = instr.getReference(); - String refClazz = ref.getClazz().substring(1); - if (!(refClazz.substring(0, refClazz.length()-1) - .equals(clazzInfo.getName().replace('.','/')))) + ClassInfo refClazz = TypeSignature.getClassInfo(ref.getClazz()); + if (!refClazz.superClassOf(clazzInfo)) return false; MethodInfo refMethod - = clazzInfo.findMethod(ref.getName(), ref.getType()); + = refClazz.findMethod(ref.getName(), ref.getType()); MethodType refType = Type.tMethod(ref.getType()); - if ((refMethod.getModifiers() & modifierMask) != - (Modifier.PRIVATE | Modifier.STATIC) + if ((refMethod.getModifiers() & modifierMask) != Modifier.STATIC || refType.getParameterTypes().length != params) return false; instr = (Instruction) iter.next(); @@ -235,6 +247,7 @@ public class SyntheticAnalyzer implements Opcodes { ClassInfo clazzInfo = method.getClazzInfo(); BytecodeInfo bytecode = method.getBytecode(); Handler[] excHandlers = bytecode.getExceptionHandlers(); + boolean dupSeen = false; if (excHandlers != null && excHandlers.length != 0) return false; @@ -251,13 +264,12 @@ public class SyntheticAnalyzer implements Opcodes { if (instr.getOpcode() == opc_getfield) { Reference ref = instr.getReference(); - String refClazz = ref.getClazz().substring(1); - if (!(refClazz.substring(0, refClazz.length()-1) - .equals(clazzInfo.getName().replace('.','/')))) + ClassInfo refClazz = TypeSignature.getClassInfo(ref.getClazz()); + if (!refClazz.superClassOf(clazzInfo)) return false; FieldInfo refField - = clazzInfo.findField(ref.getName(), ref.getType()); - if ((refField.getModifiers() & modifierMask) != Modifier.PRIVATE) + = refClazz.findField(ref.getName(), ref.getType()); + if ((refField.getModifiers() & modifierMask) != 0) return false; instr = (Instruction) iter.next(); if (instr.getOpcode() < opc_ireturn @@ -277,36 +289,51 @@ public class SyntheticAnalyzer implements Opcodes { || instr.getOpcode() == opc_dload) ? 2 : 1; instr = (Instruction) iter.next(); } + if (instr.getOpcode() == (opc_dup_x1 - 6) + 3 * slot) { + /* This is probably a opc_dup_x1 or opc_dup2_x1, + * preceding a opc_putfield + */ + instr = (Instruction) iter.next(); + if (instr.getOpcode() != opc_putfield) + return false; + dupSeen = true; + } if (instr.getOpcode() == opc_putfield) { if (params != 1) return false; /* For valid bytecode the type of param matches automatically */ Reference ref = instr.getReference(); - String refClazz = ref.getClazz().substring(1); - if (!(refClazz.substring(0, refClazz.length()-1) - .equals(clazzInfo.getName().replace('.','/')))) + ClassInfo refClazz = TypeSignature.getClassInfo(ref.getClazz()); + if (!refClazz.superClassOf(clazzInfo)) return false; FieldInfo refField - = clazzInfo.findField(ref.getName(), ref.getType()); - if ((refField.getModifiers() & modifierMask) != Modifier.PRIVATE) + = refClazz.findField(ref.getName(), ref.getType()); + if ((refField.getModifiers() & modifierMask) != 0) return false; + instr = (Instruction) iter.next(); - if (instr.getOpcode() != opc_return) - return false; + if (dupSeen) { + if (instr.getOpcode() < opc_ireturn + || instr.getOpcode() > opc_areturn) + return false; + kind = ACCESSDUPPUTFIELD; + } else { + if (instr.getOpcode() != opc_return) + return false; + kind = ACCESSPUTFIELD; + } reference = ref; - kind = ACCESSPUTFIELD; return true; } if (instr.getOpcode() == opc_invokespecial) { Reference ref = instr.getReference(); - String refClazz = ref.getClazz().substring(1); - if (!(refClazz.substring(0, refClazz.length()-1) - .equals(clazzInfo.getName().replace('.','/')))) + ClassInfo refClazz = TypeSignature.getClassInfo(ref.getClazz()); + if (!refClazz.superClassOf(clazzInfo)) return false; MethodInfo refMethod - = clazzInfo.findMethod(ref.getName(), ref.getType()); + = refClazz.findMethod(ref.getName(), ref.getType()); MethodType refType = Type.tMethod(ref.getType()); - if ((refMethod.getModifiers() & modifierMask) != Modifier.PRIVATE + if ((refMethod.getModifiers() & modifierMask) != 0 || refType.getParameterTypes().length != params) return false; instr = (Instruction) iter.next(); @@ -364,14 +391,13 @@ public class SyntheticAnalyzer implements Opcodes { unifyParam = params++; Reference ref = instr.getReference(); - String refClazz = ref.getClazz().substring(1); - if (!(refClazz.substring(0, refClazz.length()-1) - .equals(clazzInfo.getName().replace('.','/')))) + ClassInfo refClazz = TypeSignature.getClassInfo(ref.getClazz()); + if (refClazz != clazzInfo) return false; MethodInfo refMethod - = clazzInfo.findMethod(ref.getName(), ref.getType()); + = refClazz.findMethod(ref.getName(), ref.getType()); MethodType refType = Type.tMethod(ref.getType()); - if ((refMethod.getModifiers() & modifierMask) != Modifier.PRIVATE + if ((refMethod.getModifiers() & modifierMask) != 0 || !refMethod.getName().equals("") || unifyParam == -1 || refType.getParameterTypes().length != params - 2) diff --git a/jode/jode/swingui/Main.java.in b/jode/jode/swingui/Main.java.in index c93da48..db0707c 100644 --- a/jode/jode/swingui/Main.java.in +++ b/jode/jode/swingui/Main.java.in @@ -344,16 +344,42 @@ public class Main } } } + + public static void usage() { + System.err.println("Usage: java jode.swingui.Main [CLASSPATH]"); + System.err.println("The directories in CLASSPATH should be separated by ','."); + System.err.println("If no CLASSPATH is given the virtual machine classpath is used."); + } public static void main(String[] params) { String cp = System.getProperty("java.class.path", ""); cp = cp.replace(File.pathSeparatorChar, Decompiler.altPathSeparatorChar); - for (int i=0; i tArray( y.intersection(x) ) - * obj , tArray(x) -> + /* + * tArray(y), tArray(x) -> tArray( y.intersection(x) ) + * obj , tArray(x) -> * iff tArray extends and implements obj - */ + */ if (bottom.getTypeCode() == TC_ARRAY) return tArray(elementType.intersection (((ArrayType)bottom).elementType)); @@ -93,11 +99,11 @@ public class ArrayType extends ReferenceType { * @return the common sub type. */ public Type getSpecializedType(Type type) { - /* - * tArray(x), object -> tArray(x) iff tArray implements object + /* + * tArray(x), iface -> tArray(x) iff tArray implements iface * tArray(x), tArray(y) -> tArray(x.intersection(y)) - * tArray(x), other -> tError - */ + * tArray(x), other -> tError + */ if (type.getTypeCode() == TC_RANGE) { type = ((RangeType) type).getBottom(); } @@ -123,10 +129,10 @@ public class ArrayType extends ReferenceType { * @return the common super type. */ public Type getGeneralizedType(Type type) { - /* tArray(x), tNull -> tArray(x) - * tArray(x), tClass(y) -> common ifaces of tArray and tClass - * tArray(x), tArray(y) -> tArray(x.intersection(y)) or tObject - * tArray(x), other -> tError + /* tArray(x), tNull -> tArray(x) + * tArray(x), tClass(y) -> common ifaces of tArray and tClass + * tArray(x), tArray(y) -> tArray(x.intersection(y)) or tObject + * tArray(x), other -> tError */ if (type.getTypeCode() == TC_RANGE) { type = ((RangeType) type).getTop(); @@ -136,7 +142,9 @@ public class ArrayType extends ReferenceType { if (type.getTypeCode() == TC_ARRAY) { Type elType = elementType.intersection (((ArrayType)type).elementType); - return elType != tError ? tArray(elType) : tObject; + if (elType != tError) + return tArray(elType); + return ClassInterfacesType.create(null, arrayIfaces); } if (type.getTypeCode() == TC_CLASS) { ClassInterfacesType other = (ClassInterfacesType) type; diff --git a/jode/jode/type/ClassInterfacesType.java b/jode/jode/type/ClassInterfacesType.java index ce24875..930a0a5 100644 --- a/jode/jode/type/ClassInterfacesType.java +++ b/jode/jode/type/ClassInterfacesType.java @@ -509,36 +509,57 @@ public class ClassInterfacesType extends ReferenceType { private final static Hashtable keywords = new Hashtable(); static { - keywords.put("package", Boolean.TRUE); - keywords.put("import", Boolean.TRUE); + keywords.put("abstract", Boolean.TRUE); + keywords.put("default", Boolean.TRUE); keywords.put("if", Boolean.TRUE); - keywords.put("else", Boolean.TRUE); - keywords.put("for", Boolean.TRUE); - keywords.put("while", Boolean.TRUE); + keywords.put("private", Boolean.TRUE); keywords.put("throw", Boolean.TRUE); - keywords.put("return", Boolean.TRUE); - keywords.put("class", Boolean.TRUE); - keywords.put("interface", Boolean.TRUE); + keywords.put("boolean", Boolean.TRUE); + keywords.put("do", Boolean.TRUE); keywords.put("implements", Boolean.TRUE); - keywords.put("extends", Boolean.TRUE); + keywords.put("protected", Boolean.TRUE); + keywords.put("throws", Boolean.TRUE); + keywords.put("break", Boolean.TRUE); + keywords.put("double", Boolean.TRUE); + keywords.put("import", Boolean.TRUE); + keywords.put("public", Boolean.TRUE); + keywords.put("transient", Boolean.TRUE); + keywords.put("byte", Boolean.TRUE); + keywords.put("else", Boolean.TRUE); keywords.put("instanceof", Boolean.TRUE); - keywords.put("new", Boolean.TRUE); + keywords.put("return", Boolean.TRUE); + keywords.put("try", Boolean.TRUE); + keywords.put("case", Boolean.TRUE); + keywords.put("extends", Boolean.TRUE); keywords.put("int", Boolean.TRUE); - keywords.put("boolean", Boolean.TRUE); - keywords.put("long", Boolean.TRUE); - keywords.put("float", Boolean.TRUE); - keywords.put("double", Boolean.TRUE); keywords.put("short", Boolean.TRUE); - keywords.put("public", Boolean.TRUE); - keywords.put("protected", Boolean.TRUE); - keywords.put("private", Boolean.TRUE); + keywords.put("void", Boolean.TRUE); + keywords.put("catch", Boolean.TRUE); + keywords.put("final", Boolean.TRUE); + keywords.put("interface", Boolean.TRUE); keywords.put("static", Boolean.TRUE); - keywords.put("synchronized", Boolean.TRUE); - keywords.put("strict", Boolean.TRUE); - keywords.put("transient", Boolean.TRUE); - keywords.put("abstract", Boolean.TRUE); keywords.put("volatile", Boolean.TRUE); - keywords.put("final", Boolean.TRUE); + keywords.put("char", Boolean.TRUE); + keywords.put("finally", Boolean.TRUE); + keywords.put("long", Boolean.TRUE); + keywords.put("super", Boolean.TRUE); + keywords.put("while", Boolean.TRUE); + keywords.put("class", Boolean.TRUE); + keywords.put("float", Boolean.TRUE); + keywords.put("native", Boolean.TRUE); + keywords.put("switch", Boolean.TRUE); + keywords.put("const", Boolean.TRUE); + keywords.put("for", Boolean.TRUE); + keywords.put("new", Boolean.TRUE); + keywords.put("synchronized", Boolean.TRUE); + keywords.put("continue", Boolean.TRUE); + keywords.put("goto", Boolean.TRUE); + keywords.put("package", Boolean.TRUE); + keywords.put("this", Boolean.TRUE); + keywords.put("strictfp", Boolean.TRUE); + keywords.put("null", Boolean.TRUE); + keywords.put("true", Boolean.TRUE); + keywords.put("false", Boolean.TRUE); } /** diff --git a/jode/jode/type/RangeType.java b/jode/jode/type/RangeType.java index c2eedb2..c8549be 100644 --- a/jode/jode/type/RangeType.java +++ b/jode/jode/type/RangeType.java @@ -107,13 +107,18 @@ public class RangeType extends Type { /** * Returns the hint type of this range type set. This returns the * singleton set containing only the first top type, except if it - * is null and there is a unique bottom type, in which case it returns - * the bottom type. + * is null and there is a unique bottom type, in which case it + * returns the bottom type. * @return the hint type. */ public Type getHint() { - return topType == tNull && bottomType.equals(bottomType.getHint()) - ? bottomType.getHint(): topType.getHint(); + Type bottomHint = bottomType.getHint(); + Type topHint = topType.getHint(); + + if (topType == tNull && bottomType.equals(bottomHint)) + return bottomHint; + + return topHint; } /**