Ticket #6310: 64bit_safe_kernel.patch

src/system/kernel/debug/debug.cpp

@@ -1405 +1405 @@
         "Welcome to syslog debug output!\nHaiku revision: %lu\n",
         get_haiku_revision());
     syslog_write(revisionBuffer,
-        std::min(length, (ssize_t)sizeof(revisionBuffer) - 1), false);
+        std::min((ssize_t)length, (ssize_t)sizeof(revisionBuffer) - 1), false);
 
     add_debugger_command_etc("syslog", &cmd_dump_syslog,
         "Dumps the syslog buffer.",
@@ -1962 +1962 @@
         return B_BAD_ADDRESS;
 
     // limit size to avoid address overflows
-    size_t maxSize = std::min(size,
+    size_t maxSize = std::min((addr_t)size,
         ~(addr_t)0 - std::max((addr_t)from, (addr_t)to) + 1);
         // NOTE: Since strlcpy() determines the length of \a from, the source
         // address might still overflow.

src/system/kernel/device_manager/IOCache.cpp

@@ -242 +242 @@
         off_t lineOffset = (offset >> fLineSizeShift) << fLineSizeShift;
 
         // intersection of request and cache line
-        off_t cacheLineEnd = std::min(lineOffset + fLineSize, fDeviceCapacity);
+        off_t cacheLineEnd = std::min(lineOffset + (off_t)fLineSize, fDeviceCapacity);
         size_t requestLineLength
             = std::min(cacheLineEnd - offset, (off_t)length);
 

src/system/kernel/device_manager/legacy_drivers.cpp

@@ -1374 +1374 @@
             status = add_driver(imagePath.Path(), image->id);
         if (status != B_OK) {
             dprintf("legacy_driver_add_preloaded: Failed to add \"%s\": %s\n",
-                image->name, strerror(status));
+                (char *)image->name, strerror(status));
             unload_kernel_add_on(image->id);
         }
     }

src/system/kernel/lib/kernel_vsprintf.cpp

@@ -407 +407 @@
                 }
 
                 outBuffer.PutString("0x", 2);
