eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

work on LaxMalloc

Browse Source
This commit is contained in:
lax1dude 2024-11-01 00:15:24 -07:00
parent 30a61fd9dd
commit f266d21f58
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/src/main/java/org/teavm/runtime/LaxMalloc.java
View File

@ -16,6 +16,7 @@
package org.teavm.runtime; package org.teavm.runtime;
import org.teavm.interop.Address; import org.teavm.interop.Address;
import org.teavm.interop.Import;
import org.teavm.interop.StaticInit; import org.teavm.interop.StaticInit;
import org.teavm.interop.Unmanaged; import org.teavm.interop.Unmanaged;
@ -42,7 +43,8 @@ public final class LaxMalloc {
private static final int MIN_ALLOC_SIZE = 8; private static final int MIN_ALLOC_SIZE = 8;
private static final int ADDR_HEAP_LIMIT = 4; // Address where we store the current heap limit (32 bit int) private static final int ADDR_HEAP_OUTER_LIMIT = 0; // Address where we store the WebAssembly.Memory limit (32 bit int)
private static final int ADDR_HEAP_INNER_LIMIT = 4; // Address where we store the current heap limit (32 bit int)
private static final int ADDR_HEAP_BUCKETS_FREE_MASK = 8; // Address where we store the bitmask of free chunk lists (64 bit int) private static final int ADDR_HEAP_BUCKETS_FREE_MASK = 8; // Address where we store the bitmask of free chunk lists (64 bit int)
private static final int ADDR_HEAP_BUCKETS_START = 16; // Address to the list of 64 pointers to the beginnings of the 64 buckets private static final int ADDR_HEAP_BUCKETS_START = 16; // Address to the list of 64 pointers to the beginnings of the 64 buckets
private static final int ADDR_HEAP_DATA_START = 272; // Beginning of the first chunk of the heap private static final int ADDR_HEAP_DATA_START = 272; // Beginning of the first chunk of the heap
@ -51,7 +53,8 @@ public final class LaxMalloc {
// zero out the control region // zero out the control region
Allocator.fillZero(Address.fromInt(0), ADDR_HEAP_DATA_START); Allocator.fillZero(Address.fromInt(0), ADDR_HEAP_DATA_START);
// initialize heap limit // initialize heap limit
Address.fromInt(ADDR_HEAP_LIMIT).putInt(ADDR_HEAP_DATA_START); Address.fromInt(ADDR_HEAP_INNER_LIMIT).putInt(ADDR_HEAP_DATA_START);
Address.fromInt(ADDR_HEAP_OUTER_LIMIT).putInt(0x10000);
} }
/** /**
@ -314,7 +317,7 @@ public final class LaxMalloc {
} }
Address nextChunkPtr = chunkPtr.add(chunkSize); Address nextChunkPtr = chunkPtr.add(chunkSize);
if(Address.fromInt(ADDR_HEAP_LIMIT).getAddress().isLessThan(nextChunkPtr)) { if(Address.fromInt(ADDR_HEAP_INNER_LIMIT).getAddress().isLessThan(nextChunkPtr)) {
// check if we can merge with the next chunk as well // check if we can merge with the next chunk as well
int nextChunkSize = readChunkSizeStatus(nextChunkPtr); int nextChunkSize = readChunkSizeStatus(nextChunkPtr);
if((nextChunkSize & 0x80000000) == 0) { if((nextChunkSize & 0x80000000) == 0) {
@ -467,11 +470,27 @@ public final class LaxMalloc {
* This is our sbrk * This is our sbrk
*/ */
private static Address growHeap(int amount) { private static Address growHeap(int amount) {
Address heapLimit = Address.fromInt(ADDR_HEAP_LIMIT).getAddress(); Address heapInnerLimit = Address.fromInt(ADDR_HEAP_INNER_LIMIT).getAddress();
Address.fromInt(ADDR_HEAP_LIMIT).putAddress(heapLimit.add(amount)); Address heapOuterLimit = Address.fromInt(ADDR_HEAP_OUTER_LIMIT).getAddress();
//TODO: expand WebAssembly Memory Address newHeapInnerLimit = heapInnerLimit.add(amount);
return heapLimit; if(heapOuterLimit.isLessThan(newHeapInnerLimit)) {
int bytesNeeded = newHeapInnerLimit.toInt() - heapOuterLimit.toInt();
bytesNeeded = (bytesNeeded + 0xFFFF) & 0xFFFF0000;
if(growHeapOuter(bytesNeeded)) {
Address.fromInt(ADDR_HEAP_INNER_LIMIT).putAddress(newHeapInnerLimit);
Address.fromInt(ADDR_HEAP_OUTER_LIMIT).putAddress(heapOuterLimit.add(bytesNeeded));
return newHeapInnerLimit;
}else {
return Address.fromInt(0);
} }
}else {
Address.fromInt(ADDR_HEAP_INNER_LIMIT).putAddress(newHeapInnerLimit);
return newHeapInnerLimit;
}
}
@Import(name = "teavm_growHeap")
private static native boolean growHeapOuter(int bytes);
private static int readChunkSizeStatus(Address chunkAddr) { private static int readChunkSizeStatus(Address chunkAddr) {
return chunkAddr.getInt(); return chunkAddr.getInt();