update

Author: jclab-joseph

src/device/x86/cpu.go

@@ -24,6 +24,9 @@ const (
 	CPUID_PROCESSOR_FREQUENCY = 0x16
 )
 
+//export asmPause
+func AsmPause()
+
 //export asmReadRdtsc
 func AsmReadRdtsc() uint64
 

src/device/x86/cpu_amd64.S

@@ -1,5 +1,10 @@
 .section .text
 
+.global asmPause
+asmPause:
+    pause
+    ret
+
 .global asmReadRdtsc
 asmReadRdtsc:
     rdtsc

src/machine/uefi/eventloop.go

@@ -0,0 +1,9 @@
+package uefi
+
+import "device/x86"
+
+//go:noinline
+func EventLoop() {
+	// something
+	x86.AsmPause()
+}

src/runtime/runtime_uefi.go

@@ -7,12 +7,6 @@ import (
 	"machine/uefi"
 )
 
-//go:linkname systemTable machine/uefi.systemTable
-var systemTable *uefi.EFI_SYSTEM_TABLE
-
-//go:linkname imageHandle machine/uefi.imageHandle
-var imageHandle uintptr
-
 func machineTicks() uint64 {
 	return uefi.Ticks()
 }
@@ -33,40 +27,18 @@ func nanosecondsToTicks(ns int64) timeUnit {
 	return timeUnit(x86.ConvertTicksFromNanoSeconds(uefi.TicksFrequency(), uint64(ns)))
 }
 
-// timeOffset
-// TODO: use rtc
 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("WHAT THE", uint64(status))
+		uefi.DebugPrint("gettime error", uint64(status))
 		sec = (mono + timeOffset) / (1000 * 1000 * 1000)
 		nsec = int32((mono + timeOffset) - sec*(1000*1000*1000))
 	} else {
-		year := int(efiTime.Year)
-		month := int(efiTime.Month) - 1
-
-		// Compute days since the absolute epoch.
-		d := daysSinceEpoch(year)
-
-		// Add in days before this month.
-		d += uint64(daysBefore[month-1])
-		if isLeap(year) && month >= March {
-			d++ // February 29
-		}
-
-		// Add in days before today.
-		d += uint64(efiTime.Day - 1)
-
-		// Add in time elapsed today.
-		abs := d * secondsPerDay
-		abs += uint64(uint64(efiTime.Hour)*uint64(secondsPerHour) + uint64(efiTime.Minute)*uint64(secondsPerMinute) + uint64(efiTime.Second))
-
-		sec = int64(abs) + (absoluteToInternal + internalToUnix)
-		nsec = int32(efiTime.Nanosecond)
+		sec, nsec = efiTime.GetEpoch()
 	}
 	return
 }
@@ -79,22 +51,22 @@ func sleepTicks(d timeUnit) {
 	// Busy loop
 	sleepUntil := ticks() + d
 	for ticks() < sleepUntil {
+		x86.AsmPause()
 	}
 }
 
 func putchar(c byte) {
 	buf := [2]uefi.CHAR16{uefi.CHAR16(c), 0}
 	st := uefi.ST()
-	st.ConOut.OutputString(st.ConOut, &buf[0])
+	st.ConOut.OutputString(&buf[0])
 }
 
 func exit(code int) {
+	uefi.BS().Exit(uefi.GetImageHandle(), uefi.EFI_STATUS(code), 0, nil)
 }
 
 func abort() {
-	for {
-		// empty
-	}
+	uefi.BS().Exit(uefi.GetImageHandle(), uefi.EFI_ABORTED, 0, nil)
 }
 
 //go:linkname procPin sync/atomic.runtime_procPin
