From 5c7ae10f66eae34b8a786fc2fdf753bf48a3d116 Mon Sep 17 00:00:00 2001 From: Dave Cheney Date: Wed, 6 Apr 2016 15:19:12 +1000 Subject: [PATCH] runtime: merge 64bit lfstack impls Merge all the 64bit lfstack impls into one file, adjust build tags to match. Merge all the comments on the various lfstack implementations for posterity. lfstack_amd64.go can probably be merged, but it is slightly different so that will happen in a followup. Change-Id: I5362d5e127daa81c9cb9d4fa8a0cc5c5e5c2707c Reviewed-on: https://go-review.googlesource.com/21591 Run-TryBot: Dave Cheney Reviewed-by: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Minux Ma --- ...stack_linux_ppc64x.go => lfstack_64bit.go} | 7 ++-- src/runtime/lfstack_darwin_arm64.go | 25 --------------- src/runtime/lfstack_linux_arm64.go | 25 --------------- src/runtime/lfstack_linux_mips64x.go | 32 ------------------- 4 files changed, 5 insertions(+), 84 deletions(-) rename src/runtime/{lfstack_linux_ppc64x.go => lfstack_64bit.go} (80%) delete mode 100644 src/runtime/lfstack_darwin_arm64.go delete mode 100644 src/runtime/lfstack_linux_arm64.go delete mode 100644 src/runtime/lfstack_linux_mips64x.go diff --git a/src/runtime/lfstack_linux_ppc64x.go b/src/runtime/lfstack_64bit.go similarity index 80% rename from src/runtime/lfstack_linux_ppc64x.go rename to src/runtime/lfstack_64bit.go index 83b7cf4f58..27a058c763 100644 --- a/src/runtime/lfstack_linux_ppc64x.go +++ b/src/runtime/lfstack_64bit.go @@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build ppc64 ppc64le -// +build linux +// +build arm64 mips64 mips64le ppc64 ppc64le package runtime @@ -13,6 +12,10 @@ import "unsafe" // TASK_SIZE_USER64 in the Linux kernel). This has grown over time, // so here we allow 48 bit addresses. // +// On mips64, Linux limits the user address space to 40 bits (see +// TASK_SIZE64 in the Linux kernel). This has grown over time, +// so here we allow 48 bit addresses. +// // In addition to the 16 bits taken from the top, we can take 3 from the // bottom, because node must be pointer-aligned, giving a total of 19 bits // of count. diff --git a/src/runtime/lfstack_darwin_arm64.go b/src/runtime/lfstack_darwin_arm64.go deleted file mode 100644 index f48d76382b..0000000000 --- a/src/runtime/lfstack_darwin_arm64.go +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package runtime - -import "unsafe" - -// In addition to the 16 bits taken from the top, we can take 3 from the -// bottom, because node must be pointer-aligned, giving a total of 19 bits -// of count. -const ( - addrBits = 48 - cntBits = 64 - addrBits + 3 -) - -func lfstackPack(node *lfnode, cnt uintptr) uint64 { - return uint64(uintptr(unsafe.Pointer(node)))<<(64-addrBits) | uint64(cnt&(1<> cntBits << 3))) - cnt = uintptr(val & (1<> cntBits << 3))) - cnt = uintptr(val & (1<> cntBits << 3))) - cnt = uintptr(val & (1<