Add vg_ prefix to the (hopefully) remaining viengoos symbols.

2008-12-18  Neal H. Walfield  <neal@gnu.org>

	* viengoos/activity.h (struct activity_memory_policy): Rename from
	this...
	(struct vg_activity_memory_policy): ... to this.  Update users.
	(struct activity_policy): Rename from this...
	(struct vg_activity_policy): ... to this.  Update users.
	(ACTIVITY_STATS_PERIODS): Rename from this...
	(VG_ACTIVITY_STATS_PERIODS): ... to this.  Update users.
	(struct activity_stats): Rename from this...
	(struct vg_activity_stats): ... to this.  Update users.
	(struct activity_info): Rename from this...
	(struct vg_activity_info): ... to this.  Update users.
	* viengoos/addr.h (struct addr): Rename from this...
	(struct vg_addr): ... to this.  Update users.
	* viengoos/cap.h (struct object_policy): Rename from this...
	(struct vg_object_policy): ... to this.  Update users.
	(struct object_name): Rename from this...
	(struct vg_object_name): ... to this.  Update users.
	(struct object): Rename from this...
	(struct vg_object): ... to this.  Update users.
	* viengoos/folio.h (struct folio_policy): Rename from this...
	(struct vg_folio_policy): ... to this.  Update users.
	(struct folio): Rename for this...
	(struct vg_folio): ... to this.  Update users.
	* viengoos/thread.h
	(HURD_EXREGS_SET_UTCB): Rename from this...
	(VG_EXREGS_SET_UTCB): ... to this.  Update users.
	(HURD_EXREGS_SET_EXCEPTION_MESSENGER): Rename from this...
	(VG_EXREGS_SET_EXCEPTION_MESSENGER): ... to this.  Update users.
	(HURD_EXREGS_SET_ASPACE): Rename from this...
	(VG_EXREGS_SET_ASPACE): ... to this.  Update users.
	(HURD_EXREGS_SET_ACTIVITY): Rename from this...
	(VG_EXREGS_SET_ACTIVITY): ... to this.  Update users.
	(HURD_EXREGS_SET_SP): Rename from this...
	(VG_EXREGS_SET_SP): ... to this.  Update users.
	(HURD_EXREGS_SET_IP): Rename from this...
	(VG_EXREGS_SET_IP): ... to this.  Update users.
	(HURD_EXREGS_SET_SP_IP): Rename from this...
	(VG_EXREGS_SET_SP_IP): ... to this.  Update users.
	(HURD_EXREGS_SET_EFLAGS): Rename from this...
	(VG_EXREGS_SET_EFLAGS): ... to this.  Update users.
	(HURD_EXREGS_SET_USER_HANDLE): Rename from this...
	(VG_EXREGS_SET_USER_HANDLE): ... to this.  Update users.
	(HURD_EXREGS_SET_REGS): Rename from this...
	(VG_EXREGS_SET_REGS): ... to this.  Update users.
	(HURD_EXREGS_GET_REGS): Rename from this...
	(VG_EXREGS_GET_REGS): ... to this.  Update users.
	(HURD_EXREGS_START): Rename from this...
	(VG_EXREGS_START): ... to this.  Update users.
	(HURD_EXREGS_STOP): Rename from this...
	(VG_EXREGS_STOP): ... to this.  Update users.
	(HURD_EXREGS_ABORT_SEND): Rename from this...
	(VG_EXREGS_ABORT_SEND): ... to this.  Update users.
	(HURD_EXREGS_ABORT_RECEIVE): Rename from this...
	(VG_EXREGS_ABORT_RECEIVE): ... to this.  Update users.
	(HURD_EXREGS_ABORT_IPC): Rename from this...
	(VG_EXREGS_ABORT_IPC): ... to this.  Update users.
	(struct hurd_thread_exregs_in): Rename form this...
	(struct vg_thread_exregs_in): ... to this.  Update users.
	(struct hurd_thread_exregs_out): Rename form this...
	(struct vg_thread_exregs_out): ... to this.  Update users.
	(RPC_STUB_PREFIX): Define to vg_activation.  Update users.
	(RPC_ID_PREFIX): Define to VG_ACTIVATION.  Update users.
	(ACTIVATION_fault): Rename from this...
	(VG_ACTIVATION_fault): ... to this.  Update users.

1 files changed, 55 insertions, 52 deletions

diff --git a/libviengoos/viengoos/thread.h b/libviengoos/viengoos/thread.h
index 2c95f49..a61859f 100644
--- a/libviengoos/viengoos/thread.h
+++ b/libviengoos/viengoos/thread.h
@@ -138,36 +138,6 @@ enum
 #define VG_THREAD_SLOTS_LOG2 2
 
 enum
