added goexperiment.iseriesaix

merged iseries aix mods

Author: JasonTashtego

src/cmd/compile/internal/noder/lex.go

@@ -101,7 +101,7 @@ func (p *noder) pragcgo(pos syntax.Pos, text string) {
 		case len(f) == 3 && !isQuoted(f[1]) && !isQuoted(f[2]):
 		case len(f) == 4 && !isQuoted(f[1]) && !isQuoted(f[2]) && isQuoted(f[3]):
 			f[3] = strings.Trim(f[3], `"`)
-			if buildcfg.GOOS == "aix" && f[3] != "" {
+			if buildcfg.GOOS == "aix" && f[3] != "" && !buildcfg.Experiment.ISeriesAix {
 				// On Aix, library pattern must be "lib.a/object.o"
 				// or "lib.a/libname.so.X"
 				n := strings.Split(f[3], "/")

src/cmd/dist/build.go

@@ -1654,6 +1654,9 @@ func goCmd(env []string, goBinary string, cmd string, args ...string) {
 	if gohostos == "plan9" && os.Getenv("sysname") == "vx32" {
 		goCmd = append(goCmd, "-p=1")
 	}
+	if gohostos == "aix" && os.Getenv("MACHTYPE") == "powerpc-ibm-os400" {
+		goCmd = append(goCmd, "-p=1")  //IBMi-OS400
+	}
 
 	runEnv(workdir, ShowOutput|CheckExit, env, append(goCmd, args...)...)
 }

src/cmd/dist/util.go

@@ -133,6 +133,10 @@ var (
 )
 
 func bginit() {
+	if gohostos == "aix" && os.Getenv("MACHTYPE") == "powerpc-ibm-os400" {
+		maxbg = 1
+	}
+
 	bghelpers.Add(maxbg)
 	for i := 0; i < maxbg; i++ {
 		go bghelper()
@@ -272,6 +276,20 @@ func xmkdir(p string) {
 	if err != nil {
 		fatalf("%v", err)
 	}
+	if gohostos == "aix" && os.Getenv("MACHTYPE") == "powerpc-ibm-os400" {
+		// IFS bug?
+		os.Mkdir(p, 0777)
+		os.Mkdir(p, 0777)
+		os.Mkdir(p, 0777)
+		os.Mkdir(p, 0777)
+		os.Mkdir(p, 0777)
+		os.Mkdir(p, 0777)
+		os.Mkdir(p, 0777)
+		os.Mkdir(p, 0777)
+		os.Mkdir(p, 0777)
+		os.Mkdir(p, 0777)
+		os.Mkdir(p, 0777)
+	}
 }
 
 // xmkdirall creates the directory p and its parents, as needed.
@@ -280,6 +298,20 @@ func xmkdirall(p string) {
 	if err != nil {
 		fatalf("%v", err)
 	}
+	if gohostos == "aix" && os.Getenv("MACHTYPE") == "powerpc-ibm-os400" {
+		// IFS bug?
+		os.MkdirAll(p, 0777)
+		os.MkdirAll(p, 0777)
+		os.MkdirAll(p, 0777)
+		os.MkdirAll(p, 0777)
+		os.MkdirAll(p, 0777)
+		os.MkdirAll(p, 0777)
+		os.MkdirAll(p, 0777)
+		os.MkdirAll(p, 0777)
+		os.MkdirAll(p, 0777)
+		os.MkdirAll(p, 0777)
+		os.MkdirAll(p, 0777)
+	}
 }
 
 // xremove removes the file p.

src/internal/goexperiment/flags.go

@@ -127,4 +127,8 @@ type Flags struct {
 	// ExecTracer2 controls whether to use the new execution trace
 	// implementation.
 	ExecTracer2 bool
+
+	// ISeriesAix controls whether to compile for the 'aix' variant
+	// supported in IBMi/OS400
+	ISeriesAix bool
 }

src/runtime/malloc.go

@@ -306,7 +306,9 @@ const (
 	//
 	// On other platforms, the user address space is contiguous
 	// and starts at 0, so no offset is necessary.
-	arenaBaseOffset = 0xffff800000000000*goarch.IsAmd64 + 0x0a00000000000000*goos.IsAix
+
+	// aix/ppc64 on ISeries arena: 0x0700000000000000, so adjust it below
+	arenaBaseOffset = 0xffff800000000000*goarch.IsAmd64 + 0x0a00000000000000*goos.IsAix - 0x0300000000000000*goexperiment.ISeriesAixInt
 	// A typed version of this constant that will make it into DWARF (for viewcore).
 	arenaBaseOffsetUintptr = uintptr(arenaBaseOffset)
 
@@ -526,7 +528,11 @@ func mallocinit() {
 					// to avoid collisions with others mmaps done by non-go programs.
 					continue
 				}
-				p = uintptr(i)<<40 | uintptrMask&(0xa0<<52)
+				if goexperiment.ISeriesAix {
+					p = uintptr(i)<<40 | uintptrMask&(0x70<<52)
+				} else {
+					p = uintptr(i)<<40 | uintptrMask&(0xa0<<52)
+				}
 			default:
 				p = uintptr(i)<<40 | uintptrMask&(0x00c0<<32)
 			}

src/runtime/tagptr_64bit.go

@@ -9,6 +9,7 @@ package runtime
 import (
 	"internal/goarch"
 	"internal/goos"
+	"internal/goexperiment"
 	"unsafe"
 )
 
@@ -75,6 +76,9 @@ func (tp taggedPointer) pointer() unsafe.Pointer {
 		return unsafe.Pointer(uintptr(int64(tp) >> tagBits << 3))
 	}
 	if GOOS == "aix" {
+		if goexperiment.ISeriesAix {
+			return unsafe.Pointer(uintptr((tp >> aixTagBits << 3) | 0x7<<56))
+		}
 		return unsafe.Pointer(uintptr((tp >> aixTagBits << 3) | 0xa<<56))
 	}
 	if GOARCH == "riscv64" {