runtime: fix lfstack for 64-bit AIX
Change-Id: I87469745a2ffa7b2f1dfca525d7f3c54bbeb1588
Reviewed-on: https://go-review.googlesource.com/57550
Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/libgo/go/runtime/lfstack_64bit.go b/libgo/go/runtime/lfstack_64bit.go
index 3d5588d..44cbf74 100644
--- a/libgo/go/runtime/lfstack_64bit.go
+++ b/libgo/go/runtime/lfstack_64bit.go
@@ -43,6 +43,14 @@
// 52 address bits each (with 64k page size).
ia64AddrBits = 55
ia64CntBits = 64 - ia64AddrBits + 3
+
+ // On AIX, 64-bit addresses are split into 36-bit segment number and 28-bit
+ // offset in segment. Segment numbers in the range 0x070000000-0x07FFFFFFF
+ // and 0x0A0000000-0x0AFFFFFFF(LSA) are available for mmap.
+ // We assume all lfnode addresses are from memory allocated with mmap.
+ // We use one bit to distinguish between the two ranges.
+ aixAddrBits = 57
+ aixCntBits = 64 - aixAddrBits + 3
)
func lfstackPack(node *lfnode, cnt uintptr) uint64 {
@@ -54,6 +62,9 @@
val := uint64(uintptr(unsafe.Pointer(node)))
return (val<<(64-ia64AddrBits))&(1<<(64-3)-1) | val&^(1<<(64-3)-1) | uint64(cnt&(1<<ia64CntBits-1))
}
+ if GOARCH == "ppc64" && GOOS == "aix" {
+ return uint64(uintptr(unsafe.Pointer(node)))<<(64-aixAddrBits) | uint64(cnt&(1<<aixCntBits-1))
+ }
return uint64(uintptr(unsafe.Pointer(node)))<<(64-addrBits) | uint64(cnt&(1<<cntBits-1))
}
@@ -69,5 +80,12 @@
if GOARCH == "ia64" {
return (*lfnode)(unsafe.Pointer(uintptr((val>>ia64CntBits<<3)&(1<<(64-3)-1) | val&^(1<<(64-3)-1))))
}
+ if GOARCH == "ppc64" && GOOS == "aix" {
+ if val&(1<<63) != 0 {
+ return (*lfnode)(unsafe.Pointer(uintptr((val >> aixCntBits << 3) | 0x7<<56)))
+ } else {
+ return (*lfnode)(unsafe.Pointer(uintptr((val >> aixCntBits << 3) | 0xa<<56)))
+ }
+ }
return (*lfnode)(unsafe.Pointer(uintptr(val >> cntBits << 3)))
}
