You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
119 lines
5.3 KiB
119 lines
5.3 KiB
2001-02-04 Jochen Hoenicke <jochen@gnu.org>
|
|
|
|
* 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 <jochen@gnu.org>
|
|
|
|
* 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 <jochen@gnu.org>
|
|
|
|
* 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 <jochen@gnu.org>
|
|
|
|
* 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 <jochen@gnu.org>
|
|
|
|
* jode/jvm/SyntheticAnalyzer.java.in (checkConstructorAccess):
|
|
Allow the special unifyParam to be the last parameter.
|
|
|
|
2001-01-30 Jochen Hoenicke <jochen@gnu.org>
|
|
|
|
* 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 <jochen@gnu.org>
|
|
|
|
Added pascal style from Rolf Howarth <rolf@squarebox.co.uk>
|
|
* 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 <jochen@gnu.org>
|
|
|
|
* 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.
|
|
|