-                number(outBuffer, (uint32)va_arg(args, void *), 16, fieldWidth,
+                number(outBuffer, (addr_t)va_arg(args, void *), 16, fieldWidth,
                     precision, flags);
                 continue;
 

src/system/kernel/module.cpp

@@ -1804 +1804 @@
     for (image = args->preloaded_images; image != NULL; image = image->next) {
         status_t status = register_preloaded_module_image(image);
         if (status != B_OK && image->is_module) {
-            dprintf("Could not register image \"%s\": %s\n", image->name,
+            dprintf("Could not register image \"%s\": %s\n", (char *)image->name,
                 strerror(status));
         }
     }

src/system/kernel/fs/vfs.cpp

@@ -320 +320 @@
 static void query_free_fd(struct file_descriptor* descriptor);
 static status_t query_close(struct file_descriptor* descriptor);
 
-static status_t common_ioctl(struct file_descriptor* descriptor, uint32 op,
+static status_t common_ioctl(struct file_descriptor* descriptor, ulong op,
     void* buffer, size_t length);
 static status_t common_read_stat(struct file_descriptor* descriptor,
     struct stat* statData);
@@ -5837 +5837 @@
 
 
 static status_t
-common_ioctl(struct file_descriptor* descriptor, uint32 op, void* buffer,
+common_ioctl(struct file_descriptor* descriptor, ulong op, void* buffer,
     size_t length)
 {
     struct vnode* vnode = descriptor->u.vnode;

src/system/kernel/fs/socket.cpp

@@ -243 +243 @@
 
 
 static status_t
-socket_ioctl(struct file_descriptor *descriptor, uint32 op, void *buffer,
+socket_ioctl(struct file_descriptor *descriptor, ulong op, void *buffer,
     size_t length)
 {
     return sStackInterface->ioctl(descriptor->u.socket, op, buffer, length);

src/system/kernel/fs/vfs_request_io.cpp

@@ -152 +152 @@
 
     // get the next file vecs
     file_io_vec vecs[kMaxSubRequests];
-    uint32 vecCount = kMaxSubRequests;
+    size_t vecCount = kMaxSubRequests;
     status_t error = cookie->get_vecs(cookie->cookie, request, requestOffset,
         requestLength, vecs, &vecCount);
     if (error != B_OK && error != B_BUFFER_OVERFLOW)
@@ -270 +270 @@
 
         while (error == B_OK && vecLength > 0) {
             file_io_vec fileVecs[8];
-            uint32 fileVecCount = 8;
+            size_t fileVecCount = 8;
             error = getVecs(cookie, request, offset, vecLength, fileVecs,
                 &fileVecCount);
             if (error != B_OK || fileVecCount == 0)

src/system/kernel/messaging/KMessage.cpp

@@ -53 +53 @@
 static inline void*
 _Align(void* address, int32 offset = 0)
 {
-    return (void*)(((uint32)address + offset + 3) & ~0x3);
+    return (void*)(((addr_t)address + (addr_t)offset + 3) & ~0x3);
 }
 
 

src/system/kernel/smp.cpp

@@ -1242 +1242 @@
     cpu_status state = disable_interrupts();
 
     if (smp_get_num_cpus() > 1) {
-        smp_send_broadcast_ici(SMP_MSG_CALL_FUNCTION, (uint32)cookie,
+        smp_send_broadcast_ici(SMP_MSG_CALL_FUNCTION, (addr_t)cookie,
             0, 0, (void *)func, SMP_MSG_FLAG_ASYNC);
     }
 
@@ -1264 +1264 @@
     cpu_status state = disable_interrupts();
 
     if (smp_get_num_cpus() > 1) {
-        smp_send_broadcast_ici(SMP_MSG_CALL_FUNCTION, (uint32)cookie,
+        smp_send_broadcast_ici(SMP_MSG_CALL_FUNCTION, (addr_t)cookie,
             0, 0, (void *)func, SMP_MSG_FLAG_SYNC);
     }
 

src/system/kernel/vm/vm.cpp

@@ -3509 +3509 @@
         // If the address is no kernel address, we just skip it. The
         // architecture specific code has to deal with it.
         if (!IS_KERNEL_ADDRESS(address)) {
-            dprintf("reserve_boot_loader_ranges(): Skipping range: %p, %lu\n",
+            dprintf("reserve_boot_loader_ranges(): Skipping range: %p, %llu\n",
                 address, args->virtual_allocated_range[i].size);
             continue;
         }
@@ -4938 +4938 @@
         return B_BAD_ADDRESS;
 
     // limit size to avoid address overflows
-    size_t maxSize = std::min(size,
+    size_t maxSize = std::min((addr_t)size,
         ~(addr_t)0 - std::max((addr_t)from, (addr_t)to) + 1);
         // NOTE: Since arch_cpu_user_strlcpy() determines the length of \a from,
         // the source address might still overflow.

src/system/kernel/elf.cpp

@@ -72 +72 @@
 image_hash(void *_image, const void *_key, uint32 range)
 {
     struct elf_image_info *image = (struct elf_image_info *)_image;
-    image_id id = (image_id)_key;
+    addr_t id = (addr_t)_key;
 
     if (image != NULL)
         return image->id % range;
 
-    return (uint32)id % range;
+    return (addr_t)id % range;
 }
 
 
@@ -86 +86 @@
 image_compare(void *_image, const void *_key)
 {
     struct elf_image_info *image = (struct elf_image_info *)_image;
-    image_id id = (image_id)_key;
+    addr_t id = (addr_t)_key;
 
     return id - image->id;
 }
@@ -1871 +1871 @@
 
             // clean garbage brought by mmap (the region behind the file,
             // at least parts of it are the bss and have to be zeroed)
-            uint32 start = (uint32)regionAddress
+            addr_t start = (addr_t)regionAddress
                 + (programHeaders[i].p_vaddr % B_PAGE_SIZE)
                 + programHeaders[i].p_filesz;
             uint32 amount = fileUpperBound