bump toolchain

Author: abarisani

README.md

@@ -45,9 +45,9 @@ Current release level
 [![GitHub release](https://img.shields.io/github/v/release/usbarmory/tamago-go)](https://github.com/usbarmory/tamago-go/tree/latest) [![Build Status](https://github.com/usbarmory/tamago-go/workflows/Build%20Go%20compiler/badge.svg)](https://github.com/usbarmory/tamago-go/actions)
 
 The current release for the [TamaGo modified Go distribution](https://github.com/usbarmory/tamago-go) is
-[tamago1.24.6](https://github.com/usbarmory/tamago-go/tree/tamago1.24.6),
-which [adds](https://github.com/golang/go/compare/go1.24.6...usbarmory:tamago1.24.6)
-`GOOS=tamago` support to go1.24.6.
+[tamago1.25.0](https://github.com/usbarmory/tamago-go/tree/tamago1.25.0),
+which [adds](https://github.com/golang/go/compare/go1.25.0...usbarmory:tamago1.25.0)
+`GOOS=tamago` support to go1.25.0.
 
 Binary releases for amd64 and armv7l Linux hosts [are available](https://github.com/usbarmory/tamago-go/releases/latest).
 

amd64/smp.go

@@ -68,7 +68,7 @@ func (t *task) Write(addr uint) {
 // (see [CPU.InitSMP]).
 //
 // On `GOOS=tamago` Go scheduler M's are never dropped, therefore the function
-// is invoked only once per AP.
+// is invoked only once per AP (i.e. GOMAXPROCS-1).
 func (cpu *CPU) Task(sp, mp, gp, fn unsafe.Pointer) {
 	t := &task{
 		sp: uint64(uintptr(sp)),
@@ -77,7 +77,7 @@ func (cpu *CPU) Task(sp, mp, gp, fn unsafe.Pointer) {
 		pc: uint64(uintptr(fn)),
 	}
 
-	if cpu.init+1 >= runtime.NumCPU() {
+	if cpu.init+1 >= runtime.GOMAXPROCS(-1) {
 		panic("Task exceeds available resources")
 	}
 
@@ -113,7 +113,6 @@ func (cpu *CPU) procresize() {
 	runtime.ProcID = cpu.ID
 	runtime.Task = cpu.Task
 
-	runtime.SetNumCPU(n)
 	runtime.GOMAXPROCS(n)
 }
 

doc/README.md

@@ -101,7 +101,7 @@ var SocketFunc func(ctx context.Context, net string, family, sotype int, laddr,
 
 <a name="Task"></a>Task describes the optional [runtime.Task](<https://pkg.go.dev/runtime/#Task>) function, which can be set to provide an implementation for HW/OS threading \(see \`runtime.newosproc\`\).
 
-The call takes effect only when [runtime.NumCPU](<https://pkg.go.dev/runtime/#NumCPU>) is greater than 1 \(see [runtime.SetNumCPU](<https://pkg.go.dev/runtime/#SetNumCPU>)\) and it is invoked at most ncpu-1 times.
+The call takes effect only when [runtime.GOMAXPROCS](<https://pkg.go.dev/runtime/#GOMAXPROCS>) is greater than 1 and it is invoked at most GOMAXPROCS\-1 times.
 
 For an example see package [amd64 SMP initialization](<https://github.com/usbarmory/tamago/blob/master/amd64/smp.go>).
 

doc/api_doc_stub.go

@@ -210,8 +210,8 @@ var SocketFunc func(ctx context.Context, net string, family, sotype int, laddr,
 // Task describes the optional [runtime.Task] function, which can be set to
 // provide an implementation for HW/OS threading (see `runtime.newosproc`).
 //
-// The call takes effect only when [runtime.NumCPU] is greater than 1 (see
-// [runtime.SetNumCPU]) and it is invoked at most ncpu-1 times.
+// The call takes effect only when [runtime.GOMAXPROCS] is greater than 1 and
+// it is invoked at most GOMAXPROCS-1 times.
 //
 // For an example see package [amd64 SMP initialization].
 //

go.mod

@@ -1,3 +1,3 @@
 module github.com/usbarmory/tamago
 
-go 1.24.6
+go 1.25.0

internal/reg/reg16.go

@@ -73,7 +73,7 @@ func Or16(addr uint32, val uint16) {
 // cannot be used before runtime initialization with `GOOS=tamago`.
 func Wait16(addr uint32, pos int, mask int, val uint16) {
 	for Get16(addr, pos, mask) != val {
-		if runtime.NumCPU() == 1 {
+		if runtime.GOMAXPROCS(-1) == 1 {
 			runtime.Gosched()
 		}
 	}
@@ -87,7 +87,7 @@ func WaitFor16(timeout time.Duration, addr uint32, pos int, mask int, val uint16
 	start := time.Now()
 
 	for Get16(addr, pos, mask) != val {
-		if runtime.NumCPU() == 1 {
+		if runtime.GOMAXPROCS(-1) == 1 {
 			runtime.Gosched()
 		}
 

internal/reg/reg32.go

@@ -114,7 +114,7 @@ func Or(addr uint32, val uint32) {
 // cannot be used before runtime initialization with `GOOS=tamago`.
 func Wait(addr uint32, pos int, mask int, val uint32) {
 	for Get(addr, pos, mask) != val {
-		if runtime.NumCPU() == 1 {
+		if runtime.GOMAXPROCS(-1) == 1 {
 			runtime.Gosched()
 		}
 	}
@@ -128,7 +128,7 @@ func WaitFor(timeout time.Duration, addr uint32, pos int, mask int, val uint32)
 	start := time.Now()
 
 	for Get(addr, pos, mask) != val {
-		if runtime.NumCPU() == 1 {
+		if runtime.GOMAXPROCS(-1) == 1 {
 			runtime.Gosched()
 		}
 
@@ -146,7 +146,7 @@ func WaitFor(timeout time.Duration, addr uint32, pos int, mask int, val uint32)
 // runtime initialization.
 func WaitSignal(exit chan struct{}, addr uint32, pos int, mask int, val uint32) bool {
 	for Get(addr, pos, mask) != val {
-		if runtime.NumCPU() == 1 {
+		if runtime.GOMAXPROCS(-1) == 1 {
 			runtime.Gosched()
 		}