@@ -115,9 +87,10 @@ var stackTop uintptr
 var allocatePagesAddress uefi.EFI_PHYSICAL_ADDRESS
 
 func preinit() {
+	// status is must be register
 	var status uefi.EFI_STATUS
 
-	heapMaxSize = 128 * 1024 * 1024 // 1G for the entire heap
+	heapMaxSize = 1024 * 1024 * 1024 // 1G for the entire heap
 
 	bs := uefi.BS()
 	for heapMaxSize > 16*1024*1024 {
@@ -152,6 +125,29 @@ func growHeap() bool {
 	return true
 }
 
+func init() {
+	var efiTime uefi.EFI_TIME
+
+	efiTime, status := uefi.GetTime()
+	if status == uefi.EFI_SUCCESS {
+		sec, nsec := efiTime.GetEpoch()
+		timeOffset = sec*1000000000 + int64(nsec)
+	}
+
+	go func() {
+		// Event Loop
+		uefi.DebugPrint("HELLO WORLD", 0)
+		for {
+			uefi.EventLoop()
+			Gosched()
+		}
+	}()
+}
+
+func waitForEvents() {
+	uefi.DebugPrint("waitForEvents", 0)
+}
+
 // Must be a separate function to get the correct stack pointer.
 //
 //go:noinline
@@ -174,100 +170,3 @@ func main(imageHandle uintptr, systemTable uintptr) uintptr {
 	// For libc compatibility.
 	return 0
 }
-
-// region: time utils
-const (
-	secondsPerMinute = 60
-	secondsPerHour   = 60 * secondsPerMinute
-	secondsPerDay    = 24 * secondsPerHour
-	secondsPerWeek   = 7 * secondsPerDay
-	daysPer400Years  = 365*400 + 97
-	daysPer100Years  = 365*100 + 24
-	daysPer4Years    = 365*4 + 1
-
-	// The unsigned zero year for internal calculations.
-	// Must be 1 mod 400, and times before it will not compute correctly,
-	// but otherwise can be changed at will.
-	absoluteZeroYear = -292277022399
-
-	// The year of the zero Time.
-	// Assumed by the unixToInternal computation below.
-	internalYear = 1
-
-	// Offsets to convert between internal and absolute or Unix times.
-	absoluteToInternal int64 = (absoluteZeroYear - internalYear) * 365.2425 * secondsPerDay
-	internalToAbsolute       = -absoluteToInternal
-
-	unixToInternal int64 = (1969*365 + 1969/4 - 1969/100 + 1969/400) * secondsPerDay
-	internalToUnix int64 = -unixToInternal
-
-	wallToInternal int64 = (1884*365 + 1884/4 - 1884/100 + 1884/400) * secondsPerDay
-)
-
-const (
-	January = 1 + iota
-	February
-	March
-	April
-	May
-	June
-	July
-	August
-	September
-	October
-	November
-	December
-)
-
-// daysBefore[m] counts the number of days in a non-leap year
-// before month m begins. There is an entry for m=12, counting
-// the number of days before January of next year (365).
-var daysBefore = [...]int32{
-	0,
-	31,
-	31 + 28,
-	31 + 28 + 31,
-	31 + 28 + 31 + 30,
-	31 + 28 + 31 + 30 + 31,
-	31 + 28 + 31 + 30 + 31 + 30,
-	31 + 28 + 31 + 30 + 31 + 30 + 31,
-	31 + 28 + 31 + 30 + 31 + 30 + 31 + 31,
-	31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
-	31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
-	31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30,
-	31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31,
-}
-
-// daysSinceEpoch takes a year and returns the number of days from
-// the absolute epoch to the start of that year.
-// This is basically (year - zeroYear) * 365, but accounting for leap days.
-func daysSinceEpoch(year int) uint64 {
-	y := uint64(int64(year) - absoluteZeroYear)
-
-	// Add in days from 400-year cycles.
-	n := y / 400
-	y -= 400 * n
-	d := daysPer400Years * n
-
-	// Add in 100-year cycles.
-	n = y / 100
-	y -= 100 * n
-	d += daysPer100Years * n
-
-	// Add in 4-year cycles.
-	n = y / 4
-	y -= 4 * n
-	d += daysPer4Years * n
-
-	// Add in non-leap years.
-	n = y
-	d += 365 * n
-
-	return d
-}
-
-func isLeap(year int) bool {
-	return year%4 == 0 && (year%100 != 0 || year%400 == 0)
-}
-
-//endregion

src/runtime/wait_other.go

@@ -1,4 +1,4 @@
-//go:build !tinygo.riscv && !cortexm
+//go:build !tinygo.riscv && !cortexm && !uefi
 
 package runtime