ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-08 11:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nova: remove nova_die and throw from ipc layer

Browse Source 
Issue #5443
This commit is contained in:
Alexander Boettcher 2025-02-04 15:01:57 +01:00 committed by Christian Helmuth
parent 83cae3591f
commit 76a4253132
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
repos/base-nova/src/lib/base/ipc.cc
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (C) 2009-2017 Genode Labs GmbH
* Copyright (C) 2009-2025 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU Affero General Public License version 3.
@ -14,7 +14,6 @@
/* Genode includes */
#include <base/ipc.h>
#include <base/thread.h>
#include <base/log.h>
/* base-internal includes */
#include <base/internal/ipc.h>
@ -46,7 +45,7 @@ Rpc_exception_code Genode::ipc_call(Native_capability dst,
/* if this happens, the call is bogus and invalid */
if ((log2_max >= sizeof(rcv_caps) * 8))
throw Ipc_error();
return Rpc_exception_code(Rpc_exception_code::INVALID_OBJECT);
if ((1UL << log2_max) < rcv_caps)
log2_max ++;
@ -59,10 +58,8 @@ Rpc_exception_code Genode::ipc_call(Native_capability dst,
Nova::Utcb &utcb = *(Nova::Utcb *)myself->utcb();
/* the protocol value is unused as the badge is delivered by the kernel */
if (!copy_msgbuf_to_utcb(utcb, snd_msg, 0)) {
error("could not setup IPC");
throw Ipc_error();
}
if (!copy_msgbuf_to_utcb(utcb, snd_msg, 0))
return Rpc_exception_code(Rpc_exception_code::INVALID_OBJECT);
/*
* Determine manually defined selector for receiving the call result.
@ -74,7 +71,7 @@ Rpc_exception_code Genode::ipc_call(Native_capability dst,
/* if we can't setup receive window, die in order to recognize the issue */
if (!rcv_window.prepare_rcv_window(utcb, manual_rcv_sel))
/* printf doesn't work here since for IPC also rcv_prepare* is used */
nova_die();
return Rpc_exception_code(Rpc_exception_code::INVALID_OBJECT);
/* establish the mapping via a portal traversal */
uint8_t res = Nova::call(dst.local_name());