From 8c5f350e0e786bc7e5cad30ec07c5408b60a4ca2 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Fri, 2 May 2014 09:59:42 +0200 Subject: [PATCH] nova: avoid fault during core thread fault dump --- base-nova/src/core/include/util.h | 3 ++- base-nova/src/core/platform.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/base-nova/src/core/include/util.h b/base-nova/src/core/include/util.h index a353452d6..84eb0993e 100644 --- a/base-nova/src/core/include/util.h +++ b/base-nova/src/core/include/util.h @@ -42,7 +42,8 @@ namespace Genode { printf("%s (%s pf_addr=%p pf_ip=%p from %02lx %s)\n", msg, pf_type == Rm_session::WRITE_FAULT ? "WRITE" : "READ", (void *)pf_addr, (void *)pf_ip, - faulter_badge, reinterpret_cast(faulter_badge)); + faulter_badge, + faulter_badge ? reinterpret_cast(faulter_badge) : 0); } diff --git a/base-nova/src/core/platform.cc b/base-nova/src/core/platform.cc index 71b6e2fba..2e83209cc 100644 --- a/base-nova/src/core/platform.cc +++ b/base-nova/src/core/platform.cc @@ -107,7 +107,7 @@ static void page_fault_handler() addr_t pf_type = utcb->qual[0]; print_page_fault("\nPAGE-FAULT IN CORE", pf_addr, pf_ip, - (Genode::Rm_session::Fault_type)pf_type, ~0UL); + (Genode::Rm_session::Fault_type)pf_type, 0); /* dump stack trace */ struct Core_img