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

fix style violations

Browse Source
This commit is contained in:
lax1dude 2024-11-02 21:02:25 -07:00
parent df6fc752b6
commit a5836dff25
5 changed files with 60 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/org/teavm/backend/wasm/WasmGCTarget.java
View File

@ -100,7 +100,7 @@ public class WasmGCTarget implements TeaVMTarget, TeaVMWasmGCHost {
private List<WasmGCCustomGeneratorFactory> customGeneratorFactories = new ArrayList<>(); private List<WasmGCCustomGeneratorFactory> customGeneratorFactories = new ArrayList<>();
private EntryPointTransformation entryPointTransformation = new EntryPointTransformation(); private EntryPointTransformation entryPointTransformation = new EntryPointTransformation();
private List<WasmGCClassConsumer> classConsumers = new ArrayList<>(); private List<WasmGCClassConsumer> classConsumers = new ArrayList<>();
private boolean enableDirectMallocSupport = false; private boolean enableDirectMallocSupport;
private int directMallocMinHeapSize = 0x10000; private int directMallocMinHeapSize = 0x10000;
private int directMallocMaxHeapSize = 0x10000000; private int directMallocMaxHeapSize = 0x10000000;
@ -210,7 +210,7 @@ public class WasmGCTarget implements TeaVMTarget, TeaVMWasmGCHost {
var deps = new WasmGCDependencies(dependencyAnalyzer); var deps = new WasmGCDependencies(dependencyAnalyzer);
deps.contribute(); deps.contribute();
deps.contributeStandardExports(); deps.contributeStandardExports();
if(enableDirectMallocSupport) { if (enableDirectMallocSupport) {
deps.contributeDirectMalloc(); deps.contributeDirectMalloc();
} }
} }
@ -304,11 +304,12 @@ public class WasmGCTarget implements TeaVMTarget, TeaVMWasmGCHost {
moduleGenerator.generate(); moduleGenerator.generate();
customGenerators.contributeToModule(module); customGenerators.contributeToModule(module);
generateExceptionExports(declarationsGenerator); generateExceptionExports(declarationsGenerator);
if(enableDirectMallocSupport) { if (enableDirectMallocSupport) {
var heapSegment = new WasmMemorySegment(); var heapSegment = new WasmMemorySegment();
if (!module.getSegments().isEmpty()) { if (!module.getSegments().isEmpty()) {
var lastSegment = module.getSegments().get(module.getSegments().size() - 1); var lastSegment = module.getSegments().get(module.getSegments().size() - 1);
heapSegment.setOffset(WasmRuntime.align(lastSegment.getOffset() + lastSegment.getLength(), WasmHeap.PAGE_SIZE)); heapSegment.setOffset(WasmRuntime.align(lastSegment.getOffset()
+ lastSegment.getLength(), WasmHeap.PAGE_SIZE));
} }
heapSegment.setLength(directMallocMinHeapSize); heapSegment.setLength(directMallocMinHeapSize);
module.getSegments().add(heapSegment); module.getSegments().add(heapSegment);
@ -420,12 +421,13 @@ public class WasmGCTarget implements TeaVMTarget, TeaVMWasmGCHost {
return; return;
} }
if(enableDirectMallocSupport) { if (enableDirectMallocSupport) {
var minPages = (memorySize - 1) / WasmHeap.PAGE_SIZE + 1; var minPages = (memorySize - 1) / WasmHeap.PAGE_SIZE + 1;
var maxPages = (memorySize - directMallocMinHeapSize + directMallocMaxHeapSize - 1) / WasmHeap.PAGE_SIZE + 1; var maxPages = (memorySize - directMallocMinHeapSize + directMallocMaxHeapSize - 1)
/ WasmHeap.PAGE_SIZE + 1;
module.setMinMemorySize(minPages); module.setMinMemorySize(minPages);
module.setMaxMemorySize(maxPages); module.setMaxMemorySize(maxPages);
}else { } else {
var pages = (memorySize - 1) / WasmHeap.PAGE_SIZE + 1; var pages = (memorySize - 1) / WasmHeap.PAGE_SIZE + 1;
module.setMinMemorySize(pages); module.setMinMemorySize(pages);
module.setMaxMemorySize(pages); module.setMaxMemorySize(pages);

4
core/src/main/java/org/teavm/backend/wasm/generate/gc/classes/WasmGCTypeMapper.java
View File

@ -128,9 +128,9 @@ public class WasmGCTypeMapper {
} }
} }
if (result == null) { if (result == null) {
if(className.equals(Address.class.getName())) { if (className.equals(Address.class.getName())) {
typeCache.put(className, WasmType.INT32); typeCache.put(className, WasmType.INT32);
}else { } else {
var cls = classes.get(className); var cls = classes.get(className);
if (cls == null) { if (cls == null) {
className = "java.lang.Object"; className = "java.lang.Object";

15
core/src/main/java/org/teavm/backend/wasm/intrinsics/gc/LaxMallocIntrinsic.java
View File

@ -37,17 +37,18 @@ public class LaxMallocIntrinsic implements WasmGCIntrinsic {
switch (invocation.getMethod().getName()) { switch (invocation.getMethod().getName()) {
case "addrHeap": { case "addrHeap": {
WasmExpression value = context.generate(invocation.getArguments().get(0)); WasmExpression value = context.generate(invocation.getArguments().get(0));
if(value instanceof WasmInt32Constant) { if (value instanceof WasmInt32Constant) {
// if addrHeap is passed a constant i32, add the heap offset at compile time // if addrHeap is passed a constant i32, add the heap offset at compile time
final int memOffset = ((WasmInt32Constant)value).getValue(); final int memOffset = ((WasmInt32Constant) value).getValue();
WasmInt32Constant ret = new WasmInt32Constant(0); WasmInt32Constant ret = new WasmInt32Constant(0);
addressList.add((heapLoc) -> { addressList.add(heapLoc -> {
ret.setValue(heapLoc + memOffset); ret.setValue(heapLoc + memOffset);
}); });
return ret; return ret;
}else { } else {
WasmInt32Constant heapLocConst = new WasmInt32Constant(0); WasmInt32Constant heapLocConst = new WasmInt32Constant(0);
WasmExpression calcOffset = new WasmIntBinary(WasmIntType.INT32, WasmIntBinaryOperation.ADD, heapLocConst, value); WasmExpression calcOffset = new WasmIntBinary(WasmIntType.INT32, WasmIntBinaryOperation.ADD,
heapLocConst, value);
addressList.add(heapLocConst::setValue); addressList.add(heapLocConst::setValue);
return calcOffset; return calcOffset;
} }
@ -81,13 +82,13 @@ public class LaxMallocIntrinsic implements WasmGCIntrinsic {
} }
public void setHeapMinAddr(int heapSegmentMinAddr) { public void setHeapMinAddr(int heapSegmentMinAddr) {
for(WasmInt32Constant ct : minAddrConstants) { for (WasmInt32Constant ct : minAddrConstants) {
ct.setValue(heapSegmentMinAddr); ct.setValue(heapSegmentMinAddr);
} }
} }
public void setHeapMaxAddr(int heapSegmentMaxAddr) { public void setHeapMaxAddr(int heapSegmentMaxAddr) {
for(WasmInt32Constant ct : maxAddrConstants) { for (WasmInt32Constant ct : maxAddrConstants) {
ct.setValue(heapSegmentMaxAddr); ct.setValue(heapSegmentMaxAddr);
} }
} }

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

@ -44,19 +44,32 @@ 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_OUTER_LIMIT = 0; // Address where we store the WebAssembly.Memory limit (32 bit int) // 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_OUTER_LIMIT = 0;
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_DATA_START = 272; // Beginning of the first chunk of the heap
private static native Address addrHeap(int offset); // Intrinsic function to get an address in the heap segment // Address where we store the current heap limit (32 bit int)
private static final int ADDR_HEAP_INNER_LIMIT = 4;
private static native int growHeapOuter(int bytes); // Intrinsic function to grow the heap segment // Address where we store the bitmask of free chunk lists (64 bit int)
private static final int ADDR_HEAP_BUCKETS_FREE_MASK = 8;
private static native Address getHeapMinAddr(); // Intrinsic function to get the minimum direct malloc heap segment ending address // Address to the list of 64 pointers to the beginnings of the 64 buckets
private static final int ADDR_HEAP_BUCKETS_START = 16;
private static native Address getHeapMaxAddr(); // Intrinsic function to get the maximum direct malloc heap segment ending address // Beginning of the first chunk of the heap
private static final int ADDR_HEAP_DATA_START = 272;
// Intrinsic function to get an address in the heap segment
private static native Address addrHeap(int offset);
// Intrinsic function to grow the heap segment
private static native int growHeapOuter(int bytes);
// Intrinsic function to get the minimum direct malloc heap segment ending address
private static native Address getHeapMinAddr();
// Intrinsic function to get the maximum direct malloc heap segment ending address
private static native Address getHeapMaxAddr();
@Import(name = "teavm_notifyHeapResized") @Import(name = "teavm_notifyHeapResized")
private static native void notifyHeapResized(); private static native void notifyHeapResized();
@ -84,13 +97,13 @@ public final class LaxMalloc {
} }
private static Address laxAlloc(int sizeBytes, boolean cleared) { private static Address laxAlloc(int sizeBytes, boolean cleared) {
if(sizeBytes <= 0) { if (sizeBytes <= 0) {
// Produce a null pointer if 0 or invalid size is requested // Produce a null pointer if 0 or invalid size is requested
return Address.fromInt(0); return Address.fromInt(0);
} }
// Allocation must be large enough to hold the two list pointers when the chunk becomes free again // Allocation must be large enough to hold the two list pointers when the chunk becomes free again
if(sizeBytes < MIN_ALLOC_SIZE) { if (sizeBytes < MIN_ALLOC_SIZE) {
sizeBytes = MIN_ALLOC_SIZE; sizeBytes = MIN_ALLOC_SIZE;
} }
@ -100,7 +113,7 @@ public final class LaxMalloc {
// always between 0-63 // always between 0-63
int bucket = getListBucket(sizeBytes); int bucket = getListBucket(sizeBytes);
if(bucket == 63) { if (bucket == 63) {
// special bucket for the huge allocations // special bucket for the huge allocations
// uses a different slower function // uses a different slower function
return laxHugeAlloc(sizeBytes, cleared); return laxHugeAlloc(sizeBytes, cleared);
@ -110,16 +123,16 @@ public final class LaxMalloc {
long bucketMask = addrHeap(ADDR_HEAP_BUCKETS_FREE_MASK).getLong(); long bucketMask = addrHeap(ADDR_HEAP_BUCKETS_FREE_MASK).getLong();
// mask away the buckets that we know are too small for this allocation // mask away the buckets that we know are too small for this allocation
bucketMask = (bucketMask & (0xFFFFFFFFFFFFFFFFL << bucket)); bucketMask = bucketMask & (0xFFFFFFFFFFFFFFFFL << bucket);
// there are no more buckets with free chunks // there are no more buckets with free chunks
// need to sbrk // need to sbrk
if(bucketMask == 0l) { if (bucketMask == 0L) {
int sizePlusInts = sizeBytes + 8; // size + 2 ints int sizePlusInts = sizeBytes + 8; // size + 2 ints
Address newChunk = growHeap(sizePlusInts); // sbrk Address newChunk = growHeap(sizePlusInts); // sbrk
// Out of memory // Out of memory
if(newChunk.toInt() == 0) { if (newChunk.toInt() == 0) {
return Address.fromInt(0); //TODO return Address.fromInt(0); //TODO
} }
@ -142,22 +155,22 @@ public final class LaxMalloc {
Address itrChunkStart = Address.fromInt(0); Address itrChunkStart = Address.fromInt(0);
// check if the first chunk in the bucket is large enough // check if the first chunk in the bucket is large enough
if(chunkSize - 8 < sizeBytes) { // size - 2 ints if (chunkSize - 8 < sizeBytes) { // size - 2 ints
// the chunk is not large enough, move the first chunk to the end of the list // the chunk is not large enough, move the first chunk to the end of the list
// and then check in the next bucket (where the chunks are definitely large enough) // and then check in the next bucket (where the chunks are definitely large enough)
// this functionality is present in emmalloc (emscripten) // this functionality is present in emmalloc (emscripten)
Address chunkNextPtr = readChunkNextFreeAddr(chunkPtr); Address chunkNextPtr = readChunkNextFreeAddr(chunkPtr);
if(chunkNextPtr.getInt() != chunkPtr.getInt()) { if (chunkNextPtr.getInt() != chunkPtr.getInt()) {
bucketStartAddr.putAddress(chunkNextPtr); bucketStartAddr.putAddress(chunkNextPtr);
itrChunkStart = chunkNextPtr; itrChunkStart = chunkNextPtr;
} }
// extend mask to the next bucket // extend mask to the next bucket
bucketMask = (bucketMask & (0xFFFFFFFFFFFFFFFFL << (bucket + 1))); bucketMask &= 0xFFFFFFFFFFFFFFFFL << (bucket + 1);
if(bucketMask != 0l) { if (bucketMask != 0L) {
// there is a bucket with a larger chunk // there is a bucket with a larger chunk
int availableLargerBucket = Long.numberOfTrailingZeros(bucketMask); int availableLargerBucket = Long.numberOfTrailingZeros(bucketMask);
Address largerBucketStartAddr = addrHeap(ADDR_HEAP_BUCKETS_START).add(availableLargerBucket << SIZEOF_PTR_SH); Address largerBucketStartAddr = addrHeap(ADDR_HEAP_BUCKETS_START).add(availableLargerBucket << SIZEOF_PTR_SH);
@ -171,13 +184,13 @@ public final class LaxMalloc {
Address ret = largerChunkPtr.add(4); Address ret = largerChunkPtr.add(4);
// clear if requested // clear if requested
if(cleared) { if (cleared) {
DirectMalloc.zmemset(ret, sizeBytes); DirectMalloc.zmemset(ret, sizeBytes);
} }
return ret; return ret;
} }
}else { } else {
// the first chunk in the bucket is large enough // the first chunk in the bucket is large enough
// this will remove the chunk from the free list // this will remove the chunk from the free list
allocateMemoryFromChunk(chunkPtr, chunkSize, sizeBytes); allocateMemoryFromChunk(chunkPtr, chunkSize, sizeBytes);
@ -186,14 +199,14 @@ public final class LaxMalloc {
Address ret = chunkPtr.add(4); Address ret = chunkPtr.add(4);
// clear if requested // clear if requested
if(cleared) { if (cleared) {
DirectMalloc.zmemset(ret, sizeBytes); DirectMalloc.zmemset(ret, sizeBytes);
} }
return ret; return ret;
} }
if(itrChunkStart.toInt() != 0) { if (itrChunkStart.toInt() != 0) {
// if we've reached this point, it means the first chunk in the bucket wasn't large enough // if we've reached this point, it means the first chunk in the bucket wasn't large enough
// and there weren't any chunks in the larger buckets we could split up // and there weren't any chunks in the larger buckets we could split up
@ -220,7 +233,8 @@ public final class LaxMalloc {
return ret; return ret;
} }
}while((addrIterator = readChunkNextFreeAddr(addrIterator)).getInt() != chunkPtr.getInt()); addrIterator = readChunkNextFreeAddr(addrIterator);
} while (addrIterator.getInt() != chunkPtr.getInt());
} }
// no other options, time to sbrk // no other options, time to sbrk
@ -229,7 +243,7 @@ public final class LaxMalloc {
Address newChunk = growHeap(sizePlusInts); // sbrk Address newChunk = growHeap(sizePlusInts); // sbrk
// Out of memory // Out of memory
if(newChunk.toInt() == 0) { if (newChunk.toInt() == 0) {
return Address.fromInt(0); //TODO return Address.fromInt(0); //TODO
} }

4
tools/core/src/main/java/org/teavm/tooling/TeaVMTool.java
View File

@ -119,7 +119,7 @@ public class TeaVMTool {
private Set<File> generatedFiles = new HashSet<>(); private Set<File> generatedFiles = new HashSet<>();
private int minHeapSize = 4 * (1 << 20); private int minHeapSize = 4 * (1 << 20);
private int maxHeapSize = 128 * (1 << 20); private int maxHeapSize = 128 * (1 << 20);
private boolean directMallocSupport = false; private boolean directMallocSupport;
private ReferenceCache referenceCache; private ReferenceCache referenceCache;
private boolean heapDump; private boolean heapDump;
private boolean shortFileNames; private boolean shortFileNames;
@ -416,7 +416,7 @@ public class TeaVMTool {
target.setSourceMapBuilder(wasmSourceMapWriter); target.setSourceMapBuilder(wasmSourceMapWriter);
target.setSourceMapLocation(getResolvedTargetFileName() + ".map"); target.setSourceMapLocation(getResolvedTargetFileName() + ".map");
} }
if(directMallocSupport) { if (directMallocSupport) {
target.setEnableDirectMallocSupport(directMallocSupport); target.setEnableDirectMallocSupport(directMallocSupport);
target.setDirectMallocMinHeapSize(minHeapSize); target.setDirectMallocMinHeapSize(minHeapSize);
target.setDirectMallocMaxHeapSize(maxHeapSize); target.setDirectMallocMaxHeapSize(maxHeapSize);