Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5896] trunk
|
From: <ga...@us...> - 2012-04-19 12:57:22
|
Revision: 5896
http://jnode.svn.sourceforge.net/jnode/?rev=5896&view=rev
Author: galatnm
Date: 2012-04-19 12:57:10 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
Network code clean-up.
Modified Paths:
--------------
trunk/core/src/core/org/jnode/plugin/manager/DefaultPluginManager.java
trunk/core/src/core/org/jnode/plugin/model/ConfigurationElementModel.java
trunk/core/src/core/org/jnode/plugin/model/ExtensionModel.java
trunk/core/src/core/org/jnode/plugin/model/LibraryModel.java
trunk/core/src/core/org/jnode/plugin/model/PluginDescriptorModel.java
trunk/core/src/core/org/jnode/plugin/model/PluginRegistryModel.java
trunk/core/src/core/org/jnode/plugin/model/RuntimeModel.java
trunk/core/src/core/org/jnode/vm/VmStackReader.java
trunk/core/src/core/org/jnode/vm/bytecode/BasicBlockFinder.java
trunk/core/src/core/org/jnode/vm/bytecode/DeadBlockFinder.java
trunk/core/src/core/org/jnode/vm/classmgr/ClassDecoder.java
trunk/core/src/core/org/jnode/vm/classmgr/SelectorMap.java
trunk/core/src/core/org/jnode/vm/classmgr/Signature.java
trunk/core/src/core/org/jnode/vm/classmgr/TIBBuilder.java
trunk/core/src/core/org/jnode/vm/classmgr/VmAnnotation.java
trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java
trunk/core/src/core/org/jnode/vm/compiler/ir/IRControlFlowGraph.java
trunk/core/src/core/org/jnode/vm/compiler/ir/IRTest.java
trunk/core/src/core/org/jnode/vm/compiler/ir/NativeTest.java
trunk/core/src/core/org/jnode/vm/facade/VmUtils.java
trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java
trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture.java
trunk/net/src/net/org/jnode/net/NetworkLayerHeader.java
trunk/net/src/net/org/jnode/net/arp/ARPHeader.java
trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPHeader.java
Modified: trunk/core/src/core/org/jnode/plugin/manager/DefaultPluginManager.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/manager/DefaultPluginManager.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/plugin/manager/DefaultPluginManager.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -21,7 +21,6 @@
package org.jnode.plugin.manager;
import gnu.java.security.action.GetPropertyAction;
-
import java.security.AccessController;
import java.util.ArrayList;
import java.util.Collections;
@@ -32,9 +31,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import javax.naming.NamingException;
-
import org.jnode.bootlog.BootLogInstance;
import org.jnode.naming.InitialNaming;
import org.jnode.permission.JNodePermission;
@@ -294,8 +291,7 @@
}
}
final PluginPrerequisite[] prereq = descr.getPrerequisites();
- for (int i = 0; i < prereq.length; i++) {
- final PluginPrerequisite pr = prereq[i];
+ for (final PluginPrerequisite pr : prereq) {
if (!nameSet.contains(pr.getPluginId())) {
//Syslog.debug("Not in set: " + pr.getPluginId());
return false;
@@ -312,8 +308,7 @@
*/
private boolean prerequisitesExist(PluginDescriptor descr, Map<String, PluginDescriptor> all) {
final PluginPrerequisite[] prereq = descr.getPrerequisites();
- for (int i = 0; i < prereq.length; i++) {
- final PluginPrerequisite pr = prereq[i];
+ for (final PluginPrerequisite pr : prereq) {
if (!all.containsKey(pr.getPluginId())) {
return false;
}
Modified: trunk/core/src/core/org/jnode/plugin/model/ConfigurationElementModel.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/model/ConfigurationElementModel.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/plugin/model/ConfigurationElementModel.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.jnode.nanoxml.XMLElement;
import org.jnode.plugin.ConfigurationElement;
@@ -64,8 +63,7 @@
}
final ArrayList<ConfigurationElementModel> list = new ArrayList<ConfigurationElementModel>();
- for (Iterator<?> i = e.getChildren().iterator(); i.hasNext();) {
- final XMLElement ce = (XMLElement) i.next();
+ for (final XMLElement ce : e.getChildren()) {
list.add(new ConfigurationElementModel(plugin, ce));
}
elements = (ConfigurationElement[]) list.toArray(new ConfigurationElement[list.size()]);
Modified: trunk/core/src/core/org/jnode/plugin/model/ExtensionModel.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/model/ExtensionModel.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/plugin/model/ExtensionModel.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -21,7 +21,6 @@
package org.jnode.plugin.model;
import java.util.ArrayList;
-import java.util.Iterator;
import org.jnode.nanoxml.XMLElement;
import org.jnode.plugin.ConfigurationElement;
import org.jnode.plugin.Extension;
@@ -49,8 +48,7 @@
id = getAttribute(e, "id", false);
final ArrayList<ConfigurationElementModel> list = new ArrayList<ConfigurationElementModel>();
- for (Iterator<?> i = e.getChildren().iterator(); i.hasNext();) {
- final XMLElement ce = (XMLElement) i.next();
+ for (final XMLElement ce : e.getChildren()) {
list.add(new ConfigurationElementModel(plugin, ce));
}
elements = (ConfigurationElement[]) list.toArray(new ConfigurationElement[list.size()]);
Modified: trunk/core/src/core/org/jnode/plugin/model/LibraryModel.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/model/LibraryModel.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/plugin/model/LibraryModel.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -21,7 +21,6 @@
package org.jnode.plugin.model;
import java.util.ArrayList;
-import java.util.Iterator;
import org.jnode.nanoxml.XMLElement;
import org.jnode.plugin.Library;
import org.jnode.plugin.PluginException;
@@ -44,8 +43,7 @@
type = getAttribute(e, "type", false);
final ArrayList<String> list = new ArrayList<String>();
- for (Iterator<?> i = e.getChildren().iterator(); i.hasNext();) {
- final XMLElement exE = (XMLElement) i.next();
+ for (final XMLElement exE : e.getChildren()) {
if (exE.getName().equals("export")) {
list.add(getAttribute(exE, "name", true));
}
Modified: trunk/core/src/core/org/jnode/plugin/model/PluginDescriptorModel.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/model/PluginDescriptorModel.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/plugin/model/PluginDescriptorModel.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -27,7 +27,6 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.jnode.bootlog.BootLogInstance;
import org.jnode.nanoxml.XMLElement;
@@ -143,8 +142,7 @@
initializeRequiresList(reqList, e);
- for (Iterator<?> ci = e.getChildren().iterator(); ci.hasNext();) {
- final XMLElement childE = (XMLElement) ci.next();
+ for (final XMLElement childE : e.getChildren()) {
final String tag = childE.getName();
if (tag.equals("extension-point")) {
final ExtensionPointModel ep = new ExtensionPointModel(this,
@@ -154,9 +152,7 @@
// registry.registerExtensionPoint(ep);
// }
} else if (tag.equals("requires")) {
- for (Iterator<?> i = childE.getChildren().iterator(); i
- .hasNext();) {
- final XMLElement impE = (XMLElement) i.next();
+ for (final XMLElement impE : childE.getChildren()) {
if (impE.getName().equals("import")) {
reqList.add(new PluginPrerequisiteModel(this, impE));
} else {
@@ -631,18 +627,18 @@
// BootLogInstance.get().info("Resolve " + id);
this.registry = registry;
registry.registerPlugin(this);
- for (int i = 0; i < extensionPoints.length; i++) {
- extensionPoints[i].resolve(registry);
+ for (ExtensionPointModel extensionPoint : extensionPoints) {
+ extensionPoint.resolve(registry);
}
- for (int i = 0; i < requires.length; i++) {
- requires[i].resolve(registry);
+ for (PluginPrerequisiteModel require : requires) {
+ require.resolve(registry);
}
if (runtime != null) {
runtime.resolve(registry);
}
resolved = true;
- for (int i = 0; i < extensions.length; i++) {
- extensions[i].resolve(registry);
+ for (ExtensionModel extension : extensions) {
+ extension.resolve(registry);
}
}
}
@@ -742,14 +738,14 @@
if (runtime != null) {
runtime.unresolve(registry);
}
- for (int i = 0; i < requires.length; i++) {
- requires[i].unresolve(registry);
+ for (PluginPrerequisiteModel require : requires) {
+ require.unresolve(registry);
}
- for (int i = 0; i < extensionPoints.length; i++) {
- extensionPoints[i].unresolve(registry);
+ for (ExtensionPointModel extensionPoint : extensionPoints) {
+ extensionPoint.unresolve(registry);
}
- for (int i = 0; i < extensions.length; i++) {
- extensions[i].unresolve(registry);
+ for (ExtensionModel extension : extensions) {
+ extension.unresolve(registry);
}
registry.unregisterPlugin(this);
resolved = false;
Modified: trunk/core/src/core/org/jnode/plugin/model/PluginRegistryModel.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/model/PluginRegistryModel.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/plugin/model/PluginRegistryModel.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -128,9 +128,8 @@
* Resolve all plugin descriptors.
*/
public void resolveDescriptors() throws PluginException {
- for (Iterator<PluginDescriptor> i = descriptorMap.values().iterator(); i.hasNext();) {
- final PluginDescriptorModel descr = (PluginDescriptorModel) i
- .next();
+ for (PluginDescriptor pluginDescriptor : descriptorMap.values()) {
+ final PluginDescriptorModel descr = (PluginDescriptorModel) pluginDescriptor;
descr.resolve(this);
}
}
Modified: trunk/core/src/core/org/jnode/plugin/model/RuntimeModel.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/model/RuntimeModel.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/plugin/model/RuntimeModel.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -21,7 +21,6 @@
package org.jnode.plugin.model;
import java.util.ArrayList;
-import java.util.Iterator;
import org.jnode.nanoxml.XMLElement;
import org.jnode.plugin.Library;
import org.jnode.plugin.PluginException;
@@ -41,8 +40,7 @@
super(plugin);
final ArrayList<LibraryModel> list = new ArrayList<LibraryModel>();
- for (Iterator<?> i = e.getChildren().iterator(); i.hasNext();) {
- final XMLElement lE = (XMLElement) i.next();
+ for (final XMLElement lE : e.getChildren()) {
if (lE.getName().equals("library")) {
list.add(new LibraryModel(plugin, lE));
}
@@ -65,8 +63,8 @@
* @throws PluginException
*/
protected void resolve(PluginRegistryModel registry) throws PluginException {
- for (int i = 0; i < libraries.length; i++) {
- libraries[i].resolve(registry);
+ for (LibraryModel library : libraries) {
+ library.resolve(registry);
}
}
@@ -76,8 +74,8 @@
* @throws PluginException
*/
protected void unresolve(PluginRegistryModel registry) throws PluginException {
- for (int i = 0; i < libraries.length; i++) {
- libraries[i].unresolve(registry);
+ for (LibraryModel library : libraries) {
+ library.unresolve(registry);
}
}
}
Modified: trunk/core/src/core/org/jnode/vm/VmStackReader.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/VmStackReader.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/VmStackReader.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -238,8 +238,8 @@
Unsafe.debug("Debug stacktrace:<no stack trace>\n");
} else {
Unsafe.debug("Debug stacktrace: ");
- for (int i = 0; i < frames.length; i++) {
- final VmStackFrame s = (VmStackFrame) frames[i];
+ for (VmStackFrame frame : frames) {
+ final VmStackFrame s = (VmStackFrame) frame;
Unsafe.debug(s.getMethod().getDeclaringClass().getName());
Unsafe.debug("::");
Unsafe.debug(s.getMethod().getName());
Modified: trunk/core/src/core/org/jnode/vm/bytecode/BasicBlockFinder.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/bytecode/BasicBlockFinder.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/bytecode/BasicBlockFinder.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -296,9 +296,9 @@
*/
public void visit_tableswitch(int defValue, int lowValue, int highValue, int[] addresses) {
tstack.pop(JvmType.INT);
- for (int i = 0; i < addresses.length; i++) {
- addBranch(addresses[i], true);
- condYieldPoint(addresses[i]);
+ for (int address : addresses) {
+ addBranch(address, true);
+ condYieldPoint(address);
}
addBranch(defValue, false);
condYieldPoint(defValue);
@@ -312,9 +312,9 @@
*/
public void visit_lookupswitch(int defValue, int[] matchValues, int[] addresses) {
tstack.pop(JvmType.INT);
- for (int i = 0; i < addresses.length; i++) {
- addBranch(addresses[i], true);
- condYieldPoint(addresses[i]);
+ for (int address : addresses) {
+ addBranch(address, true);
+ condYieldPoint(address);
}
addBranch(defValue, false);
condYieldPoint(defValue);
Modified: trunk/core/src/core/org/jnode/vm/bytecode/DeadBlockFinder.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/bytecode/DeadBlockFinder.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/bytecode/DeadBlockFinder.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -21,7 +21,6 @@
package org.jnode.vm.bytecode;
import java.util.TreeMap;
-
import org.jnode.bootlog.BootLogInstance;
import org.jnode.vm.JvmType;
import org.jnode.vm.classmgr.VmByteCode;
@@ -334,9 +333,9 @@
* @see BytecodeVisitor#visit_tableswitch(int, int, int, int[])
*/
public void visit_tableswitch(int defValue, int lowValue, int highValue, int[] addresses) {
- for (int i = 0; i < addresses.length; i++) {
- addBranch(addresses[i], true);
- condYieldPoint(addresses[i]);
+ for (int address : addresses) {
+ addBranch(address, true);
+ condYieldPoint(address);
}
addBranch(defValue, false);
condYieldPoint(defValue);
@@ -349,9 +348,9 @@
* @see BytecodeVisitor#visit_lookupswitch(int, int[], int[])
*/
public void visit_lookupswitch(int defValue, int[] matchValues, int[] addresses) {
- for (int i = 0; i < addresses.length; i++) {
- addBranch(addresses[i], true);
- condYieldPoint(addresses[i]);
+ for (int address : addresses) {
+ addBranch(address, true);
+ condYieldPoint(address);
}
addBranch(defValue, false);
condYieldPoint(defValue);
Modified: trunk/core/src/core/org/jnode/vm/classmgr/ClassDecoder.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/ClassDecoder.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/classmgr/ClassDecoder.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -1271,9 +1271,9 @@
final int tag = data.get() & 0xFF;
switch (tag) {
case 'B':
- return Byte.valueOf((byte) cp.getInt(data.getChar()));
+ return (byte) cp.getInt(data.getChar());
case 'C':
- return Character.valueOf((char) cp.getInt(data.getChar()));
+ return (char) cp.getInt(data.getChar());
case 'D':
return cp.getDouble(data.getChar());
case 'F':
@@ -1283,9 +1283,9 @@
case 'J':
return cp.getLong(data.getChar());
case 'S':
- return Short.valueOf((short) cp.getInt(data.getChar()));
+ return (short) cp.getInt(data.getChar());
case 'Z':
- return Boolean.valueOf(cp.getInt(data.getChar()) != 0);
+ return cp.getInt(data.getChar()) != 0;
case 's':
return cp.getAny(data.getChar());
case 'e': // enum
Modified: trunk/core/src/core/org/jnode/vm/classmgr/SelectorMap.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/SelectorMap.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/classmgr/SelectorMap.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -46,7 +46,7 @@
final String id = InternString.internString(name + '#' + signature);
final Integer selector = (Integer) map.get(id);
if (selector != null) {
- return selector.intValue();
+ return selector;
} else {
return getNew(id);
}
@@ -62,7 +62,7 @@
private synchronized int getNew(String id) {
Integer selector = (Integer) map.get(id);
if (selector != null) {
- return selector.intValue();
+ return selector;
} else {
final int sel = ++lastSelector;
map.put(id, sel);
Modified: trunk/core/src/core/org/jnode/vm/classmgr/Signature.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/Signature.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/classmgr/Signature.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -330,8 +330,8 @@
StringBuilder b = new StringBuilder();
b.append('(');
if (argTypes != null) {
- for (int i = 0; i < argTypes.length; i++) {
- b.append(toSignature(argTypes[i]));
+ for (Class argType : argTypes) {
+ b.append(toSignature(argType));
}
}
b.append(')');
@@ -393,8 +393,8 @@
StringBuilder b = new StringBuilder();
b.append('(');
if (argTypes != null) {
- for (int i = 0; i < argTypes.length; i++) {
- b.append(toSignature(argTypes[i]));
+ for (VmType argType : argTypes) {
+ b.append(toSignature(argType));
}
}
b.append(')');
Modified: trunk/core/src/core/org/jnode/vm/classmgr/TIBBuilder.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/TIBBuilder.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/classmgr/TIBBuilder.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -20,9 +20,9 @@
package org.jnode.vm.classmgr;
+import gnu.java.lang.VMClassHelper;
import java.util.ArrayList;
import java.util.HashMap;
-import gnu.java.lang.VMClassHelper;
/**
* @author epr
@@ -137,7 +137,7 @@
// skip index 0
final Object idx = nameSignature2Index.get(getNameSignature(name, signature));
if (idx != null) {
- return ((Integer) idx).intValue();
+ return (Integer) idx;
} else {
return -1;
}
Modified: trunk/core/src/core/org/jnode/vm/classmgr/VmAnnotation.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/VmAnnotation.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/classmgr/VmAnnotation.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -27,9 +27,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-
import org.jnode.vm.objects.VmSystemObject;
-
import sun.reflect.annotation.AnnotationParser;
/**
@@ -114,8 +112,8 @@
}
- for (int i = 0; i < values.length; i++) {
- vmap.put(values[i].name, values[i].value);
+ for (ElementValue value1 : values) {
+ vmap.put(value1.name, value1.value);
}
Set<Map.Entry> set = vmap.entrySet();
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -25,7 +25,6 @@
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
-
import org.jnode.vm.bytecode.BytecodeFlags;
import org.jnode.vm.bytecode.BytecodeVisitorSupport;
import org.jnode.vm.classmgr.VmByteCode;
@@ -212,18 +211,18 @@
}
public void visit_tableswitch(int defValue, int lowValue, int highValue, int[] addresses) {
- for (int i = 0; i < addresses.length; i++) {
+ for (int address : addresses) {
// Next block could be successor, e.g. switch could fall through
- addBranch(addresses[i], CONDITIONAL_BRANCH);
+ addBranch(address, CONDITIONAL_BRANCH);
}
// Same for default case
addBranch(defValue, CONDITIONAL_BRANCH);
}
public void visit_lookupswitch(int defValue, int[] matchValues, int[] addresses) {
- for (int i = 0; i < addresses.length; i++) {
+ for (int address : addresses) {
// Next block could be successor, e.g. switch could fall through
- addBranch(addresses[i], CONDITIONAL_BRANCH);
+ addBranch(address, CONDITIONAL_BRANCH);
}
// Same for default case
addBranch(defValue, CONDITIONAL_BRANCH);
@@ -278,7 +277,7 @@
private final void addBranch(int target, byte flags) {
IRBasicBlock pred = this.currentBlock;
IRBasicBlock succ = startBB(target);
- branchTargets.put(new Integer(getInstructionAddress()), new Integer(target));
+ branchTargets.put(getInstructionAddress(), target);
endBB(flags);
}
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/IRControlFlowGraph.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/IRControlFlowGraph.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/IRControlFlowGraph.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -250,8 +250,7 @@
public void deconstrucSSA() {
final List<PhiAssignQuad<T>> phiQuads = new BootableArrayList<PhiAssignQuad<T>>();
- for (int i = 0; i < bblocks.length; i += 1) {
- IRBasicBlock<T> b = bblocks[i];
+ for (IRBasicBlock<T> b : bblocks) {
for (Quad<T> q : b.getQuads()) {
if (q instanceof PhiAssignQuad) {
phiQuads.add((PhiAssignQuad<T>) q);
@@ -261,8 +260,7 @@
}
}
int n = phiQuads.size();
- for (int i = 0; i < n; i += 1) {
- PhiAssignQuad<T> paq = phiQuads.get(i);
+ for (PhiAssignQuad<T> paq : phiQuads) {
Variable<T> lhs = paq.getLHS();
IRBasicBlock<T> firstBlock = null;
VariableRefAssignQuad<T> firstPhiMove = null;
@@ -411,9 +409,9 @@
sb.append(bb.toString());
sb.append(":\n predecessors:");
final List<IRBasicBlock<T>> pred = bb.getPredecessors();
- for (int i = 0; i < pred.size(); i += 1) {
+ for (IRBasicBlock<T> aPred : pred) {
sb.append("\n ");
- sb.append(pred.get(i).toString());
+ sb.append(aPred.toString());
}
sb.append("\n successors:");
for (IRBasicBlock<T> succ : bb.getSuccessors()) {
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/IRTest.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/IRTest.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/IRTest.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -27,7 +27,6 @@
import java.net.MalformedURLException;
import java.util.Collection;
import java.util.Map;
-
import org.jnode.assembler.x86.X86Assembler;
import org.jnode.assembler.x86.X86BinaryAssembler;
import org.jnode.assembler.x86.X86Constants;
@@ -263,8 +262,8 @@
System.out.print(" ");
Variable[] vars = quad.getBasicBlock().getVariables();
System.out.print("[");
- for (int j = 0; j < vars.length; j += 1) {
- System.out.print(vars[j]);
+ for (Variable var : vars) {
+ System.out.print(var);
System.out.print(",");
}
System.out.print("] ");
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/NativeTest.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/NativeTest.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/NativeTest.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -243,8 +243,8 @@
System.out.print(" ");
Variable[] vars = quad.getBasicBlock().getVariables();
System.out.print("[");
- for (int j = 0; j < vars.length; j += 1) {
- System.out.print(vars[j]);
+ for (Variable var : vars) {
+ System.out.print(var);
System.out.print(",");
}
System.out.print("] ");
Modified: trunk/core/src/core/org/jnode/vm/facade/VmUtils.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/facade/VmUtils.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/facade/VmUtils.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -21,9 +21,7 @@
package org.jnode.vm.facade;
import gnu.java.lang.VMClassHelper;
-
import java.io.PrintWriter;
-
import org.jnode.annotation.Inline;
import org.jnode.annotation.KernelSpace;
import org.jnode.annotation.NoInline;
@@ -69,7 +67,7 @@
allowNatives |= className.equals("org.jnode.vm." + architectureName + ".Unsafe"
+ architectureName.toUpperCase());
*/
- allowNatives |= className.indexOf("org.jnode.vm.") > -1 && className.indexOf(".Unsafe") > -1;
+ allowNatives |= className.contains("org.jnode.vm.") && className.contains(".Unsafe");
return allowNatives;
}
@@ -188,8 +186,8 @@
*/
public static void dumpStatistics(PrintWriter out) {
final Statistic[] stats = VM_INSTANCE.getStatistics();
- for (int i = 0; i < stats.length; i++) {
- out.println(stats[i]);
+ for (Statistic stat : stats) {
+ out.println(stat);
}
}
@@ -198,8 +196,7 @@
*/
public static void resetCounters() {
final Statistic[] stats = VM_INSTANCE.getStatistics();
- for (int i = 0; i < stats.length; i++) {
- final Statistic s = stats[i];
+ for (final Statistic s : stats) {
if (s instanceof Counter) {
((Counter) s).reset();
}
Modified: trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -508,7 +508,7 @@
this.exitCode = status;
}
- if (vmThread.getName().indexOf("-AWT-stopper") > -1) {
+ if (vmThread.getName().contains("-AWT-stopper")) {
doExit();
} else {
disposeAppContext(true);
@@ -1008,8 +1008,7 @@
StackTraceElement[] trace = ex.getStackTrace();
if (trace != null) {
Unsafe.debug("getStackTrace() != null\n");
- for (int i = 0; i < trace.length; i++) {
- StackTraceElement element = trace[i];
+ for (StackTraceElement element : trace) {
Unsafe.debug(element.getClassName());
Unsafe.debug('#');
Unsafe.debug(element.getMethodName());
Modified: trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -22,7 +22,6 @@
import java.nio.ByteOrder;
import java.util.HashMap;
-
import org.jnode.annotation.Internal;
import org.jnode.annotation.MagicPermission;
import org.jnode.assembler.x86.X86Constants;
@@ -30,8 +29,8 @@
import org.jnode.system.resource.ResourceManager;
import org.jnode.system.resource.ResourceNotFreeException;
import org.jnode.system.resource.ResourceOwner;
-import org.jnode.vm.Unsafe;
import org.jnode.vm.BaseVmArchitecture;
+import org.jnode.vm.Unsafe;
import org.jnode.vm.VmMagic;
import org.jnode.vm.VmMultiMediaSupport;
import org.jnode.vm.VmSystem;
@@ -247,7 +246,7 @@
bootCpu.setBootProcessor(true);
final String cmdLine = VmSystem.getCmdLine();
- if (cmdLine.indexOf("mp=no") >= 0) {
+ if (cmdLine.contains("mp=no")) {
return;
}
//
Modified: trunk/net/src/net/org/jnode/net/NetworkLayerHeader.java
===================================================================
--- trunk/net/src/net/org/jnode/net/NetworkLayerHeader.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/net/src/net/org/jnode/net/NetworkLayerHeader.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -37,4 +37,6 @@
* Gets the source address of the packet described in this header
*/
public ProtocolAddress getDestinationAddress();
+
+ public int getDataLength();
}
Modified: trunk/net/src/net/org/jnode/net/arp/ARPHeader.java
===================================================================
--- trunk/net/src/net/org/jnode/net/arp/ARPHeader.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/net/src/net/org/jnode/net/arp/ARPHeader.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -33,6 +33,8 @@
* @author epr
*/
public class ARPHeader implements NetworkLayerHeader {
+
+ private final static int ARP_DATA_LENGTH = 28;
private HardwareAddress srcHWAddress;
private ProtocolAddress srcPAddress;
@@ -143,6 +145,10 @@
return targetPAddress;
}
+ public int getDataLength() {
+ return ARP_DATA_LENGTH;
+ }
+
/**
* Gets the hardware type
*/
Modified: trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPHeader.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPHeader.java 2012-03-28 14:33:09 UTC (rev 5895)
+++ trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPHeader.java 2012-04-19 12:57:10 UTC (rev 5896)
@@ -109,10 +109,6 @@
phdr.set16(10, tcpLength + headerLength);
phdr.append(skbuf);
- /*
- * final int ccs1 = IPv4Utils.calcChecksum(phdr, 0, 12); final int
- * ccs2 = IPv4Utils.calcChecksum(skbuf, 0, udpLength, ccs1);
- */
final int ccs2 = IPv4Utils.calcChecksum(phdr, 0, headerLength + tcpLength + 12);
this.checksumOk = (ccs2 == 0);
if (!checksumOk) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
