1.1 --- a/libexec/lib/src/external_pager.cc Mon Mar 06 16:19:15 2023 +0100
1.2 +++ b/libexec/lib/src/external_pager.cc Mon Mar 06 18:30:22 2023 +0100
1.3 @@ -76,7 +76,7 @@
1.4
1.5 if (l4_is_valid_cap(_task))
1.6 {
1.7 - ipc_unmap_capability(_task, _rtask);
1.8 + ipc_unmap_capability(_task, _mapped_task);
1.9 ipc_cap_free_um(_task);
1.10 _task = L4_INVALID_CAP;
1.11 }
1.12 @@ -86,10 +86,10 @@
1.13
1.14 /* Manage the task and thread capabilities. */
1.15
1.16 -void ExternalPager::add_thread(l4_cap_idx_t cap, l4_cap_idx_t rcap)
1.17 +void ExternalPager::add_thread(l4_cap_idx_t cap, l4_cap_idx_t mapped_cap)
1.18 {
1.19 _threads.push_back(cap);
1.20 - _rthreads.push_back(rcap);
1.21 + _mapped_threads.push_back(mapped_cap);
1.22 }
1.23
1.24 void ExternalPager::set_gate(l4_cap_idx_t cap)
1.25 @@ -97,22 +97,22 @@
1.26 _ipc_gate = cap;
1.27 }
1.28
1.29 -void ExternalPager::set_pager(l4_cap_idx_t cap, l4_cap_idx_t rcap)
1.30 +void ExternalPager::set_pager(l4_cap_idx_t cap, l4_cap_idx_t mapped_cap)
1.31 {
1.32 _pager = cap;
1.33 - _rpager = rcap;
1.34 + _mapped_pager = mapped_cap;
1.35 }
1.36
1.37 -void ExternalPager::set_parent(l4_cap_idx_t cap, l4_cap_idx_t rcap)
1.38 +void ExternalPager::set_parent(l4_cap_idx_t cap, l4_cap_idx_t mapped_cap)
1.39 {
1.40 _parent = cap;
1.41 - _rparent = rcap;
1.42 + _mapped_parent = mapped_cap;
1.43 }
1.44
1.45 -void ExternalPager::set_task(l4_cap_idx_t cap, l4_cap_idx_t rcap)
1.46 +void ExternalPager::set_task(l4_cap_idx_t cap, l4_cap_idx_t mapped_cap)
1.47 {
1.48 _task = cap;
1.49 - _rtask = rcap;
1.50 + _mapped_task = mapped_cap;
1.51 }
1.52
1.53
1.54 @@ -268,8 +268,8 @@
1.55 {
1.56 /* Parent and pager/region mapper. */
1.57
1.58 - ipc_unmap_capability(_task, _rparent);
1.59 - ipc_unmap_capability(_task, _rpager);
1.60 + ipc_unmap_capability(_task, _mapped_parent);
1.61 + ipc_unmap_capability(_task, _mapped_pager);
1.62
1.63 /* Threads. For some reason, these cannot be released by the process, so
1.64 they are also unmapped on its behalf. */
1.65 @@ -279,7 +279,7 @@
1.66 for (it = _threads.begin(); it != _threads.end(); it++)
1.67 ipc_cap_free_um(*it);
1.68
1.69 - for (it = _rthreads.begin(); it != _rthreads.end(); it++)
1.70 + for (it = _mapped_threads.begin(); it != _mapped_threads.end(); it++)
1.71 ipc_unmap_capability(_task, *it);
1.72 }
1.73 }