michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: implement 64-bit exception recovery logic

Browse source 
The esf has a different set of members on 64-bit.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2019-11-13 12:43:12 -08:00 • committed by Anas Nashif
commit fc589d7279
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/core/fatal.c
View file

@ -378,11 +378,19 @@ void z_x86_page_fault_handler(z_arch_esf_t *esf)
int i; int i;
for (i = 0; i < ARRAY_SIZE(exceptions); i++) { for (i = 0; i < ARRAY_SIZE(exceptions); i++) {
#ifdef CONFIG_X86_64
if ((void *)esf->rip >= exceptions[i].start &&
(void *)esf->rip < exceptions[i].end) {
esf->rip = (u64_t)(exceptions[i].fixup);
return;
}
#else
if ((void *)esf->eip >= exceptions[i].start && if ((void *)esf->eip >= exceptions[i].start &&
(void *)esf->eip < exceptions[i].end) { (void *)esf->eip < exceptions[i].end) {
esf->eip = (unsigned int)(exceptions[i].fixup); esf->eip = (unsigned int)(exceptions[i].fixup);
return; return;
} }
#endif /* CONFIG_X86_64 */
} }
#endif #endif
#ifdef CONFIG_EXCEPTION_DEBUG #ifdef CONFIG_EXCEPTION_DEBUG