diff --git a/src/osdep/gui/PanelRAM.cpp b/src/osdep/gui/PanelRAM.cpp index 4a6eaabb4..351af8ecc 100644 --- a/src/osdep/gui/PanelRAM.cpp +++ b/src/osdep/gui/PanelRAM.cpp @@ -373,7 +373,6 @@ void RefreshPanelRAM() } } - bool HelpPanelRAM(std::vector& helptext) { helptext.clear(); diff --git a/src/osdep/sigsegv_handler.cpp b/src/osdep/sigsegv_handler.cpp index 2f2b3a11e..ff90371e4 100644 --- a/src/osdep/sigsegv_handler.cpp +++ b/src/osdep/sigsegv_handler.cpp @@ -159,16 +159,6 @@ static int handle_exception(mcontext_t sigcont, long fault_addr) break; } - // Did the error happen in compiled code? - if (fault_pc >= uintptr(compiled_code) && fault_pc < uintptr(current_compile_p)) - output_log(_T("Error in compiled code.\n")); - else if (fault_pc >= uintptr(popallspace) && fault_pc < uintptr(popallspace + POPALLSPACE_SIZE)) - output_log(_T("Error in popallspace code.\n")); - else { - output_log(_T("Error not in JIT code.\n")); - break; - } - // Get Amiga address of illegal memory address long amiga_addr = long(fault_addr) - long(regs.natmem_offset); @@ -196,6 +186,16 @@ static int handle_exception(mcontext_t sigcont, long fault_addr) break; } + // Did the error happen in compiled code? + if (fault_pc >= uintptr(compiled_code) && fault_pc < uintptr(current_compile_p)) + output_log(_T("Error in compiled code.\n")); + else if (fault_pc >= uintptr(popallspace) && fault_pc < uintptr(popallspace + POPALLSPACE_SIZE)) + output_log(_T("Error in popallspace code.\n")); + else { + output_log(_T("Error not in JIT code.\n")); + break; + } + // Get memory bank of address addrbank* ab = &get_mem_bank(amiga_addr); if (ab) @@ -602,16 +602,6 @@ static int handle_exception(unsigned long* pregs, long fault_addr) break; } - // Did the error happen in compiled code? - if ((uae_u8*)fault_pc >= compiled_code && (uae_u8*)fault_pc < current_compile_p) - output_log(_T("Error in compiled code.\n")); - else if ((uae_u8*)fault_pc >= popallspace && (uae_u8*)fault_pc < popallspace + POPALLSPACE_SIZE) - output_log(_T("Error in popallspace code.\n")); - else { - output_log(_T("Error not in JIT code.\n")); - break; - } - // Get Amiga address of illegal memory address auto amiga_addr = (long)fault_addr - (long)regs.natmem_offset; @@ -630,7 +620,17 @@ static int handle_exception(unsigned long* pregs, long fault_addr) handled = HANDLE_EXCEPTION_A4000RAM; break; } - + + // Did the error happen in compiled code? + if ((uae_u8*)fault_pc >= compiled_code && (uae_u8*)fault_pc < current_compile_p) + output_log(_T("Error in compiled code.\n")); + else if ((uae_u8*)fault_pc >= popallspace && (uae_u8*)fault_pc < popallspace + POPALLSPACE_SIZE) + output_log(_T("Error in popallspace code.\n")); + else { + output_log(_T("Error not in JIT code.\n")); + break; + } + // Get memory bank of address auto* ab = &get_mem_bank(amiga_addr); if (ab)