Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-20 15:31:22 +00:00
Code Issues Projects Releases Wiki Activity

Make sure reported fault instruction address falls into the expected code

Browse Source 
range. This is a configure-time safety net that depends on the GCC "Labels
as Values" extension.
This commit is contained in:
gbeauche 2003-10-12 21:41:19 +00:00
parent 006f72c9fe
commit 46dc8c5391
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BasiliskII/src/Unix/sigsegv.cpp
View File

@ -1201,10 +1201,25 @@ static sigsegv_return_t sigsegv_test_handler(sigsegv_address_t fault_address, si
} }
#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION #ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
#ifdef __GNUC__
// Code range where we expect the fault to come from
static void *b_region, *e_region;
#endif
static sigsegv_return_t sigsegv_insn_handler(sigsegv_address_t fault_address, sigsegv_address_t instruction_address) static sigsegv_return_t sigsegv_insn_handler(sigsegv_address_t fault_address, sigsegv_address_t instruction_address)
{ {
if (((unsigned long)fault_address - (unsigned long)page) < page_size) if (((unsigned long)fault_address - (unsigned long)page) < page_size) {
#ifdef __GNUC__
// Make sure reported fault instruction address falls into
// expected code range
if (instruction_address != SIGSEGV_INVALID_PC
&& ((instruction_address < (sigsegv_address_t)b_region) ||
(instruction_address >= (sigsegv_address_t)e_region)))
return SIGSEGV_RETURN_FAILURE;
#endif
return SIGSEGV_RETURN_SKIP_INSTRUCTION; return SIGSEGV_RETURN_SKIP_INSTRUCTION;
}
return SIGSEGV_RETURN_FAILURE; return SIGSEGV_RETURN_FAILURE;
} }
#endif #endif
@ -1251,9 +1266,15 @@ int main(void)
return 1; \ return 1; \
} while (0) } while (0)
#ifdef __GNUC__
b_region = &&L_b_region;
e_region = &&L_e_region;
#endif
L_b_region:
TEST_SKIP_INSTRUCTION(unsigned char); TEST_SKIP_INSTRUCTION(unsigned char);
TEST_SKIP_INSTRUCTION(unsigned short); TEST_SKIP_INSTRUCTION(unsigned short);
TEST_SKIP_INSTRUCTION(unsigned int); TEST_SKIP_INSTRUCTION(unsigned int);
L_e_region:
#endif #endif
vm_exit(); vm_exit();