moparisthebest/fernflower
1
0
Fork 0
mirror of https://github.com/moparisthebest/fernflower synced 2024-11-27 03:32:14 -05:00
Code Issues Releases Wiki Activity

Fixed 'IDEA-127466: dup_x1 semantics broken'

Browse Source
This commit is contained in:
Stiver 2014-07-21 14:28:40 +02:00
parent 58427deb49
commit 6606a474bf
3 changed files with 127 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/de/fernflower/modules/decompiler/StackVarsProcessor.java
View File

@ -206,6 +206,8 @@ public class StackVarsProcessor {
int[] ret = iterateExprent(lst, index, next, mapVarValues, ssa);
//System.out.println("***************** \r\n"+root.toJava());
if(ret[0] >= 0) {
index = ret[0];
} else {

78
src/de/fernflower/modules/decompiler/sforms/SSAUConstructorSparseEx.java
View File

@ -247,45 +247,45 @@ public class SSAUConstructorSparseEx {
SFormsFastMapDirect varmap = varmaparr[0];
// // field access
// if(expr.type == Exprent.EXPRENT_FIELD) {
//
// int index;
// if(mapFieldVars.containsKey(expr.id)) {
// index = mapFieldVars.get(expr.id);
// } else {
// index = fieldvarcounter--;
// mapFieldVars.put(expr.id, index);
//
// // ssu graph
// ssuversions.createNode(new VarVersionPaar(index, 1));
// }
//
// setCurrentVar(varmap, index, 1);
//
// } else if(expr.type == Exprent.EXPRENT_INVOCATION ||
// (expr.type == Exprent.EXPRENT_ASSIGNMENT && ((AssignmentExprent)expr).getLeft().type == Exprent.EXPRENT_FIELD) ||
// (expr.type == Exprent.EXPRENT_NEW && ((NewExprent)expr).getNewtype().type == CodeConstants.TYPE_OBJECT) ||
// expr.type == Exprent.EXPRENT_FUNCTION) {
//
// boolean ismmpp = true;
//
// if(expr.type == Exprent.EXPRENT_FUNCTION) {
//
// ismmpp = false;
//
// FunctionExprent fexpr = (FunctionExprent)expr;
// if(fexpr.getFunctype() >= FunctionExprent.FUNCTION_IMM && fexpr.getFunctype() <= FunctionExprent.FUNCTION_PPI) {
// if(fexpr.getLstOperands().get(0).type == Exprent.EXPRENT_FIELD) {
// ismmpp = true;
// }
// }
// }
//
// if(ismmpp) {
// varmap.removeAllFields();
// }
// }
// field access
if(expr.type == Exprent.EXPRENT_FIELD) {
int index;
if(mapFieldVars.containsKey(expr.id)) {
index = mapFieldVars.get(expr.id);
} else {
index = fieldvarcounter--;
mapFieldVars.put(expr.id, index);
// ssu graph
ssuversions.createNode(new VarVersionPaar(index, 1));
}
setCurrentVar(varmap, index, 1);
} else if(expr.type == Exprent.EXPRENT_INVOCATION ||
(expr.type == Exprent.EXPRENT_ASSIGNMENT && ((AssignmentExprent)expr).getLeft().type == Exprent.EXPRENT_FIELD) ||
(expr.type == Exprent.EXPRENT_NEW && ((NewExprent)expr).getNewtype().type == CodeConstants.TYPE_OBJECT) ||
expr.type == Exprent.EXPRENT_FUNCTION) {
boolean ismmpp = true;
if(expr.type == Exprent.EXPRENT_FUNCTION) {
ismmpp = false;
FunctionExprent fexpr = (FunctionExprent)expr;
if(fexpr.getFunctype() >= FunctionExprent.FUNCTION_IMM && fexpr.getFunctype() <= FunctionExprent.FUNCTION_PPI) {
if(fexpr.getLstOperands().get(0).type == Exprent.EXPRENT_FIELD) {
ismmpp = true;
}
}
}
if(ismmpp) {
varmap.removeAllFields();
}
}
if(varassign != null) {

86
timer/com/vladium/utils/timing/HRTimer.java Normal file
View File

@ -0,0 +1,86 @@
package com.vladium.utils.timing;
// ----------------------------------------------------------------------------
/**
* A package-private implementation of {@link ITimer} based around native
* <code>getTime</code> method. It will work on any platform for which a JNI
* implementation of "hrtlib" library is available.<P>
*
* {@link TimerFactory} acts as the Factory for this class.<P>
*
* MT-safety: an instance of this class is safe to be used within the same
* thread only.
*
* @author (C) <a href="mailto:vroubtsov@illinoisalumni.org">Vlad Roubtsov</a>, 2002
*/
final class HRTimer implements ITimer, ITimerConstants
{
// public: ................................................................
public void start ()
{
if (DO_STATE_CHECKS)
{
if (m_state != STATE_READY)
throw new IllegalStateException (this + ": start() must be called from READY state, current state is " + STATE_NAMES [m_state]);
}
if (DO_STATE_CHECKS) m_state = STATE_STARTED;
m_data = getTime ();
}
public void stop ()
{
// latch stop time in a local var before doing anything else:
final double data = getTime ();
if (DO_STATE_CHECKS)
{
if (m_state != STATE_STARTED)
throw new IllegalStateException (this + ": stop() must be called from STARTED state, current state is " + STATE_NAMES [m_state]);
}
m_data = data - m_data;
if (DO_STATE_CHECKS) m_state = STATE_STOPPED;
}
public double getDuration ()
{
if (DO_STATE_CHECKS)
{
if (m_state != STATE_STOPPED)
throw new IllegalStateException (this + ": getDuration() must be called from STOPPED state, current state is " + STATE_NAMES [m_state]);
}
return m_data;
}
public void reset ()
{
if (DO_STATE_CHECKS) m_state = STATE_READY;
}
// protected: .............................................................
// package: ...............................................................
// private: ...............................................................
/*
* This is supposed to return a fractional count of milliseconds elapsed
* since some indeterminate moment in the past. The exact starting point
* is not relevant because this timer class reports time differences only.
*
* JNI code in HRTIMER_LIB library is supposed to implement this. */
private static native double getTime ();
private int m_state; // used to keep track of timer state
private double m_data; // timing data
private static final String HRTIMER_LIB = "hrtlib";
} // end of class
// ----------------------------------------------------------------------------