Commit 7537bb7b authored by Hajime Hoshi's avatar Hajime Hoshi Committed by Matthew Dempsky

cmd/compile/internal/gc: unexport global constants

Change-Id: Ib292ef3b0a31b2c7bdd77519324362667f30389c
Reviewed-on: https://go-review.googlesource.com/44393Reviewed-by: default avatarDaniel Martí <mvdan@mvdan.cc>
Reviewed-by: default avatarMatthew Dempsky <mdempsky@google.com>
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent 2f8b555d
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
package gc package gc
const ( const (
WORDBITS = 32 wordBits = 32
WORDMASK = WORDBITS - 1 wordMask = wordBits - 1
WORDSHIFT = 5 wordShift = 5
) )
// A bvec is a bit vector. // A bvec is a bit vector.
...@@ -17,7 +17,7 @@ type bvec struct { ...@@ -17,7 +17,7 @@ type bvec struct {
} }
func bvalloc(n int32) bvec { func bvalloc(n int32) bvec {
nword := (n + WORDBITS - 1) / WORDBITS nword := (n + wordBits - 1) / wordBits
return bvec{n, make([]uint32, nword)} return bvec{n, make([]uint32, nword)}
} }
...@@ -28,7 +28,7 @@ type bulkBvec struct { ...@@ -28,7 +28,7 @@ type bulkBvec struct {
} }
func bvbulkalloc(nbit int32, count int32) bulkBvec { func bvbulkalloc(nbit int32, count int32) bulkBvec {
nword := (nbit + WORDBITS - 1) / WORDBITS nword := (nbit + wordBits - 1) / wordBits
size := int64(nword) * int64(count) size := int64(nword) * int64(count)
if int64(int32(size*4)) != size*4 { if int64(int32(size*4)) != size*4 {
Fatalf("bvbulkalloc too big: nbit=%d count=%d nword=%d size=%d", nbit, count, nword, size) Fatalf("bvbulkalloc too big: nbit=%d count=%d nword=%d size=%d", nbit, count, nword, size)
...@@ -66,24 +66,24 @@ func (bv bvec) Get(i int32) bool { ...@@ -66,24 +66,24 @@ func (bv bvec) Get(i int32) bool {
if i < 0 || i >= bv.n { if i < 0 || i >= bv.n {
Fatalf("bvget: index %d is out of bounds with length %d\n", i, bv.n) Fatalf("bvget: index %d is out of bounds with length %d\n", i, bv.n)
} }
mask := uint32(1 << uint(i%WORDBITS)) mask := uint32(1 << uint(i%wordBits))
return bv.b[i>>WORDSHIFT]&mask != 0 return bv.b[i>>wordShift]&mask != 0
} }
func (bv bvec) Set(i int32) { func (bv bvec) Set(i int32) {
if i < 0 || i >= bv.n { if i < 0 || i >= bv.n {
Fatalf("bvset: index %d is out of bounds with length %d\n", i, bv.n) Fatalf("bvset: index %d is out of bounds with length %d\n", i, bv.n)
} }
mask := uint32(1 << uint(i%WORDBITS)) mask := uint32(1 << uint(i%wordBits))
bv.b[i/WORDBITS] |= mask bv.b[i/wordBits] |= mask
} }
func (bv bvec) Unset(i int32) { func (bv bvec) Unset(i int32) {
if i < 0 || i >= bv.n { if i < 0 || i >= bv.n {
Fatalf("bvunset: index %d is out of bounds with length %d\n", i, bv.n) Fatalf("bvunset: index %d is out of bounds with length %d\n", i, bv.n)
} }
mask := uint32(1 << uint(i%WORDBITS)) mask := uint32(1 << uint(i%wordBits))
bv.b[i/WORDBITS] &^= mask bv.b[i/wordBits] &^= mask
} }
// bvnext returns the smallest index >= i for which bvget(bv, i) == 1. // bvnext returns the smallest index >= i for which bvget(bv, i) == 1.
...@@ -94,11 +94,11 @@ func (bv bvec) Next(i int32) int32 { ...@@ -94,11 +94,11 @@ func (bv bvec) Next(i int32) int32 {
} }
// Jump i ahead to next word with bits. // Jump i ahead to next word with bits.
if bv.b[i>>WORDSHIFT]>>uint(i&WORDMASK) == 0 { if bv.b[i>>wordShift]>>uint(i&wordMask) == 0 {
i &^= WORDMASK i &^= wordMask
i += WORDBITS i += wordBits
for i < bv.n && bv.b[i>>WORDSHIFT] == 0 { for i < bv.n && bv.b[i>>wordShift] == 0 {
i += WORDBITS i += wordBits
} }
} }
...@@ -107,7 +107,7 @@ func (bv bvec) Next(i int32) int32 { ...@@ -107,7 +107,7 @@ func (bv bvec) Next(i int32) int32 {
} }
// Find 1 bit. // Find 1 bit.
w := bv.b[i>>WORDSHIFT] >> uint(i&WORDMASK) w := bv.b[i>>wordShift] >> uint(i&wordMask)
for w&1 == 0 { for w&1 == 0 {
w >>= 1 w >>= 1
...@@ -118,8 +118,8 @@ func (bv bvec) Next(i int32) int32 { ...@@ -118,8 +118,8 @@ func (bv bvec) Next(i int32) int32 {
} }
func (bv bvec) IsEmpty() bool { func (bv bvec) IsEmpty() bool {
for i := int32(0); i < bv.n; i += WORDBITS { for i := int32(0); i < bv.n; i += wordBits {
if bv.b[i>>WORDSHIFT] != 0 { if bv.b[i>>wordShift] != 0 {
return false return false
} }
} }
...@@ -129,7 +129,7 @@ func (bv bvec) IsEmpty() bool { ...@@ -129,7 +129,7 @@ func (bv bvec) IsEmpty() bool {
func (bv bvec) Not() { func (bv bvec) Not() {
i := int32(0) i := int32(0)
w := int32(0) w := int32(0)
for ; i < bv.n; i, w = i+WORDBITS, w+1 { for ; i < bv.n; i, w = i+wordBits, w+1 {
bv.b[w] = ^bv.b[w] bv.b[w] = ^bv.b[w]
} }
} }
......
...@@ -679,7 +679,7 @@ func (e *EscState) esc(n *Node, parent *Node) { ...@@ -679,7 +679,7 @@ func (e *EscState) esc(n *Node, parent *Node) {
// Big stuff escapes unconditionally // Big stuff escapes unconditionally
// "Big" conditions that were scattered around in walk have been gathered here // "Big" conditions that were scattered around in walk have been gathered here
if n.Esc != EscHeap && n.Type != nil && if n.Esc != EscHeap && n.Type != nil &&
(n.Type.Width > MaxStackVarSize || (n.Type.Width > maxStackVarSize ||
(n.Op == ONEW || n.Op == OPTRLIT) && n.Type.Elem().Width >= 1<<16 || (n.Op == ONEW || n.Op == OPTRLIT) && n.Type.Elem().Width >= 1<<16 ||
n.Op == OMAKESLICE && !isSmallMakeSlice(n)) { n.Op == OMAKESLICE && !isSmallMakeSlice(n)) {
if Debug['m'] > 2 { if Debug['m'] > 2 {
......
...@@ -14,7 +14,7 @@ import ( ...@@ -14,7 +14,7 @@ import (
const ( const (
BADWIDTH = types.BADWIDTH BADWIDTH = types.BADWIDTH
MaxStackVarSize = 10 * 1024 * 1024 maxStackVarSize = 10 * 1024 * 1024
) )
// isRuntimePkg reports whether p is package runtime. // isRuntimePkg reports whether p is package runtime.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment