Message

Reply | Reply all

Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

From: cvs at opencores.org<cvs@o...>
Date: Tue Feb 26 00:30:40 CET 2008
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/08/02 26:00:30

Modified: jop/java/tools/src/joptimizer/actions
TransitiveHullGenerator.java GraphHelper.java
ClassInfoLoader.java
Log:
fixes for loading incomplete code, fixes for array-class handling


Revision Changes Path
1.5 jop/java/tools/src/joptimizer/actions/TransitiveHullGenerator.java

http://www.opencores.org/cvsweb.shtml/jop/java/tools/src/joptimizer/actions/TransitiveHullGenerator.java.diff?r1=1.4&r2=1.5

(In the diff below, changes in quantity of whitespace are not shown.)

Index: TransitiveHullGenerator.java
===================================================================
RCS file: /cvsroot/stefant/jop/java/tools/src/joptimizer/actions/TransitiveHullGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- TransitiveHullGenerator.java 17 Feb 2008 20:47:27 -0000 1.4
+++ TransitiveHullGenerator.java 25 Feb 2008 23:30:40 -0000 1.5
@@ -20,6 +20,7 @@

import com.jopdesign.libgraph.struct.ClassInfo;
import com.jopdesign.libgraph.struct.TypeException;
+import com.jopdesign.libgraph.struct.type.TypeHelper;
import joptimizer.config.JopConfig;
import joptimizer.framework.JOPtimizer;
import joptimizer.framework.actions.AbstractClassAction;
@@ -86,6 +87,14 @@

private void addClass(String className) {

+ // get class from array classes
+ if ( className.startsWith("[") ) {
+ className = TypeHelper.getClassName(className);
+ if ( className == null ) {
+ return;
+ }
+ }
+
if ( visited.contains(className) ) {
return;
} else {
@@ -114,9 +123,11 @@

private boolean doEnqueueClass(String className) {

- // ignore array classes
- if ( className.startsWith("[") ) {
- if (logger.isInfoEnabled()) logger.info("Ingored array class {" + className + "}.");
+ String reason = getJopConfig().doExcludeClassName(className);
+ if ( reason != null ) {
+ if ( logger.isInfoEnabled() ) {
+ logger.info(reason);
+ }
return false;
}




1.3 jop/java/tools/src/joptimizer/actions/GraphHelper.java

http://www.opencores.org/cvsweb.shtml/jop/java/tools/src/joptimizer/actions/GraphHelper.java.diff?r1=1.2&r2=1.3

(In the diff below, changes in quantity of whitespace are not shown.)

Index: GraphHelper.java
===================================================================
RCS file: /cvsroot/stefant/jop/java/tools/src/joptimizer/actions/GraphHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- GraphHelper.java 17 Feb 2008 20:47:27 -0000 1.2
+++ GraphHelper.java 25 Feb 2008 23:30:40 -0000 1.3
@@ -29,6 +29,7 @@
import joptimizer.framework.JOPtimizer;
import joptimizer.framework.actions.AbstractMethodAction;
import joptimizer.framework.actions.ActionException;
+import org.apache.log4j.Logger;

import java.util.List;

@@ -77,6 +78,7 @@
return;
}

+ try {
if ( setModified ) {
try {
code.getGraph().setModified(true);
@@ -109,6 +111,14 @@
throw new ActionException("Could not transform graph.", e);
}
}
+ } catch (ActionException e) {
+ if ( getJopConfig().doIgnoreActionErrors() ) {
+ Logger.getLogger(getClass()).warn("Error running action on graph of {"+
+ methodInfo.getFQMethodName()+"}: " + e.getMessage(), e); + } else { + throw e; + } + } } } 1.4 jop/java/tools/src/joptimizer/actions/ClassInfoLoader.java http://www.opencores.org/cvsweb.shtml/jop/java/tools/src/joptimizer/actions/ClassInfoLoader.java.diff?r1=1.3&r2=1.4 (In the diff below, changes in quantity of whitespace are not shown.) Index: ClassInfoLoader.java =================================================================== RCS file: /cvsroot/stefant/jop/java/tools/src/joptimizer/actions/ClassInfoLoader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- ClassInfoLoader.java 17 Feb 2008 20:47:27 -0000 1.3 +++ ClassInfoLoader.java 25 Feb 2008 23:30:40 -0000 1.4 @@ -100,7 +100,11 @@ public void execute(ClassInfo classInfo) throws ActionException { if ( forceReload || !classInfo.isInitialized() ) { + try { classInfo.reload(); + } catch (TypeException e) { + throw new ActionException("Could not reload class {"+classInfo.getClassName()+"}.", e); + } } }