diff --git a/CVSROOT/checkoutlist b/CVSROOT/checkoutlist deleted file mode 100644 index b04b350..0000000 --- a/CVSROOT/checkoutlist +++ /dev/null @@ -1,13 +0,0 @@ -# The "checkoutlist" file is used to support additional version controlled -# administrative files in $CVSROOT/CVSROOT, such as template files. -# -# The first entry on a line is a filename which will be checked out from -# the corresponding RCS file in the $CVSROOT/CVSROOT directory. -# The remainder of the line is an error message to use if the file cannot -# be checked out. -# -# File format: -# -# [] -# -# comment lines begin with '#' diff --git a/CVSROOT/commitinfo b/CVSROOT/commitinfo deleted file mode 100644 index b19e7b7..0000000 --- a/CVSROOT/commitinfo +++ /dev/null @@ -1,15 +0,0 @@ -# The "commitinfo" file is used to control pre-commit checks. -# The filter on the right is invoked with the repository and a list -# of files to check. A non-zero exit of the filter program will -# cause the commit to be aborted. -# -# The first entry on a line is a regular expression which is tested -# against the directory that the change is being committed to, relative -# to the $CVSROOT. For the first match that is found, then the remainder -# of the line is the name of the filter to run. -# -# If the repository name does not match any of the regular expressions in this -# file, the "DEFAULT" line is used, if it is specified. -# -# If the name "ALL" appears as a regular expression it is always used -# in addition to the first matching regex or "DEFAULT". diff --git a/CVSROOT/config b/CVSROOT/config deleted file mode 100644 index 8069cad..0000000 --- a/CVSROOT/config +++ /dev/null @@ -1,11 +0,0 @@ -# Set this to "no" if pserver shouldn't check system users/passwords -#SystemAuth=no - -# Set `PreservePermissions' to `yes' to save file status information -# in the repository. -#PreservePermissions=no - -# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top -# level of the new working directory when using the `cvs checkout' -# command. -#TopLevelAdmin=no diff --git a/CVSROOT/cvsignore b/CVSROOT/cvsignore deleted file mode 100644 index 6b468b6..0000000 --- a/CVSROOT/cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.class diff --git a/CVSROOT/cvswrappers b/CVSROOT/cvswrappers deleted file mode 100644 index 0accaf1..0000000 --- a/CVSROOT/cvswrappers +++ /dev/null @@ -1,23 +0,0 @@ -# This file affects handling of files based on their names. -# -# The -t/-f options allow one to treat directories of files -# as a single file, or to transform a file in other ways on -# its way in and out of CVS. -# -# The -m option specifies whether CVS attempts to merge files. -# -# The -k option specifies keyword expansion (e.g. -kb for binary). -# -# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers) -# -# wildcard [option value][option value]... -# -# where option is one of -# -f from cvs filter value: path to filter -# -t to cvs filter value: path to filter -# -m update methodology value: MERGE or COPY -# -k expansion mode value: b, o, kkv, &c -# -# and value is a single-quote delimited value. -# For example: -#*.gif -k 'b' diff --git a/CVSROOT/editinfo b/CVSROOT/editinfo deleted file mode 100644 index d78886c..0000000 --- a/CVSROOT/editinfo +++ /dev/null @@ -1,21 +0,0 @@ -# The "editinfo" file is used to allow verification of logging -# information. It works best when a template (as specified in the -# rcsinfo file) is provided for the logging procedure. Given a -# template with locations for, a bug-id number, a list of people who -# reviewed the code before it can be checked in, and an external -# process to catalog the differences that were code reviewed, the -# following test can be applied to the code: -# -# Making sure that the entered bug-id number is correct. -# Validating that the code that was reviewed is indeed the code being -# checked in (using the bug-id number or a seperate review -# number to identify this particular code set.). -# -# If any of the above test failed, then the commit would be aborted. -# -# Actions such as mailing a copy of the report to each reviewer are -# better handled by an entry in the loginfo file. -# -# One thing that should be noted is the the ALL keyword is not -# supported. There can be only one entry that matches a given -# repository. diff --git a/CVSROOT/loginfo b/CVSROOT/loginfo deleted file mode 100644 index 5a59f0a..0000000 --- a/CVSROOT/loginfo +++ /dev/null @@ -1,26 +0,0 @@ -# The "loginfo" file controls where "cvs commit" log information -# is sent. The first entry on a line is a regular expression which must match -# the directory that the change is being made to, relative to the -# $CVSROOT. If a match is found, then the remainder of the line is a filter -# program that should expect log information on its standard input. -# -# If the repository name does not match any of the regular expressions in this -# file, the "DEFAULT" line is used, if it is specified. -# -# If the name ALL appears as a regular expression it is always used -# in addition to the first matching regex or DEFAULT. -# -# You may specify a format string as part of the -# filter. The string is composed of a `%' followed -# by a single format character, or followed by a set of format -# characters surrounded by `{' and `}' as separators. The format -# characters are: -# -# s = file name -# V = old version number (pre-checkin) -# v = new version number (post-checkin) -# -# For example: -#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog -# or -#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog diff --git a/CVSROOT/modules b/CVSROOT/modules deleted file mode 100644 index fedbdcb..0000000 --- a/CVSROOT/modules +++ /dev/null @@ -1 +0,0 @@ -jode jode diff --git a/CVSROOT/notify b/CVSROOT/notify deleted file mode 100644 index 34f0bc2..0000000 --- a/CVSROOT/notify +++ /dev/null @@ -1,12 +0,0 @@ -# The "notify" file controls where notifications from watches set by -# "cvs watch add" or "cvs edit" are sent. The first entry on a line is -# a regular expression which is tested against the directory that the -# change is being made to, relative to the $CVSROOT. If it matches, -# then the remainder of the line is a filter program that should contain -# one occurrence of %s for the user to notify, and information on its -# standard input. -# -# "ALL" or "DEFAULT" can be used in place of the regular expression. -# -# For example: -#ALL mail %s -s "CVS notification" diff --git a/CVSROOT/rcsinfo b/CVSROOT/rcsinfo deleted file mode 100644 index 49e59f4..0000000 --- a/CVSROOT/rcsinfo +++ /dev/null @@ -1,13 +0,0 @@ -# The "rcsinfo" file is used to control templates with which the editor -# is invoked on commit and import. -# -# The first entry on a line is a regular expression which is tested -# against the directory that the change is being made to, relative to the -# $CVSROOT. For the first match that is found, then the remainder of the -# line is the name of the file that contains the template. -# -# If the repository name does not match any of the regular expressions in this -# file, the "DEFAULT" line is used, if it is specified. -# -# If the name "ALL" appears as a regular expression it is always used -# in addition to the first matching regex or "DEFAULT". diff --git a/CVSROOT/taginfo b/CVSROOT/taginfo deleted file mode 100644 index 274a46d..0000000 --- a/CVSROOT/taginfo +++ /dev/null @@ -1,20 +0,0 @@ -# The "taginfo" file is used to control pre-tag checks. -# The filter on the right is invoked with the following arguments: -# -# $1 -- tagname -# $2 -- operation "add" for tag, "mov" for tag -F, and "del" for tag -d -# $3 -- repository -# $4-> file revision [file revision ...] -# -# A non-zero exit of the filter program will cause the tag to be aborted. -# -# The first entry on a line is a regular expression which is tested -# against the directory that the change is being committed to, relative -# to the $CVSROOT. For the first match that is found, then the remainder -# of the line is the name of the filter to run. -# -# If the repository name does not match any of the regular expressions in this -# file, the "DEFAULT" line is used, if it is specified. -# -# If the name "ALL" appears as a regular expression it is always used -# in addition to the first matching regex or "DEFAULT". diff --git a/CVSROOT/verifymsg b/CVSROOT/verifymsg deleted file mode 100644 index 86f747c..0000000 --- a/CVSROOT/verifymsg +++ /dev/null @@ -1,21 +0,0 @@ -# The "verifymsg" file is used to allow verification of logging -# information. It works best when a template (as specified in the -# rcsinfo file) is provided for the logging procedure. Given a -# template with locations for, a bug-id number, a list of people who -# reviewed the code before it can be checked in, and an external -# process to catalog the differences that were code reviewed, the -# following test can be applied to the code: -# -# Making sure that the entered bug-id number is correct. -# Validating that the code that was reviewed is indeed the code being -# checked in (using the bug-id number or a seperate review -# number to identify this particular code set.). -# -# If any of the above test failed, then the commit would be aborted. -# -# Actions such as mailing a copy of the report to each reviewer are -# better handled by an entry in the loginfo file. -# -# One thing that should be noted is the the ALL keyword is not -# supported. There can be only one entry that matches a given -# repository. diff --git a/jode/AUTHORS b/jode/AUTHORS index fc38b9f..0f30348 100644 --- a/jode/AUTHORS +++ b/jode/AUTHORS @@ -1 +1 @@ -Jochen Hoenicke \ No newline at end of file +Jochen Hoenicke diff --git a/jode/ChangeLog b/jode/ChangeLog index e69de29..e135202 100644 --- a/jode/ChangeLog +++ b/jode/ChangeLog @@ -0,0 +1,303 @@ +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 + uninitialized objects in local or stack slots on backwards jump or + exception blocks. Sun's jdk also doesn't check it, and I never + understood why it is necessary. But see JVM Spec 4.9.4. + +2001-05-02 Jochen Hoenicke + + * 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. + +2001-04-09 Jochen Hoenicke + + * jode/bytecode/SearchPath.java: Bug fixes from Joe Bronkema: + (exists): Don't replace '/' with fileSeparator in original + filename; make a copy instead. + (getFile): likewise. + (isDirectory): likewise. + (listFiles): Reset fileNr when a new directory is read. + +2001-02-28 Jochen Hoenicke + + * acinclude.m4 (JODE_CHECK_CLASS): Changed "test -e" to "-f" since + -e is not supported on all architectures (Solaris) and -f is more + correct anyway. + Reported by Erik Modén. + +2001-02-27 Jochen Hoenicke + + * jode/swingui/Main.java.in (AreaWriter): Convert all kinds of + line breaks (CR+LF, CR, LF) to a LF character, which a JTextArea + understands. + +2001-02-08 Jochen Hoenicke + + * jode/expr/StoreInstruction.java (dumpExpression): Java doesn't + allow parenthesis around left hand side, so use NO_PAREN and don't + call lhs.dumpExpression() with priority. + * jode/expr/PrePostFixOperator.java (dumpExpression): likewise. + * jode/expr/IIncOperator.java (dumpExpression): likewise. + * jode/flow/TransformConstructors.java (jikesAnonInner): Removed, + since it wasn't used: This information is stored in OuterValues + now. + * jode/decompiler/LocalInfo.java (isConstant): Always return true + so that inner classes that access final locals work, even if we + can't decide that the local can be final. + +2001-02-05 Jochen Hoenicke + + * jode/expr/InvokeOperator.java.in (Environment.invokeMethod): + Fixed the call to ClassInfo.forName: it expects a class name, while + ref.getClazz() gives a type signature. + * jode/flow/TransformExceptionHandlers.java.in: + (checkAndRemoveJSR): Only invoke removeBadJSR, if there are + successors left. + (checkAndRemoveMonitorExit): likewise. + +2001-02-04 Jochen Hoenicke + + * jode/expr/IfThenElseOperator.java (simplify): Allow in the class$ + simplification the then and else part to be swapped. + * jode/bytecode/ClassInfo.java.in (read): Accept class version + 1.3. + * jode/type/ClassInterfacesType.java (keywords): Added the package + and import keywords. + * jode/flow/TransformExceptionHandlers.java.in: + (getPredecessor): New function. + (getMonitorExitSlot): New function. + (skipFinExitChain): New function. + (removeJSR): Replaced by ... + (removeBadJSR): ... this. + (checkAndRemoveJSR): Use the new functions. Much simpler and + handles nested synchronized blocks. It now traces the whole JSR + and monitorexit chain before a jump to the first entry via + skipFinExitChain, then checks and remove the first JSR + resp. monitorexit. JSR jumps are simply ignored now. + (checkAndRemoveMonitorExit): likewise. + * jode/flow/StructuredBlock.java.in (prependBlock): New function. + * jode/flow/CatchBlock.java.in (makeDeclaration): Generate name + of dummyLocal, since nobody else will generate it. + +2001-02-03 Jochen Hoenicke + + * jode/bytecode/BytecodeInfo.java.in (read): Remove bogus + exceptionHandlers, whose catchers just throw the exception again. + This kind of entries are inserted by an obfuscator and would break + JODE. + * jode/util/UnifyHash.java.in (iterateHashCode): Call cleanUp, + to clean unneeded references. + * jode/flow/TransformConstructors.java (transformOneField): + Changed to private. Take field number as parameter. Check that + expression doesn't contain a FieldOperator for a later field of + the same class or a PutFieldOperator. Changed all callers. + +2001-02-01 Jochen Hoenicke + + * jode/jvm/CodeVerifier.java.in (Type.mergeType): If array elem + types can't be merged, return tObject as common super type. + * jode/type/ArrayType.java (getGeneralizedType): If array elem + type can't be intersected, return tObject as common super type. + * jode/flow/TransformExceptionHandlers.java.in: Merged patch from + the 1.2 tree to support javac 1.3 synchronized blocks. Doesn't + handle nested synchronized blocks yet. + * jode/expr/Expression.java.in (dumpExpression): Show runtime + exception when it occurs. + +2001-01-31 Jochen Hoenicke + + * jode/expr/Expression.java.in (updateParentTypes): Call setType, + instead of merging the types. Other childs want to know about the + type change as well. + * jode/decompiler/LocalInfo.java (combineWith): Reorganized a bit, + but no changes. + * jode/expr/InvokeOperator.java.in (dumpExpression): Always print + the ThisOperator if a field is from a parent class of an outer + class is used. And always qualify the this operator if not + innermost. + +2001-01-30 Jochen Hoenicke + + * jode/jvm/SyntheticAnalyzer.java.in (checkConstructorAccess): + Allow the special unifyParam to be the last parameter. + +2001-01-30 Jochen Hoenicke + + * jode/decompiler/TabbedPrintWriter.java: Better gnu style handling: + (openBraceClass) (closeBraceClass) + (openBraceNoIndent) (closeBraceNoIndent): new functions. + (closeBraceNoSpace): Removed. + * jode/decompiler/Options.java (GNU_SPACING): new constant. + (GNU_STYLE): changed to include GNU_SPACING. + * jode/decompiler/ClassAnalyzer.java.in (dumpSource): Use + open/closeBraceClass. + * jode/decompiler/MethodAnalyzer.java.in (dumpSource): Use + open/closeBraceNoIndent. Insert a space for GNU_SPACING. + * jode/decompiler/InvokeOperator.java.in (dumpExpression): Insert + a space for GNU_SPACING, use open/closeBraceClass for inner + classes. + * jode/decompiler/UnaryOperator.java (dumpExpression): Insert + a space for GNU_SPACING. + +2001-01-30 Jochen Hoenicke + + Added pascal style from Rolf Howarth + * jode/decompiler/Options.java (PASCAL_STYLE): new constant. + (BRACE_FLUSH_LEFT): dito. + * jode/decompiler/Decompiler.java (setOption): detect pascal option. + * jode/decompiler/Main.java (main): dito. + * jode/decompiler/TabbedPrintWriter.java (openBrace, + openBraceContinue, closeBrace, closeBraceNoSpace, + closeBraceContinue): handle flush left. + +2001-01-30 Jochen Hoenicke + + * jode/type/NullType.java (intersection): Removed, since the + version in ReferenceType is more correct. Before + tNull.isOfType(tRange(X,tNull)) returned false, which lead to + incorrect behaviour in InvokeOperator.needsCast. + * jode/decompiler/FieldAnalyzer.java.in (dumpSource): Removed the + "= null" hack for final fields; it was not correct, since the + field could be initialized in a constructor. + * jode/decompiler/TabbedPrintWriter.java (BreakPoint.endOp): + Simplified the code, copy options always from child. + * jode/jvm/SyntheticAnalyzer.java.in (unifyParam): new field. + (checkConstructorAccess): Allow the special Parameter, whose + purpose is to distinguish the wrapper from the real constructor + and give him a "$" in the type signature, to appear at every + position. It doesn't appear at position 1 for inner classes. + Store the position in unifyParam. + * jode/expr/InvokeOperator.java (isGetClass): Allow the method to + be declared inside an outer class: We simply check if we can get + the method analyzer. + (simplify): handle unifyParam. + * jode/expr/PopOperator.java (getBreakPenalty): return penalty of + inner expression. (dumpExpression): Call dumpExpression of + subexpression immediately without priority. 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/THANKS b/jode/THANKS new file mode 100644 index 0000000..b95fa57 --- /dev/null +++ b/jode/THANKS @@ -0,0 +1,5 @@ +Joe Bronkema +Rolf Howarth for pascal indentaton style. +Erik Modén +Martin Schmitz for finding many bugs in the obfuscator. +zzzeek diff --git a/jode/TODO b/jode/TODO index 96163d2..d200981 100644 --- a/jode/TODO +++ b/jode/TODO @@ -4,12 +4,13 @@ Decompiler: - outline inlined methods. - remove string decrypt method. - remove synthetic methods if and only if all calls to them are resolved. - ~ handle try catch more thouroughly/safely. - ~ decompile jode.jvm.Interpreter (hand optimized bytecode) 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: @@ -20,13 +21,15 @@ DeObfuscator: User Interface: - make a nice user interface: - ~ list classnames: toggable between class hierarchie/package hierarchie. - list fields/method of selected class. - - show decompilation of selected method. + - show only decompilation of selected method. - show usage of method/fields. - syntax highlighting, hyper links etc. (look at java.swing.JEditorPane or at Java Insight) - visual obfuscation/deobfuscation (like klassmaster?, better?) Internal: - - clean up package hierarchy, esp. expr, flow and decompiler. \ No newline at end of file + - 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/acinclude.m4 b/jode/acinclude.m4 index 563ec98..296d1ad 100644 --- a/jode/acinclude.m4 +++ b/jode/acinclude.m4 @@ -28,7 +28,7 @@ AC_DEFUN(JODE_CHECK_CLASS, myclasspath=$2; for path in $myclasspath; do if test -d $path; then - if test -e $path/$clazz; then + if test -f $path/$clazz; then exit 0 fi elif CLASS_CHECK $path $clazz ; then diff --git a/jode/configure.in b/jode/configure.in index 28ea404..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.93) +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) @@ -78,7 +70,7 @@ AM_CONDITIONAL(HAVE_JIKES, test x"$JIKES" != x) AC_ARG_WITH(javac, [ --with-javac specify location of javac ], [ - if test x$USER_SPECIFIED_JIKES == xtrue; then + if test x$USER_SPECIFIED_JIKES = xtrue; then AC_MSG_ERROR(You must only give one option --with-javac or --with-jikes) fi if test ${withval} != "" || test ${withval} != "yes" || test ${withval} != "no"; then @@ -114,13 +106,20 @@ 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" COLLECTIONEXTRA="java.lang" ], - [ JODE_CHECK_CLASS(org.gnu.java.util.collections.Set, $CLASSPATH:$CLASSLIB, - [ COLLECTIONS="org.gnu.java.util.collections" - COLLECTIONEXTRA="org.gnu.java.util.collections" ], + [ JODE_CHECK_CLASS(gnu.java.util.collections.Set, $CLASSPATH:$CLASSLIB, + [ COLLECTIONS="gnu.java.util.collections" + COLLECTIONEXTRA="gnu.java.util.collections" ], [ JODE_CHECK_CLASS(com.sun.java.util.collections.Set, $CLASSPATH:$CLASSLIB, [ COLLECTIONS="com.sun.java.util.collections" COLLECTIONEXTRA="com.sun.java.util.collections" ], @@ -240,6 +239,12 @@ bin/Makefile bin/jode bin/jode.bat doc/Makefile -doc/download.html 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/a-logo.gif b/jode/doc/a-logo.gif new file mode 100644 index 0000000..cf02839 Binary files /dev/null and b/jode/doc/a-logo.gif differ 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/faq.php b/jode/doc/faq.php new file mode 100644 index 0000000..bcadf76 --- /dev/null +++ b/jode/doc/faq.php @@ -0,0 +1,66 @@ + + +

