Skip to content

Fix jump-table accesses in MMIO regions #1945

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
aswaterman merged 1 commit into from
Mar 29, 2025
Merged

Fix jump-table accesses in MMIO regions #1945

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
11 changes: 9 additions & 2 deletions riscv/mmu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,15 @@ class mmu_t

template<typename T>
T ALWAYS_INLINE fetch_jump_table(reg_t addr) {
auto tlb_entry = translate_insn_addr(addr);
return from_target(*(target_endian<T>*)(tlb_entry.host_offset + addr));
typedef std::remove_const<std::remove_pointer<decltype(translate_insn_addr_to_host(addr))>::type>::type U;
U parcels[sizeof(T) / sizeof(U)];

for (size_t i = 0; i < std::size(parcels); i++)
parcels[i] = *translate_insn_addr_to_host(addr + i * sizeof(U));

target_endian<T> res;
memcpy(&res, parcels, sizeof(T));
return from_target(res);
}

inline icache_entry_t* refill_icache(reg_t addr, icache_entry_t* entry)
Expand Down