Skip to content

remove bugged ISA checks from lib/src/sailsim-riscv.cpp #1

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

Open
Lyssia-Seiden wants to merge 2 commits into
base: main
Choose a base branch
from
Open

remove bugged ISA checks from lib/src/sailsim-riscv.cpp #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6cbd11
remove bugged ISA checks from sailsim-riscv.cpp
LewisSeiden Nov 17, 2025
d239b5a
fix formatting
LewisSeiden Nov 17, 2025
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
22 changes: 4 additions & 18 deletions lib/src/sailsim_riscv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,9 @@ sailsim_isa_t sailsim_detect_elf_isa(const char* elf_path) {
}

try {
ELF elf = ELF::open(elf_path);
ISA elf_isa = elf.isa();

switch (elf_isa) {
case ISA::RISCV:
return SAILSIM_ISA_RISCV;
case ISA::ARM:
return SAILSIM_ISA_ARM;
default:
return SAILSIM_ISA_UNKNOWN;
}
// throws if the elf isnt RISC-V
ELF _elf = ELF::open(elf_path);
return SAILSIM_ISA_RISCV;
} catch (const std::exception& e) {
return SAILSIM_ISA_UNKNOWN;
}
Expand Down Expand Up @@ -205,15 +197,9 @@ bool sailsim_load_elf(sailsim_context_t* ctx, const char* elf_path) {

try {
// Load ELF file using ELF class from elf_loader.h
// throws if the elf isnt RISC-V
ELF elf = ELF::open(elf_path);

// Validate this is a RISC-V ELF file
ISA elf_isa = elf.isa();
if (elf_isa != ISA::RISCV) {
ctx->last_error = "ELF file is not RISC-V (this library only supports RISC-V)";
return false;
}

// Load segments into memory using RISC-V write_mem
elf.load([](uint64_t addr, const uint8_t* data, uint64_t len) {
for (uint64_t i = 0; i < len; i++) {
Expand Down