diff --git a/repos/base-nova/src/core/include/pager.h b/repos/base-nova/src/core/include/pager.h index db18f28bcd..19cc38baec 100644 --- a/repos/base-nova/src/core/include/pager.h +++ b/repos/base-nova/src/core/include/pager.h @@ -91,7 +91,6 @@ class Core::Pager_object : public Object_pool::Entry DEAD = 0x2U, SINGLESTEP = 0x4U, SIGNAL_SM = 0x8U, - DISSOLVED = 0x10U, SUBMIT_SIGNAL = 0x20U, BLOCKED_PAUSE_SM = 0x40U, MIGRATE = 0x80U @@ -115,9 +114,6 @@ class Core::Pager_object : public Object_pool::Entry inline void mark_signal_sm() { _status |= SIGNAL_SM; } inline bool has_signal_sm() { return _status & SIGNAL_SM; } - inline void mark_dissolved() { _status |= DISSOLVED; } - inline bool dissolved() { return _status & DISSOLVED; } - inline bool to_submit() { return _status & SUBMIT_SIGNAL; } inline void submit_signal() { _status |= SUBMIT_SIGNAL; } inline void reset_submit() { _status &= (uint8_t)(~SUBMIT_SIGNAL); } diff --git a/repos/base-nova/src/core/pager.cc b/repos/base-nova/src/core/pager.cc index 1f8c4c7820..aa2039173f 100644 --- a/repos/base-nova/src/core/pager.cc +++ b/repos/base-nova/src/core/pager.cc @@ -523,8 +523,6 @@ uint8_t Pager_object::_unsynchronized_client_recall(bool get_state_and_block) void Pager_object::cleanup_call() { - _state.mark_dissolved(); - /* revoke ec and sc cap of client before the sm cap */ if (_state.sel_client_ec != Native_thread::INVALID_INDEX) revoke(Obj_crd(_state.sel_client_ec, 2)); @@ -750,10 +748,6 @@ void Pager_object::migrate(Affinity::Location location) Pager_object::~Pager_object() { - /* sanity check that object got dissolved already - otherwise bug */ - if (!_state.dissolved()) - nova_die(); - /* revoke portal used for the cleanup call and sm cap for blocking state */ revoke(Obj_crd(_selectors, 2)); cap_map().remove(_selectors, 2, false);