From 65f868cac6f7fd5c3ad02046574c19f8f4673255 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 23 May 2018 14:17:25 +0200 Subject: Add _CPU_Counter_frequency() Add rtems_counter_frequency() API function. Use it to initialize the counter value converter via the new system initialization step (RTEMS_SYSINIT_CPU_COUNTER). This decouples the counter implementation and the counter converter. It avoids an unnecessary pull in of the 64-bit integer division from libgcc. Update #3456. --- cpukit/score/cpu/or1k/Makefile.am | 3 ++- cpukit/score/cpu/or1k/include/rtems/score/cpu.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'cpukit/score/cpu/or1k') diff --git a/cpukit/score/cpu/or1k/Makefile.am b/cpukit/score/cpu/or1k/Makefile.am index ac83acf9b3..732f7c3d69 100644 --- a/cpukit/score/cpu/or1k/Makefile.am +++ b/cpukit/score/cpu/or1k/Makefile.am @@ -6,8 +6,9 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = libscorecpu_a_SOURCES += cpu.c -libscorecpu_a_SOURCES += or1k-context-switch.S +libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c libscorecpu_a_SOURCES += or1k-context-initialize.c +libscorecpu_a_SOURCES += or1k-context-switch.S libscorecpu_a_SOURCES += or1k-context-validate.S libscorecpu_a_SOURCES += or1k-context-volatile-clobber.S libscorecpu_a_SOURCES += or1k-exception-default.c diff --git a/cpukit/score/cpu/or1k/include/rtems/score/cpu.h b/cpukit/score/cpu/or1k/include/rtems/score/cpu.h index 648a7a6b9c..1dedeb6629 100644 --- a/cpukit/score/cpu/or1k/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/or1k/include/rtems/score/cpu.h @@ -665,8 +665,6 @@ void _CPU_Context_Initialize( #define CPU_MAXIMUM_PROCESSORS 32 #ifndef ASM -typedef uint32_t CPU_Counter_ticks; - typedef struct { uint32_t r[32]; @@ -856,6 +854,8 @@ static inline unsigned int CPU_swap_u32( typedef uint32_t CPU_Counter_ticks; +uint32_t _CPU_Counter_frequency( void ); + CPU_Counter_ticks _CPU_Counter_read( void ); CPU_Counter_ticks _CPU_Counter_difference( -- cgit v1.2.3