[dev.garbage] runtime: use s.base() everywhere it makes sense

Currently we have lots of (s.start << _PageShift) and variants. We now
have an s.base() function that returns this. It's faster and more
readable, so use it.

Change-Id: I888060a9dae15ea75ca8cc1c2b31c905e71b452b
Reviewed-on: https://go-review.googlesource.com/22559
Reviewed-by: Rick Hudson <rlh@golang.org>
Run-TryBot: Austin Clements <austin@google.com>
This commit is contained in:
Austin Clements 2016-04-28 10:59:00 -04:00
parent 2e8b74b695
commit b7adc41fba
5 changed files with 12 additions and 12 deletions

View file

@ -198,7 +198,7 @@ func stackpoolalloc(order uint8) gclinkptr {
throw("bad stackfreelist")
}
for i := uintptr(0); i < _StackCacheSize; i += _FixedStack << order {
x := gclinkptr(uintptr(s.start)<<_PageShift + i)
x := gclinkptr(s.base() + i)
x.ptr().next = s.stackfreelist
s.stackfreelist = x
}
@ -391,7 +391,7 @@ func stackalloc(n uint32) (stack, []stkbar) {
throw("out of memory")
}
}
v = unsafe.Pointer(s.start << _PageShift)
v = unsafe.Pointer(s.base())
}
if raceenabled {
@ -456,7 +456,7 @@ func stackfree(stk stack, n uintptr) {
} else {
s := mheap_.lookup(v)
if s.state != _MSpanStack {
println(hex(s.start<<_PageShift), v)
println(hex(s.base()), v)
throw("bad span state")
}
if gcphase == _GCoff {