svn commit: r356592 - head/sys/riscv/riscv

[Mitchell Horne]

Author: mhorne
Date: Fri Jan 10 03:17:28 2020
New Revision: 356592
URL: https://svnweb.freebsd.org/changeset/base/356592

Log:
  Replace inline assembly with rdtime macro
  
  This macro is used elsewhere and is slightly cleaner. NFC.

Modified:
  head/sys/riscv/riscv/timer.c

Modified: head/sys/riscv/riscv/timer.c
==============================================================================
--- head/sys/riscv/riscv/timer.c	Fri Jan 10 03:16:40 2020	(r356591)
+++ head/sys/riscv/riscv/timer.c	Fri Jan 10 03:17:28 2020	(r356592)
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
+#include <machine/cpufunc.h>
 #include <machine/intr.h>
 #include <machine/asm.h>
 #include <machine/trap.h>
@@ -91,11 +92,8 @@ static struct timecounter riscv_timer_timecount = {
 static inline uint64_t
 get_cycles(void)
 {
-	uint64_t cycles;
 
-	__asm __volatile("rdtime %0" : "=r" (cycles));
-
-	return (cycles);
+	return (rdtime());
 }
 
 static long