Changeset 515542 in git for kernel

Timestamp:

May 10, 2022, 4:52:42 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8b811f4e2c82f8c9c973cb0e694725e6c174a8c1

Parents:

74622283ad46295f0602f84dc752ccf62f699461

Message:

fix: gcc-12 does not like offsetof ?

File:

• kernel/oswrapper/vspace.cc (modified) (6 diffs)

kernel/oswrapper/vspace.cc

@@ -198 +198 @@
 void vmem_free(vaddr_t vaddr) {
   lock_allocator();
+  #if defined(__GNUC__) && (__GNUC__>11)
+  vaddr -= (sizeof(vaddr_t)*2);
+  #else
   vaddr -= offsetof(Block, data);
+  #endif
   vmem.ensure_is_mapped(vaddr);
   size_t segno = vmem.segment_no(vaddr);
@@ -246 +250 @@
 vaddr_t vmem_alloc(size_t size) {
   lock_allocator();
+  #if defined(__GNUC__) && (__GNUC__>11)
+  size_t alloc_size = size + (sizeof(vaddr_t)*2);
+  #else
   size_t alloc_size = size + offsetof(Block, data);
+  #endif
   int level = find_level(alloc_size);
   int flevel = level;
@@ -276 +284 @@
   Block *block = vmem.block_ptr(vmem.freelist[level]);
   vaddr_t vaddr = vmem.freelist[level];
+  #if defined(__GNUC__) && (__GNUC__>11)
+  vaddr_t result = vaddr + (sizeof(vaddr_t)*2);
+  #else
   vaddr_t result = vaddr + offsetof(Block, data);
+  #endif
   vmem.freelist[level] = block->next;
   if (block->next != VADDR_NULL)
@@ -752 +764 @@
 void vmem_free(vaddr_t vaddr) {
   lock_allocator();
+  #if defined(__GNUC__) && (__GNUC__>11)
+  vaddr_t vaddr -= (sizeof(vaddr_t)*2);
+  #else
   vaddr -= offsetof(Block, data);
+  #endif
   vmem.ensure_is_mapped(vaddr);
   size_t segno = vmem.segment_no(vaddr);
@@ -800 +816 @@
 vaddr_t vmem_alloc(size_t size) {
   lock_allocator();
+  #if defined(__GNUC__) && (__GNUC__>11)
+  size_t alloc_size = size +  (sizeof(vaddr_t)*2);
+  #else
   size_t alloc_size = size + offsetof(Block, data);
+  #endif
   int level = find_level(alloc_size);
   int flevel = level;
@@ -830 +850 @@
   Block *block = vmem.block_ptr(vmem.freelist[level]);
   vaddr_t vaddr = vmem.freelist[level];
+  #if defined(__GNUC__) && (__GNUC__>11)
+  vaddr_t result = vaddr + (sizeof(vaddr_t)*2);
+  #else
   vaddr_t result = vaddr + offsetof(Block, data);
+  #endif
   vmem.freelist[level] = block->next;
   if (block->next != VADDR_NULL)