folkert/KEK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

corrected placement of [[unlikely]]

Browse source
This commit is contained in:
folkert van heusden 2024-05-04 18:58:03 +02:00
parent 44317e69c0
commit 9c46999730
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mmu.cpp
View file

@ -321,13 +321,13 @@ uint32_t mmu::calculate_physical_address(cpu *const c, const int run_mode, const
uint32_t io_base = get_io_base(); uint32_t io_base = get_io_base();
bool is_io = m_offset >= io_base; bool is_io = m_offset >= io_base;
if (trap_on_failure) [[unlikely]] { if (trap_on_failure) {
{ {
auto rc = get_trap_action(run_mode, d, apf, is_write); auto rc = get_trap_action(run_mode, d, apf, is_write);
auto trap_action = rc.first; auto trap_action = rc.first;
int access_control = rc.second; int access_control = rc.second;
if (trap_action != T_PROCEED) { if (trap_action != T_PROCEED) [[unlikely]] {
if (is_write) if (is_write)
set_page_trapped(run_mode, d, apf); set_page_trapped(run_mode, d, apf);
@ -406,7 +406,7 @@ uint32_t mmu::calculate_physical_address(cpu *const c, const int run_mode, const
// DOLOG(debug, false, "p_offset %06o pdr_len %06o direction %d, run_mode %d, apf %d, pdr: %06o", p_offset, pdr_len, direction, run_mode, apf, pages[run_mode][d][apf].pdr); // DOLOG(debug, false, "p_offset %06o pdr_len %06o direction %d, run_mode %d, apf %d, pdr: %06o", p_offset, pdr_len, direction, run_mode, apf, pages[run_mode][d][apf].pdr);
if ((pdr_cmp > pdr_len && direction == false) || (pdr_cmp < pdr_len && direction == true)) { if ((pdr_cmp > pdr_len && direction == false) || (pdr_cmp < pdr_len && direction == true)) [[unlikely]] {
DOLOG(debug, false, "mmu::calculate_physical_address::p_offset %o versus %o direction %d", pdr_cmp, pdr_len, direction); DOLOG(debug, false, "mmu::calculate_physical_address::p_offset %o versus %o direction %d", pdr_cmp, pdr_len, direction);
DOLOG(debug, false, "TRAP(0250) (throw 7) on address %06o", a); DOLOG(debug, false, "TRAP(0250) (throw 7) on address %06o", a);
c->trap(0250); // invalid access c->trap(0250); // invalid access