summaryrefslogtreecommitdiff
path: root/vm
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-03-09 01:04:52 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-03-09 01:04:52 +0100
commit4ae07e7e07cf77f1b7ce06bebf1057bfe4a16c54 (patch)
treeb36ddbd87707b330069c83f1298e6b8e6015e2cb /vm
parentdfb4a89ba3bee1c4c000f8e6b54fb92ed25fb2b7 (diff)
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.
Diffstat (limited to 'vm')
-rw-r--r--vm/vm_fault.c2
-rw-r--r--vm/vm_map.c2
-rw-r--r--vm/vm_map.h2
-rw-r--r--vm/vm_object.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/vm/vm_fault.c b/vm/vm_fault.c
index 10955ed..178f307 100644
--- a/vm/vm_fault.c
+++ b/vm/vm_fault.c
@@ -657,7 +657,7 @@ vm_fault_return_t vm_fault_page(first_object, first_offset,
m->offset + object->paging_offset,
PAGE_SIZE, access_required)) != KERN_SUCCESS) {
if (rc != MACH_SEND_INTERRUPTED)
- printf("%s(0x%p, 0x%p, 0x%x, 0x%x, 0x%x) failed, %x\n",
+ printf("%s(0x%p, 0x%p, 0x%lx, 0x%x, 0x%x) failed, %x\n",
"memory_object_data_request",
object->pager,
object->pager_request,
diff --git a/vm/vm_map.c b/vm/vm_map.c
index 1f06275..8012bcf 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -711,7 +711,7 @@ vm_map_pmap_enter(map, addr, end_addr, object, offset, protection)
if (vm_map_pmap_enter_print) {
printf("vm_map_pmap_enter:");
- printf("map: %p, addr: %x, object: %p, offset: %x\n",
+ printf("map: %p, addr: %lx, object: %p, offset: %lx\n",
map, addr, object, offset);
}
diff --git a/vm/vm_map.h b/vm/vm_map.h
index 17de5db..381c7cf 100644
--- a/vm/vm_map.h
+++ b/vm/vm_map.h
@@ -354,7 +354,7 @@ MACRO_END
*/
extern vm_offset_t kentry_data;
-extern vm_offset_t kentry_data_size;
+extern vm_size_t kentry_data_size;
extern int kentry_count;
/* Initialize the module */
extern void vm_map_init(void);
diff --git a/vm/vm_object.c b/vm/vm_object.c
index d80124a..f101708 100644
--- a/vm/vm_object.c
+++ b/vm/vm_object.c
@@ -919,7 +919,7 @@ boolean_t vm_object_pmap_protect_by_page = FALSE;
void vm_object_pmap_protect(
register vm_object_t object,
register vm_offset_t offset,
- vm_offset_t size,
+ vm_size_t size,
pmap_t pmap,
vm_offset_t pmap_start,
vm_prot_t prot)