updates to fix build errors, found an off by 1 error that would never actually arrise, UB, but, fixed anyways in the heap code

Author: jonathan-beard

git-dep/shm

@@ -157,34 +157,34 @@ alloc::_512bits::set_bit( std::uint16_t x, _512bits *f )
     }
     else if( x < 128 )
     {
-        f->_064_127 |= (1ULL << x);
+        f->_064_127 |= (1ULL << ( x - 64 ));
 
     }
     else if( x < 192 )
     {
-        f->_128_191 |= (1ULL << x);
+        f->_128_191 |= (1ULL << ( x - 128 ));
     }
     else if( x < 256 )
     {
-        f->_192_255 |= (1ULL << x);
+        f->_192_255 |= (1ULL << ( x - 192 ));
     }
     else if( x < 320 )
     {
-        f->_256_319 |= (1ULL << x);
+        f->_256_319 |= (1ULL << ( x - 256 ));
     }
     else if( x < 384 )
     {
-        f->_320_383 |= (1ULL << x);
+        f->_320_383 |= (1ULL << ( x - 320 ));
 
     }
     else if( x < 448 )
     {
-        f->_384_447 |= (1ULL << x);
+        f->_384_447 |= (1ULL << ( x - 384 ));
 
     }
     else if( x < 512 )
     {
-        f->_448_511 |= (1ULL << x);
+        f->_448_511 |= (1ULL << ( x - 448 ));
     }
     return;
 }
@@ -198,32 +198,32 @@ alloc::_512bits::unset_bit( std::uint16_t x, _512bits *f )
     }
     else if( x < 128 )
     {
-        f->_064_127 &= ~(1ULL << x);
+        f->_064_127 &= ~(1ULL << ( x - 64 ));
 
     }
     else if( x < 192 )
     {
-        f->_128_191 &= ~(1ULL << x);
+        f->_128_191 &= ~(1ULL << ( x - 128 ));
     }
     else if( x < 256 )
     {
-        f->_192_255 &= ~(1ULL << x);
+        f->_192_255 &= ~(1ULL << ( x - 192 ));
     }
     else if( x < 320 )
     {
-        f->_256_319 &= ~(1ULL << x);
+        f->_256_319 &= ~(1ULL << ( x - 256 ));
     }
     else if( x < 384 )
     {
-        f->_320_383 &= ~(1ULL << x);
+        f->_320_383 &= ~(1ULL << ( x - 320 ));
     }
     else if( x < 448 )
     {
-        f->_384_447 &= ~(1ULL << x);
+        f->_384_447 &= ~(1ULL << ( x - 384 ));
     }
     else if( x < 512 )
     {
-        f->_448_511 &= ~(1ULL << x);
+        f->_448_511 &= ~(1ULL << ( x - 448 ));
     }
     return;
 }

modules/heapalloc/src/_512bits.cpp

@@ -11,13 +11,26 @@ int main()
 {
 
 
-    char *base = (char*)malloc( (1 << ipc::buffer_size_pow_two ) );
-
+    char *base = nullptr;
+    base = reinterpret_cast<char*>( std::malloc( (1 << ipc::buffer_size_pow_two ) ) );
+    if( base == nullptr )
+    {
+        std::cerr << "malloc failed\n";
+        return( EXIT_FAILURE );
+    }
 
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
     const auto offset1 = ipc::buffer::calculate_buffer_offset( base, (void*)(base));
-    const auto offset3 = ipc::buffer::calculate_buffer_offset( base, (void*)(base-1));
+    const auto offset3 = ipc::buffer::calculate_buffer_offset( base, (void*)(base - 1));
     const auto offset5 = ipc::buffer::calculate_buffer_offset( base, (void*)(0));
-    const auto offset6 = ipc::buffer::calculate_buffer_offset( base, (void*)(base + ( 1<<ipc::buffer_size_pow_two )+1 ) );
+    const auto offset6 = ipc::buffer::calculate_buffer_offset( base,
+        (void*)(base + ( 1<<ipc::buffer_size_pow_two )+1 ) );
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
 
 
     /** Offsets should be zero */
@@ -48,6 +61,6 @@ int main()
         return( EXIT_FAILURE );
     }
 
-    free( base );
+    std::free( base );
     return( EXIT_SUCCESS );
 }