Revision: 2894
http://jnode.svn.sourceforge.net/jnode/?rev=2894&view=rev
Author: lsantha
Date: 2006-12-10 14:12:03 -0800 (Sun, 10 Dec 2006)
Log Message:
-----------
Fixed usage of Address.
Modified Paths:
--------------
trunk/core/src/core/org/jnode/vm/memmgr/def/VmDefaultHeap.java
Modified: trunk/core/src/core/org/jnode/vm/memmgr/def/VmDefaultHeap.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/memmgr/def/VmDefaultHeap.java 2006-12-10 22:02:58 UTC (rev 2893)
+++ trunk/core/src/core/org/jnode/vm/memmgr/def/VmDefaultHeap.java 2006-12-10 22:12:03 UTC (rev 2894)
@@ -186,7 +186,7 @@
*/
protected Object alloc(VmClassType<?> vmClass, int alignedSize) {
- if (nextFreePtr == null) { /* This heap is full */
+ if (nextFreePtr.EQ(Address.zero())) { /* This heap is full */
return null; }
final Offset tibOffset = this.tibOffset;
@@ -201,7 +201,7 @@
throw new IllegalArgumentException("vmClass.TIB is null");
}
//final int size = getSize();
- Address objectPtr = null;
+ Address objectPtr = Address.zero();
lock();
try {
// Search for the first free block that is large enough
@@ -218,7 +218,7 @@
// No large enough free space has been found
// A collect may recover smaller free spaces in this
// heap, but we leave that to a GC iteration.
- nextFreePtr = null;
+ nextFreePtr = Address.zero();
//Screen.debug("B");
return null;
} else {
@@ -309,7 +309,7 @@
lock();
try {
- Address firstFreePtr = null;
+ Address firstFreePtr = Address.zero();
while (offset.LT(size)) {
final Address ptr = start.add(offset);
final Word objSize = ptr.loadWord(sizeOffset);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
