Use unsigned long for addresses and sizes

TODO: remonter formats

* i386/include/mach/i386/vm_types.h (vm_offset_t): Define to unsigned long.
(signed32_t): Define to signed int.
(unsigned32_t): Define to unsigned int.
* i386/include/mach/sa/stdarg.h (__va_size): Use sizeof(unsigned long)-1
instead of 3.
* include/mach/port.h (mach_port_t): Define to vm_offset_t instead of
natural_t.
* include/sys/types.h (size_t): Define to unsigned long instead of
natural_t.
* linux/src/include/asm-i386/posix_types.h (__kernel_size_t): Define to
unsigned long.
(__kernel_ssize_t): Define to long.
* linux/src/include/linux/stddef.h (size_t): Define to unsigned long.

* device/dev_pager.c (dev_pager_hash): Cast port to vm_offset_t insted of
natural_t.
(device_pager_data_request): Fix format.

* device/ds_routines.c (ds_no_senders): Fix format.
* i386/i386/io_map.c (io_map): Likewise.
* i386/i386at/autoconf.c (take_dev_irq): Likewise.
* i386/i386at/com.c (comattach): Likewise.
* i386/i386at/lpr.c (lprattach): Likewise.
* i386/i386at/model_dep.c (mem_size_init, mem_size_init, c_boot_entry):
Likewise.
* i386/intel/pmap.c (pmap_enter): Likewise.
* ipc/ipc_notify.c (ipc_notify_port_deleted, ipc_notify_msg_accepted,
ipc_notify_dead_name): Likewise.
* ipc/mach_port.c (mach_port_destroy, mach_port_deallocate): Likewise.
* kern/ipc_kobject.c (ipc_kobject_destroy): Likewise.
* kern/slab.c (kalloc_init): Likewise.
* vm/vm_fault.c (vm_fault_page): Likewise.
* vm/vm_map.c (vm_map_pmap_enter): Likewise.
* xen/block.c (device_read): Likewise.

