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

wasm gc: emit string literals in WTF-8 rather than in UTF-8

Browse Source
This commit is contained in:
Alexey Andreev 2024-09-18 14:24:19 +02:00
parent 944fd22513
commit 3cf5fc10c8
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/java/org/teavm/backend/wasm/generate/gc/strings/WasmGCStringPool.java
View File

@ -15,7 +15,6 @@
*/ */
package org.teavm.backend.wasm.generate.gc.strings; package org.teavm.backend.wasm.generate.gc.strings;
import java.nio.charset.StandardCharsets;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import org.teavm.backend.wasm.BaseWasmFunctionRepository; import org.teavm.backend.wasm.BaseWasmFunctionRepository;
@ -83,7 +82,7 @@ public class WasmGCStringPool implements WasmGCStringProvider, WasmGCInitializer
createInitNextStringFunction(); createInitNextStringFunction();
} }
binaryWriter.writeLEB(string.length()); binaryWriter.writeLEB(string.length());
binaryWriter.writeBytes(string.getBytes(StandardCharsets.UTF_8)); writeWTF8(string, binaryWriter);
var brief = string.length() > 16 ? string.substring(0, 16) : string; var brief = string.length() > 16 ? string.substring(0, 16) : string;
var globalName = names.topLevel("teavm@string<" + stringMap.size() + ">" var globalName = names.topLevel("teavm@string<" + stringMap.size() + ">"
+ WasmGCNameProvider.sanitize(brief)); + WasmGCNameProvider.sanitize(brief));
@ -96,6 +95,22 @@ public class WasmGCStringPool implements WasmGCStringProvider, WasmGCInitializer
}); });
} }
private void writeWTF8(String s, WasmBinaryWriter writer) {
for (var i = 0; i < s.length(); ++i) {
var c = (int) s.charAt(i);
if (c < 0x80) {
writer.writeByte(c);
} else if (c < 0x800) {
writer.writeByte(0xC0 | ((c >> 6) & 0x1F));
writer.writeByte(0x80 | (c & 0x3F));
} else if (c < 0x10000) {
writer.writeByte(0xE0 | ((c >> 12) & 0x1F));
writer.writeByte(0x80 | ((c >> 6) & 0x3F));
writer.writeByte(0x80 | (c & 0x3F));
}
}
}
private void createInitNextStringFunction() { private void createInitNextStringFunction() {
var stringTypeInfo = standardClasses.stringClass(); var stringTypeInfo = standardClasses.stringClass();
var nextCharArrayFunction = functionProvider.forStaticMethod(new MethodReference(WasmGCSupport.class, var nextCharArrayFunction = functionProvider.forStaticMethod(new MethodReference(WasmGCSupport.class,