paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-08-23 20:29:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

* TextDecoder cannot handle shared memory, need to copy to local buffer first

Browse Source
This commit is contained in:
Michael Van Canneyt 2024-12-02 21:27:29 +01:00
parent 4d0e769b41
commit d43a547461
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/wasi/src/wasienv.pas
View File

@ -119,7 +119,6 @@ type
function GetTotalIOVsLen(iovs: TMemBufferArray): Integer; function GetTotalIOVsLen(iovs: TMemBufferArray): Integer;
function GetIOVsAsBytes(iovs, iovsLen: NativeInt): TJSUInt8array; function GetIOVsAsBytes(iovs, iovsLen: NativeInt): TJSUInt8array;
function GetMemory: TJSWebassemblyMemory; function GetMemory: TJSWebassemblyMemory;
function GetUTF8ByteLength(const AString: String): Integer;
procedure SetArguments(AValue: TStrings); procedure SetArguments(AValue: TStrings);
procedure SetEnvironment(AValue: TStrings); procedure SetEnvironment(AValue: TStrings);
procedure SetInstance(AValue: TJSWebAssemblyInstance); procedure SetInstance(AValue: TJSWebAssemblyInstance);
@ -199,6 +198,7 @@ type
class constructor init; class constructor init;
Constructor Create; Constructor Create;
Destructor Destroy; override; Destructor Destroy; override;
function GetUTF8ByteLength(const AString: String): Integer;
Function GetUTF8StringFromMem(aLoc, aLen : Longint) : String; Function GetUTF8StringFromMem(aLoc, aLen : Longint) : String;
// Write string as UTF8 string in memory at aLoc, with max aLen bytes. // Write string as UTF8 string in memory at aLoc, with max aLen bytes.
// Return number of bytes written, or -NeededLen if not enough room. // Return number of bytes written, or -NeededLen if not enough room.
@ -2252,8 +2252,23 @@ end;
function TPas2JSWASIEnvironment.GetUTF8StringFromMem(aLoc, aLen: Longint): String; function TPas2JSWASIEnvironment.GetUTF8StringFromMem(aLoc, aLen: Longint): String;
var
src,tmpBuf : TJSArrayBuffer;
SrcBytes,tmpBytes : TJSUint8Array;
begin begin
Result:=UTF8TextDecoder.Decode(getModuleMemoryDataView.buffer.slice(aLoc,aLoc+alen)); if getModuleMemoryDataView.bufferObj is TJSSharedArrayBuffer then
begin
src:=getModuleMemoryDataView.buffer.slice(aLoc,aLoc+alen);
SrcBytes:=TJSUint8Array.new(src);
tmpBuf:=TJSArrayBuffer.new(aLen);
tmpBytes:=TJSUint8Array.new(tmpBuf);
tmpBytes._set(SrcBytes);
Result:=UTF8TextDecoder.Decode(tmpBuf);
end
else
Result:=UTF8TextDecoder.Decode(getModuleMemoryDataView.buffer.slice(aLoc,aLoc+alen));
end; end;
function TPas2JSWASIEnvironment.GetUTF8ByteLength(const AString: String) : Integer; function TPas2JSWASIEnvironment.GetUTF8ByteLength(const AString: String) : Integer;