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: support Date.toString

Browse Source
This commit is contained in:
Alexey Andreev 2023-09-27 14:30:20 +02:00
parent 348b71685d
commit 7fd3166f9b
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
classlib/src/main/java/org/teavm/classlib/java/util/TDate.java
View File

@ -370,8 +370,10 @@ public class TDate implements TComparable<TDate> {
@Override @Override
public String toString() { public String toString() {
if (PlatformDetector.isLowLevel()) { if (PlatformDetector.isC()) {
return toStringLowLevel(value); return toStringC(value);
} else if (PlatformDetector.isWebAssembly()) {
return toStringWebAssembly(value);
} else { } else {
return JSDate.create(value).stringValue(); return JSDate.create(value).stringValue();
} }
@ -380,8 +382,10 @@ public class TDate implements TComparable<TDate> {
@Import(name = "teavm_date_format") @Import(name = "teavm_date_format")
@NoSideEffects @NoSideEffects
@RuntimeInclude("date.h") @RuntimeInclude("date.h")
@UnsupportedOn(Platforms.WEBASSEMBLY) private static native String toStringC(long date);
private static native String toStringLowLevel(long date);
@Import(module = "teavm", name = "dateToString")
private static native String toStringWebAssembly(double date);
@Deprecated @Deprecated
public String toLocaleString() { public String toLocaleString() {

31
core/src/main/resources/org/teavm/backend/wasm/wasm-runtime.js
View File

@ -50,11 +50,25 @@ TeaVM.wasm = function() {
let memory = instance.exports.memory.buffer; let memory = instance.exports.memory.buffer;
let arrayPtr = instance.exports.teavm_stringData(string); let arrayPtr = instance.exports.teavm_stringData(string);
let length = instance.exports.teavm_arrayLength(arrayPtr); let length = instance.exports.teavm_arrayLength(arrayPtr);
let arrayData = new DataView(memory, instance.exports.teavm_charArrayData(arrayPtr), length * 2); let arrayData = new Uint16Array(memory, instance.exports.teavm_charArrayData(arrayPtr), length * 2);
for (let i = 0; i < length; ++i) { for (let i = 0; i < length; ++i) {
putwchar(arrayData.getUint16(i * 2, true)); putwchar(arrayData[i]);
} }
} }
function dateToString(timestamp, controller) {
const s = new Date(timestamp).toString();
let instance = controller.instance;
let result = instance.allocateString(s.length);
if (result === 0) {
return 0;
}
let resultAddress = instance.objectArrayData(instance.stringData(result));
let resultView = new Uint16Array(instance.exports.memory.buffer, resultAddress, s.length);
for (let i = 0; i < s.length; ++i) {
resultView[i] = s.charCodeAt(i);
}
return result;
}
function logInt(i) { function logInt(i) {
lineBuffer += i.toString(); lineBuffer += i.toString();
} }
@ -87,14 +101,15 @@ TeaVM.wasm = function() {
controller.complete = false; controller.complete = false;
obj.teavm = { obj.teavm = {
currentTimeMillis: currentTimeMillis, currentTimeMillis: currentTimeMillis,
nanoTime: function() { return performance.now(); }, nanoTime: () => performance.now(),
putwcharsOut: (chars, count) => putwchars(controller, chars, count), putwcharsOut: (chars, count) => putwchars(controller, chars, count),
putwcharsErr: (chars, count) => putwchars(controller, chars, count), putwcharsErr: (chars, count) => putwchars(controller, chars, count),
getNativeOffset: getNativeOffset, getNativeOffset: getNativeOffset,
logString: string => logString(string, controller), logString: string => logString(string, controller),
logInt: logInt, logInt: logInt,
logOutOfMemory: () => console.log("Out of memory"), logOutOfMemory: () => console.log("Out of memory"),
teavm_interrupt: () => interrupt(controller) teavm_interrupt: () => interrupt(controller),
dateToString: (timestamp) => dateToString(timestamp, controller)
}; };
obj.teavmMath = Math; obj.teavmMath = Math;
@ -184,16 +199,16 @@ TeaVM.wasm = function() {
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let javaArgs = teavm.allocateStringArray(args.length); let javaArgs = teavm.allocateStringArray(args.length);
let javaArgsData = new DataView(teavm.memory.buffer, teavm.objectArrayData(javaArgs), args.length * 4); let javaArgsData = new Int32Array(teavm.memory.buffer, teavm.objectArrayData(javaArgs), args.length);
for (let i = 0; i < args.length; ++i) { for (let i = 0; i < args.length; ++i) {
let arg = args[i]; let arg = args[i];
let javaArg = teavm.allocateString(arg.length); let javaArg = teavm.allocateString(arg.length);
let javaArgAddress = teavm.objectArrayData(teavm.stringData(javaArg)); let javaArgAddress = teavm.objectArrayData(teavm.stringData(javaArg));
let javaArgData = new DataView(teavm.memory.buffer, javaArgAddress, arg.length * 2); let javaArgData = new Uint16Array(teavm.memory.buffer, javaArgAddress, arg.length);
for (let j = 0; j < arg.length; ++j) { for (let j = 0; j < arg.length; ++j) {
javaArgData.setUint16(j * 2, arg.charCodeAt(j), true); javaArgData[j] = arg.charCodeAt(j);
} }
javaArgsData.setInt32(i * 4, javaArg, true); javaArgsData[i] = javaArg;
} }
controller.resolve = resolve; controller.resolve = resolve;