* device/net_io.c (bpf_match): Take unsigned long * instead of unsigned int
*.
(bpf_do_filter): Make mem unsigned long instead of long.
* i386/i386/ktss.c (ktss_init): Cast pointer to unsigned long instead of
unsigned.
* i386/i386/pcb.c (stack_attach, switch_ktss): Cast pointers to long instead of
int.
* i386/i386/trap.c (dump_ss): Likewise.
* ipc/ipc_hash.c (IH_LOCAL_HASH): Cast object to vm_offset_t.
* ipc/mach_msg.c (mach_msg_receive, mach_msg_receive_continue): Cast kmsg to
vm_offset_t instead of natural_t.
* kern/pc_sample.c (take_pc_sample): Cast to vm_offset_t instead of
natural_t.
* kern/boot_script.c (sym, arg): Set type of `val' field to long instead of int.
(create_task, builtin_symbols, boot_script_parse_line,
boot_script_define_function): Cast to long instead of int.
* kern/bootstrap.c (bootstrap_create): Likewise.
* kern/sched_prim.c (decl_simple_lock_data): Likewise.
* kern/printf.c (vsnprintf): Set size type to size_t.
* kern/printf.h (vsnprintf): Likewise.
* vm/vm_map.h (kentry_data_size): Fix type to vm_size_t.
* vm/vm_object.c (vm_object_pmap_protect_by_page): Fix size parameter type
to vm_size_t.

4 files changed, 8 insertions, 8 deletions

diff --git a/ipc/ipc_hash.c b/ipc/ipc_hash.c
index ad05016..5eec58c 100644
--- a/ipc/ipc_hash.c
+++ b/ipc/ipc_hash.c
@@ -326,7 +326,7 @@ ipc_hash_global_delete(
  */
 
 #define	IH_LOCAL_HASH(obj, size)				\
-		((((mach_port_index_t) (obj)) >> 6) % (size))
+		((((mach_port_index_t) (vm_offset_t) (obj)) >> 6) % (size))
 
 /*
  *	Routine:	ipc_hash_local_lookup
diff --git a/ipc/ipc_notify.c b/ipc/ipc_notify.c
index d06346e..25fa421 100644
--- a/ipc/ipc_notify.c
+++ b/ipc/ipc_notify.c
@@ -264,7 +264,7 @@ ipc_notify_port_deleted(port, name)
 
 	kmsg = ikm_alloc(sizeof *n);
 	if (kmsg == IKM_NULL) {
-		printf("dropped port-deleted (0x%p, 0x%x)\n", port, name);
+		printf("dropped port-deleted (0x%p, 0x%lx)\n", port, name);
 		ipc_port_release_sonce(port);
 		return;
 	}
@@ -298,7 +298,7 @@ ipc_notify_msg_accepted(port, name)
 
 	kmsg = ikm_alloc(sizeof *n);
 	if (kmsg == IKM_NULL) {
-		printf("dropped msg-accepted (0x%p, 0x%x)\n", port, name);
+		printf("dropped msg-accepted (0x%p, 0x%lx)\n", port, name);
 		ipc_port_release_sonce(port);
 		return;
 	}
@@ -437,7 +437,7 @@ ipc_notify_dead_name(port, name)
 
 	kmsg = ikm_alloc(sizeof *n);
 	if (kmsg == IKM_NULL) {
-		printf("dropped dead-name (0x%p, 0x%x)\n", port, name);
+		printf("dropped dead-name (0x%p, 0x%lx)\n", port, name);
 		ipc_port_release_sonce(port);
 		return;
 	}
diff --git a/ipc/mach_msg.c b/ipc/mach_msg.c
index 43ae918..00ab085 100644
--- a/ipc/mach_msg.c
+++ b/ipc/mach_msg.c
@@ -218,7 +218,7 @@ mach_msg_receive(msg, option, rcv_size, rcv_name, time_out, notify)
 		if (mr != MACH_MSG_SUCCESS) {
 			if (mr == MACH_RCV_TOO_LARGE) {
 				mach_msg_size_t real_size =
-					(mach_msg_size_t) (natural_t) kmsg;
+					(mach_msg_size_t) (vm_offset_t) kmsg;
 
 				assert(real_size > rcv_size);
 
@@ -309,7 +309,7 @@ mach_msg_receive_continue(void)
 		if (mr != MACH_MSG_SUCCESS) {
 			if (mr == MACH_RCV_TOO_LARGE) {
 				mach_msg_size_t real_size =
-					(mach_msg_size_t) (natural_t) kmsg;
+					(mach_msg_size_t) (vm_offset_t) kmsg;
 
 				assert(real_size > rcv_size);
 
diff --git a/ipc/mach_port.c b/ipc/mach_port.c
index c5688c9..d0310b5 100644
--- a/ipc/mach_port.c
+++ b/ipc/mach_port.c
@@ -571,7 +571,7 @@ mach_port_destroy(
 	kr = ipc_right_lookup_write(space, name, &entry);
 	if (kr != KERN_SUCCESS) {
 		if (name != MACH_PORT_NULL && name != MACH_PORT_DEAD && space == current_space()) {
-			printf("task %p destroying an invalid port %u, most probably a bug.\n", current_task(), name);
+			printf("task %p destroying an invalid port %lu, most probably a bug.\n", current_task(), name);
 			if (mach_port_deallocate_debug)
 				SoftDebugger("mach_port_deallocate");
 		}
@@ -615,7 +615,7 @@ mach_port_deallocate(
 	kr = ipc_right_lookup_write(space, name, &entry);
 	if (kr != KERN_SUCCESS) {
 		if (name != MACH_PORT_NULL && name != MACH_PORT_DEAD && space == current_space()) {
-			printf("task %p deallocating an invalid port %u, most probably a bug.\n", current_task(), name);
+			printf("task %p deallocating an invalid port %lu, most probably a bug.\n", current_task(), name);
 			if (mach_port_deallocate_debug)
 				SoftDebugger("mach_port_deallocate");
 		}