diff options
author | Neal H. Walfield <neal@gnu.org> | 2008-12-17 22:24:56 +0100 |
---|---|---|
committer | Neal H. Walfield <neal@gnu.org> | 2008-12-17 22:24:56 +0100 |
commit | 6d78a8b7e141b65c283cda0379e96f7c88f78f78 (patch) | |
tree | e9612e44658d08279cefe2c7d67f55d8605bb35b | |
parent | ff6e2854d787288233cef4b756103d064906e8cf (diff) |
Rename vg_cap_copy to vg_cap_copy_simple.
libviengoos/
2008-12-17 Neal H. Walfield <neal@gnu.org>
* viengoos/cap.h (vg_cap_copy): Rename from this...
(vg_cap_copy_simple): ... to this. Update users.
libc-parts/
2008-12-17 Neal H. Walfield <neal@gnu.org>
* process-spawn.c (process_spawn): Don't use vg_cap_copy but
vg_cap_copy_simple.
libhurd-mm/
2008-12-17 Neal H. Walfield <neal@gnu.org>
* as-build-custom.c (as_insert_custom): Don't use vg_cap_copy but
vg_cap_copy_simple.
* as.h (as_insert_full): Likewise.
-rw-r--r-- | libc-parts/ChangeLog | 5 | ||||
-rw-r--r-- | libc-parts/process-spawn.c | 25 | ||||
-rw-r--r-- | libhurd-mm/ChangeLog | 6 | ||||
-rw-r--r-- | libhurd-mm/as-build-custom.c | 3 | ||||
-rw-r--r-- | libhurd-mm/as.c | 3 | ||||
-rw-r--r-- | libhurd-mm/as.h | 14 | ||||
-rw-r--r-- | libviengoos/ChangeLog | 65 | ||||
-rw-r--r-- | libviengoos/viengoos/cap.h | 20 |
8 files changed, 111 insertions, 30 deletions
diff --git a/libc-parts/ChangeLog b/libc-parts/ChangeLog index 4532e7d..8c55f39 100644 --- a/libc-parts/ChangeLog +++ b/libc-parts/ChangeLog @@ -1,5 +1,10 @@ 2008-12-17 Neal H. Walfield <neal@gnu.org> + * process-spawn.c (process_spawn): Don't use vg_cap_copy but + vg_cap_copy_simple. + +2008-12-17 Neal H. Walfield <neal@gnu.org> + * backtrace.c: Don't include <hurd/exceptions.h>. 2008-12-17 Neal H. Walfield <neal@gnu.org> diff --git a/libc-parts/process-spawn.c b/libc-parts/process-spawn.c index 68beb78..b20ffa5 100644 --- a/libc-parts/process-spawn.c +++ b/libc-parts/process-spawn.c @@ -546,9 +546,9 @@ process_spawn (vg_addr_t activity, as_slot_lookup_use (thread, ({ - r = vg_cap_copy (root_activity, - VG_ADDR_VOID, slot, thread, - VG_ADDR_VOID, rt.cap, rt.storage); + r = vg_cap_copy_simple (root_activity, + VG_ADDR_VOID, slot, thread, + VG_ADDR_VOID, rt.cap, rt.storage); assert (r); })); #endif @@ -577,15 +577,16 @@ process_spawn (vg_addr_t activity, allocate_page_table, do_index); if (ro) - as_slot_lookup_rel_use (root_activity, as_root_cap, addr, - ({ - bool r = vg_cap_copy_x (root_activity, - as_root, slot, addr, - as_root, *slot, addr, - VG_CAP_COPY_WEAKEN, - VG_CAP_PROPERTIES_VOID); - assert (r); - })); + as_slot_lookup_rel_use + (root_activity, as_root_cap, addr, + ({ + bool r = vg_cap_copy_x (root_activity, + as_root, slot, addr, + as_root, *slot, addr, + VG_CAP_COPY_WEAKEN, + VG_CAP_PROPERTIES_VOID); + assert (r); + })); void *local = rt_to_object (rt); diff --git a/libhurd-mm/ChangeLog b/libhurd-mm/ChangeLog index f5d9cdf..eda3af9 100644 --- a/libhurd-mm/ChangeLog +++ b/libhurd-mm/ChangeLog @@ -1,5 +1,11 @@ 2008-12-17 Neal H. Walfield <neal@gnu.org> + * as-build-custom.c (as_insert_custom): Don't use vg_cap_copy but + vg_cap_copy_simple. + * as.h (as_insert_full): Likewise. + +2008-12-17 Neal H. Walfield <neal@gnu.org> + * exceptions.c (hurd_activation_fetch): Use vg_thread_activation_collect_send, not rm_thread_activation_collect_send. diff --git a/libhurd-mm/as-build-custom.c b/libhurd-mm/as-build-custom.c index 0acc415..96efe3d 100644 --- a/libhurd-mm/as-build-custom.c +++ b/libhurd-mm/as-build-custom.c @@ -50,7 +50,8 @@ as_insert_custom (activity_t activity, as_allocate_page_table, object_index, false); assert (slot); - vg_cap_copy (activity, as_root_addr, slot, addr, entry_as, entry, entry_addr); + vg_cap_copy_simple (activity, + as_root_addr, slot, addr, entry_as, entry, entry_addr); return slot; } diff --git a/libhurd-mm/as.c b/libhurd-mm/as.c index e179796..a654e3e 100644 --- a/libhurd-mm/as.c +++ b/libhurd-mm/as.c @@ -437,7 +437,8 @@ as_alloc_slow (int width) struct vg_cap_properties properties = VG_CAP_PROPERTIES_DEFAULT; VG_CAP_ADDR_TRANS_SET_GUARD (&properties.addr_trans, 0, gbits); - err = vg_cap_copy (meta_data_activity, VG_ADDR_VOID, slot, VG_ADDR_VOID, slot, + err = vg_cap_copy (meta_data_activity, + VG_ADDR_VOID, slot, VG_ADDR_VOID, slot, VG_CAP_COPY_COPY_ADDR_TRANS_GUARD, properties); if (err) panic ("failed to copy capability: %d", err); diff --git a/libhurd-mm/as.h b/libhurd-mm/as.h index d3253f8..812693d 100644 --- a/libhurd-mm/as.h +++ b/libhurd-mm/as.h @@ -410,13 +410,13 @@ as_insert_full (activity_t activity, allocate_page_table, ({ bool ret; - ret = vg_cap_copy (activity, - target_as_root_addr, - slot, - target_addr, - source_as_root_addr, - source_cap, - source_addr); + ret = vg_cap_copy_simple (activity, + target_as_root_addr, + slot, + target_addr, + source_as_root_addr, + source_cap, + source_addr); assertx (ret, VG_ADDR_FMT "@" VG_ADDR_FMT " <- " VG_ADDR_FMT "@" VG_ADDR_FMT " (" VG_CAP_FMT ")", diff --git a/libviengoos/ChangeLog b/libviengoos/ChangeLog index 70cb6ed..716b7d4 100644 --- a/libviengoos/ChangeLog +++ b/libviengoos/ChangeLog @@ -1,5 +1,70 @@ 2008-12-17 Neal H. Walfield <neal@gnu.org> + * viengoos/cap.h (vg_cap_copy): Rename from this... + (vg_cap_copy_simple): ... to this. Update users. + +2008-12-17 Neal H. Walfield <neal@gnu.org> + + * viengoos/activity.h (RM_activity_policy): Rename from this... + (VG_activity_policy): ... to this. Update users. + (RM_activity_info): Rename from this... + (VG_activity_info): ... to this. Update users. + (RPC_STUB_PREFIX): Define to vg. + (RPC_ID_PREFIX): Define to VG. + * viengoos/cap.h + (RM_cap_copy): Rename from this... + (VG_cap_copy): ... to this. Update users. + (RM_cap_rubout): Rename from this... + (VG_cap_rubout): ... to this. Update users. + (RM_cap_read): Rename from this... + (VG_cap_read): ... to this. Update users. + (RM_object_discarded_clear): Rename from this... + (VG_object_discarded_clear): ... to this. Update users. + (RM_object_discard): Rename from this... + (VG_object_discard): ... to this. Update users. + (RM_object_status): Rename from this... + (VG_object_status): ... to this. Update users. + (RM_object_reply_on_destruction): Rename from this... + (VG_object_reply_on_destruction): ... to this. Update users. + (RM_object_name): Rename from this... + (VG_object_name): ... to this. Update users. + (RPC_STUB_PREFIX): Define to vg. + (RPC_ID_PREFIX): Define to VG. + * viengoos/folio.h (RM_folio_alloc): Rename from this... + (VG_folio_alloc): ... to this. Update users. + (RM_folio_free): Rename from this... + (Vg_folio_free): ... to this. Update users. + (RM_folio_object_alloc): Rename from this... + (VG_folio_object_alloc): ... to this. Update users. + (RM_folio_policy): Rename from this... + (VG_folio_policy): ... to this. Update users. + (RPC_STUB_PREFIX): Define to vg. + (RPC_ID_PREFIX): Define to VG. + * viengoos/futex.h (RM_futex): Rename from this... + (VG_futex): ... to this. Update users. + (RPC_STUB_PREFIX): Define to vg. + (RPC_ID_PREFIX): Define to VG. + * viengoos/misc.h (RM_write): Rename from this... + (VG_write): ... to this. Update users. + (RM_read): Rename from this... + (VG_read): ... to this. Update users. + (RM_as_dump): Rename from this... + (VG_as_dump): ... to this. Update users. + (RM_fault): Rename from this... + (VG_fault): ... to this. Update users. + (RPC_STUB_PREFIX): Define to vg. + (RPC_ID_PREFIX): Define to VG. + * viengoos/thread.h (RM_thread_exregs): Rename from this... + (RM_thread_exregs): ... to this. Update users. + (RM_thread_id): Rename from this... + (RM_thread_id): ... to this. Update users. + (RM_thread_activation_collect): Rename from this... + (RM_thread_activation_collect): ... to this. Update users. + (RPC_STUB_PREFIX): Define to vg. + (RPC_ID_PREFIX): Define to VG. + +2008-12-17 Neal H. Walfield <neal@gnu.org> + * viengoos/misc.h: Don't include <hurd/exceptions.h>. 2008-12-17 Neal H. Walfield <neal@gnu.org> diff --git a/libviengoos/viengoos/cap.h b/libviengoos/viengoos/cap.h index e6cb1e4..551a054 100644 --- a/libviengoos/viengoos/cap.h +++ b/libviengoos/viengoos/cap.h @@ -565,9 +565,9 @@ vg_cap_to_object (activity_t activity, struct vg_cap *vg_cap) capabilities. */ static inline bool vg_cap_copy_x (activity_t activity, - vg_addr_t target_address_space, struct vg_cap *target, vg_addr_t target_addr, - vg_addr_t source_address_space, struct vg_cap source, vg_addr_t source_addr, - int flags, struct vg_cap_properties properties) + vg_addr_t target_address_space, struct vg_cap *target, vg_addr_t target_addr, + vg_addr_t source_address_space, struct vg_cap source, vg_addr_t source_addr, + int flags, struct vg_cap_properties properties) { /* By default, we preserve SOURCE's subpage specification. */ int subpage = VG_CAP_SUBPAGE (&source); @@ -717,14 +717,16 @@ vg_cap_copy_x (activity_t activity, SOURCE's subpage specification and TARGET's guard. Copies SOURCE's policy. */ static inline bool -vg_cap_copy (activity_t activity, - vg_addr_t target_as, struct vg_cap *target, vg_addr_t target_addr, - vg_addr_t source_as, struct vg_cap source, vg_addr_t source_addr) +vg_cap_copy_simple (activity_t activity, + vg_addr_t target_as, + struct vg_cap *target, vg_addr_t target_addr, + vg_addr_t source_as, + struct vg_cap source, vg_addr_t source_addr) { return vg_cap_copy_x (activity, target_as, target, target_addr, - source_as, source, source_addr, - VG_CAP_COPY_DISCARDABLE_SET | VG_CAP_COPY_PRIORITY_SET, - VG_CAP_PROPERTIES_GET (source)); + source_as, source, source_addr, + VG_CAP_COPY_DISCARDABLE_SET | VG_CAP_COPY_PRIORITY_SET, + VG_CAP_PROPERTIES_GET (source)); } #endif |