Skip to content

Implement more wasi functions #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ksh8281 merged 1 commit into from
Jun 3, 2026
+76 −18
Merged

Implement more wasi functions #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/shell/Shell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ static Trap::TrapResult executeWASM(Store* store, const std::string& filename, c

static Trap::TrapResult executeWASMComponent(Store* store, const std::string& filename, const std::vector<uint8_t>& src)
{
std::pair<Optional<Component*>, std::string> parseResult = WASMComponentParser::parseBinary(store, filename, src.data(), src.size());
std::pair<Optional<Component*>, std::string> parseResult = WASMComponentParser::parseBinary(store, filename, src.data(), src.size(), s_JITFlags, s_FeatureFlags);
if (!parseResult.second.empty()) {
Trap::TrapResult tr;
tr.exception = Exception::create(parseResult.second);
Expand Down
92 changes: 75 additions & 17 deletions src/wasi/WASI02Impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,21 @@

namespace Walrus {

enum OptionalTypes : uint8_t {
optionalNone = 0,
optionalSome = 1,
};

enum ResultTypes : uint8_t {
resultOk = 0,
resultError = 1,
};

enum StreamErrorTypes : uint8_t {
streamErrLastOperationFailed = 0,
streamErrClosed = 1,
};

enum DescriptorFlags : uint32_t {
flagRead = 1 << 0,
flagWrite = 1 << 1,
Expand All @@ -38,6 +53,17 @@ enum OpenFlags : uint32_t {
openTruncate = 1 << 3,
};

enum FileType : uint8_t {
fileTypeUnknown = 0,
fileTypeBlockDevice = 1,
fileTypeCharacterDevice = 2,
fileTypeDirectory = 3,
fileTypeFifo = 4,
fileTypeSymbolicLink = 5,
fileTypeRegularFile = 6,
fileTypeSocket = 7,
};

static void throwNoMemory(ExecutionState& state)
{
std::string message = "out of memory";
Expand Down Expand Up @@ -94,7 +120,7 @@ void callWasiFunction(ExecutionState& state, Value* argv, Value* result, LiftedW
uint32_t offset = argv[1].asI32();
uint64_t value = 0xffffffff;
options->memory()->store(state, offset, 8, value);
options->memory()->buffer()[offset] = 0;
options->memory()->buffer()[offset] = resultOk;
break;
}
case LiftedWasiFunction::ioInputStreamRead02: {
Expand All @@ -103,7 +129,7 @@ void callWasiFunction(ExecutionState& state, Value* argv, Value* result, LiftedW
uint32_t offset = argv[2].asI32();

ASSERT(!options->memory()->is64());
options->memoryCheckRange32(state, 1, offset, 12);
options->memoryCheckRange32(state, 4, offset, 12);

ComponentHandle* handle = options->instance()->getHandle(state, index);
if (handle->kind() != ComponentHandle::ResourceWasiInputStreamKind) {
Expand All @@ -112,8 +138,8 @@ void callWasiFunction(ExecutionState& state, Value* argv, Value* result, LiftedW

ComponentResourceWasiStream* stream = asStream(handle);
if (stream->isClosed()) {
options->memory()->buffer()[offset + 4] = 1;
options->memory()->buffer()[offset] = 1;
options->memory()->buffer()[offset + 4] = streamErrClosed;
options->memory()->buffer()[offset] = resultError;
break;
}

Expand All @@ -126,7 +152,7 @@ void callWasiFunction(ExecutionState& state, Value* argv, Value* result, LiftedW
uint32_t start = options->memoryMalloc32(state, 1, read);
memcpy(options->memory()->buffer() + start, buffer.data(), size);

options->memory()->buffer()[offset] = 0;
options->memory()->buffer()[offset] = resultOk;
uint32_t* list = reinterpret_cast<uint32_t*>(options->memory()->buffer() + offset);
list[1] = start;
list[2] = read;
Expand Down Expand Up @@ -164,11 +190,11 @@ void callWasiFunction(ExecutionState& state, Value* argv, Value* result, LiftedW
}

ASSERT(!options->memory()->is64());
options->memoryCheckRange32(state, 1, offset, 12);
options->memoryCheckRange32(state, 4, offset, 12);
ComponentResourceWasiStream* stream = asStream(handle);
if (stream->isClosed()) {
options->memory()->buffer()[offset + 4] = 1;
options->memory()->buffer()[offset] = 1;
options->memory()->buffer()[offset + 4] = streamErrClosed;
options->memory()->buffer()[offset] = resultError;
break;
}

Expand All @@ -181,7 +207,7 @@ void callWasiFunction(ExecutionState& state, Value* argv, Value* result, LiftedW
size_t written = fwrite(options->memory()->buffer() + bufferStart, bufferSize, 1, stream->file());
stream->advanceOffset(written);

options->memory()->buffer()[offset] = 0;
options->memory()->buffer()[offset] = resultOk;
break;
}
case LiftedWasiFunction::ioOutputStreamBlockingFlush02: {
Expand All @@ -194,8 +220,8 @@ void callWasiFunction(ExecutionState& state, Value* argv, Value* result, LiftedW
}

ASSERT(!options->memory()->is64());
options->memoryCheckRange32(state, 1, offset, 12);
options->memory()->buffer()[offset] = 0;
options->memoryCheckRange32(state, 4, offset, 12);
options->memory()->buffer()[offset] = resultOk;
break;
}
case LiftedWasiFunction::cliGetEnvironment02: {
Expand Down Expand Up @@ -254,8 +280,16 @@ void callWasiFunction(ExecutionState& state, Value* argv, Value* result, LiftedW
}
break;
}
case LiftedWasiFunction::cliGetStdout02: {
WasiRefCountedFile* fileRef = new WasiRefCountedFile(stdout);
case LiftedWasiFunction::cliGetStdin02:
case LiftedWasiFunction::cliGetStdout02:
case LiftedWasiFunction::cliGetStderr02: {
FILE* file = stdin;
if (function->type() == LiftedWasiFunction::cliGetStdout02) {
file = stdout;
} else if (function->type() == LiftedWasiFunction::cliGetStderr02) {
file = stderr;
}
WasiRefCountedFile* fileRef = new WasiRefCountedFile(file);
ComponentTypeResource* resourceType = instance->type()->getType(0)->asTypeResource();
ComponentResource* resource = new ComponentResourceWasiStream(resourceType, ComponentHandle::ResourceWasiOutputStreamKind, fileRef, ComponentResourceWasiStream::NoSeek);
result[0] = Value(static_cast<int32_t>(options->instance()->appendHandle(state, resource)));
Expand All @@ -266,7 +300,7 @@ void callWasiFunction(ExecutionState& state, Value* argv, Value* result, LiftedW
uint32_t offset = argv[0].asI32();
uint32_t value = options->instance()->appendHandle(state, resource);
options->memory()->store(state, offset, 4, value);
options->memory()->buffer()[offset] = 1;
options->memory()->buffer()[offset] = optionalSome;
break;
}
case LiftedWasiFunction::clockMonotonicNow02: {
Expand All @@ -293,7 +327,31 @@ void callWasiFunction(ExecutionState& state, Value* argv, Value* result, LiftedW
ComponentResource* resource = new ComponentResourceWasiStream(resourceType, ComponentHandle::ResourceWasiInputStreamKind, fileRef, offset);
uint32_t resultResource = options->instance()->appendHandle(state, resource);
options->memory()->store(state, resultOffset, 4, resultResource);
options->memory()->buffer()[resultOffset] = 0;
options->memory()->buffer()[resultOffset] = resultOk;
break;
}
case LiftedWasiFunction::fileSystemDescriptorStat02: {
uint32_t descriptorIndex = argv[0].asI32();
uint32_t offset = argv[1].asI32();

ComponentHandle* handle = options->instance()->getHandle(state, descriptorIndex);
if (handle->kind() != ComponentHandle::ResourceWasiFileKind) {
ComponentInstance::throwInvalidHandle(state, descriptorIndex);
}

ComponentResourceWasiFile* file = asFile(handle);

options->memoryCheckRange32(state, 8, offset, 96);
uint8_t* buffer = options->memory()->buffer() + offset;
buffer[0] = resultOk;
buffer[8] = fileTypeRegularFile;
*reinterpret_cast<uint64_t*>(buffer + 16) = 1;
fseek(file->file(), 0, SEEK_END);
*reinterpret_cast<uint64_t*>(buffer + 24) = static_cast<uint64_t>(ftell(file->file()));
// Optional(dateTime) is 24 bytes long.
buffer[32] = optionalNone;
buffer[56] = optionalNone;
buffer[80] = optionalNone;
break;
}
case LiftedWasiFunction::fileSystemDescriptorOpenAt02: {
Expand Down Expand Up @@ -345,15 +403,15 @@ void callWasiFunction(ExecutionState& state, Value* argv, Value* result, LiftedW
if (file == NULL) {
// Support more error codes.
options->memory()->store(state, resultOffset, 4, 0);
options->memory()->buffer()[resultOffset] = 1;
options->memory()->buffer()[resultOffset] = resultError;
break;
}

WasiRefCountedFile* fileRef = new WasiRefCountedFile(file);
ComponentResource* resource = new ComponentResourceWasiFile(instance->type()->getType(0)->asTypeResource(), fileRef);
uint32_t resultResource = options->instance()->appendHandle(state, resource);
options->memory()->store(state, resultOffset, 4, resultResource);
options->memory()->buffer()[resultOffset] = 0;
options->memory()->buffer()[resultOffset] = resultOk;
break;
}
case LiftedWasiFunction::fileSystemGetDirectories02: {
Expand Down
Loading