refactor: use baremetal time and seperate baremetal_memory

Author: jclab-joseph

src/runtime/baremetal.go

@@ -1,41 +1,11 @@
-//go:build baremetal && !uefi
+//go:build baremetal
 
 package runtime
 
 import (
 	"unsafe"
 )
 
-//go:extern _heap_start
-var heapStartSymbol [0]byte
-
-//go:extern _heap_end
-var heapEndSymbol [0]byte
-
-//go:extern _globals_start
-var globalsStartSymbol [0]byte
-
-//go:extern _globals_end
-var globalsEndSymbol [0]byte
-
-//go:extern _stack_top
-var stackTopSymbol [0]byte
-
-var (
-	heapStart    = uintptr(unsafe.Pointer(&heapStartSymbol))
-	heapEnd      = uintptr(unsafe.Pointer(&heapEndSymbol))
-	globalsStart = uintptr(unsafe.Pointer(&globalsStartSymbol))
-	globalsEnd   = uintptr(unsafe.Pointer(&globalsEndSymbol))
-	stackTop     = uintptr(unsafe.Pointer(&stackTopSymbol))
-)
-
-// growHeap tries to grow the heap size. It returns true if it succeeds, false
-// otherwise.
-func growHeap() bool {
-	// On baremetal, there is no way the heap can be grown.
-	return false
-}
-
 //export malloc
 func libc_malloc(size uintptr) unsafe.Pointer {
 	// Note: this zeroes the returned buffer which is not necessary.

src/runtime/baremetal_memory.go

@@ -0,0 +1,33 @@
+//go:build baremetal && !uefi
+
+package runtime
+
+//go:extern _heap_start
+var heapStartSymbol [0]byte
+
+//go:extern _heap_end
+var heapEndSymbol [0]byte
+
+//go:extern _globals_start
+var globalsStartSymbol [0]byte
+
+//go:extern _globals_end
+var globalsEndSymbol [0]byte
+
+//go:extern _stack_top
+var stackTopSymbol [0]byte
+
+var (
+	heapStart    = uintptr(unsafe.Pointer(&heapStartSymbol))
+	heapEnd      = uintptr(unsafe.Pointer(&heapEndSymbol))
+	globalsStart = uintptr(unsafe.Pointer(&globalsStartSymbol))
+	globalsEnd   = uintptr(unsafe.Pointer(&globalsEndSymbol))
+	stackTop     = uintptr(unsafe.Pointer(&stackTopSymbol))
+)
+
+// growHeap tries to grow the heap size. It returns true if it succeeds, false
+// otherwise.
+func growHeap() bool {
+	// On baremetal, there is no way the heap can be grown.
+	return false
+}

src/runtime/os_other.go

@@ -1,4 +1,4 @@
-//go:build linux && (baremetal || nintendoswitch || wasi) && !uefi
+//go:build linux && (baremetal || nintendoswitch || wasi)
 
 // Other systems that aren't operating systems supported by the Go toolchain
 // need to pretend to be an existing operating system. Linux seems like a good

src/runtime/os_uefi.go

@@ -7,10 +7,6 @@ import (
 	"unsafe"
 )
 
-const baremetal = true
-
-const GOOS = "uefi"
-
 // Mark global variables.
 // Unfortunately, the linker doesn't provide symbols for the start and end of
 // the data/bss sections. Therefore these addresses need to be determined at

src/runtime/runtime_uefi.go

@@ -27,22 +27,6 @@ func nanosecondsToTicks(ns int64) timeUnit {
 	return timeUnit(x86.ConvertTicksFromNanoSeconds(uefi.TicksFrequency(), uint64(ns)))
 }
 
-var timeOffset int64
-
-//go:linkname now time.now
-func now() (sec int64, nsec int32, mono int64) {
-	mono = nanotime()
-	efiTime, status := uefi.GetTime()
-	if status != uefi.EFI_SUCCESS {
-		uefi.DebugPrint("gettime error", uint64(status))
-		sec = (mono + timeOffset) / (1000 * 1000 * 1000)
-		nsec = int32((mono + timeOffset) - sec*(1000*1000*1000))
-	} else {
-		sec, nsec = efiTime.GetEpoch()
-	}
-	return
-}
-
 func sleepTicks(d timeUnit) {
 	if d == 0 {
 		return
@@ -128,10 +112,11 @@ func growHeap() bool {
 func init() {
 	var efiTime uefi.EFI_TIME
 
+	mono := nanotime()
 	efiTime, status := uefi.GetTime()
 	if status == uefi.EFI_SUCCESS {
 		sec, nsec := efiTime.GetEpoch()
-		timeOffset = sec*1000000000 + int64(nsec)
+		timeOffset = sec*1000000000 + int64(nsec) - mono
 	}
 
 	go func() {