From b308ab4327d1bd5d61813cd35a4f36c01a1bf75a Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Thu, 21 Dec 2023 09:14:06 +0100 Subject: [PATCH] blockchain: fix compilation issues with 32bit systems --- blockchain/sizehelper.go | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/blockchain/sizehelper.go b/blockchain/sizehelper.go index 15a9ccd8a9e..6b7f6edc44f 100644 --- a/blockchain/sizehelper.go +++ b/blockchain/sizehelper.go @@ -63,14 +63,25 @@ const ( loadFactorNum = 13 loadFactorDen = 2 - // maxAlloc is the maximum size of an allocation. On 64-bit, - // it's theoretically possible to allocate 1<> 63) / 2 + + // PtrSize is the size of a pointer in bytes - unsafe.Sizeof(uintptr(0)) + // but as an ideal constant. It is also the size of the machine's native + // word size (that is, 4 on 32-bit systems, 8 on 64-bit). + PtrSize = 4 << (^uintptr(0) >> 63) + + // heapAddrBits is the number of bits in a heap address that's actually + // available for memory allocation. // - // NOTE (kcalvinalvin): I just took the constant for a 64 bit system. - maxAlloc = 281474976710656 + // NOTE (guggero): For 64-bit systems, we just assume 40 bits of address + // space available, as that seems to be the lowest common denominator. + // See heapAddrBits in runtime/malloc.go of the standard library for + // more details + heapAddrBits = 32 + (_64bit * 8) + + // maxAlloc is the maximum size of an allocation on the heap. + maxAlloc = (1 << heapAddrBits) - (1-_64bit)*1 ) var class_to_size = [_NumSizeClasses]uint16{0, 8, 16, 24, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 256, 288, 320, 352, 384, 416, 448, 480, 512, 576, 640, 704, 768, 896, 1024, 1152, 1280, 1408, 1536, 1792, 2048, 2304, 2688, 3072, 3200, 3456, 4096, 4864, 5376, 6144, 6528, 6784, 6912, 8192, 9472, 9728, 10240, 10880, 12288, 13568, 14336, 16384, 18432, 19072, 20480, 21760, 24576, 27264, 28672, 32768} @@ -175,7 +186,7 @@ func calculateMinEntries(totalBytes int, bucketSize int) int { // mulUintptr returns a * b and whether the multiplication overflowed. // On supported platforms this is an intrinsic lowered by the compiler. func mulUintptr(a, b uintptr) (uintptr, bool) { - if a|b < 1<<(4*8) || a == 0 { + if a|b < 1<<(4*PtrSize) || a == 0 { return a * b, false } overflow := b > MaxUintptr/a