runtime: fix arenaBaseOffset for aix/ppc

The arenaBaseOffset modifications was aimed only for aix/ppc64.

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/237038
This commit is contained in:
Clément Chigot 2020-06-09 11:36:01 +02:00 committed by Ian Lance Taylor
parent 309a6c468f
commit 75452d6867
3 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
ea58b8491064fbed18a220571a3043c38dccf7c7 74199467ea912138c1b76e9a156bb47886be1436
The first line of this file holds the git revision number of the last The first line of this file holds the git revision number of the last
merge done from the gofrontend repository. merge done from the gofrontend repository.

View File

@ -866,7 +866,7 @@ func FreePageAlloc(pp *PageAlloc) {
// //
// This should not be higher than 0x100*pallocChunkBytes to support // This should not be higher than 0x100*pallocChunkBytes to support
// mips and mipsle, which only have 31-bit address spaces. // mips and mipsle, which only have 31-bit address spaces.
var BaseChunkIdx = ChunkIdx(chunkIndex(((0xc000*pageAlloc64Bit + 0x100*pageAlloc32Bit) * pallocChunkBytes) + 0x0a00000000000000*sys.GoosAix)) var BaseChunkIdx = ChunkIdx(chunkIndex(((0xc000*pageAlloc64Bit + 0x100*pageAlloc32Bit) * pallocChunkBytes) + 0x0a00000000000000*sys.GoosAix*sys.GoarchPpc64))
// PageBase returns an address given a chunk index and a page index // PageBase returns an address given a chunk index and a page index
// relative to that chunk. // relative to that chunk.

View File

@ -312,7 +312,7 @@ const (
// //
// On other platforms, the user address space is contiguous // On other platforms, the user address space is contiguous
// and starts at 0, so no offset is necessary. // and starts at 0, so no offset is necessary.
arenaBaseOffset = sys.GoarchAmd64*(1<<47) + (^0x0a00000000000000+1)&uintptrMask*sys.GoosAix arenaBaseOffset = sys.GoarchAmd64*(1<<47) + (^0x0a00000000000000+1)&uintptrMask*sys.GoosAix*sys.GoarchPpc64
// Max number of threads to run garbage collection. // Max number of threads to run garbage collection.
// 2, 3, and 4 are all plausible maximums depending // 2, 3, and 4 are all plausible maximums depending