add rpc_versions for vm types

* vm_types.h: add new types and conversion functions
* mach_types.defs: adapt vm types depending on kernel user/server
* vm_info.h: adapt rpc structure to have uniformly-sized members also
  on 64-bit
* x86_64/configfrag.c: add new option to select the user-space variant.

Note that with this change the user-space interface is somehow fixed,
i.e. it can't support 32-bit and 64-bit tasks at the same time.
If this would be needed at some point, this change needs to be reworked.

Signed-off-by: Luca Dariz <luca@orpolo.org>
Message-Id: <20220403145955.120742-3-luca@orpolo.org>

2 files changed, 40 insertions, 15 deletions

diff --git a/include/mach/mach_types.defs b/include/mach/mach_types.defs
index a0e9241c..a271d597 100644
--- a/include/mach/mach_types.defs
+++ b/include/mach/mach_types.defs
@@ -110,9 +110,34 @@ type ipc_space_t = mach_port_t
 #endif	/* KERNEL_SERVER */
 		;
 
-type vm_address_t = natural_t;
-type vm_offset_t = natural_t;
-type vm_size_t = natural_t;
+#if defined(KERNEL_SERVER) && defined(USER32)
+type rpc_vm_size_t = uint32_t;
+#else /* KERNEL_SERVER and USER32 */
+#if defined(__x86_64__)
+type rpc_vm_size_t = uint64_t;
+#else /* __x86_64__ */
+type rpc_vm_size_t = uint32_t;
+#endif /* __x86_64__ */
+#endif /* KERNEL_SERVER and USER32 */
+
+type vm_address_t = rpc_vm_size_t
+#if defined(KERNEL_SERVER) || defined(KERNEL_USER)
+    intran: vm_address_t convert_vm_from_user(rpc_vm_address_t)
+    outtran: rpc_vm_address_t convert_vm_to_user(vm_address_t)
+#endif
+    ;
+type vm_offset_t = rpc_vm_size_t
+#if defined(KERNEL_SERVER) || defined(KERNEL_USER)
+    intran: vm_offset_t convert_vm_from_user(rpc_vm_offset_t)
+    outtran: rpc_vm_offset_t convert_vm_to_user(vm_offset_t)
+#endif
+    ;
+type vm_size_t = rpc_vm_size_t
+#if defined(KERNEL_SERVER) || defined(KERNEL_USER)
+    intran: vm_size_t convert_vm_from_user(rpc_vm_size_t)
+    outtran: rpc_vm_size_t convert_vm_to_user(vm_size_t)
+#endif
+;
 type vm_prot_t = int;
 type vm_inherit_t = int;
 type vm_statistics_data_t = struct[13] of integer_t;
diff --git a/include/mach_debug/vm_info.h b/include/mach_debug/vm_info.h
index b50fb92d..e68bb1d5 100644
--- a/include/mach_debug/vm_info.h
+++ b/include/mach_debug/vm_info.h
@@ -46,8 +46,8 @@
  */
 
 typedef struct vm_region_info {
-	vm_offset_t vri_start;		/* start of region */
-	vm_offset_t vri_end;		/* end of region */
+	rpc_vm_offset_t vri_start;		/* start of region */
+	rpc_vm_offset_t vri_end;		/* end of region */
 
 /*vm_prot_t*/natural_t vri_protection;	/* protection code */
 /*vm_prot_t*/natural_t vri_max_protection;	/* maximum protection */
@@ -55,8 +55,8 @@ typedef struct vm_region_info {
 	natural_t vri_wired_count;	/* number of times wired */
 	natural_t vri_user_wired_count; /* number of times user has wired */
 
-	vm_offset_t vri_object;		/* the mapped object */
-	vm_offset_t vri_offset;		/* offset into object */
+	rpc_vm_offset_t vri_object;		/* the mapped object */
+	rpc_vm_offset_t vri_offset;		/* offset into object */
 /*boolean_t*/integer_t vri_needs_copy;	/* does object need to be copied? */
 	natural_t vri_sharing;	/* share map references */
 } vm_region_info_t;
@@ -77,19 +77,19 @@ typedef natural_t vm_object_info_state_t;
 #define VOI_STATE_LOCK_RESTART		0x00000100
 
 typedef struct vm_object_info {
-	vm_offset_t voi_object;		/* this object */
-	vm_size_t voi_pagesize;		/* object's page size */
-	vm_size_t voi_size;		/* object size (valid if internal) */
+	rpc_vm_offset_t voi_object;		/* this object */
+	rpc_vm_size_t voi_pagesize;		/* object's page size */
+	rpc_vm_size_t voi_size;		/* object size (valid if internal) */
 	natural_t voi_ref_count;	/* number of references */
 	natural_t voi_resident_page_count; /* number of resident pages */
 	natural_t voi_absent_count;	/* number requested but not filled */
-	vm_offset_t voi_copy;		/* copy object */
-	vm_offset_t voi_shadow;		/* shadow object */
-	vm_offset_t voi_shadow_offset;	/* offset into shadow object */
-	vm_offset_t voi_paging_offset;	/* offset into memory object */
+	rpc_vm_offset_t voi_copy;		/* copy object */
+	rpc_vm_offset_t voi_shadow;		/* shadow object */
+	rpc_vm_offset_t voi_shadow_offset;	/* offset into shadow object */
+	rpc_vm_offset_t voi_paging_offset;	/* offset into memory object */
 /*memory_object_copy_strategy_t*/integer_t voi_copy_strategy;
 					/* how to handle data copy */
-	vm_offset_t voi_last_alloc;	/* offset of last allocation */
+	rpc_vm_offset_t voi_last_alloc;	/* offset of last allocation */
 	natural_t voi_paging_in_progress; /* paging references */
 	vm_object_info_state_t voi_state; /* random state bits */
 } vm_object_info_t;