-{
-  HURD_EXREGS_SET_UTCB = 0x2000,
-  HURD_EXREGS_SET_EXCEPTION_MESSENGER = 0x1000,
-  HURD_EXREGS_SET_ASPACE = 0x800,
-  HURD_EXREGS_SET_ACTIVITY = 0x400,
-  HURD_EXREGS_SET_SP = _L4_XCHG_REGS_SET_SP,
-  HURD_EXREGS_SET_IP = _L4_XCHG_REGS_SET_IP,
-  HURD_EXREGS_SET_SP_IP = _L4_XCHG_REGS_SET_SP | _L4_XCHG_REGS_SET_IP,
-  HURD_EXREGS_SET_EFLAGS = _L4_XCHG_REGS_SET_FLAGS,
-  HURD_EXREGS_SET_USER_HANDLE = _L4_XCHG_REGS_SET_USER_HANDLE,
-  HURD_EXREGS_SET_REGS = (HURD_EXREGS_SET_UTCB
-			  | HURD_EXREGS_SET_EXCEPTION_MESSENGER
-			  | HURD_EXREGS_SET_ASPACE
-			  | HURD_EXREGS_SET_ACTIVITY
-			  | HURD_EXREGS_SET_SP
-			  | HURD_EXREGS_SET_IP
-			  | HURD_EXREGS_SET_EFLAGS
-			  | HURD_EXREGS_SET_USER_HANDLE),
-
-  HURD_EXREGS_GET_REGS = _L4_XCHG_REGS_DELIVER,
-
-  HURD_EXREGS_START = _L4_XCHG_REGS_SET_HALT,
-  HURD_EXREGS_STOP = _L4_XCHG_REGS_SET_HALT | _L4_XCHG_REGS_HALT,
-
-  HURD_EXREGS_ABORT_SEND = _L4_XCHG_REGS_CANCEL_SEND,
-  HURD_EXREGS_ABORT_RECEIVE = _L4_XCHG_REGS_CANCEL_RECV,
-  HURD_EXREGS_ABORT_IPC = HURD_EXREGS_ABORT_SEND | _L4_XCHG_REGS_CANCEL_RECV,
-};
-
-enum
   {
     VG_thread_exregs = 600,
     VG_thread_id,
@@ -186,7 +156,37 @@ typedef vg_addr_t vg_thread_t;
 
 #include <viengoos/rpc.h>
 
-struct hurd_thread_exregs_in
+enum
+{
+  VG_EXREGS_SET_UTCB = 0x2000,
+  VG_EXREGS_SET_EXCEPTION_MESSENGER = 0x1000,
+  VG_EXREGS_SET_ASPACE = 0x800,
+  VG_EXREGS_SET_ACTIVITY = 0x400,
+  VG_EXREGS_SET_SP = _L4_XCHG_REGS_SET_SP,
+  VG_EXREGS_SET_IP = _L4_XCHG_REGS_SET_IP,
+  VG_EXREGS_SET_SP_IP = _L4_XCHG_REGS_SET_SP | _L4_XCHG_REGS_SET_IP,
+  VG_EXREGS_SET_EFLAGS = _L4_XCHG_REGS_SET_FLAGS,
+  VG_EXREGS_SET_USER_HANDLE = _L4_XCHG_REGS_SET_USER_HANDLE,
+  VG_EXREGS_SET_REGS = (VG_EXREGS_SET_UTCB
+			| VG_EXREGS_SET_EXCEPTION_MESSENGER
+			| VG_EXREGS_SET_ASPACE
+			| VG_EXREGS_SET_ACTIVITY
+			| VG_EXREGS_SET_SP
+			| VG_EXREGS_SET_IP
+			| VG_EXREGS_SET_EFLAGS
+			| VG_EXREGS_SET_USER_HANDLE),
+
+  VG_EXREGS_GET_REGS = _L4_XCHG_REGS_DELIVER,
+
+  VG_EXREGS_START = _L4_XCHG_REGS_SET_HALT,
+  VG_EXREGS_STOP = _L4_XCHG_REGS_SET_HALT | _L4_XCHG_REGS_HALT,
+
+  VG_EXREGS_ABORT_SEND = _L4_XCHG_REGS_CANCEL_SEND,
+  VG_EXREGS_ABORT_RECEIVE = _L4_XCHG_REGS_CANCEL_RECV,
+  VG_EXREGS_ABORT_IPC = VG_EXREGS_ABORT_SEND | _L4_XCHG_REGS_CANCEL_RECV,
+};
+
+struct vg_thread_exregs_in
 {
   uintptr_t aspace_cap_properties_flags;
   struct vg_cap_properties aspace_cap_properties;
@@ -197,7 +197,7 @@ struct hurd_thread_exregs_in
   uintptr_t user_handle;
 };
 
-struct hurd_thread_exregs_out
+struct vg_thread_exregs_out
 {
   uintptr_t sp;
   uintptr_t ip;
@@ -208,50 +208,53 @@ struct hurd_thread_exregs_out
 /* l4_exregs wrapper.  */
 RPC (thread_exregs, 6, 1, 4,
      /* cap_t principal, cap_t thread, */
-     uintptr_t, control, struct hurd_thread_exregs_in, in,
+     uintptr_t, control, struct vg_thread_exregs_in, in,
      cap_t, aspace, cap_t, activity, cap_t, utcb, cap_t, exception_messenger,
      /* Out: */
-     struct hurd_thread_exregs_out, out,
+     struct vg_thread_exregs_out, out,
      cap_t, aspace_out, cap_t, activity_out, cap_t, utcb_out,
      cap_t, exception_messenger_out)
 
 static inline error_t
 vg_thread_start (vg_addr_t thread)
 {
-  struct hurd_thread_exregs_in in;
-  struct hurd_thread_exregs_out out;
+  struct vg_thread_exregs_in in;
+  struct vg_thread_exregs_out out;
 
   return vg_thread_exregs (VG_ADDR_VOID, thread,
-			   HURD_EXREGS_START | HURD_EXREGS_ABORT_IPC,
-			   in, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID,
+			   VG_EXREGS_START | VG_EXREGS_ABORT_IPC,
+			   in, VG_ADDR_VOID, VG_ADDR_VOID,
+			   VG_ADDR_VOID, VG_ADDR_VOID,
 			   &out, NULL, NULL, NULL, NULL);
 }
 
 static inline error_t
 vg_thread_start_sp_ip (vg_addr_t thread, uintptr_t sp, uintptr_t ip)
 {
-  struct hurd_thread_exregs_in in;
-  struct hurd_thread_exregs_out out;
+  struct vg_thread_exregs_in in;
+  struct vg_thread_exregs_out out;
 
   in.sp = sp;
   in.ip = ip;
 
   return vg_thread_exregs (VG_ADDR_VOID, thread,
-			   HURD_EXREGS_START | HURD_EXREGS_ABORT_IPC
-			   | HURD_EXREGS_SET_SP_IP,
-			   in, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID,
+			   VG_EXREGS_START | VG_EXREGS_ABORT_IPC
+			   | VG_EXREGS_SET_SP_IP,
+			   in, VG_ADDR_VOID, VG_ADDR_VOID,
+			   VG_ADDR_VOID, VG_ADDR_VOID,
 			   &out, NULL, NULL, NULL, NULL);
 }
 
 static inline error_t
 vg_thread_stop (vg_addr_t thread)
 {
-  struct hurd_thread_exregs_in in;
-  struct hurd_thread_exregs_out out;
+  struct vg_thread_exregs_in in;
+  struct vg_thread_exregs_out out;
 
   return vg_thread_exregs (VG_ADDR_VOID, thread,
-			   HURD_EXREGS_STOP | HURD_EXREGS_ABORT_IPC,
-			   in, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID,
+			   VG_EXREGS_STOP | VG_EXREGS_ABORT_IPC,
+			   in, VG_ADDR_VOID, VG_ADDR_VOID,
+			   VG_ADDR_VOID, VG_ADDR_VOID,
 			   &out, NULL, NULL, NULL, NULL);
 }
 
@@ -266,7 +269,7 @@ RPC(thread_activation_collect, 0, 0, 0
 
 #undef RPC_STUB_PREFIX
 #undef RPC_ID_PREFIX
-
+
 static inline vg_thread_id_t
 vg_myself (void)
 {
@@ -277,14 +280,14 @@ vg_myself (void)
   return tid;
 }
 
-#define RPC_STUB_PREFIX activation
-#define RPC_ID_PREFIX ACTIVATION
+#define RPC_STUB_PREFIX vg_activation
+#define RPC_ID_PREFIX VG_ACTIVATION
 #include <viengoos/rpc.h>
 
 /* Activation message ids.  */
 enum
   {
-    ACTIVATION_fault = 10,
+    VG_ACTIVATION_fault = 10,
   };
 
 /* Return a string corresponding to a message id.  */
@@ -293,7 +296,7 @@ vg_activation_method_id_string (uintptr_t id)
 {
   switch (id)
     {
-    case ACTIVATION_fault:
+    case VG_ACTIVATION_fault:
       return "fault";
     default:
       return "unknown";