summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-07-06 08:12:40 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-07-06 13:46:46 +0200
commitdd32e2b2d009de525c1a4ad488899fab355d8fed (patch)
treea513efdbd56380e53fb2851dae3ae8be0163f085 /cpukit
parentUpdate config.guess and config.sub (diff)
downloadrtems-dd32e2b2d009de525c1a4ad488899fab355d8fed.tar.bz2
riscv: Implement CPU counter
Update #3433.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/score/cpu/riscv/Makefile.am1
-rw-r--r--cpukit/score/cpu/riscv/include/rtems/score/cpu.h17
2 files changed, 16 insertions, 2 deletions
diff --git a/cpukit/score/cpu/riscv/Makefile.am b/cpukit/score/cpu/riscv/Makefile.am
index e7714686f2..3630c038a7 100644
--- a/cpukit/score/cpu/riscv/Makefile.am
+++ b/cpukit/score/cpu/riscv/Makefile.am
@@ -2,7 +2,6 @@ include $(top_srcdir)/automake/compile.am
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
libscorecpu_a_SOURCES = cpu.c
-libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c
libscorecpu_a_SOURCES += riscv-exception-handler.S
libscorecpu_a_SOURCES += riscv-exception-default.c
libscorecpu_a_SOURCES += riscv-exception-frame-print.c
diff --git a/cpukit/score/cpu/riscv/include/rtems/score/cpu.h b/cpukit/score/cpu/riscv/include/rtems/score/cpu.h
index e79ce25510..f84395c638 100644
--- a/cpukit/score/cpu/riscv/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/riscv/include/rtems/score/cpu.h
@@ -370,7 +370,22 @@ typedef uint32_t CPU_Counter_ticks;
uint32_t _CPU_Counter_frequency( void );
-CPU_Counter_ticks _CPU_Counter_read( void );
+static inline CPU_Counter_ticks _CPU_Counter_read( void )
+{
+ unsigned long ticks;
+
+ __asm__ volatile ( "rdtime %0" : "=&r" ( ticks ) );
+
+ return (uint32_t) ticks;
+}
+
+static inline CPU_Counter_ticks _CPU_Counter_difference(
+ CPU_Counter_ticks second,
+ CPU_Counter_ticks first
+)
+{
+ return second - first;
+}
#ifdef RTEMS_SMP