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:41 CET 2008
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/08/02 26:00:30

Modified: jop/java/tools/src/joptimizer/optimizer/inline
InlineHelper.java CodeInliner.java
Log:
fixes for loading incomplete code, fixes for array-class handling


Revision Changes Path
1.4 jop/java/tools/src/joptimizer/optimizer/inline/InlineHelper.java

http://www.opencores.org/cvsweb.shtml/jop/java/tools/src/joptimizer/optimizer/inline/InlineHelper.java.diff?r1=1.3&r2=1.4

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

Index: InlineHelper.java
===================================================================
RCS file: /cvsroot/stefant/jop/java/tools/src/joptimizer/optimizer/inline/InlineHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- InlineHelper.java 24 Feb 2008 20:19:14 -0000 1.3
+++ InlineHelper.java 25 Feb 2008 23:30:41 -0000 1.4
@@ -154,6 +154,8 @@
*/
public InlineResult doInline(CheckResult check) throws ActionException {

+ changeToPublic( check.getChangePublic() );
+
InlineResult result;
try {
result = inliner.doInline(check);
@@ -161,8 +163,6 @@
throw new ActionException("Could not perform inlining.", e);
}

- changeToPublic( check.getChangePublic() );
-
return result;
}




1.3 jop/java/tools/src/joptimizer/optimizer/inline/CodeInliner.java

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

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

Index: CodeInliner.java
===================================================================
RCS file: /cvsroot/stefant/jop/java/tools/src/joptimizer/optimizer/inline/CodeInliner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CodeInliner.java 22 Feb 2008 21:37:28 -0000 1.2
+++ CodeInliner.java 25 Feb 2008 23:30:41 -0000 1.3
@@ -363,7 +363,7 @@

// create a new NPE and throw it manually
ConstantClass newEx = appStruct.getConstantClass("java.lang.NullPointerException", false);
- ConstantMethod newInit = appStruct.getConstantMethod(newEx, "<init>", "()V");
+ ConstantMethod newInit = appStruct.getConstantMethod(newEx, "<init>", "()V", false);

newCode.addStatement(new StackNew(newEx));
newCode.addStatement(new StackDup(TypeInfo.CONST_OBJECTREF));
@@ -384,7 +384,7 @@
newBlocks.add(targetBlock);

ConstantClass newEx = appStruct.getConstantClass("java.lang.NullPointerException", false);
- ConstantMethod newInit = appStruct.getConstantMethod(newEx, "init", "()V");
+ ConstantMethod newInit = appStruct.getConstantMethod(newEx, "init", "()V", false);

Variable newVar = code.getBasicBlock().getGraph().getVariableTable().createVariable();
newCode.addStatement(new QuadNew(newEx, newVar));