refactor: remove runtime_uefi_x86.go

Author: jclab-joseph

src/device/x86/cpu.go

@@ -140,48 +140,3 @@ func CpuidCoreClockCalculateTscFrequency() uint64 {
 	TscFrequency = ((CoreXtalFrequency * uint64(RegEbx)) + (uint64(RegEax) / 2)) / uint64(RegEax)
 	return TscFrequency
 }
-
-func ConvertTimeInNanoSecond(frequency uint64, ticks uint64) int64 {
-	//          Ticks
-	// Time = --------- x 1,000,000,000
-	//        Frequency
-	nanoSeconds := (ticks / frequency) * 1000000000
-	remainder := ticks % frequency
-
-	// Ensure (Remainder * 1,000,000,000) will not overflow 64-bit.
-	// Since 2^29 < 1,000,000,000 = 0x3B9ACA00 < 2^30, Remainder should < 2^(64-30) = 2^34,
-	// i.e. highest bit set in Remainder should <= 33.
-	//
-	shift := highBitSet64(remainder) - 32
-	if shift < 0 {
-		shift = 0
-	}
-	remainder = remainder >> shift
-	frequency = frequency >> shift
-	nanoSeconds += remainder * 1000000000 / frequency
-
-	return int64(nanoSeconds)
-}
-
-func ConvertTicksFromNanoSeconds(frequency uint64, nano uint64) uint64 {
-	return nano * frequency / 1000000000
-}
-
-func highBitSet64(operand uint64) int {
-	if operand == (operand & 0xffffffff) {
-		return highBitSet32(uint32(operand))
-	}
-	return highBitSet32(uint32(operand>>32)) + 32
-}
-
-func highBitSet32(operand uint32) int {
-	if operand == 0 {
-		return -1
-	}
-	bitIndex := 32
-	for operand > 0 {
-		bitIndex--
-		operand <<= 1
-	}
-	return bitIndex
-}

src/machine/uefi/arch_x86.go

@@ -8,6 +8,10 @@ func Ticks() uint64 {
 	return x86.AsmReadRdtsc()
 }
 
+func CpuPause() {
+	x86.AsmPause()
+}
+
 func getTscFrequency() uint64 {
 	return x86.InternalGetPerformanceCounterFrequency()
 }

src/runtime/runtime_uefi.go

@@ -12,22 +12,69 @@ func machineTicks() uint64 {
 	return uefi.Ticks()
 }
 
-type timeUnit uint64
+type timeUnit int64
 
 // ticks returns the number of ticks (microseconds) elapsed since power up.
 func ticks() timeUnit {
 	t := machineTicks()
 	return timeUnit(t)
 }
 
+func nanosecondsToTicks(ns int64) timeUnit {
+	return timeUnit(ns * int64(uefi.TicksFrequency()) / 1000000000)
+}
+
+func ticksToNanoseconds(ticks timeUnit) int64 {
+	frequency := timeUnit(uefi.TicksFrequency())
+
+	//          Ticks
+	// Time = --------- x 1,000,000,000
+	//        Frequency
+	nanoSeconds := (ticks / frequency) * 1000000000
+	remainder := ticks % frequency
+
+	// Ensure (Remainder * 1,000,000,000) will not overflow 64-bit.
+	// Since 2^29 < 1,000,000,000 = 0x3B9ACA00 < 2^30, Remainder should < 2^(64-30) = 2^34,
+	// i.e. highest bit set in Remainder should <= 33.
+	//
+	shift := highBitSet64(uint64(remainder)) - 32
+	if shift < 0 {
+		shift = 0
+	}
+	remainder = remainder >> shift
+	frequency = frequency >> shift
+	nanoSeconds += remainder * 1000000000 / frequency
+
+	return int64(nanoSeconds)
+}
+
+func highBitSet64(operand uint64) int {
+	if operand == (operand & 0xffffffff) {
+		return highBitSet32(uint32(operand))
+	}
+	return highBitSet32(uint32(operand>>32)) + 32
+}
+
+func highBitSet32(operand uint32) int {
+	if operand == 0 {
+		return -1
+	}
+	bitIndex := 32
+	for operand > 0 {
+		bitIndex--
+		operand <<= 1
+	}
+	return bitIndex
+}
+
 func sleepTicks(d timeUnit) {
 	if d == 0 {
 		return
 	}
 
 	sleepUntil := ticks() + d
 	for ticks() < sleepUntil {
-		cpuPause()
+		uefi.CpuPause()
 	}
 }
 
@@ -113,7 +160,7 @@ func init() {
 }
 
 var waitForEventsFunction WaitForEvents = func() {
-	cpuPause()
+	uefi.CpuPause()
 }
 
 // SetWaitForEvents