refactor: seperate architecture specific codes

Author: jclab-joseph

src/machine/uefi/arch_x86.go

@@ -0,0 +1,13 @@
+//go:build i386 || amd64
+
+package uefi
+
+import "device/x86"
+
+func Ticks() uint64 {
+	return x86.AsmReadRdtsc()
+}
+
+func getTscFrequency() uint64 {
+	return x86.InternalGetPerformanceCounterFrequency()
+}

src/machine/uefi/clock.go

@@ -3,15 +3,14 @@
 package uefi
 
 import (
-	"device/x86"
 	"sync"
 )
 
 var calibrateMutex sync.Mutex
 var calculatedFrequency uint64
 
-func GetTscFrequency() uint64 {
-	frequency := x86.InternalGetPerformanceCounterFrequency()
+func TicksFrequency() uint64 {
+	frequency := getTscFrequency()
 	if frequency > 0 {
 		return frequency
 	}
@@ -37,14 +36,14 @@ func GetTscFrequency() uint64 {
 	}
 	defer bs.CloseEvent(event)
 
-	st := x86.AsmReadRdtsc()
+	st := Ticks()
 	status = bs.SetTimer(event, TimerPeriodic, 250*10000)
 	if status != EFI_SUCCESS {
 		DebugPrint("GetTscFrequency) SetTimer Failed", uint64(status))
 		return 0
 	}
 	status = bs.WaitForEvent(1, &event, &index)
-	diff := x86.AsmReadRdtsc() - st
+	diff := Ticks() - st
 
 	calculatedFrequency = diff * 4
 
@@ -91,7 +90,6 @@ const (
 	secondsPerMinute = 60
 	secondsPerHour   = 60 * secondsPerMinute
 	secondsPerDay    = 24 * secondsPerHour
-	secondsPerWeek   = 7 * secondsPerDay
 	daysPer400Years  = 365*400 + 97
 	daysPer100Years  = 365*100 + 24
 	daysPer4Years    = 365*4 + 1
@@ -107,12 +105,9 @@ const (
 
 	// 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
 )
 
 // daysBefore[m] counts the number of days in a non-leap year

src/machine/uefi/util.go

@@ -3,7 +3,6 @@
 package uefi
 
 import (
-	"device/x86"
 	"unicode/utf16"
 	"unicode/utf8"
 	"unsafe"
@@ -30,14 +29,6 @@ func GetImageHandle() EFI_HANDLE {
 	return EFI_HANDLE(imageHandle)
 }
 
-func Ticks() uint64 {
-	return x86.AsmReadRdtsc()
-}
-
-func TicksFrequency() uint64 {
-	return GetTscFrequency()
-}
-
 func UTF16ToString(input []CHAR16) string {
 	return UTF16PtrLenToString(&input[0], len(input))
 }

src/runtime/runtime_uefi.go

@@ -3,10 +3,11 @@
 package runtime
 
 import (
-	"device/x86"
 	"machine/uefi"
 )
 
+type WaitForEvents func()
+
 func machineTicks() uint64 {
 	return uefi.Ticks()
 }
@@ -19,23 +20,14 @@ func ticks() timeUnit {
 	return timeUnit(t)
 }
 
-func ticksToNanoseconds(ticks timeUnit) int64 {
-	return x86.ConvertTimeInNanoSecond(uefi.TicksFrequency(), uint64(ticks))
-}
-
-func nanosecondsToTicks(ns int64) timeUnit {
-	return timeUnit(x86.ConvertTicksFromNanoSeconds(uefi.TicksFrequency(), uint64(ns)))
-}
-
 func sleepTicks(d timeUnit) {
 	if d == 0 {
 		return
 	}
 
-	// Busy loop
 	sleepUntil := ticks() + d
 	for ticks() < sleepUntil {
-		x86.AsmPause()
+		cpuPause()
 	}
 }
 
@@ -120,8 +112,18 @@ func init() {
 	}
 }
 
+var waitForEventsFunction WaitForEvents = func() {
+	cpuPause()
+}
+
+// SetWaitForEvents
+// You can implement your own event-loop with BS.CheckEvent or BS.WaitForEvents.
+func SetWaitForEvents(f WaitForEvents) {
+	waitForEventsFunction = f
+}
+
 func waitForEvents() {
-	uefi.DebugPrint("waitForEvents", 0)
+	waitForEventsFunction()
 }
 
 // Must be a separate function to get the correct stack pointer.

src/runtime/runtime_uefi_x86.go

@@ -0,0 +1,20 @@
+//go:build uefi && (i386 || amd64)
+
+package runtime
+
+import (
+	"device/x86"
+	"machine/uefi"
+)
+
+func ticksToNanoseconds(ticks timeUnit) int64 {
+	return x86.ConvertTimeInNanoSecond(uefi.TicksFrequency(), uint64(ticks))
+}
+
+func nanosecondsToTicks(ns int64) timeUnit {
+	return timeUnit(x86.ConvertTicksFromNanoSeconds(uefi.TicksFrequency(), uint64(ns)))
+}
+
+func cpuPause() {
+	x86.AsmPause()
+}