Skip to content

fix: fix libc io ret value #14

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
DarkSharpness merged 1 commit into from
Dec 16, 2025
Merged

fix: fix libc io ret value #14

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
30 changes: 8 additions & 22 deletions src/libc/inout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,49 +125,40 @@ auto puts(Executable &, RegisterFile &rf, Memory &mem, Device &dev) -> Hint {
auto ptr = rf[Register::a0];
auto str = checked_get_string<_Index::puts>(mem, ptr);
dev.out << str << '\n';

dev.counter.libcIO += kLibcOverhead + io(str.size() + 1);

return return_to_user(rf, mem, 0);
}

auto putchar(Executable &, RegisterFile &rf, Memory &mem, Device &dev) -> Hint {
auto c = rf[Register::a0];
dev.out.put(static_cast<char>(c));
dev.counter.libcIO += kLibcOverhead + io(1);
return return_to_user(rf, mem, 0);
return return_to_user(rf, mem, c);
}

auto printf(Executable &, RegisterFile &rf, Memory &mem, Device &dev) -> Hint {
auto ptr = rf[Register::a0];
auto fmt = checked_get_string<_Index::printf>(mem, ptr);
auto os = std::stringstream{};
checked_printf_impl<_Index::printf>(rf, mem, os, fmt, Register::a1);

auto str = std::move(os).str();
dev.out << str;

dev.counter.libcIO += kLibcOverhead + io(str.size()) + op(fmt.size());

return return_to_user(rf, mem, 0);
return return_to_user(rf, mem, str.size());
}

auto sprintf(Executable &, RegisterFile &rf, Memory &mem, Device &dev) -> Hint {
auto ptr0 = rf[Register::a0];
auto ptr1 = rf[Register::a1];
auto fmt = checked_get_string<_Index::sprintf>(mem, ptr1);

auto os = std::stringstream{};
auto os = std::stringstream{};
checked_printf_impl<_Index::sprintf>(rf, mem, os, fmt, Register::a2);

auto str = std::move(os).str();
auto raw = checked_get_area<_Index::sprintf>(mem, ptr0, str.size() + 1);
std::memcpy(raw, str.data(), str.size() + 1);

// Format time + IO time
dev.counter.libcOp += kLibcOverhead + io(str.size()) + op(fmt.size());

return return_to_user(rf, mem, ptr0);
return return_to_user(rf, mem, str.size());
}

auto getchar(Executable &, RegisterFile &rf, Memory &mem, Device &dev) -> Hint {
Expand All @@ -181,24 +172,19 @@ auto scanf(Executable &, RegisterFile &rf, Memory &mem, Device &dev) -> Hint {
auto fmt = checked_get_string<_Index::scanf>(mem, ptr);
auto &is = dev.in;
auto result = checked_scanf_impl<_Index::scanf>(rf, mem, is, fmt, Register::a1);

dev.counter.libcIO += kLibcOverhead + io(result.second) + op(fmt.size());

return return_to_user(rf, mem, result.first);
}

auto sscanf(Executable &, RegisterFile &rf, Memory &mem, Device &dev) -> Hint {
auto ptr0 = rf[Register::a0];
auto ptr1 = rf[Register::a1];
auto str = checked_get_string<_Index::sscanf>(mem, ptr0);
auto fmt = checked_get_string<_Index::sscanf>(mem, ptr1);

auto ptr0 = rf[Register::a0];
auto ptr1 = rf[Register::a1];
auto str = checked_get_string<_Index::sscanf>(mem, ptr0);
auto fmt = checked_get_string<_Index::sscanf>(mem, ptr1);
auto is = std::stringstream{std::string(str)};
auto result = checked_scanf_impl<_Index::sscanf>(rf, mem, is, fmt, Register::a2);

// Format time + IO time
dev.counter.libcOp += kLibcOverhead + op(result.second) + op(fmt.size());

return return_to_user(rf, mem, result.first);
}

Expand Down