FAQ - Frequently Asked Questions

+ +This is a list of some questions that pop up from time to time. + +

Decompiler issues

+ +

The decompiler crashes with a VerifyException, what can I do?

+ +

The class isn't verifiable, probably because there is not enough +information about used classes. See the question about the +classpath.

+ +

This could also be caused by malicious bytecode, or because there +is a bug in Jode's verifier.

+ +

What should be included in the classpath?

+ +

Jode needs to know the full class hierarchie to guess the types. +This includes not only the classes in the program, but also the +libraries used by the java program, even the Java runtime library. +You should set the classpath to include all these classes.

+ +

If you don't specify the classpath on the command line, Jode uses +the same as your Java Virtual Machine.

+ +

As last resort, if Jode can't find a class in the classpath it uses +reflection to ask the Virtual Machine. This works quite well, but +loading classes can have side effects, e.g. when AWT classes are +loaded, an AWT thread is created, even though Jode doesn't need +it.

+ +

Obfuscator issues

+ +

What should be included in the classpath?

+ +

The program, all libraries, the Java runtime library. Don't omit a +library even when you don't want to obfuscate it.

+ +

What should I preserve

+ +

The most common mistake is to preserve a class. In most cases this +is not what you want. This only makes sure the class won't be +renamed, it doesn't prevent it from being stripped. Instead you +should preserve methods and constructors. The constructor is just a +method with the special name <init&rt;.

+ +

