Ticket #845: amd64.diff

src/tools/fs_shell/vfs.cpp

@@ -3223 +3223 @@
     // We need to set the locking atomically - someone
     // else might set one at the same time
     if (fssh_atomic_test_and_set((vint32_t *)&vnode->mandatory_locked_by,
-            0, (fssh_addr_t)descriptor) != (int32_t)descriptor)
+            0, (fssh_addr_t)descriptor) != (uint64_t)descriptor)
         status = FSSH_B_BAD_VALUE;
 
     put_fd(descriptor);

src/tools/fs_shell/block_cache.cpp

@@ -951 +951 @@
     if (_unchangedData)
         *_unchangedData = block->original_data;
 
-    *_cookie = (uint32_t)block;
+    *_cookie = (uint64_t)block;
     return FSSH_B_OK;   
 }
 

src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp

@@ -1908 +1908 @@
             nextOffset = node->OverflowLink();
         else {
             if (node->AllKeyLength() > fTree->fNodeSize
-                || (uint32)node->Values() > (uint32)node + fTree->fNodeSize
+                || (uint64)node->Values() > (uint64)node + fTree->fNodeSize
                     - 8 * node->NumKeys())
                 RETURN_ERROR(B_ERROR);
 

src/add-ons/kernel/file_systems/bfs/Journal.cpp

@@ -77 +77 @@
 add_to_iovec(iovec *vecs, int32 &index, int32 max, const void *address, size_t size)
 {
     if (index > 0
-        && (addr_t)vecs[index - 1].iov_base + vecs[index - 1].iov_len == (addr_t)address) {
+        && (uint64)vecs[index - 1].iov_base + vecs[index - 1].iov_len == (uint64)address) {
         // the iovec can be combined with the previous one
         vecs[index - 1].iov_len += size;
         return;

src/add-ons/kernel/file_systems/bfs/bfs.h

@@ -365 +365 @@
     // we need to check the location first, because if name_size is already beyond
     // the block, we would touch invalid memory (although that can't cause wrong
     // results)
-    return (uint32)this > (uint32)inode + inode->InodeSize() - sizeof(small_data) || name_size == 0;
+    return (uint64)this > (uint64)inode + inode->InodeSize() - sizeof(small_data) || name_size == 0;
 }
 
 #ifdef _BOOT_MODE

src/add-ons/kernel/file_systems/bfs/Debug.cpp

@@ -206 +206 @@
         buffer[length] = '\0';
 
         off_t *value = node->Values() + i;
-        if ((uint32)value < (uint32)node || (uint32)value > (uint32)node + header->node_size)
+        if ((uint64)value < (uint64)node || (uint64)value > (uint64)node + header->node_size)
             Print("  %2d. Invalid Offset!!\n", (int)i);
         else {
             Print("  %2d. ", (int)i);

headers/private/fs_shell/fssh_errors.h

@@ -10 +10 @@
 
 
 /* Error baselines */
-#define FSSH_B_GENERAL_ERROR_BASE       LONG_MIN
+#define FSSH_B_GENERAL_ERROR_BASE       INT_MIN
 #define FSSH_B_OS_ERROR_BASE            FSSH_B_GENERAL_ERROR_BASE + 0x1000
 #define FSSH_B_APP_ERROR_BASE           FSSH_B_GENERAL_ERROR_BASE + 0x2000
 #define FSSH_B_INTERFACE_ERROR_BASE     FSSH_B_GENERAL_ERROR_BASE + 0x3000

headers/private/fs_shell/fssh_types.h

@@ -6 +6 @@
 typedef uint32_t            fssh_ulong;
 typedef volatile int32_t    vint32_t;
 
-typedef uint32_t    fssh_addr_t;
+typedef uint64_t    fssh_addr_t;
 
 typedef int32_t     fssh_dev_t;
 typedef int64_t     fssh_ino_t;