Another common mistake is to omit the type +signature, e.g. to preserve Class.main instead of +Class.main.([Ljava/lang/String;)V. That doesn't work. If +you don't want to care about the format of the type signature use a +wildcard as in Class.main.*.

+ +

What is a type signature

+ +

The type signature is a machine readable representation of a java +type that is used all over in java bytecode. The JDK ships a command +named javap. With java -s you can lists the fields +and methods of a class with their type signatures.

+ +

If you are interested in the format of type signatures read the +Java Virtual Machine Specification, Chapter 4.3 Descriptors

+ + + diff --git a/jode/doc/feedback.php b/jode/doc/feedback.php new file mode 100644 index 0000000..ee5b665 --- /dev/null +++ b/jode/doc/feedback.php @@ -0,0 +1,14 @@ + + +

Feedback

+ +

You can report bugs to the bug forum.

+ +

You can contact me by email via hoenicke at +users.sourceforge.net. Please mention jode in the +subject.

+ +

There is a mailing list. Check this page for subscription informations.

+ + 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/GlobalOptions.java.in b/jode/jode/GlobalOptions.java.in index de63c2f..97cd37c 100644 --- a/jode/jode/GlobalOptions.java.in +++ b/jode/jode/GlobalOptions.java.in @@ -1,4 +1,4 @@ -/* GlobalOptions Copyright (C) 1999-2000 Jochen Hoenicke. +/* GlobalOptions Copyright (C) 1999-2001 Jochen Hoenicke. * * 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 @@ -25,7 +25,7 @@ public class GlobalOptions { public final static String version = "@VERSION@"; public final static String email = "jochen@gnu.org"; public final static String copyright = - "Jode (c) 1998-2000 Jochen Hoenicke <"+email+">"; + "Jode (c) 1998-2001 Jochen Hoenicke <"+email+">"; public final static String URL = "http://jode.sourceforge.net/"; public static PrintWriter err = new PrintWriter(System.err, true); diff --git a/jode/jode/bytecode/BytecodeInfo.java.in b/jode/jode/bytecode/BytecodeInfo.java.in index d7a0169..5bdd291 100644 --- a/jode/jode/bytecode/BytecodeInfo.java.in +++ b/jode/jode/bytecode/BytecodeInfo.java.in @@ -25,6 +25,8 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.EOFException; import java.io.IOException; +import java.util.BitSet; +import java.util.Stack; import java.util.Vector; import java.util.Enumeration; import java.util.NoSuchElementException; @@ -845,6 +847,21 @@ public class BytecodeInfo extends BinaryInfo implements Opcodes { int index = input.readUnsignedShort(); exceptionHandlers[i].type = (index == 0) ? null : cp.getClassName(index); + + if (exceptionHandlers[i].catcher.getOpcode() == opc_athrow) { + /* There is an obfuscator, which inserts bogus + * exception entries jumping directly to a throw + * instruction. Remove those handlers. + */ + handlersLength--; + i--; + } + } + if (handlersLength < exceptionHandlers.length) { + Handler[] newHandlers = new Handler[handlersLength]; + System.arraycopy(exceptionHandlers, 0, newHandlers, 0, + handlersLength); + exceptionHandlers = newHandlers; } } readAttributes(cp, input, FULLINFO); @@ -901,9 +918,73 @@ public class BytecodeInfo extends BinaryInfo implements Opcodes { } } + private void calculateMaxStack() { + maxStack = 0; + int[] stackHeights = new int[instructions.getCodeLength()]; + int[] poppush = new int[2]; + Stack todo = new Stack(); + + for (int i=0; i < stackHeights.length; i++) + stackHeights[i] = -1; + + stackHeights[0] = 0; + todo.push(instructions.get(0)); + while (!todo.isEmpty()) { + Instruction instr = (Instruction) todo.pop(); + Instruction next = instr.getNextByAddr(); + Instruction[] succs = instr.getSuccs(); + int addr = instr.getAddr(); + instr.getStackPopPush(poppush); + int sh = stackHeights[addr] - poppush[0] + poppush[1]; +// System.err.println("Instr: "+instr.getDescription()+ +// "; before: "+stackHeights[addr]+" after: "+sh); + if (maxStack < sh) + maxStack = sh; + if (instr.getOpcode() == opc_jsr) { + if (stackHeights[next.getAddr()] == -1) { + stackHeights[next.getAddr()] = sh - 1; + todo.push(next); + } + if (stackHeights[succs[0].getAddr()] == -1) { + stackHeights[succs[0].getAddr()] = sh; + todo.push(succs[0]); + } + } else { + if (succs != null) { + for (int i=0; i < succs.length; i++) { + if (stackHeights[succs[i].getAddr()] == -1) { + stackHeights[succs[i].getAddr()] = sh; + todo.push(succs[i]); + } + } + } + if (!instr.doesAlwaysJump() + && stackHeights[next.getAddr()] == -1) { + stackHeights[next.getAddr()] = sh; + todo.push(next); + } + } + for (int i=0; i< exceptionHandlers.length; i++) { + if (exceptionHandlers[i].start.compareTo(instr) <= 0 + && exceptionHandlers[i].end.compareTo(instr) >= 0) { + int catcher = exceptionHandlers[i].catcher.getAddr(); + if (stackHeights[catcher] == -1) { + stackHeights[catcher] = 1; + todo.push(exceptionHandlers[i].catcher); + } + } + } + } +// System.err.println("New maxStack: "+maxStack+" Locals: "+maxLocals); + } + public void prepareWriting(GrowableConstantPool gcp) { - /* Recalculate addr, length and add all constants to gcp */ + /* Recalculate addr, length, maxStack, maxLocals and add all + * constants to gcp */ int addr = 0; + maxLocals = (methodInfo.isStatic() ? 0 : 1) + + TypeSignature.getArgumentSize(methodInfo.getType()); + for (Iterator iter = instructions.iterator(); iter.hasNext(); ) { Instruction instr = (Instruction) iter.next(); int opcode = instr.getOpcode(); @@ -957,22 +1038,44 @@ public class BytecodeInfo extends BinaryInfo implements Opcodes { length = 3; else length = 6; + if (slot >= maxLocals) + maxLocals = slot + 1; break; } - case opc_iload: case opc_lload: - case opc_fload: case opc_dload: case opc_aload: - case opc_istore: case opc_lstore: - case opc_fstore: case opc_dstore: case opc_astore: - if (instr.getLocalSlot() < 4) { + case opc_iload: case opc_fload: case opc_aload: + case opc_istore: case opc_fstore: case opc_astore: { + int slot = instr.getLocalSlot(); + if (slot < 4) length = 1; - break; - } - /* fall through */ + else if (slot < 256) + length = 2; + else + length = 4; + if (slot >= maxLocals) + maxLocals = slot + 1; + break; + } + case opc_lload: case opc_dload: + case opc_lstore: case opc_dstore: { + int slot = instr.getLocalSlot(); + if (slot < 4) + length = 1; + else if (slot < 256) + length = 2; + else + length = 4; + if (slot+1 >= maxLocals) + maxLocals = slot + 2; + break; + } case opc_ret: { - if (instr.getLocalSlot() < 256) + int slot = instr.getLocalSlot(); + if (slot < 256) length = 2; else length = 4; + if (slot >= maxLocals) + maxLocals = slot + 1; break; } case opc_lookupswitch: { @@ -1092,6 +1195,7 @@ public class BytecodeInfo extends BinaryInfo implements Opcodes { addr += length; } instructions.setLastAddr(addr); + calculateMaxStack(); for (int i=0; i< exceptionHandlers.length; i++) if (exceptionHandlers[i].type != null) gcp.putClassName(exceptionHandlers[i].type); @@ -1483,14 +1587,6 @@ public class BytecodeInfo extends BinaryInfo implements Opcodes { return lnt; } - public void setMaxStack(int ms) { - maxStack = ms; - } - - public void setMaxLocals(int ml) { - maxLocals = ml; - } - public void setExceptionHandlers(Handler[] handlers) { exceptionHandlers = handlers; } diff --git a/jode/jode/bytecode/ClassInfo.java.in b/jode/jode/bytecode/ClassInfo.java.in index abb5a01..687bf94 100644 --- a/jode/jode/bytecode/ClassInfo.java.in +++ b/jode/jode/bytecode/ClassInfo.java.in @@ -192,6 +192,19 @@ public class ClassInfo extends BinaryInfo { int access = input.readUnsignedShort(); if (innername != null && innername.length() == 0) innername = null; + + /* Some compilers give method scope classes a valid + * outer field, but we mustn't handle them as inner + * classes. The best way to distinguish this case + * is by the class name. + */ + if (outer != null && innername != null + && inner.length() > outer.length() + 2 + innername.length() + && inner.startsWith(outer+"$") + && inner.endsWith("$"+innername) + && Character.isDigit(inner.charAt(outer.length() + 1))) + outer = null; + InnerClassInfo ici = new InnerClassInfo (inner, outer, innername, access); @@ -272,10 +285,11 @@ public class ClassInfo extends BinaryInfo { /* header */ if (input.readInt() != 0xcafebabe) throw new ClassFormatException("Wrong magic"); - if (input.readUnsignedShort() > 3) - throw new ClassFormatException("Wrong minor"); - if (input.readUnsignedShort() != 45) - throw new ClassFormatException("Wrong major"); + int version = input.readUnsignedShort(); + version |= input.readUnsignedShort() << 16; + if (version < (45 << 16 | 0) + || version > (47 << 16 | 0)) + throw new ClassFormatException("Wrong class version"); /* constant pool */ ConstantPool cpool = new ConstantPool(); @@ -603,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/bytecode/SearchPath.java b/jode/jode/bytecode/SearchPath.java index 83b864c..a93e73a 100644 --- a/jode/jode/bytecode/SearchPath.java +++ b/jode/jode/bytecode/SearchPath.java @@ -279,7 +279,7 @@ public class SearchPath { } catch (SecurityException ex) { GlobalOptions.err.println ("Warning: Security exception while accessing " - +bases[i]+"."); + + bases[i] + "."); } } catch (MalformedURLException ex) { /* disable entry */ @@ -309,6 +309,10 @@ public class SearchPath { } public boolean exists(String filename) { + String localFileName = + (java.io.File.separatorChar != '/') + ? filename.replace('/', java.io.File.separatorChar) + : filename; for (int i=0; i 0) { - int count = read(tmpbuf, 0, - (int)Math.min(n, 512L)); - if (count == -1) - return skipped; - skipped += count; - n -= count; - } - return skipped; - } - }; +/// // The skip method in jdk1.1.7 ZipInputStream +/// // is buggy. We return a wrapper that fixes +/// // this. +/// return new FilterInputStream(zis) { +/// private byte[] tmpbuf = new byte[512]; +/// public long skip(long n) throws IOException { +/// long skipped = 0; +/// while (n > 0) { +/// int count = read(tmpbuf, 0, +/// (int)Math.min(n, 512L)); +/// if (count == -1) +/// return skipped; +/// skipped += count; +/// n -= count; +/// } +/// return skipped; +/// } +/// }; ///#else -/// return zis; + return zis; ///#endif } zis.closeEntry(); @@ -413,8 +418,8 @@ public class SearchPath { return conn.getInputStream(); } catch (SecurityException ex) { GlobalOptions.err.println("Warning: SecurityException" - +" while accessing " - +bases[i]+filename); + + " while accessing " + + bases[i] + filename); ex.printStackTrace(GlobalOptions.err); /* ignore and take next element */ } catch (FileNotFoundException ex) { @@ -431,17 +436,14 @@ public class SearchPath { if (ze != null) return zips[i].getInputStream(ze); } else { - if (java.io.File.separatorChar != '/') - filename = filename - .replace('/', java.io.File.separatorChar); try { - File f = new File(dirs[i], filename); + File f = new File(dirs[i], localFileName); if (f.exists()) return new FileInputStream(f); } catch (SecurityException ex) { GlobalOptions.err.println("Warning: SecurityException" - +" while accessing " - +dirs[i]+filename); + + " while accessing " + + dirs[i] + localFileName); /* ignore and take next element */ } } @@ -457,6 +459,10 @@ public class SearchPath { * @return true, if filename exists and is a directory, false otherwise. */ public boolean isDirectory(String filename) { + String localFileName = + (java.io.File.separatorChar != '/') + ? filename.replace('/', java.io.File.separatorChar) + : filename; for (int i=0; i 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,67 +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.openBrace(); - writer.tab(); - dumpBlock(writer, pl, done, scale); - writer.untab(); - if (parent instanceof MethodAnalyzer) { - /* This is a method scope class */ - writer.closeBraceNoSpace(); - } else - writer.closeBrace(); - clazz.dropInfo(clazz.KNOWNATTRIBS | clazz.UNKNOWNATTRIBS); } public void dumpJavaFile(TabbedPrintWriter writer) @@ -611,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(); @@ -639,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/Decompiler.java b/jode/jode/decompiler/Decompiler.java index eb8c3c9..88574d1 100644 --- a/jode/jode/decompiler/Decompiler.java +++ b/jode/jode/decompiler/Decompiler.java @@ -103,6 +103,8 @@ public class Decompiler { Options.outputStyle = Options.GNU_STYLE; else if (value.equals("sun")) Options.outputStyle = Options.SUN_STYLE; + else if (value.equals("pascal")) + Options.outputStyle = Options.PASCAL_STYLE; else throw new IllegalArgumentException("Invalid style "+value); return; 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 261a548..88cdaf4 100644 --- a/jode/jode/decompiler/LocalInfo.java +++ b/jode/jode/decompiler/LocalInfo.java @@ -126,56 +126,58 @@ public class LocalInfo implements Declarable { * If this is called with ourself nothing will happen. * @param li the local info that we want to shadow. */ - public void combineWith(LocalInfo li) { - li = li.getLocalInfo(); - if (shadow != null) { - getLocalInfo().combineWith(li); - } else { - if (this != li) { - shadow = li; - if (!nameIsGenerated) - shadow.name = name; - if (constExpr != null) { - if (shadow.constExpr != null) - throw new jode.AssertError - ("local has multiple constExpr"); - shadow.constExpr = constExpr; - } - -// GlobalOptions.err.println("combining "+name+"("+type+") and " -// +shadow.name+"("+shadow.type+")"); - shadow.setType(type); - - - boolean needTypeUpdate = !li.type.equals(type); - - java.util.Enumeration enum = operators.elements(); - while (enum.hasMoreElements()) { - LocalVarOperator lvo = - (LocalVarOperator) enum.nextElement(); - if (needTypeUpdate) { - if ((GlobalOptions.debuggingFlags - & GlobalOptions.DEBUG_TYPES) != 0) - GlobalOptions.err.println("updating " + lvo); - lvo.updateType(); - } - shadow.operators.addElement(lvo); - } - - enum = hints.elements(); - while (enum.hasMoreElements()) { - Object hint = enum.nextElement(); - if (!shadow.hints.contains(hint)) - shadow.hints.addElement(hint); - } + public void combineWith(LocalInfo shadow) { + if (this.shadow != null) { + getLocalInfo().combineWith(shadow); + return; + } - /* Clear unused fields, to allow garbage collection. - */ - type = null; - name = null; - operators = null; - } - } + shadow = shadow.getLocalInfo(); + if (this == shadow) + return; + + this.shadow = shadow; + if (!nameIsGenerated) + shadow.name = name; + if (constExpr != null) { + if (shadow.constExpr != null) + throw new jode.AssertError + ("local has multiple constExpr"); + shadow.constExpr = constExpr; + } + +// GlobalOptions.err.println("combining "+name+"("+type+") and " +// +shadow.name+"("+shadow.type+")"); + shadow.setType(type); + + + boolean needTypeUpdate = !shadow.type.equals(type); + + java.util.Enumeration enum = operators.elements(); + while (enum.hasMoreElements()) { + LocalVarOperator lvo = + (LocalVarOperator) enum.nextElement(); + if (needTypeUpdate) { + if ((GlobalOptions.debuggingFlags + & GlobalOptions.DEBUG_TYPES) != 0) + GlobalOptions.err.println("updating " + lvo); + lvo.updateType(); + } + shadow.operators.addElement(lvo); + } + + enum = hints.elements(); + while (enum.hasMoreElements()) { + Object hint = enum.nextElement(); + if (!shadow.hints.contains(hint)) + shadow.hints.addElement(hint); + } + + /* Clear unused fields, to allow garbage collection. + */ + type = null; + name = null; + operators = null; } /** @@ -359,15 +361,13 @@ public class LocalInfo implements Declarable { } public boolean isConstant() { - LocalInfo li = getLocalInfo(); - Enumeration enum = li.operators.elements(); - int writes = 0; - while (enum.hasMoreElements()) { - if (((LocalVarOperator) enum.nextElement()).isWrite()) - writes++; - } - if (writes > 1) - return false; + /* Checking if a local can be declared final is tricky, + * since it can also be the case if it is written in + * the "then" and "else" part of an if statement. + * + * We return true now, otherwise some code would not be + * decompilable. + */ return true; } @@ -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 8b84c48..72e0e93 100644 --- a/jode/jode/decompiler/Main.java +++ b/jode/jode/decompiler/Main.java @@ -1,4 +1,4 @@ -/* Main Copyright (C) 1998-1999 Jochen Hoenicke. +/* Main Copyright (C) 1998-2001 Jochen Hoenicke. * * 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 @@ -19,7 +19,6 @@ package jode.decompiler; import jode.bytecode.ClassInfo; -import jode.bytecode.SearchPath; import jode.GlobalOptions; import java.io.BufferedOutputStream; @@ -28,7 +27,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.util.zip.ZipOutputStream; +import java.util.zip.ZipFile; import java.util.zip.ZipEntry; +import java.util.Enumeration; import gnu.getopt.LongOpt; import gnu.getopt.Getopt; @@ -73,7 +74,10 @@ public class Main extends Options { public static void usage() { PrintWriter err = GlobalOptions.err; err.println("Version: " + GlobalOptions.version); - err.println("Usage: java jode.decompiler.Main [OPTIONS]... [CLASSES]..."); + err.println("Usage: java jode.decompiler.Main [OPTION]* {CLASS|JAR}*"); + err.println("Give a fully qualified CLASS name, e.g. jode.decompiler.Main, if you want to"); + err.println("decompile a single class, or a JAR file containing many classes."); + err.println("OPTION is any of these:"); err.println(" -h, --help "+ "show this information."); err.println(" -V, --version "+ @@ -94,9 +98,13 @@ public class Main extends Options { err.println(" "+ "and packages with more then pkglimit used classes."); err.println(" "+ - "Limit 0 means, never import, default is 0,1."); + "Limit 0 means never import. Default is 0,1."); + 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 "+ "decompile inner classes (default)."); err.println(" --anonymous "+ @@ -106,7 +114,7 @@ public class Main extends Options { err.println(" --lvt "+ "use the local variable table (default)."); err.println(" --pretty "+ - "use `pretty' names for local variables."); + "use `pretty' names for local variables (default)."); err.println(" --push "+ "allow PUSH instructions in output."); err.println(" --decrypt "+ @@ -116,10 +124,7 @@ public class Main extends Options { err.println(" --immediate "+ "output source immediately (may produce buggy code)."); err.println(" --verify "+ - "verify code before decompiling it."); - err.println("Debugging options, mainly used to debug this decompiler:"); - err.println(" -D, --debug=... "+ - "use --debug=help for more information."); + "verify code before decompiling it (default)."); } public static boolean handleOption(int option, int longind, String arg) { @@ -131,21 +136,98 @@ public class Main extends Options { options &= ~(1 << option); else { GlobalOptions.err.println - ("jode.decompiler.Main: option --"+longOptions[longind].getName() - +" takes one of `yes', `no', `on', `off' as parameter"); + ("jode.decompiler.Main: option --" + + longOptions[longind].getName() + + " takes one of `yes', `no', `on', `off' as parameter"); return false; } return true; } + public static void decompileClass(String className, + ZipOutputStream destZip, String destDir, + TabbedPrintWriter writer, + ImportHandler imports) { + try { + ClassInfo clazz; + try { + clazz = ClassInfo.forName(className); + } catch (IllegalArgumentException ex) { + GlobalOptions.err.println + ("`"+className+"' is not a class name"); + return; + } + if (skipClass(clazz)) + return; + + String filename = + className.replace('.', File.separatorChar)+".java"; + if (destZip != null) { + writer.flush(); + destZip.putNextEntry(new ZipEntry(filename)); + } else if (destDir != null) { + File file = new File (destDir, filename); + File directory = new File(file.getParent()); + if (!directory.exists() && !directory.mkdirs()) { + GlobalOptions.err.println + ("Could not create directory " + + directory.getPath() + ", check permissions."); + } + writer = new TabbedPrintWriter + (new BufferedOutputStream(new FileOutputStream(file)), + imports, false); + } + + GlobalOptions.err.println(className); + + ClassAnalyzer clazzAna = new ClassAnalyzer(clazz, imports); + clazzAna.dumpJavaFile(writer); + + if (destZip != null) { + writer.flush(); + destZip.closeEntry(); + } else if (destDir != null) + writer.close(); + /* Now is a good time to clean up */ + System.gc(); + } catch (IOException ex) { + GlobalOptions.err.println + ("Can't write source of "+className+"."); + GlobalOptions.err.println("Check the permissions."); + ex.printStackTrace(GlobalOptions.err); + } + } + 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; @@ -202,6 +284,8 @@ public class Main extends Options { outputStyle = SUN_STYLE; else if ("gnu".startsWith(arg)) outputStyle = GNU_STYLE; + else if ("pascal".startsWith(arg)) + outputStyle = Options.PASCAL_STYLE; else { GlobalOptions.err.println ("jode.decompiler.Main: Unknown style `"+arg+"'."); @@ -246,7 +330,7 @@ public class Main extends Options { } if (errorInParams) return; - ClassInfo.setClassPath(classPath.toString()); + ClassInfo.setClassPath(classPath); ImportHandler imports = new ImportHandler(importPackageLimit, importClassLimit); @@ -268,51 +352,32 @@ public class Main extends Options { } for (int i= g.getOptind(); i< params.length; i++) { try { - ClassInfo clazz; - try { - clazz = ClassInfo.forName(params[i]); - } catch (IllegalArgumentException ex) { - GlobalOptions.err.println - ("`"+params[i]+"' is not a class name"); - continue; - } - if (skipClass(clazz)) - continue; - - String filename = - params[i].replace('.', File.separatorChar)+".java"; - if (destZip != null) { - writer.flush(); - destZip.putNextEntry(new ZipEntry(filename)); - } else if (destDir != null) { - File file = new File (destDir, filename); - File directory = new File(file.getParent()); - if (!directory.exists() && !directory.mkdirs()) { - GlobalOptions.err.println - ("Could not create directory " - + directory.getPath() + ", check permissions."); + if ((params[i].endsWith(".jar") || params[i].endsWith(".zip")) + && new File(params[i]).isFile()) { + /* The user obviously wants to decompile a jar/zip file. + * Lets do him a pleasure and allow this. + */ + ClassInfo.setClassPath(params[i] + + Decompiler.altPathSeparatorChar + + classPath); + Enumeration enum = new ZipFile(params[i]).entries(); + while (enum.hasMoreElements()) { + String entry + = ((ZipEntry) enum.nextElement()).getName(); + if (entry.endsWith(".class")) { + entry = entry.substring(0, entry.length() - 6) + .replace('/', '.'); + decompileClass(entry, destZip, destDir, + writer, imports); + } } - writer = new TabbedPrintWriter - (new BufferedOutputStream(new FileOutputStream(file)), - imports, false); - } - - GlobalOptions.err.println(params[i]); - - ClassAnalyzer clazzAna = new ClassAnalyzer(clazz, imports); - clazzAna.dumpJavaFile(writer); - - if (destZip != null) { - writer.flush(); - destZip.closeEntry(); - } else if (destDir != null) - writer.close(); - /* Now is a good time to clean up */ - System.gc(); + ClassInfo.setClassPath(classPath); + } else + decompileClass(params[i], destZip, destDir, + writer, imports); } catch (IOException ex) { GlobalOptions.err.println - ("Can't write source of "+params[i]+"."); - GlobalOptions.err.println("Check the permissions."); + ("Can't read zip file " + params[i] + "."); ex.printStackTrace(GlobalOptions.err); } } diff --git a/jode/jode/decompiler/MethodAnalyzer.java.in b/jode/jode/decompiler/MethodAnalyzer.java.in index 8b5585c..724f08d 100644 --- a/jode/jode/decompiler/MethodAnalyzer.java.in +++ b/jode/jode/decompiler/MethodAnalyzer.java.in @@ -27,6 +27,7 @@ import jode.bytecode.Handler; import jode.bytecode.Instruction; import jode.bytecode.LocalVariableInfo; import jode.jvm.SyntheticAnalyzer; +import jode.decompiler.Options; import jode.type.*; import jode.expr.Expression; import jode.expr.ConstOperator; @@ -80,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. */ @@ -316,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. @@ -593,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"); @@ -719,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; @@ -746,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 @@ -839,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 = ""; @@ -847,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 @@ -866,6 +900,8 @@ public class MethodAnalyzer implements Scope, ClassDeclarer { writer.print(" " + methodName); } writer.breakOp(); + if ((Options.outputStyle & Options.GNU_SPACING) != 0) + writer.print(" "); writer.print("("); writer.startOp(writer.EXPL_PAREN, 0); int offset = skipParams + (isStatic() ? 0 : 1); @@ -895,11 +931,11 @@ public class MethodAnalyzer implements Scope, ClassDeclarer { } writer.endOp(); if (code != null) { - writer.openBrace(); + writer.openBraceNoIndent(); writer.tab(); methodHeader.dumpSource(writer); writer.untab(); - writer.closeBrace(); + writer.closeBraceNoIndent(); } else writer.println(";"); writer.popScope(); @@ -1008,8 +1044,7 @@ public class MethodAnalyzer implements Scope, ClassDeclarer { expr).getSubExpressions()[0]; if (expr instanceof ThisOperator) { outerValueArray[j] = - new ThisOperator(((ThisOperator) - expr).getClassInfo()); + new ThisOperator(((ThisOperator) expr).getClassInfo()); continue; } LocalInfo li = null; diff --git a/jode/jode/decompiler/Options.java b/jode/jode/decompiler/Options.java index a083181..e34f750 100644 --- a/jode/jode/decompiler/Options.java +++ b/jode/jode/decompiler/Options.java @@ -22,10 +22,13 @@ import jode.bytecode.ClassInfo; import jode.bytecode.InnerClassInfo; public class Options { - public static final int TAB_SIZE_MASK = 0x0f; - public static final int BRACE_AT_EOL = 0x10; - public static final int SUN_STYLE = 0x14; - public static final int GNU_STYLE = 0x02; + public static final int TAB_SIZE_MASK = 0x0f; + public static final int BRACE_AT_EOL = 0x10; + public static final int BRACE_FLUSH_LEFT = 0x20; + public static final int GNU_SPACING = 0x40; + public static final int SUN_STYLE = 0x14; + public static final int GNU_STYLE = 0x42; + public static final int PASCAL_STYLE = 0x24; public static final int OPTION_LVT = 0x0001; public static final int OPTION_INNER = 0x0002; 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 b8df179..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; @@ -120,17 +117,15 @@ public class TabbedPrintWriter { public void endOp(int pos) { endPos = pos; if (childBPs.size() == 1) { - BreakPoint child = - (BreakPoint) currentBP.childBPs.elementAt(0); - if (child.startPos == -1) { - startPos = endPos = -1; - childBPs = null; - } else if (child.startPos == currentBP.startPos - && child.endPos == currentBP.endPos) { - if (options == DONT_BREAK) - options = child.options; - childBPs = child.childBPs; - } + /* There is no breakpoint in this op, replace this with + * our child, if possible. + */ + BreakPoint child = (BreakPoint) childBPs.elementAt(0); + options = Math.min(options, child.options); + startPos = child.startPos; + endPos = child.endPos; + breakPenalty = child.breakPenalty; + childBPs = child.childBPs; } } @@ -541,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; } @@ -553,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); } } @@ -746,12 +741,38 @@ public class TabbedPrintWriter { } else { if (currentLine.length() > 0) println(); - if (currentIndent > 0) + if ((Options.outputStyle & Options.BRACE_FLUSH_LEFT) == 0 + && currentIndent > 0) tab(); println("{"); } } + public void openBraceClass() { + if (currentLine.length() > 0) { + if ((Options.outputStyle & Options.BRACE_AT_EOL) != 0) + print(" "); + else + println(); + } + println("{"); + } + + /** + * Print a opening brace with the current indentation style. + * Called at the end the line of a method declaration. + */ + public void openBraceNoIndent() { + if ((Options.outputStyle & Options.BRACE_AT_EOL) != 0) { + print(currentLine.length() > 0 ? " {" : "{"); + println(); + } else { + if (currentLine.length() > 0) + println(); + println("{"); + } + } + /** * Print a opening brace with the current indentation style. * Called at the end of the line of the instance that opens the @@ -763,7 +784,8 @@ public class TabbedPrintWriter { else { if (currentLine.length() > 0) println(); - if (currentIndent > 0) + if ((Options.outputStyle & Options.BRACE_FLUSH_LEFT) == 0 + && currentIndent > 0) tab(); println("{"); } @@ -774,19 +796,14 @@ public class TabbedPrintWriter { print("} "); else { println("}"); - if (currentIndent > 0) + if ((Options.outputStyle & Options.BRACE_FLUSH_LEFT) == 0 + && currentIndent > 0) untab(); } } - public void closeBraceNoSpace() { - if ((Options.outputStyle & Options.BRACE_AT_EOL) != 0) - print("}"); - else { - println("}"); - if (currentIndent > 0) - untab(); - } + public void closeBraceClass() { + print("}"); } public void closeBrace() { @@ -794,11 +811,16 @@ public class TabbedPrintWriter { println("}"); else { println("}"); - if (currentIndent > 0) + if ((Options.outputStyle & Options.BRACE_FLUSH_LEFT) == 0 + && currentIndent > 0) untab(); } } + public void closeBraceNoIndent() { + println("}"); + } + public void flush() { pw.flush(); } 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 8e2cd4f..d7127da 100644 --- a/jode/jode/expr/Expression.java.in +++ b/jode/jode/expr/Expression.java.in @@ -53,23 +53,7 @@ public abstract class Expression { } public void updateParentType(Type otherType) { - Type newType = otherType.intersection(type); - if (type.equals(newType)) - return; - - if (newType == Type.tError) { - if (otherType == Type.tError) { - // Don't propagate type errors. - return; - } - GlobalOptions.err.println("updateParentType: Type error in " - +this+": merging "+getType() - +" and "+otherType); - if ((GlobalOptions.debuggingFlags - & GlobalOptions.DEBUG_TYPES) != 0) - Thread.dumpStack(); - } - type = newType; + setType(otherType); if (parent != null) parent.updateType(); } @@ -224,7 +208,7 @@ public abstract class Expression { return null; } - public void makeInitializer() { + public void makeInitializer(Type type) { } public boolean isConstant() { @@ -299,6 +283,7 @@ public abstract class Expression { dumpExpression(writer); } catch (RuntimeException ex) { writer.print("(RUNTIME ERROR IN EXPRESSION)"); + ex.printStackTrace(GlobalOptions.err); } if (needEndOp2) { 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/IIncOperator.java b/jode/jode/expr/IIncOperator.java index 0d1f5ee..9053108 100644 --- a/jode/jode/expr/IIncOperator.java +++ b/jode/jode/expr/IIncOperator.java @@ -81,7 +81,9 @@ public class IIncOperator extends Operator public void dumpExpression(TabbedPrintWriter writer) throws java.io.IOException { - subExpressions[0].dumpExpression(writer, 950); + writer.startOp(writer.NO_PAREN, 2); + subExpressions[0].dumpExpression(writer); + writer.endOp(); writer.print(getOperatorString() + value); } } diff --git a/jode/jode/expr/IfThenElseOperator.java b/jode/jode/expr/IfThenElseOperator.java index 586460e..1e4ad3b 100644 --- a/jode/jode/expr/IfThenElseOperator.java +++ b/jode/jode/expr/IfThenElseOperator.java @@ -39,9 +39,9 @@ public class IfThenElseOperator extends Operator { } public void updateType() { - Type subType = Type.tSuperType(subExpressions[1].getType()) + Type commonType = Type.tSuperType(subExpressions[1].getType()) .intersection(Type.tSuperType(subExpressions[2].getType())); - updateParentType(subType); + updateParentType(commonType); } public Expression simplify() { @@ -59,37 +59,46 @@ public class IfThenElseOperator extends Operator { } } if (subExpressions[0] instanceof CompareUnaryOperator - && (subExpressions[1] instanceof GetFieldOperator) - && (subExpressions[2] instanceof StoreInstruction)) { - // Check for - // class$classname != null ? class$classname : - // (class$classname = class$("classname")) - // and replace with - // classname.class + && ((((CompareUnaryOperator) subExpressions[0]) + .getOperatorIndex() & ~1) == Operator.COMPARE_OP)) { CompareUnaryOperator cmp = (CompareUnaryOperator) subExpressions[0]; - GetFieldOperator get = (GetFieldOperator) subExpressions[1]; - StoreInstruction put = (StoreInstruction) subExpressions[2]; - FieldAnalyzer field; - if (cmp.getOperatorIndex() == Operator.NOTEQUALS_OP - && put.getLValue() instanceof PutFieldOperator - && ((field = ((PutFieldOperator)put.getLValue()).getField()) - != null) && field.isSynthetic() - && put.lvalueMatches(get) - && cmp.subExpressions[0] instanceof GetFieldOperator - && put.lvalueMatches((GetFieldOperator)cmp.subExpressions[0]) - && put.subExpressions[1] instanceof InvokeOperator) { - InvokeOperator invoke = (InvokeOperator) put.subExpressions[1]; - if (invoke.isGetClass() - && invoke.subExpressions[0] instanceof ConstOperator - && (invoke.subExpressions[0].getType() - .equals(Type.tString))) { - String clazz = (String) - ((ConstOperator)invoke.subExpressions[0]).getValue(); - if (field.setClassConstant(clazz)) - return new ClassFieldOperator(clazz.charAt(0) == '[' - ? Type.tType(clazz) - : Type.tClass(clazz)); + int cmpType = cmp.getOperatorIndex() & 1; + if ((subExpressions[2 - cmpType] instanceof GetFieldOperator) + && (subExpressions[1 + cmpType] instanceof StoreInstruction)) { + // Check for + // class$classname != null ? class$classname : + // (class$classname = class$("classname")) + // and replace with + // classname.class + GetFieldOperator get + = (GetFieldOperator) subExpressions[2 - cmpType]; + StoreInstruction put + = (StoreInstruction) subExpressions[1 + cmpType]; + int opIndex = cmp.getOperatorIndex(); + FieldAnalyzer field; + if (put.getLValue() instanceof PutFieldOperator + && ((field = ((PutFieldOperator)put.getLValue()) + .getField()) != null) && field.isSynthetic() + && put.lvalueMatches(get) + && (cmp.subExpressions[0] instanceof GetFieldOperator) + && put.lvalueMatches((GetFieldOperator) + cmp.subExpressions[0]) + && put.subExpressions[1] instanceof InvokeOperator) { + InvokeOperator invoke = (InvokeOperator) + put.subExpressions[1]; + if (invoke.isGetClass() + && invoke.subExpressions[0] instanceof ConstOperator + && (invoke.subExpressions[0].getType() + .equals(Type.tString))) { + String clazz = (String) + ((ConstOperator)invoke.subExpressions[0]) + .getValue(); + if (field.setClassConstant(clazz)) + return new ClassFieldOperator + (clazz.charAt(0) == '[' + ? Type.tType(clazz) : Type.tClass(clazz)); + } } } } diff --git a/jode/jode/expr/InvokeOperator.java.in b/jode/jode/expr/InvokeOperator.java.in index 5c6b131..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; } @@ -201,7 +222,7 @@ public final class InvokeOperator extends Operator } /** - * Makes a non void expression out of this store instruction. + * Makes a non void expression, in case this is a constructor. */ public void makeNonVoid() { if (type != Type.tVoid) @@ -398,12 +419,12 @@ public final class InvokeOperator extends Operator * @return true if this is the magic class$ method, false otherwise. */ public boolean isGetClass() { - if (isThis()) { - SyntheticAnalyzer synth = getMethodAnalyzer().getSynthetic(); - if (synth != null && synth.getKind() == SyntheticAnalyzer.GETCLASS) - return true; - } - return false; + MethodAnalyzer mana = getMethodAnalyzer(); + if (mana == null) + return false; + SyntheticAnalyzer synth = getMethodAnalyzer().getSynthetic(); + return (synth != null + && synth.getKind() == SyntheticAnalyzer.GETCLASS); } class Environment extends SimpleRuntimeEnvironment { @@ -419,8 +440,10 @@ public final class InvokeOperator extends Operator Object cls, Object[] params) throws InterpreterException, InvocationTargetException { if (cls == null && ref.getClazz().equals(classSig)) { - BytecodeInfo info = - ClassInfo.forName(ref.getClazz()) + String clazzName = ref.getClazz(); + clazzName = clazzName.substring(1, ref.getClazz().length() - 1) + .replace('/', '.'); + BytecodeInfo info = ClassInfo.forName(clazzName) .findMethod(ref.getName(), ref.getType()) .getBytecode(); if (info != null) @@ -572,6 +595,7 @@ public final class InvokeOperator extends Operator if (getMethodAnalyzer() != null) { SyntheticAnalyzer synth = getMethodAnalyzer().getSynthetic(); if (synth != null) { + int unifyParam = synth.getUnifyParam(); Expression op = null; switch (synth.getKind()) { case SyntheticAnalyzer.ACCESSGETFIELD: @@ -583,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, @@ -601,9 +631,9 @@ public final class InvokeOperator extends Operator synth.getReference()); break; case SyntheticAnalyzer.ACCESSCONSTRUCTOR: - if (subExpressions[1] instanceof ConstOperator + if (subExpressions[unifyParam] instanceof ConstOperator && ((ConstOperator) - subExpressions[1]).getValue() == null) { + subExpressions[unifyParam]).getValue() == null) { op = new InvokeOperator(methodAnalyzer, CONSTRUCTOR, synth.getReference()); } @@ -613,7 +643,7 @@ public final class InvokeOperator extends Operator if (op != null) { if (subExpressions != null) { for (int i=subExpressions.length; i-- > 0; ) { - if (i == 1 && synth.getKind() + if (i == unifyParam && synth.getKind() == SyntheticAnalyzer.ACCESSCONSTRUCTOR) // skip the null param. continue; @@ -633,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]; } @@ -675,9 +731,10 @@ public final class InvokeOperator extends Operator } for (int p = offset; p < paramTypes.length; p++) { if (!paramTypes[p] - .isOfType(Type.tSubType(otherParamTypes[p-offset]))) + .isOfType(Type.tSubType(otherParamTypes[p-offset]))){ /* No conflict here */ continue next_method; + } } /* There is a conflict that can be resolved by a cast. */ return true; @@ -727,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 @@ -735,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]; @@ -764,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] @@ -826,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 @@ -833,7 +895,8 @@ public final class InvokeOperator extends Operator * super class and anonymousNew will be set. */ InnerClassInfo outer = getOuterClassInfo(clazz); - if (outer != null && outer.name == null) + if (outer != null && outer.name == null + && (Options.options & Options.OPTION_ANON) != 0) anonymousNew = true; clazzAna = methodAnalyzer.getClassAnalyzer(clazz); if ((~Options.options & @@ -846,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 */ @@ -888,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 @@ -1056,30 +1127,19 @@ public final class InvokeOperator extends Operator ThisOperator thisOp = (ThisOperator) subExpressions[0]; Scope scope = writer.getScope(thisOp.getClassInfo(), Scope.CLASSSCOPE); - if (writer.conflicts(methodName, scope, Scope.METHODNAME)) { + if (writer.conflicts(methodName, scope, Scope.METHODNAME) + || (/* 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 + * method in some outer class. + */ + getMethodAnalyzer() == null + && (!isThis() || + writer.conflicts(methodName, null, + Scope.NOSUPERMETHODNAME)))) { thisOp.dumpExpression(writer, 950); writer.breakOp(); writer.print("."); - } else if (/* This is a inherited field conflicting - * with a field name in some outer class. - */ - getMethodAnalyzer() == null - && writer.conflicts(methodName, null, - Scope.NOSUPERMETHODNAME)) { - 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); - } - writer.breakOp(); - writer.print("."); } } else { if (needsCast(0, paramTypes)){ @@ -1103,6 +1163,8 @@ public final class InvokeOperator extends Operator writer.endOp(); writer.breakOp(); + if ((Options.outputStyle & Options.GNU_SPACING) != 0) + writer.print(" "); writer.print("("); writer.startOp(writer.EXPL_PAREN, 0); boolean first = true; @@ -1136,11 +1198,11 @@ public final class InvokeOperator extends Operator * dump the source code of the anonymous class. */ Object state = writer.saveOps(); - writer.openBrace(); + writer.openBraceClass(); writer.tab(); clazzAna.dumpBlock(writer); writer.untab(); - writer.closeBraceNoSpace(); + writer.closeBraceClass(); writer.restoreOps(state); } } diff --git a/jode/jode/expr/PopOperator.java b/jode/jode/expr/PopOperator.java index 4fa839c..9d55640 100644 --- a/jode/jode/expr/PopOperator.java +++ b/jode/jode/expr/PopOperator.java @@ -41,8 +41,17 @@ public class PopOperator extends Operator { public void updateType() { } + public int getBreakPenalty() { + if (subExpressions[0] instanceof Operator) + return ((Operator) subExpressions[0]).getBreakPenalty(); + return 0; + } + public void dumpExpression(TabbedPrintWriter writer) throws java.io.IOException { - subExpressions[0].dumpExpression(writer, 0); + /* Don't give a priority; we can't allow parens around + * a statement. + */ + subExpressions[0].dumpExpression(writer); } } diff --git a/jode/jode/expr/PrePostFixOperator.java b/jode/jode/expr/PrePostFixOperator.java index 1b0857c..a0ac65f 100644 --- a/jode/jode/expr/PrePostFixOperator.java +++ b/jode/jode/expr/PrePostFixOperator.java @@ -52,13 +52,11 @@ public class PrePostFixOperator extends Operator { public void dumpExpression(TabbedPrintWriter writer) throws java.io.IOException { - boolean needBrace = false; - int priority = 700; - if (!postfix) { + if (!postfix) writer.print(getOperatorString()); - priority = 800; - } - subExpressions[0].dumpExpression(writer, priority); + writer.startOp(writer.NO_PAREN, 2); + subExpressions[0].dumpExpression(writer); + writer.endOp(); if (postfix) writer.print(getOperatorString()); } diff --git a/jode/jode/expr/StoreInstruction.java b/jode/jode/expr/StoreInstruction.java index 1870977..538ead4 100644 --- a/jode/jode/expr/StoreInstruction.java +++ b/jode/jode/expr/StoreInstruction.java @@ -111,7 +111,9 @@ public class StoreInstruction extends Operator public void dumpExpression(TabbedPrintWriter writer) throws java.io.IOException { - subExpressions[0].dumpExpression(writer, 950); + writer.startOp(writer.NO_PAREN, 2); + subExpressions[0].dumpExpression(writer); + writer.endOp(); writer.breakOp(); writer.print(getOperatorString()); subExpressions[1].dumpExpression(writer, 100); diff --git a/jode/jode/expr/UnaryOperator.java b/jode/jode/expr/UnaryOperator.java index 1722442..72c3003 100644 --- a/jode/jode/expr/UnaryOperator.java +++ b/jode/jode/expr/UnaryOperator.java @@ -19,6 +19,7 @@ package jode.expr; import jode.type.Type; +import jode.decompiler.Options; import jode.decompiler.TabbedPrintWriter; public class UnaryOperator extends Operator { @@ -57,6 +58,8 @@ public class UnaryOperator extends Operator { public void dumpExpression(TabbedPrintWriter writer) throws java.io.IOException { writer.print(getOperatorString()); + if ((Options.outputStyle & Options.GNU_SPACING) != 0) + writer.print(" "); subExpressions[0].dumpExpression(writer, 700); } } 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/CatchBlock.java.in b/jode/jode/flow/CatchBlock.java.in index bc24007..5a39548 100644 --- a/jode/jode/flow/CatchBlock.java.in +++ b/jode/jode/flow/CatchBlock.java.in @@ -20,6 +20,7 @@ package jode.flow; import jode.type.Type; import jode.decompiler.LocalInfo; +import jode.decompiler.Declarable; import jode.expr.Expression; import jode.expr.LocalLoadOperator; import jode.expr.LocalStoreOperator; @@ -27,6 +28,7 @@ import jode.expr.StoreInstruction; import jode.util.SimpleSet; import @COLLECTIONS@.Collections; +import @COLLECTIONS@.Iterator; import @COLLECTIONS@.Set; @@ -160,6 +162,16 @@ public class CatchBlock extends StructuredBlock { ib.appendBlock(catchBlock); catchBlock = ib; exceptionLocal = dummyLocal; + String localName = dummyLocal.guessName(); + Iterator doneIter = done.iterator(); + while (doneIter.hasNext()) { + Declarable previous = (Declarable) doneIter.next(); + if (localName.equals(previous.getName())) { + /* A name conflict happened. */ + dummyLocal.makeNameUnique(); + break; + } + } } } } diff --git a/jode/jode/flow/CreateClassField.java b/jode/jode/flow/CreateClassField.java index afaa91e..0724b00 100644 --- a/jode/jode/flow/CreateClassField.java +++ b/jode/jode/flow/CreateClassField.java @@ -63,10 +63,12 @@ public class CreateClassField { return false; InvokeOperator invoke = (InvokeOperator) store.getSubExpressions()[1]; + if (!invoke.isGetClass()) + return false; + Expression param = invoke.getSubExpressions()[0]; - if (invoke.isGetClass() - && param instanceof ConstOperator + if (param instanceof ConstOperator && ((ConstOperator)param).getValue() instanceof String) { String clazz = (String) ((ConstOperator)param).getValue(); if (put.getField().setClassConstant(clazz)) { diff --git a/jode/jode/flow/EmptyBlock.java b/jode/jode/flow/EmptyBlock.java index 840e56b..1099934 100644 --- a/jode/jode/flow/EmptyBlock.java +++ b/jode/jode/flow/EmptyBlock.java @@ -56,6 +56,17 @@ public class EmptyBlock extends StructuredBlock { return block; } + /** + * Prepends a block to this block. + * @return the new combined block. + */ + public StructuredBlock prependBlock(StructuredBlock block) { + /* For empty blocks: append == prepend modulo jump */ + block = appendBlock(block); + block.moveJump(this.jump); + return block; + } + public void dumpInstruction(TabbedPrintWriter writer) throws java.io.IOException { diff --git a/jode/jode/flow/FlowBlock.java.in b/jode/jode/flow/FlowBlock.java.in index b7a2e83..b1e575e 100644 --- a/jode/jode/flow/FlowBlock.java.in +++ b/jode/jode/flow/FlowBlock.java.in @@ -1708,7 +1708,8 @@ public class FlowBlock { java.io.StringWriter strw = new java.io.StringWriter(); TabbedPrintWriter writer = new TabbedPrintWriter(strw); writer.println(super.toString() + ": "+addr+"-"+(addr+length)); - if ((GlobalOptions.debuggingFlags & GlobalOptions.DEBUG_INOUT) != 0) { + if ((GlobalOptions.debuggingFlags + & GlobalOptions.DEBUG_INOUT) != 0) { writer.println("in: "+in); } writer.tab(); 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/StructuredBlock.java.in b/jode/jode/flow/StructuredBlock.java.in index ed6e754..9d6a3e3 100644 --- a/jode/jode/flow/StructuredBlock.java.in +++ b/jode/jode/flow/StructuredBlock.java.in @@ -301,6 +301,18 @@ public abstract class StructuredBlock { } } + /** + * Prepends a block to this block. + * @return the new combined block. + */ + public StructuredBlock prependBlock(StructuredBlock block) { + SequentialBlock sequBlock = new SequentialBlock(); + sequBlock.replace(this); + sequBlock.setFirst(block); + sequBlock.setSecond(this); + return sequBlock; + } + /** * Removes this block, or replaces it with an EmptyBlock. */ diff --git a/jode/jode/flow/TransformConstructors.java b/jode/jode/flow/TransformConstructors.java index 1ea93ab..2a1df7c 100644 --- a/jode/jode/flow/TransformConstructors.java +++ b/jode/jode/flow/TransformConstructors.java @@ -1,4 +1,4 @@ -/* TransformConstructors Copyright (C) 1998-1999 Jochen Hoenicke. +/* TransformConstructors Copyright (C) 1998-2001 Jochen Hoenicke. * * 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 @@ -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; @@ -99,8 +100,6 @@ public class TransformConstructors { OuterValues outerValues; - boolean jikesAnonInner = false; - public TransformConstructors(ClassAnalyzer clazzAnalyzer, boolean isStatic, MethodAnalyzer[] cons) { this.clazzAnalyzer = clazzAnalyzer; @@ -320,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) @@ -573,7 +583,8 @@ public class TransformConstructors { * @param expr the initializer to check * @return the transformed initializer or null if expr is not valid. */ - public Expression transformFieldInitializer(Expression expr) { + private Expression transformFieldInitializer(int fieldSlot, + Expression expr) { if (expr instanceof LocalVarOperator) { if (!(expr instanceof LocalLoadOperator)) { if ((GlobalOptions.debuggingFlags @@ -594,11 +605,39 @@ public class TransformConstructors { +" "+outerValues); return null; } + if (expr instanceof FieldOperator) { + if (expr instanceof PutFieldOperator) + return null; + FieldOperator fo = (FieldOperator) expr; + if (fo.getClassInfo() == clazzAnalyzer.getClazz() + && clazzAnalyzer.getFieldIndex(fo.getFieldName(), + 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(); for (int i=0; i< subExpr.length; i++) { - Expression transformed = transformFieldInitializer(subExpr[i]); + Expression transformed + = transformFieldInitializer(fieldSlot, subExpr[i]); if (transformed == null) return null; if (transformed != subExpr[i]) @@ -675,7 +714,7 @@ public class TransformConstructors { break big_loop; Expression expr = store.getSubExpressions()[1]; - expr = transformFieldInitializer(expr); + expr = transformFieldInitializer(field, expr); if (expr == null) break big_loop; @@ -762,8 +801,14 @@ public class TransformConstructors { } } + int field = clazzAnalyzer.getFieldIndex(pfo.getFieldName(), + pfo.getFieldType()); + + if (field <= lastField) + return -1; + Expression expr = store.getSubExpressions()[1]; - expr = transformFieldInitializer(expr); + expr = transformFieldInitializer(field, expr); if (expr == null) return -1; @@ -772,9 +817,6 @@ public class TransformConstructors { GlobalOptions.err.println(" field " + pfo.getFieldName() + " = " + expr); - int field = clazzAnalyzer.getFieldIndex(pfo.getFieldName(), - pfo.getFieldType()); - // if field does not exists: -1 <= lastField. if (field <= lastField || !(clazzAnalyzer.getField(field).setInitializer(expr))) { diff --git a/jode/jode/flow/TransformExceptionHandlers.java.in b/jode/jode/flow/TransformExceptionHandlers.java.in index 1b20429..17f2e14 100644 --- a/jode/jode/flow/TransformExceptionHandlers.java.in +++ b/jode/jode/flow/TransformExceptionHandlers.java.in @@ -109,16 +109,12 @@ public class TransformExceptionHandlers { * | ... * `- catch block */ - static void analyzeCatchBlock(Type type, - FlowBlock tryFlow, FlowBlock catchFlow) { - - StructuredBlock catchBlock = catchFlow.block; + static void analyzeCatchBlock(Type type, FlowBlock tryFlow, + StructuredBlock catchBlock) { CatchBlock newBlock = new CatchBlock(type); ((TryBlock)tryFlow.block).addCatchBlock(newBlock); - newBlock.setCatchBlock(catchFlow.block); - tryFlow.mergeSuccessors(catchFlow); - tryFlow.mergeAddr(catchFlow); + newBlock.setCatchBlock(catchBlock); } /* And now the complicated parts. */ @@ -128,132 +124,200 @@ public class TransformExceptionHandlers { * local assignment matches the final ret and then returns. */ boolean transformSubRoutine(StructuredBlock subRoutine) { - if (!(subRoutine instanceof SequentialBlock) - || !(subRoutine.getSubBlocks()[0] instanceof InstructionBlock)) - return false; + if (!(subRoutine instanceof SequentialBlock)) + return false; SequentialBlock sequBlock = (SequentialBlock) subRoutine; - InstructionBlock instr = (InstructionBlock)sequBlock.subBlocks[0]; - - if (!(instr.getInstruction() instanceof StoreInstruction) - || !(((StoreInstruction) instr.getInstruction()).getLValue() - instanceof LocalStoreOperator)) - return false; - LocalStoreOperator store = (LocalStoreOperator) - ((StoreInstruction)instr.getInstruction()).getLValue(); - - while (sequBlock.subBlocks[1] instanceof SequentialBlock) - sequBlock = (SequentialBlock) sequBlock.subBlocks[1]; - - /* XXX - Check that the local isn't used for any other purposes - * than RET and replace any RET with a flow control to end of - * flow block. + StructuredBlock firstBlock = sequBlock.getSubBlocks()[0]; + + LocalInfo local = null; + if (firstBlock instanceof SpecialBlock) { + SpecialBlock popBlock + = (SpecialBlock) firstBlock; + if (popBlock.type != SpecialBlock.POP + || popBlock.count != 1) + return false; + } else if (firstBlock instanceof InstructionBlock) { + Expression expr + = ((InstructionBlock) firstBlock).getInstruction(); + if (expr instanceof StoreInstruction + && ((StoreInstruction) + expr).getLValue() instanceof LocalStoreOperator) { + LocalStoreOperator store = (LocalStoreOperator) + ((StoreInstruction)expr).getLValue(); + local = store.getLocalInfo(); + expr = ((StoreInstruction) expr).getSubExpressions()[1]; + } + if (!(expr instanceof NopOperator)) + return false; + } else + return false; + + /* We have now committed. Remove the first Statement which + * stores/removes the return address. + */ + firstBlock.removeBlock(); + + /* XXX - Replace any RET with a jump to end of this flow block. * - * This is a complicated task which isn't needed for javac nor jikes. + * This is a complicated task which isn't needed for javac nor + * jikes. We just check if the last instruction is a ret and + * replace this. This will never produce code with wrong semantic, + * as long as the bytecode was verified correctly. */ - if (sequBlock.subBlocks[1].jump != null - && sequBlock.subBlocks[1].jump.destination - == FlowBlock.END_OF_METHOD) { - instr.removeBlock(); - return true; + while (sequBlock.subBlocks[1] instanceof SequentialBlock) + sequBlock = (SequentialBlock) sequBlock.subBlocks[1]; + + if (sequBlock.subBlocks[1] instanceof RetBlock + && (((RetBlock) sequBlock.subBlocks[1]).local.equals(local))) { + sequBlock.subBlocks[1].removeBlock(); } - if (! (sequBlock.subBlocks[1] instanceof RetBlock) - || !(((RetBlock)sequBlock.subBlocks[1]) - .local.equals(store.getLocalInfo()))) - return false; - - instr.removeBlock(); - sequBlock.subBlocks[1].removeBlock(); - return true; + return true; } /** - * Remove the JSR's jumping to the specified subRoutine. It - * is checked if the next block is a leaving instruction, and - * otherwise the JsrBlock is not removed (to give the user a - * hint that something went wrong). This will also remove the - * local javac generates for returns. + * Remove the locale that javac introduces to temporary store the return + * value, when it executes a finally block resp. monitorexit + * @param ret the ReturnBlock. + */ + private void removeReturnLocal(ReturnBlock ret) { + StructuredBlock pred = getPredecessor(ret); + if (!(pred instanceof InstructionBlock)) + return; + Expression instr = ((InstructionBlock) pred).getInstruction(); + if (!(instr instanceof StoreInstruction)) + return; + + Expression retInstr = ret.getInstruction(); + if (!(retInstr instanceof LocalLoadOperator + && ((StoreInstruction) instr).lvalueMatches + ((LocalLoadOperator) retInstr))) + return; + + Expression rvalue = ((StoreInstruction) instr).getSubExpressions()[1]; + ret.setInstruction(rvalue); + ret.replace(ret.outer); + } + + /** + * Remove the wrongly placed JSRs jumping to the specified + * subRoutine. The right JSRs are already removed, but we have to + * replace the wrong ones with a warning. * @param tryFlow the FlowBLock of the try block. * @param subRoutine the FlowBlock of the sub routine. */ - private void removeJSR(FlowBlock tryFlow, FlowBlock subRoutine) { - for (Jump jumps = tryFlow.removeJumps(subRoutine); - jumps != null; jumps = jumps.next) { + private void removeJSR(FlowBlock tryFlow, StructuredBlock catchBlock, + FlowBlock subRoutine) { + Jump nextJump; + for (Jump jumps = tryFlow.getJumps(subRoutine); + jumps != null; jumps = nextJump) { StructuredBlock prev = jumps.prev; - prev.removeJump(); + nextJump = jumps.next; if (prev instanceof EmptyBlock && prev.outer instanceof JsrBlock) { - if (prev.outer.getNextFlowBlock() != null) { - /* The jsr is directly before a jump, okay. */ - prev.outer.removeBlock(); - continue; - } - if (prev.outer.outer instanceof SequentialBlock - && prev.outer.outer.getSubBlocks()[0] == prev.outer) { - SequentialBlock seq = (SequentialBlock) prev.outer.outer; - if (seq.subBlocks[1] instanceof JsrBlock - || (seq.subBlocks[1] instanceof SequentialBlock - && seq.subBlocks[1].getSubBlocks()[0] - instanceof JsrBlock)) { - /* The jsr is followed by a jsr, okay. */ - prev.outer.removeBlock(); - continue; - } - if (seq.subBlocks[1] instanceof ReturnBlock - && !(seq.subBlocks[1] instanceof ThrowBlock)) { - - /* The jsr is followed by a return, okay. */ - ReturnBlock ret = (ReturnBlock) seq.subBlocks[1]; - prev.outer.removeBlock(); - - if (ret.outer != null - && ret.outer instanceof SequentialBlock) { - /* Try to eliminate the local that javac uses - * in this case. - */ - try { - StoreInstruction store = (StoreInstruction) - ((InstructionBlock) - ret.outer.getSubBlocks()[0]).instr; - LocalInfo local = - ((LocalStoreOperator) store.getLValue()) - .getLocalInfo(); - if (store.lvalueMatches - ((LocalLoadOperator) - ret.getInstruction())) { - Expression expr = - store.getSubExpressions()[1]; - ret.setInstruction(expr); - ret.replace(ret.outer); - } - } catch(ClassCastException ex) { - /* didn't succeed */ - } - } - continue; - } - } + JsrBlock jsr = (JsrBlock) prev.outer; + if (prev.outer == catchBlock) { + /* This is the mandatory jsr in the catch block */ + continue; + } + + tryFlow.removeSuccessor(jumps); + prev.removeJump(); + 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. + */ + DescriptionBlock msg + = new DescriptionBlock("ERROR: GOTO FINALLY BLOCK!"); + tryFlow.removeSuccessor(jumps); + prev.removeJump(); + prev.appendBlock(msg); + } + } + } + + private static StructuredBlock getPredecessor(StructuredBlock stmt) + { + if (stmt.outer instanceof SequentialBlock) { + SequentialBlock seq = (SequentialBlock) stmt.outer; + if (seq.subBlocks[1] == stmt) + return seq.subBlocks[0]; + else if (seq.outer instanceof SequentialBlock) + return seq.outer.getSubBlocks()[0]; + } + return null; + } + + /** + * Gets the slot of the monitorexit instruction instr in the + * stmt, or -1 if stmt isn't a InstructionBlock with a + * monitorexit instruction. + * @param stmt the stmt, may be null. + */ + private static int getMonitorExitSlot(StructuredBlock stmt) { + if (stmt instanceof InstructionBlock) { + Expression instr = ((InstructionBlock) stmt).getInstruction(); + if (instr instanceof MonitorExitOperator) { + MonitorExitOperator monExit = (MonitorExitOperator)instr; + if (monExit.getFreeOperandCount() == 0 + && (monExit.getSubExpressions()[0] + instanceof LocalLoadOperator)) + return ((LocalLoadOperator) monExit.getSubExpressions()[0]) + .getLocalInfo().getSlot(); } - /* Now we have a jump to the subroutine, that is wrong. - * We complain here. - */ - DescriptionBlock msg - = new DescriptionBlock("ERROR: GOTO FINALLY BLOCK!"); - prev.appendBlock(msg); } + return -1; } - public void checkAndRemoveJSR(FlowBlock tryFlow, FlowBlock subRoutine, - int startOutExit, int endOutExit) { - boolean foundSub = false; + private boolean isMonitorExitSubRoutine(FlowBlock subRoutine, + LocalInfo local) { + if (transformSubRoutine(subRoutine.block) + && getMonitorExitSlot(subRoutine.block) == local.getSlot()) + return true; + return false; + } + + private static StructuredBlock skipFinExitChain(StructuredBlock block) + { + StructuredBlock pred, result; + if (block instanceof ReturnBlock) + pred = getPredecessor(block); + else + pred = block; + result = null; + + while (pred instanceof JsrBlock + || getMonitorExitSlot(pred) >= 0) { + result = pred; + pred = getPredecessor(pred); + } + return result; + } + + + private void checkAndRemoveJSR(FlowBlock tryFlow, + StructuredBlock catchBlock, + FlowBlock subRoutine, + int startOutExit, int endOutExit) { Iterator iter = tryFlow.getSuccessors().iterator(); dest_loop: while (iter.hasNext()) { FlowBlock dest = (FlowBlock) iter.next(); - if (dest == subRoutine) { - foundSub = true; + if (dest == subRoutine) continue dest_loop; - } boolean isFirstJump = true; for (Jump jumps = tryFlow.getJumps(dest); @@ -266,41 +330,31 @@ public class TransformExceptionHandlers { */ continue; } - if (prev instanceof JsrBlock) { - /* The jump is directly preceeded by a jsr. - * Everything okay. - */ - continue; - } - if (prev instanceof EmptyBlock && prev.outer instanceof JsrBlock) { - /* If jump is a jsr check the outer - * block instead. - */ - prev = prev.outer; - } - if ((prev instanceof ReturnBlock - || prev instanceof JsrBlock) - && prev.outer instanceof SequentialBlock) { - SequentialBlock seq = (SequentialBlock) prev.outer; - if (seq.subBlocks[1] == prev - && (seq.subBlocks[0] instanceof JsrBlock)) { - /* The jump is preceeded by another jsr, okay. - */ - continue; - } - if (seq.subBlocks[0] == prev - && seq.outer instanceof SequentialBlock - && (seq.outer.getSubBlocks()[0] instanceof JsrBlock)) { - /* Again the jump is preceeded by another jsr, okay. - */ - continue; - } + /* This jump is really a jsr, since it doesn't + * leave the block forever, we can ignore it. + */ + continue; } + StructuredBlock pred = skipFinExitChain(prev); + + if (pred instanceof JsrBlock) { + 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. Mark the + * jsr as good. + */ + jsr.setGood(true); + continue; + } + } - if (isFirstJump) { - /* Now we have a jump that is not preceded by the + if (pred == null && isFirstJump) { + /* Now we have a jump that is not preceded by any * jsr. There's a last chance: the jump jumps * directly to a correct jsr instruction, which * lies outside the try/catch block. @@ -331,44 +385,22 @@ public class TransformExceptionHandlers { */ DescriptionBlock msg = new DescriptionBlock("ERROR: NO JSR TO FINALLY"); - prev.appendBlock(msg); - msg.moveJump(jumps); - } - } - if (foundSub) - removeJSR(tryFlow, subRoutine); - } - - static boolean isMonitorExit(Expression instr, LocalInfo local) { - if (instr instanceof MonitorExitOperator) { - MonitorExitOperator monExit = (MonitorExitOperator)instr; - if (monExit.getFreeOperandCount() == 0 - && monExit.getSubExpressions()[0] instanceof LocalLoadOperator - && (((LocalLoadOperator) monExit.getSubExpressions()[0]) - .getLocalInfo().getSlot() == local.getSlot())) { - return true; + if (pred != null) + pred.prependBlock(msg); + else { + prev.appendBlock(msg); + msg.moveJump(prev.jump); + } } } - return false; - } - - boolean isMonitorExitSubRoutine(FlowBlock subRoutine, LocalInfo local) { - if (transformSubRoutine(subRoutine.block)) { - if (subRoutine.block instanceof InstructionBlock) { - Expression instr = - ((InstructionBlock)subRoutine.block) - .getInstruction(); - if (isMonitorExit(instr, local)) { - return true; - } - } - } - return false; + if (tryFlow.getSuccessors().contains(subRoutine)) + removeJSR(tryFlow, catchBlock, subRoutine); } - public void checkAndRemoveMonitorExit(FlowBlock tryFlow, LocalInfo local, - int startOutExit, int endOutExit, - int startMonExit, int endMonExit) { + private void checkAndRemoveMonitorExit(FlowBlock tryFlow, + StructuredBlock catchBlock, + LocalInfo local, + int start, int end) { FlowBlock subRoutine = null; Iterator succs = tryFlow.getSuccessors().iterator(); dest_loop: @@ -379,87 +411,54 @@ public class TransformExceptionHandlers { jumps != null; jumps = jumps.next, isFirstJump = false) { StructuredBlock prev = jumps.prev; - if (prev instanceof ThrowBlock) { - /* The jump is a throw. We have a catch all block - * that will do the monitorexit. - */ - continue; - } - if (prev instanceof JsrBlock) { - /* The jump is directly preceeded by a jsr. + /* The jump is a throw. We have a catch-all block + * that will do the finally. */ continue; } if (prev instanceof EmptyBlock && prev.outer instanceof JsrBlock) { - /* If jump is a jsr check the outer - * block instead. - */ - prev = prev.outer; - } - - /* If the block is a jsr or a return block, check if - * it is preceeded by another jsr. - */ - if ((prev instanceof JsrBlock - || prev instanceof ReturnBlock) - && prev.outer instanceof SequentialBlock) { - SequentialBlock seq = (SequentialBlock) prev.outer; - StructuredBlock pred = null; - if (seq.subBlocks[1] == prev) - pred = seq.subBlocks[0]; - else if (seq.outer instanceof SequentialBlock) - pred = seq.outer.getSubBlocks()[0]; - - if (pred != null) { - if (pred instanceof JsrBlock) - /* The jump is preceeded by another jsr, okay. - */ - continue; - - if (pred instanceof InstructionBlock) { - Expression instr = - ((InstructionBlock)pred).getInstruction(); - if (isMonitorExit(instr, local)) - continue; - } - } - } - - if (prev instanceof InstructionBlock - && isMonitorExit(((InstructionBlock)prev).instr, local)) { - /* This is probably the last expression in the - * synchronized block, and has the right monitor exit - * attached. Remove this block. - */ - prev.removeBlock(); - continue; - } - - if (isFirstJump) { - /* This is the first jump to that destination. - * Check if the destination does the monitorExit + /* This jump is really a jsr, since it doesn't + * leave the block forever, we can ignore it. */ + continue; + } + StructuredBlock pred = skipFinExitChain(prev); + if (pred instanceof JsrBlock) { + JsrBlock jsr = (JsrBlock) pred; + StructuredBlock jsrInner = jsr.innerBlock; + if (jsrInner instanceof EmptyBlock + && jsrInner.jump != null) { + FlowBlock dest = jsrInner.jump.destination; - /* The block is a jsr that is not preceeded by - * another jsr. This must be the monitorexit - * subroutine. - */ - if (prev instanceof JsrBlock) { if (subRoutine == null - && successor.getAddr() >= startMonExit - && successor.getNextAddr() <= endMonExit) { - successor.analyze(startMonExit, endMonExit); - - if (isMonitorExitSubRoutine(successor, local)) - subRoutine = successor; + && dest.getAddr() >= start + && dest.getNextAddr() <= end) { + dest.analyze(start, end); + if (isMonitorExitSubRoutine(dest, local)) + subRoutine = dest; } - if (subRoutine == successor) - continue dest_loop; + if (dest == subRoutine) { + /* The jump is preceeded by the right jsr. + * Mark it as good. + */ + jsr.setGood(true); + continue; + } } + } else if (getMonitorExitSlot(pred) == local.getSlot()) { + /* The jump is preceeded by the right monitor + * exit instruction. + */ + pred.removeBlock(); + if (prev instanceof ReturnBlock) + removeReturnLocal((ReturnBlock) prev); + continue; + } + if (pred == null && isFirstJump) { /* Now we have a jump that is not preceded by a * monitorexit. There's a last chance: the jump * jumps directly to the correct monitorexit @@ -467,9 +466,9 @@ public class TransformExceptionHandlers { * block. */ if (successor.predecessors.size() == 1 - && successor.getAddr() >= startOutExit - && successor.getNextAddr() <= endOutExit) { - successor.analyze(startOutExit, endOutExit); + && successor.getAddr() >= start + && successor.getNextAddr() <= end) { + successor.analyze(start, end); StructuredBlock sb = successor.block; if (sb instanceof SequentialBlock) @@ -479,25 +478,23 @@ public class TransformExceptionHandlers { StructuredBlock jsrInner = sb.getSubBlocks()[0]; FlowBlock dest = jsrInner.jump.destination; if (subRoutine == null - && dest.getAddr() >= startMonExit - && dest.getNextAddr() <= endMonExit) { - dest.analyze(startMonExit, endMonExit); + && dest.getAddr() >= start + && dest.getNextAddr() <= end) { + dest.analyze(start, end); if (isMonitorExitSubRoutine(dest, local)) subRoutine = dest; } if (subRoutine == dest) { + successor.removeSuccessor(jsrInner.jump); + jsrInner.removeJump(); sb.removeBlock(); continue dest_loop; } } - if (sb instanceof InstructionBlock) { - Expression instr = ((InstructionBlock)sb) - .getInstruction(); - if (isMonitorExit(instr, local)) { - sb.removeBlock(); - continue dest_loop; - } + if (getMonitorExitSlot(sb) == local.getSlot()) { + sb.removeBlock(); + continue dest_loop; } } } @@ -512,126 +509,148 @@ public class TransformExceptionHandlers { } if (subRoutine != null) { - removeJSR(tryFlow, subRoutine); + if (tryFlow.getSuccessors().contains(subRoutine)) + removeJSR(tryFlow, catchBlock, subRoutine); tryFlow.mergeAddr(subRoutine); } } + private StoreInstruction getExceptionStore(StructuredBlock catchBlock) { + if (!(catchBlock instanceof SequentialBlock) + || !(catchBlock.getSubBlocks()[0] instanceof InstructionBlock)) + return null; + + Expression instr = + ((InstructionBlock)catchBlock.getSubBlocks()[0]).getInstruction(); + if (!(instr instanceof StoreInstruction)) + return null; + + StoreInstruction store = (StoreInstruction) instr; + if (!(store.getLValue() instanceof LocalStoreOperator + && store.getSubExpressions()[1] instanceof NopOperator)) + return null; + + return store; + } + private boolean analyzeSynchronized(FlowBlock tryFlow, - FlowBlock catchFlow, + StructuredBlock catchBlock, int endHandler) { - if (!(catchFlow.block instanceof SequentialBlock - && catchFlow.block.getSubBlocks()[0] + StoreInstruction excStore = getExceptionStore(catchBlock); + if (excStore != null) + catchBlock = catchBlock.getSubBlocks()[1]; + + if (!(catchBlock instanceof SequentialBlock + && catchBlock.getSubBlocks()[0] instanceof InstructionBlock)) return false; - SequentialBlock catchBlock = (SequentialBlock) catchFlow.block; Expression instr = - ((InstructionBlock)catchBlock.subBlocks[0]).getInstruction(); + ((InstructionBlock)catchBlock.getSubBlocks()[0]).getInstruction(); - if (instr instanceof MonitorExitOperator - && instr.getFreeOperandCount() == 0 - && (((MonitorExitOperator)instr).getSubExpressions()[0] - instanceof LocalLoadOperator) - && catchBlock.subBlocks[1] instanceof ThrowBlock - && (((ThrowBlock)catchBlock.subBlocks[1]).instr - instanceof NopOperator)) { - - /* This is a synchronized block: - * - * local_x = monitor object; // later - * monitorenter local_x // later - * tryFlow: - * |- synchronized block - * | ... - * | every jump to outside is preceded by jsr subroutine-, - * | ... | - * |- monitorexit local_x | - * ` jump after this block (without jsr monexit) | - * | - * catchFlow: | - * local_n = stack | - * monitorexit local_x | - * throw local_n | - * optional subroutine: <-----------------------------------' - * astore_n - * monitorexit local_x - * return_n - */ + if (!(instr instanceof MonitorExitOperator + && instr.getFreeOperandCount() == 0 + && (((MonitorExitOperator)instr).getSubExpressions()[0] + instanceof LocalLoadOperator) + && catchBlock.getSubBlocks()[1] instanceof ThrowBlock)) + return false; - /* Now remove the jump (after the throw) from the - * catch block so that we can forget about it. - */ - - catchFlow.removeSuccessor(catchBlock.subBlocks[1].jump); - MonitorExitOperator monexit = (MonitorExitOperator) - ((InstructionBlock) catchBlock.subBlocks[0]).instr; - LocalInfo local = - ((LocalLoadOperator)monexit.getSubExpressions()[0]) - .getLocalInfo(); - - if ((GlobalOptions.debuggingFlags - & GlobalOptions.DEBUG_ANALYZE) != 0) - GlobalOptions.err.println - ("analyzeSynchronized(" + tryFlow.getAddr() - + "," + tryFlow.getNextAddr() + "," + catchFlow.getAddr() - + "," + catchFlow.getNextAddr() + "," + endHandler + ")"); - - checkAndRemoveMonitorExit - (tryFlow, local, - tryFlow.getNextAddr(), catchFlow.getAddr(), - catchFlow.getNextAddr(), endHandler); - - tryFlow.mergeAddr(catchFlow); - SynchronizedBlock syncBlock = new SynchronizedBlock(local); - TryBlock tryBlock = (TryBlock) tryFlow.block; - syncBlock.replace(tryBlock); - syncBlock.moveJump(tryBlock.jump); - syncBlock.setBodyBlock(tryBlock.subBlocks.length == 1 - ? tryBlock.subBlocks[0] : tryBlock); - tryFlow.lastModified = syncBlock; - return true; - } - return false; + Expression throwInstr = + ((ThrowBlock)catchBlock.getSubBlocks()[1]).getInstruction(); + + if (excStore != null) { + if (!(throwInstr instanceof Operator + && excStore.lvalueMatches((Operator)throwInstr))) + return false; + } else { + if (!(throwInstr instanceof NopOperator)) + return false; + } + + /* This is a synchronized block: + * + * local_x = monitor object; // later + * monitorenter local_x // later + * tryFlow: + * |- synchronized block + * | ... + * | every jump to outside is preceded by jsr subroutine-, + * | ... | + * |- monitorexit local_x | + * ` jump after this block (without jsr monexit) | + * | + * catchBlock: | + * local_n = stack | + * monitorexit local_x | + * throw local_n | + * [OR ALTERNATIVELY:] | + * monitorexit local_x | + * throw stack | + * optional subroutine: <-----------------------------------' + * astore_n + * monitorexit local_x + * return_n + */ + + MonitorExitOperator monexit = (MonitorExitOperator) + ((InstructionBlock) catchBlock.getSubBlocks()[0]).instr; + LocalInfo local = + ((LocalLoadOperator)monexit.getSubExpressions()[0]) + .getLocalInfo(); + + if ((GlobalOptions.debuggingFlags + & GlobalOptions.DEBUG_ANALYZE) != 0) + GlobalOptions.err.println + ("analyzeSynchronized(" + tryFlow.getAddr() + + "," + tryFlow.getNextAddr() + "," + endHandler + ")"); + + checkAndRemoveMonitorExit + (tryFlow, catchBlock, local, tryFlow.getNextAddr(), endHandler); + + SynchronizedBlock syncBlock = new SynchronizedBlock(local); + TryBlock tryBlock = (TryBlock) tryFlow.block; + syncBlock.replace(tryBlock); + syncBlock.moveJump(tryBlock.jump); + syncBlock.setBodyBlock(tryBlock.subBlocks.length == 1 + ? tryBlock.subBlocks[0] : tryBlock); + tryFlow.lastModified = syncBlock; + return true; } - private boolean analyzeFinally(FlowBlock tryFlow, FlowBlock catchFlow, - int end) { - - /* Layout of a try-finally block: - * - * tryFlow: - * |- first instruction - * | ... - * | every jump to outside is preceded by jsr finally - * | ... - * | jsr finally -----------------, - * `- jump after finally | - * | - * catchFlow: (already checked) | - * local_n = stack v - * jsr finally ---------------->| - * throw local_n; | - * finally: <-----------------------' - * astore_n - * ... - * return_n - */ - - if (!(catchFlow.block instanceof SequentialBlock) - || !(catchFlow.block.getSubBlocks()[0] - instanceof InstructionBlock) - || !(catchFlow.block.getSubBlocks()[1] - instanceof SequentialBlock)) + private boolean analyzeFinally(FlowBlock tryFlow, + StructuredBlock catchBlock, int end) { + + /* Layout of a try-finally block: + * + * tryFlow: + * |- first instruction + * | ... + * | every jump to outside is preceded by jsr finally + * | ... + * | jsr finally -----------------, + * `- jump after finally | + * | + * catchBlock: | + * local_n = stack v + * jsr finally ---------------->| + * throw local_n; | + * finally: <-----------------------' + * astore_n + * ... + * return_n + */ + + StoreInstruction excStore = getExceptionStore(catchBlock); + if (excStore == null) + return false; + + catchBlock = catchBlock.getSubBlocks()[1]; + if (!(catchBlock instanceof SequentialBlock)) return false; StructuredBlock finallyBlock = null; - SequentialBlock catchBlock = (SequentialBlock) catchFlow.block; - Expression instr = - ((InstructionBlock)catchBlock.subBlocks[0]).getInstruction(); - catchBlock = (SequentialBlock)catchBlock.subBlocks[1]; - if (catchBlock.subBlocks[0] instanceof LoopBlock) { + if (catchBlock.getSubBlocks()[0] instanceof LoopBlock) { /* In case the try block has no exit (that means, it throws * an exception), the finallyBlock was already merged with * the catchBlock. We have to check for this case separately: @@ -641,20 +660,21 @@ public class TransformExceptionHandlers { * break; * throw local_x * } while(false); - * finallyBlock; + * finallyBlock; (starts with POP or local_y = POP) */ - LoopBlock doWhileFalse = (LoopBlock)catchBlock.subBlocks[0]; + LoopBlock doWhileFalse = (LoopBlock)catchBlock.getSubBlocks()[0]; if (doWhileFalse.type == LoopBlock.DOWHILE && doWhileFalse.cond == LoopBlock.FALSE && doWhileFalse.bodyBlock instanceof SequentialBlock) { - finallyBlock = catchBlock.subBlocks[1]; - catchBlock = (SequentialBlock) doWhileFalse.bodyBlock; + if (transformSubRoutine(catchBlock.getSubBlocks()[1])) { + finallyBlock = catchBlock.getSubBlocks()[1]; + catchBlock = (SequentialBlock) doWhileFalse.bodyBlock; + } } } if (!(catchBlock instanceof SequentialBlock && catchBlock.getSubBlocks()[0] instanceof JsrBlock - && instr instanceof StoreInstruction && catchBlock.getSubBlocks()[1] instanceof ThrowBlock)) return false; @@ -663,21 +683,12 @@ public class TransformExceptionHandlers { ThrowBlock throwBlock = (ThrowBlock) catchBlock.getSubBlocks()[1]; - if (!(throwBlock.instr instanceof LocalLoadOperator) - || !(((StoreInstruction) instr).lvalueMatches - ((LocalLoadOperator) throwBlock.instr))) + if (!(throwBlock.getInstruction() instanceof Operator + && excStore.lvalueMatches((Operator) + throwBlock.getInstruction()))) return false; - /* Wow that was complicated :-) - * But now we know that the catch block looks - * exactly like it should: - * - * catchBlock: - * JSR - * finally - * throw local_n <- matches the local in instr. - */ - + FlowBlock subRoutine; if (finallyBlock != null) { /* Check if the jsr breaks (see two comments above). We don't * need to check if it breaks to the right block, because @@ -687,77 +698,35 @@ public class TransformExceptionHandlers { return false; /* Check if the try block has no exit (except throws) + * XXX - Unfortunately the try block already has the + * successors of catch block. */ - Set succs = tryFlow.getSuccessors(); - if (succs.size() > 0) { - if (!succs.contains(FlowBlock.END_OF_METHOD)) - return false; - Jump throwJumps - = tryFlow.getJumps(FlowBlock.END_OF_METHOD); - for (/**/; throwJumps != null; - throwJumps = throwJumps.next) { - if (!(throwJumps.prev instanceof ThrowBlock)) - /* There is a return exit in the try block */ - return false; - } - } - /* Remove the jump of the throw instruction. - */ - catchFlow.removeSuccessor(throwBlock.jump); - throwBlock.removeJump(); - - /* Replace the catchBlock with the finallyBlock. - */ - finallyBlock.replace(catchFlow.block); - transformSubRoutine(finallyBlock); - - tryFlow.updateInOutCatch(catchFlow); - tryFlow.mergeAddr(catchFlow); - finallyBlock = catchFlow.block; - tryFlow.mergeSuccessors(catchFlow); +// if (tryFlow.getSuccessors() > 0) +// return false; + catchBlock = finallyBlock; + subRoutine = null; } else { - FlowBlock subRoutine = jsrBlock.innerBlock.jump.destination; - checkAndRemoveJSR(tryFlow, subRoutine, - tryFlow.getNextAddr(), catchFlow.getAddr()); - - while (subRoutine.analyze(catchFlow.getNextAddr(), end)); + if (!(jsrBlock.innerBlock instanceof EmptyBlock)) + return false; + catchBlock = jsrBlock; + subRoutine = jsrBlock.innerBlock.jump.destination; + checkAndRemoveJSR(tryFlow, catchBlock, subRoutine, + tryFlow.getNextAddr(), subRoutine.getAddr()); + } - /* Now check if the subroutine is correct and has only the - * catchFlow as predecessor. - */ - if (subRoutine.predecessors.size() == 1 - && transformSubRoutine(subRoutine.block)) { - subRoutine.mergeAddr(catchFlow); + /* Wow that was complicated :-) + * But now we know that the catch block looks + * exactly like it should: + * + * local_n = POP + * catchBlock: + * JSR + * finally + * throw local_n + */ - /* Now remove the jump to the JSR from the catch block - * and the jump of the throw instruction. - */ - catchFlow.removeSuccessor(jsrBlock.innerBlock.jump); - jsrBlock.innerBlock.removeJump(); - catchFlow.removeSuccessor(throwBlock.jump); - throwBlock.removeJump(); - - tryFlow.updateInOutCatch(subRoutine); - tryFlow.mergeAddr(subRoutine); - tryFlow.mergeSuccessors(subRoutine); - finallyBlock = subRoutine.block; - } else { - catchFlow.removeSuccessor(throwBlock.jump); - throwBlock.removeJump(); - finallyBlock = jsrBlock; - - finallyBlock.replace(catchFlow.block); - transformSubRoutine(finallyBlock); - - tryFlow.updateInOutCatch(catchFlow); - tryFlow.mergeAddr(catchFlow); - finallyBlock = catchFlow.block; - tryFlow.mergeSuccessors(catchFlow); - } - } - - TryBlock tryBlock = (TryBlock)tryFlow.block; + TryBlock tryBlock = (TryBlock) tryFlow.block; if (tryBlock.getSubBlocks()[0] instanceof TryBlock) { /* remove the surrounding tryBlock */ TryBlock innerTry = (TryBlock)tryBlock.getSubBlocks()[0]; @@ -768,88 +737,83 @@ public class TransformExceptionHandlers { tryFlow.block = tryBlock; } FinallyBlock newBlock = new FinallyBlock(); - newBlock.setCatchBlock(finallyBlock); + newBlock.setCatchBlock(catchBlock); tryBlock.addCatchBlock(newBlock); + + if (subRoutine != null) { + while (subRoutine.analyze(tryFlow.getNextAddr(), end)); + + /* Now check if the subroutine is correct and has only the + * catchFlow as predecessor. + */ + if (subRoutine.predecessors.size() == 1 + && transformSubRoutine(subRoutine.block)) { + + tryFlow.removeSuccessor(jsrBlock.innerBlock.jump); + tryFlow.mergeAddr(subRoutine); + tryFlow.mergeSuccessors(subRoutine); + subRoutine.block.replace(catchBlock); + tryFlow.updateInOutCatch(subRoutine); + } + } return true; } private boolean analyzeSpecialFinally(FlowBlock tryFlow, - FlowBlock catchFlow, int end) { - + StructuredBlock catchBlock, + int end) { StructuredBlock firstInstr = - catchFlow.block instanceof SequentialBlock - ? catchFlow.block.getSubBlocks()[0]: catchFlow.block; + catchBlock instanceof SequentialBlock + ? catchBlock.getSubBlocks()[0]: catchBlock; - if (firstInstr instanceof SpecialBlock - && ((SpecialBlock)firstInstr).type == SpecialBlock.POP - && ((SpecialBlock)firstInstr).count == 1) { - - /* This is a special try/finally-block, where - * the finally block ends with a break, return or - * similar. - */ - - FlowBlock succ = (firstInstr.jump != null) ? - firstInstr.jump.destination : null; - boolean hasExit = false; - Iterator iter = tryFlow.getSuccessors().iterator(); - while (iter.hasNext()) { - FlowBlock dest = (FlowBlock) iter.next(); - if (dest == succ) - continue; - if (dest != FlowBlock.END_OF_METHOD) { - /* There is another exit in the try block, bad */ - return false; - } - for (Jump throwJumps = (Jump) tryFlow.getJumps(dest); - throwJumps != null; throwJumps = throwJumps.next) { - if (!(throwJumps.prev instanceof ThrowBlock)) { - /* There is a return exit in the try block */ - return false; - } - } - } + if (!(firstInstr instanceof SpecialBlock + && ((SpecialBlock)firstInstr).type == SpecialBlock.POP + && ((SpecialBlock)firstInstr).count == 1)) + return false; - /* remove the pop now */ - firstInstr.removeBlock(); - tryFlow.mergeAddr(catchFlow); + /* This may be a special try/finally-block, where + * the finally block ends with a break, return or + * similar. + */ + FlowBlock succ = null; - if (succ != null) { - Jump jumps = tryFlow.removeJumps(succ); - /* Handle the jumps in the tryFlow. - */ - jumps = tryFlow.resolveSomeJumps(jumps, succ); - tryFlow.resolveRemaining(jumps); - } + /* remove the pop now */ + if (catchBlock instanceof SequentialBlock) + catchBlock = catchBlock.getSubBlocks()[1]; + else { + catchBlock = new EmptyBlock(); + catchBlock.moveJump(firstInstr.jump); - TryBlock tryBlock = (TryBlock)tryFlow.block; - if (tryBlock.getSubBlocks()[0] instanceof TryBlock) { - /* remove the unnecessary tryBlock */ - TryBlock innerTry = (TryBlock)tryBlock.getSubBlocks()[0]; - innerTry.gen = tryBlock.gen; - innerTry.replace(tryBlock); - tryBlock = innerTry; - tryFlow.lastModified = innerTry; - } - FinallyBlock newBlock = new FinallyBlock(); - tryBlock.addCatchBlock(newBlock); - /* try block has no successors */ - - if (succ != null && succ.predecessors.size() == 1) { - while (succ.analyze(catchFlow.getNextAddr(), end)); - tryFlow.mergeAddr(succ); - tryFlow.removeJumps(succ); - newBlock.setCatchBlock(succ.block); - tryFlow.mergeSuccessors(succ); - } else { - /* Put the catchBlock in instead. - */ - newBlock.setCatchBlock(catchFlow.block); - tryFlow.mergeSuccessors(catchFlow); - } - return true; - } - return false; + succ = firstInstr.jump.destination; + } + +// Set trySuccs = tryFlow.getSuccessors(); +// if (trySuccs.size() > 1 +// || (trySuccs.size() == 1 +// && trySuccs.iterator().next() != succ)) +// return false; + + if (succ != null) { + Jump jumps = tryFlow.removeJumps(succ); + /* Handle the jumps in the tryFlow. + */ + jumps = tryFlow.resolveSomeJumps(jumps, succ); + tryFlow.resolveRemaining(jumps); + } + + TryBlock tryBlock = (TryBlock)tryFlow.block; + if (tryBlock.getSubBlocks()[0] instanceof TryBlock) { + /* remove the unnecessary tryBlock */ + TryBlock innerTry = (TryBlock)tryBlock.getSubBlocks()[0]; + innerTry.gen = tryBlock.gen; + innerTry.replace(tryBlock); + tryBlock = innerTry; + tryFlow.lastModified = innerTry; + } + FinallyBlock newBlock = new FinallyBlock(); + tryBlock.addCatchBlock(newBlock); + newBlock.setCatchBlock(catchBlock); + return true; } /** @@ -958,17 +922,22 @@ public class TransformExceptionHandlers { + catchFlow.getAddr() + ", " + endHandler + ")"); while (catchFlow.analyze(catchFlow.getAddr(), endHandler)); } - + + /* Merge the try-block with the catch-block now */ tryFlow.updateInOutCatch(catchFlow); + tryFlow.mergeSuccessors(catchFlow); + tryFlow.mergeAddr(catchFlow); if (exc.type != null) - analyzeCatchBlock(exc.type, tryFlow, catchFlow); + analyzeCatchBlock(exc.type, tryFlow, catchFlow.block); - else if (!analyzeSynchronized(tryFlow, catchFlow, endHandler) - && ! analyzeFinally(tryFlow, catchFlow, endHandler) - && ! analyzeSpecialFinally(tryFlow, catchFlow, + else if (!analyzeSynchronized(tryFlow, catchFlow.block, + endHandler) + && ! analyzeFinally(tryFlow, catchFlow.block, + endHandler) + && ! analyzeSpecialFinally(tryFlow, catchFlow.block, endHandler)) - analyzeCatchBlock(Type.tObject, tryFlow, catchFlow); + analyzeCatchBlock(Type.tObject, tryFlow, catchFlow.block); tryFlow.checkConsistent(); if ((GlobalOptions.debuggingFlags diff --git a/jode/jode/jvm/CodeVerifier.java.in b/jode/jode/jvm/CodeVerifier.java.in index 556902f..b8fb2f8 100644 --- a/jode/jode/jvm/CodeVerifier.java.in +++ b/jode/jode/jvm/CodeVerifier.java.in @@ -207,19 +207,17 @@ public class CodeVerifier implements Opcodes { dimensions++; } - if (c1 == '[' || c2 == '[') { - // Only one of them is array now, the other must be an - // object, the common super is tObject - if (c1 == 'L' || c2 == 'L') { - if (dimensions == 0) - return tObject; - StringBuffer result = new StringBuffer(dimensions + 18); - for (int i=0; i< dimensions; i++) - result.append("["); - result.append("Ljava/lang/Object;"); - return tType(result.toString()); - } - return tNone; + // One of them is array now, the other is an object, + // the common super is tObject + if ((c1 == '[' && c2 == 'L') + || (c1 == 'L' && c2 == '[')) { + if (dimensions == 0) + return tObject; + StringBuffer result = new StringBuffer(dimensions + 18); + for (int i=0; i< dimensions; i++) + result.append("["); + result.append("Ljava/lang/Object;"); + return tType(result.toString()); } if (c1 == 'L' && c2 == 'L') { @@ -240,6 +238,18 @@ public class CodeVerifier implements Opcodes { .append(clazz1.getName().replace('.', '/')).append(";"); return tType(result.toString()); } + + // Both were arrays, but of different primitive types. The + // common super is tObject with one dimension less. + if (dimensions > 0) { + if (dimensions == 1) + return tObject; + StringBuffer result = new StringBuffer(dimensions + 17); + for (int i=0; i < dimensions - 1; i++) + result.append("["); + result.append("Ljava/lang/Object;"); + return tType(result.toString()); + } return tNone; } @@ -1044,21 +1054,6 @@ public class CodeVerifier implements Opcodes { } if (instr.getSuccs() != null) { for (int i=0; i< instr.getSuccs().length; i++) { - if (instr.getSuccs()[i].getAddr() < instr.getAddr()) { - /* This is a backwards branch */ - for (int j = 0; j < prevInfo.locals.length; j++) { - if (prevInfo.locals[j] - .getTypeSig().charAt(0) == 'N') - throw new VerifyException - ("Uninitialized local in back-branch"); - } - for (int j = 0; j < prevInfo.stackHeight; j++) { - if (prevInfo.stack[j] - .getTypeSig().charAt(0) == 'N') - throw new VerifyException - ("Uninitialized stack in back-branch"); - } - } if (mergeInfo(instr.getSuccs()[i], (VerifyInfo) info.clone())) todoSet.add(instr.getSuccs()[i]); @@ -1067,12 +1062,6 @@ public class CodeVerifier implements Opcodes { for (int i=0; i= 0) { - for (int j = 0; j < prevInfo.locals.length; j++) { - if (prevInfo.locals[j] - .getTypeSig().charAt(0) == 'N') - throw new VerifyException - ("Uninitialized local in try block"); - } VerifyInfo excInfo = (VerifyInfo) prevInfo.clone(); excInfo.stackHeight = 1; if (handlers[i].type != null) diff --git a/jode/jode/jvm/SyntheticAnalyzer.java.in b/jode/jode/jvm/SyntheticAnalyzer.java.in index 4e55ef4..4bf52ef 100644 --- a/jode/jode/jvm/SyntheticAnalyzer.java.in +++ b/jode/jode/jvm/SyntheticAnalyzer.java.in @@ -27,6 +27,7 @@ import jode.bytecode.Instruction; import jode.bytecode.MethodInfo; import jode.bytecode.Opcodes; import jode.bytecode.Reference; +import jode.bytecode.TypeSignature; import jode.type.Type; import jode.type.MethodType; @@ -44,10 +45,13 @@ 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; MethodInfo method; + int unifyParam = -1; public SyntheticAnalyzer(MethodInfo method, boolean checkName) { this.method = method; @@ -72,6 +76,14 @@ public class SyntheticAnalyzer implements Opcodes { return reference; } + /** + * Gets the index of the dummy parameter for an ACCESSCONSTRUCTOR. + * Normally the 1 but for inner classes it may be 2. + */ + public int getUnifyParam() { + return unifyParam; + } + private static final int[] getClassOpcodes = { opc_aload, opc_invokestatic, opc_areturn, opc_astore, opc_new, opc_dup, opc_aload, @@ -131,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 @@ -169,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(); @@ -225,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; @@ -241,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 @@ -267,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(); @@ -320,45 +357,60 @@ public class SyntheticAnalyzer implements Opcodes { public boolean checkConstructorAccess() { ClassInfo clazzInfo = method.getClazzInfo(); BytecodeInfo bytecode = method.getBytecode(); + String[] paramTypes + = TypeSignature.getParameterTypes(method.getType()); Handler[] excHandlers = bytecode.getExceptionHandlers(); if (excHandlers != null && excHandlers.length != 0) return false; - Iterator iter = bytecode.getInstructions().iterator(); - Instruction instr = (Instruction) iter.next(); - if (instr.getOpcode() != opc_aload || instr.getLocalSlot() != 0) - return false; - instr = (Instruction) iter.next(); - // slot begins with 2. Slot 1 contains a dummy value, that - // is used so that the constructor has a different type signature. - int params = 0, slot = 2; + Instruction instr = (Instruction) iter.next(); + int params = 0, slot = 0; while (instr.getOpcode() >= opc_iload - && instr.getOpcode() <= opc_aload - && instr.getLocalSlot() == slot) { + && instr.getOpcode() <= opc_aload) { + + if (instr.getLocalSlot() > slot + && unifyParam == -1 && params > 0 + && paramTypes[params - 1].charAt(0) == 'L') { + unifyParam = params; + params++; + slot++; + } + if (instr.getLocalSlot() != slot) + return false; + params++; slot += (instr.getOpcode() == opc_lload || instr.getOpcode() == opc_dload) ? 2 : 1; instr = (Instruction) iter.next(); } - if (instr.getOpcode() == opc_invokespecial) { + if (params > 0 && instr.getOpcode() == opc_invokespecial) { + + if (unifyParam == -1 && params <= paramTypes.length + && paramTypes[params - 1].charAt(0) == 'L') + 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("") - || refType.getParameterTypes().length != params) + || unifyParam == -1 + || refType.getParameterTypes().length != params - 2) return false; + instr = (Instruction) iter.next(); if (instr.getOpcode() != opc_return) return false; - /* For valid bytecode the types matches automatically */ + /* We don't check if types matches. No problem since we only + * need to make sure, this constructor doesn't do anything + * more than relay to the real one. + */ reference = ref; kind = ACCESSCONSTRUCTOR; return true; diff --git a/jode/jode/obfuscator/ClassBundle.java.in b/jode/jode/obfuscator/ClassBundle.java.in index c9ba0f6..b2ced86 100644 --- a/jode/jode/obfuscator/ClassBundle.java.in +++ b/jode/jode/obfuscator/ClassBundle.java.in @@ -38,7 +38,7 @@ import @COLLECTIONS@.TreeMap; import @COLLECTIONEXTRA@.UnsupportedOperationException; ///#ifdef JDK12 -///import @COLLECTIONS@.WeakHashMap; +import @COLLECTIONS@.WeakHashMap; ///#endif public class ClassBundle implements OptionHandler { @@ -74,9 +74,9 @@ public class ClassBundle implements OptionHandler { } ///#ifdef JDK12 -/// private static final Map aliasesHash = new WeakHashMap(); + private static final Map aliasesHash = new WeakHashMap(); ///#else - private static final Map aliasesHash = new HashMap(); +/// private static final Map aliasesHash = new HashMap(); ///#endif private static final Map clazzCache = new HashMap(); private static final Map referenceCache = new HashMap(); @@ -248,6 +248,13 @@ public class ClassBundle implements OptionHandler { return alias; } + public String getClassAlias(String className) { + ClassIdentifier classIdent = getClassIdentifier(className); + if (classIdent == null) + return className; + return classIdent.getFullAlias(); + } + public String getTypeAlias(String typeSig) { String alias = (String) aliasesHash.get(typeSig); if (alias == null) { @@ -256,7 +263,7 @@ public class ClassBundle implements OptionHandler { while ((nextindex = typeSig.indexOf('L', index)) != -1) { newSig.append(typeSig.substring(index, nextindex+1)); index = typeSig.indexOf(';', nextindex); - String typeAlias = basePackage.findAlias + String typeAlias = getClassAlias (typeSig.substring(nextindex+1, index).replace('/','.')); newSig.append(typeAlias.replace('.', '/')); } diff --git a/jode/jode/obfuscator/ClassIdentifier.java.in b/jode/jode/obfuscator/ClassIdentifier.java.in index 9894f43..563862d 100644 --- a/jode/jode/obfuscator/ClassIdentifier.java.in +++ b/jode/jode/obfuscator/ClassIdentifier.java.in @@ -401,15 +401,11 @@ public class ClassIdentifier extends Identifier { ifaceNames = new String[ifaces.length]; for (int i=0; i < ifaces.length; i++) { ifaceNames[i] = ifaces[i].getName(); - ClassIdentifier ifaceident = Main.getClassBundle() - .getClassIdentifier(ifaceNames[i]); initSuperClasses(ifaces[i]); } if (info.getSuperclass() != null) { superName = info.getSuperclass().getName(); - ClassIdentifier superident = Main.getClassBundle() - .getClassIdentifier(superName); initSuperClasses(info.getSuperclass()); } @@ -458,11 +454,10 @@ public class ClassIdentifier extends Identifier { * @param ancestor The ancestor whose interfaces should be added. */ public void addIfaces(Collection result, ClassIdentifier ancestor) { - String[] ifaces = ancestor.ifaceNames; ClassInfo[] ifaceInfos = ancestor.info.getInterfaces(); - for (int i=0; i < ifaces.length; i++) { + for (int i=0; i < ifaceInfos.length; i++) { ClassIdentifier ifaceident - = Main.getClassBundle().getClassIdentifier(ifaces[i]); + = Main.getClassBundle().getClassIdentifier(ifaceInfos[i].getName()); if (ifaceident != null && !ifaceident.isReachable()) addIfaces(result, ifaceident); else diff --git a/jode/jode/obfuscator/PackageIdentifier.java.in b/jode/jode/obfuscator/PackageIdentifier.java.in index cf239f3..a8b3ee5 100644 --- a/jode/jode/obfuscator/PackageIdentifier.java.in +++ b/jode/jode/obfuscator/PackageIdentifier.java.in @@ -310,21 +310,6 @@ public class PackageIdentifier extends Identifier { return ""; } - public String findAlias(String className) { - int index = className.indexOf('.'); - if (index == -1) { - Identifier ident = getIdentifier(className); - if (ident != null) - return ident.getFullAlias(); - } else { - Identifier pack = getIdentifier(className.substring(0, index)); - if (pack != null) - return ((PackageIdentifier)pack) - .findAlias(className.substring(index+1)); - } - return className; - } - public void buildTable(Renamer renameRule) { loadOnDemand = false; super.buildTable(renameRule); diff --git a/jode/jode/obfuscator/TranslationTable.java.in b/jode/jode/obfuscator/TranslationTable.java.in index 40d8574..4247046 100644 --- a/jode/jode/obfuscator/TranslationTable.java.in +++ b/jode/jode/obfuscator/TranslationTable.java.in @@ -24,7 +24,7 @@ import @COLLECTIONS@.TreeMap; import @COLLECTIONS@.Iterator; ///#ifndef JDK12 -import @COLLECTIONS@.Comparator; +///import @COLLECTIONS@.Comparator; ///#endif import java.io.InputStream; @@ -37,17 +37,17 @@ import java.io.IOException; public class TranslationTable extends TreeMap { ///#ifndef JDK12 - public TranslationTable() { - super(createStringComparator()); - } - - private static Comparator createStringComparator() { - return new Comparator() { - public int compare(Object o1, Object o2) { - return ((String) o1).compareTo((String) o2); - } - }; - } +/// public TranslationTable() { +/// super(createStringComparator()); +/// } +/// +/// private static Comparator createStringComparator() { +/// return new Comparator() { +/// public int compare(Object o1, Object o2) { +/// return ((String) o1).compareTo((String) o2); +/// } +/// }; +/// } ///#endif public void load(InputStream in) throws IOException { diff --git a/jode/jode/obfuscator/modules/ConstantAnalyzer.java.in b/jode/jode/obfuscator/modules/ConstantAnalyzer.java.in index 237b87d..595d1b3 100644 --- a/jode/jode/obfuscator/modules/ConstantAnalyzer.java.in +++ b/jode/jode/obfuscator/modules/ConstantAnalyzer.java.in @@ -734,9 +734,9 @@ public class ConstantAnalyzer implements Opcodes, CodeAnalyzer { boolean known = value1.value != ConstValue.VOLATILE && value2.value != ConstValue.VOLATILE; if (known) { - if ((opcode == opc_idiv + if (((opcode == opc_idiv || opcode == opc_irem) && ((Integer)value2.value).intValue() == 0) - || (opcode == opc_ldiv + || ((opcode == opc_ldiv || opcode == opc_lrem) && ((Long)value2.value).longValue() == 0)) known = false; } @@ -1522,10 +1522,6 @@ public class ConstantAnalyzer implements Opcodes, CodeAnalyzer { case opc_ineg: case opc_fneg: iter.set(new Instruction(opc_pop)); break; - case opc_if_icmpeq: case opc_if_icmpne: - case opc_if_icmplt: case opc_if_icmpge: - case opc_if_icmpgt: case opc_if_icmple: - case opc_if_acmpeq: case opc_if_acmpne: case opc_lcmp: case opc_dcmpg: case opc_dcmpl: case opc_ladd: case opc_dadd: @@ -1535,7 +1531,12 @@ public class ConstantAnalyzer implements Opcodes, CodeAnalyzer { case opc_lrem: case opc_drem: case opc_land: case opc_lor : case opc_lxor: iter.set(new Instruction(opc_pop2)); - /* fall through */ + iter.add(new Instruction(opc_pop2)); + break; + case opc_if_icmpeq: case opc_if_icmpne: + case opc_if_icmplt: case opc_if_icmpge: + case opc_if_icmpgt: case opc_if_icmple: + case opc_if_acmpeq: case opc_if_acmpne: case opc_fcmpg: case opc_fcmpl: case opc_l2i: case opc_l2f: case opc_l2d: case opc_d2i: case opc_d2l: case opc_d2f: @@ -1574,14 +1575,14 @@ public class ConstantAnalyzer implements Opcodes, CodeAnalyzer { case opc_invokevirtual: { Reference ref = instr.getReference(); String[] pt = TypeSignature.getParameterTypes(ref.getType()); - int arg = 0; - if (instr.getOpcode() != opc_invokestatic) - iter.set(new Instruction(opc_pop)); - else if (pt.length > 0) { - iter.set(new Instruction(TypeSignature.getTypeSize(pt[0]) + int len = pt.length; + + if (len > 0) + iter.set(new Instruction(TypeSignature.getTypeSize(pt[--len]) + opc_pop - 1)); - arg++; - } else { + else if (instr.getOpcode() != opc_invokestatic) + iter.set(new Instruction(opc_pop)); + else { if (replacement == null) iter.remove(); else @@ -1589,7 +1590,7 @@ public class ConstantAnalyzer implements Opcodes, CodeAnalyzer { return; } - for (int i=arg; i < pt.length; i++) + for (int i = len - 1; i >= 0; i++) iter.add(new Instruction(TypeSignature.getTypeSize(pt[i]) + opc_pop - 1)); } diff --git a/jode/jode/obfuscator/modules/LocalOptimizer.java.in b/jode/jode/obfuscator/modules/LocalOptimizer.java.in index cb776fc..bb1b0c0 100644 --- a/jode/jode/obfuscator/modules/LocalOptimizer.java.in +++ b/jode/jode/obfuscator/modules/LocalOptimizer.java.in @@ -657,17 +657,12 @@ public class LocalOptimizer implements Opcodes, CodeTransformer { */ distributeLocals(locals); - /* Update the instructions and calculate new maxlocals. + /* Update the instructions. */ - maxlocals = paramLocals.length; for (InstrInfo info = firstInfo; info != null; info = info.nextInfo) { - if (info.local != null) { - if (info.local.newSlot+info.local.size > maxlocals) - maxlocals = info.local.newSlot + info.local.size; + if (info.local != null) info.instr.setLocalSlot(info.local.newSlot); - } } - bc.setMaxLocals(maxlocals); /* Update LocalVariableTable */ diff --git a/jode/jode/obfuscator/modules/ModifierMatcher.java.in b/jode/jode/obfuscator/modules/ModifierMatcher.java.in index 1c8d176..8d36c49 100644 --- a/jode/jode/obfuscator/modules/ModifierMatcher.java.in +++ b/jode/jode/obfuscator/modules/ModifierMatcher.java.in @@ -109,7 +109,7 @@ public class ModifierMatcher implements IdentifierMatcher, OptionHandler, Clonea : str.equals("NATIVE") ? Modifier.NATIVE : str.equals("STATIC") ? Modifier.STATIC ///#ifdef JDK12 -/// : str.equals("STRICT") ? Modifier.STRICT + : str.equals("STRICT") ? Modifier.STRICT ///#endif : str.equals("SYNCHRONIZED") ? Modifier.SYNCHRONIZED : str.equals("TRANSIENT") ? Modifier.TRANSIENT diff --git a/jode/jode/swingui/Main.java.in b/jode/jode/swingui/Main.java.in index 21bcf36..db0707c 100644 --- a/jode/jode/swingui/Main.java.in +++ b/jode/jode/swingui/Main.java.in @@ -79,9 +79,11 @@ public class Main classTree.addTreeSelectionListener(this); JScrollPane spClassTree = new JScrollPane(classTree); sourcecodeArea = new JTextArea(20, 80); + sourcecodeArea.setEditable(false); sourcecodeArea.setFont(monospaced); JScrollPane spText = new JScrollPane(sourcecodeArea); errorArea = new JTextArea(3, 80); + errorArea.setEditable(false); errorArea.setFont(monospaced); JScrollPane spError = new JScrollPane(errorArea); @@ -141,6 +143,7 @@ public class Main public class AreaWriter extends Writer { boolean initialized = false; + boolean lastCR = false; private JTextArea area; public AreaWriter(JTextArea a) { @@ -153,7 +156,23 @@ public class Main area.setText(""); initialized = true; } - area.append(new String(b, off, len)); + String str = new String(b, off, len); + StringBuffer sb = new StringBuffer(len); + while (str != null && str.length() > 0) { + if (lastCR && str.charAt(0) == '\n') + str = str.substring(1); + int crIndex = str.indexOf('\r'); + if (crIndex >= 0) { + sb.append(str.substring(0, crIndex)); + sb.append("\n"); + str = str.substring(crIndex+1); + lastCR = true; + } else { + sb.append(str); + str = null; + } + } + area.append(sb.toString()); } public void flush() { @@ -325,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,19 +99,20 @@ 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(); } if (type == tNull) return this; if (type.getTypeCode() == TC_ARRAY) { - return tArray(elementType.intersection - (((ArrayType)type).elementType)); + Type elType = elementType.intersection + (((ArrayType)type).elementType); + return elType != tError ? tArray(elType) : tError; } if (type.getTypeCode() == TC_CLASS) { ClassInterfacesType other = (ClassInterfacesType) type; @@ -122,19 +129,23 @@ 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)) - * 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(); } if (type == tNull) return this; - if (type.getTypeCode() == TC_ARRAY) - return tArray(elementType.intersection - (((ArrayType)type).elementType)); + if (type.getTypeCode() == TC_ARRAY) { + Type elType = elementType.intersection + (((ArrayType)type).elementType); + if (elType != tError) + return tArray(elType); + return ClassInterfacesType.create(null, arrayIfaces); + } if (type.getTypeCode() == TC_CLASS) { ClassInterfacesType other = (ClassInterfacesType) type; if (implementsAllIfaces(other.clazz, other.ifaces, arrayIfaces)) diff --git a/jode/jode/type/ClassInterfacesType.java b/jode/jode/type/ClassInterfacesType.java index 0f00bfe..930a0a5 100644 --- a/jode/jode/type/ClassInterfacesType.java +++ b/jode/jode/type/ClassInterfacesType.java @@ -509,34 +509,57 @@ public class ClassInterfacesType extends ReferenceType { private final static Hashtable keywords = new Hashtable(); static { + 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/NullType.java b/jode/jode/type/NullType.java index 1521b66..6fe8804 100644 --- a/jode/jode/type/NullType.java +++ b/jode/jode/type/NullType.java @@ -71,15 +71,4 @@ public class NullType extends ReferenceType { public String toString() { return "tNull"; } - - /** - * Intersect this type with another type and return the new type. - * @param type the other type. - * @return the intersection, or tError, if a type conflict happens. - */ - public Type intersection(Type type) { - if (type == this) - return type; - return tError; - } } 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; } /** diff --git a/jode/jode/util/UnifyHash.java.in b/jode/jode/util/UnifyHash.java.in index 8c5104c..a5661ce 100644 --- a/jode/jode/util/UnifyHash.java.in +++ b/jode/jode/util/UnifyHash.java.in @@ -1,4 +1,4 @@ -/* UnifyHash Copyright (C) 1999 Jochen Hoenicke. +/* UnifyHash Copyright (C) 1999-2001 Jochen Hoenicke. * * 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 @@ -19,8 +19,8 @@ package jode.util; ///#ifdef JDK12 -///import java.lang.ref.WeakReference; -///import java.lang.ref.ReferenceQueue; +import java.lang.ref.WeakReference; +import java.lang.ref.ReferenceQueue; ///#endif import @COLLECTIONS@.Comparator; @@ -40,28 +40,28 @@ public class UnifyHash extends AbstractCollection { private static final float DEFAULT_LOAD_FACTOR = 0.75F; ///#ifdef JDK12 -/// private ReferenceQueue queue = new ReferenceQueue(); + private ReferenceQueue queue = new ReferenceQueue(); ///#endif static class Bucket ///#ifdef JDK12 -/// extends WeakReference + extends WeakReference ///#endif { ///#ifdef JDK12 -/// public Bucket(Object o, ReferenceQueue q) { -/// super(o, q); -/// } -///#else - public Bucket(Object o) { - this.obj = o; - } - - Object obj; - - public Object get() { - return obj; + public Bucket(Object o, ReferenceQueue q) { + super(o, q); } +///#else +/// public Bucket(Object o) { +/// this.obj = o; +/// } +/// +/// Object obj; +/// +/// public Object get() { +/// return obj; +/// } ///#endif int hash; @@ -107,21 +107,21 @@ public class UnifyHash extends AbstractCollection { } ///#ifdef JDK12 -/// public final void cleanUp() { -/// Bucket died; -/// while ((died = (Bucket)queue.poll()) != null) { -/// int diedSlot = Math.abs(died.hash % buckets.length); -/// if (buckets[diedSlot] == died) -/// buckets[diedSlot] = died.next; -/// else { -/// Bucket b = buckets[diedSlot]; -/// while (b.next != died) -/// b = b.next; -/// b.next = died.next; -/// } -/// size--; -/// } -/// } + public final void cleanUp() { + Bucket died; + while ((died = (Bucket)queue.poll()) != null) { + int diedSlot = Math.abs(died.hash % buckets.length); + if (buckets[diedSlot] == died) + buckets[diedSlot] = died.next; + else { + Bucket b = buckets[diedSlot]; + while (b.next != died) + b = b.next; + b.next = died.next; + } + size--; + } + } ///#endif @@ -131,7 +131,7 @@ public class UnifyHash extends AbstractCollection { public Iterator iterator() { ///#ifdef JDK12 -/// cleanUp(); + cleanUp(); ///#endif return new Iterator() { @@ -182,6 +182,9 @@ public class UnifyHash extends AbstractCollection { } public Iterator iterateHashCode(final int hash) { +///#ifdef JDK12 + cleanUp(); +///#endif return new Iterator() { private int known = modCount; private Bucket nextBucket @@ -232,9 +235,9 @@ public class UnifyHash extends AbstractCollection { int slot = Math.abs(hash % buckets.length); ///#ifdef JDK12 -/// Bucket b = new Bucket(o, queue); + Bucket b = new Bucket(o, queue); ///#else - Bucket b = new Bucket(o); +/// Bucket b = new Bucket(o); ///#endif b.hash = hash; b.next = buckets[slot]; @@ -243,7 +246,7 @@ public class UnifyHash extends AbstractCollection { public Object unify(Object o, int hash, Comparator comparator) { ///#ifdef JDK12 -/// cleanUp(); + cleanUp(); ///#endif int slot = Math.abs(hash % buckets.length); for (Bucket b = buckets[slot]; b != null; b = b.next) {