andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM port updated to latest spec. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13802 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2020-08-01 09:54:27 +00:00
parent 71c5be34a8
commit 5697059a00
3 changed files with 125 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h
View File

@ -625,7 +625,7 @@
* tickless mode. * tickless mode.
*/ */
#if !defined(CH_DBG_THREADS_PROFILING) #if !defined(CH_DBG_THREADS_PROFILING)
#define CH_DBG_THREADS_PROFILING TRUE #define CH_DBG_THREADS_PROFILING FALSE
#endif #endif
/** @} */ /** @} */

221
os/common/ports/ARM/chcore.h
View File

@ -28,10 +28,31 @@
#ifndef CHCORE_H #ifndef CHCORE_H
#define CHCORE_H #define CHCORE_H
/* Inclusion of the ARM implementation specific parameters.*/
#include "armparams.h"
/*===========================================================================*/ /*===========================================================================*/
/* Module constants. */ /* Module constants. */
/*===========================================================================*/ /*===========================================================================*/
/* The following code is not processed when the file is included from an
asm module because those intrinsic macros are not necessarily defined
by the assembler too.*/
#if !defined(_FROM_ASM_)
/**
* @brief Compiler name and version.
*/
#if defined(__GNUC__) || defined(__DOXYGEN__)
#define PORT_COMPILER_NAME "GCC " __VERSION__
#else
#error "unsupported compiler"
#endif
#endif /* !defined(_FROM_ASM_) */
/** @} */
/** /**
* @name Port Capabilities and Constants * @name Port Capabilities and Constants
* @{ * @{
@ -60,33 +81,6 @@
#define PORT_WORKING_AREA_ALIGN sizeof (stkalign_t) #define PORT_WORKING_AREA_ALIGN sizeof (stkalign_t)
/** @} */ /** @} */
/**
* @name Architecture and Compiler
* @{
*/
/**
* @brief Macro defining a generic ARM architecture.
*/
#define PORT_ARCHITECTURE_ARM
/* The following code is not processed when the file is included from an
asm module because those intrinsic macros are not necessarily defined
by the assembler too.*/
#if !defined(_FROM_ASM_)
/**
* @brief Compiler name and version.
*/
#if defined(__GNUC__) || defined(__DOXYGEN__)
#define PORT_COMPILER_NAME "GCC " __VERSION__
#else
#error "unsupported compiler"
#endif
#endif /* !defined(_FROM_ASM_) */
/** @} */
/** /**
* @name ARM variants * @name ARM variants
* @{ * @{
@ -99,8 +93,70 @@
#define ARM_CORE_CORTEX_A9 109 #define ARM_CORE_CORTEX_A9 109
/** @} */ /** @} */
/* Inclusion of the ARM implementation specific parameters.*/ /**
#include "armparams.h" * @name Architecture
* @{
*/
/**
* @brief Macro defining a generic ARM architecture.
*/
#define PORT_ARCHITECTURE_ARM
/* ARM core check.*/
#if (ARM_CORE == ARM_CORE_ARM7TDMI) || defined(__DOXYGEN__)
#define PORT_ARCHITECTURE_ARM_ARM7
#define PORT_ARCHITECTURE_NAME "ARMv4T"
#define PORT_CORE_VARIANT_NAME "ARM7"
#elif ARM_CORE == ARM_CORE_ARM9
#define PORT_ARCHITECTURE_ARM_ARM9
#define PORT_ARCHITECTURE_NAME "ARMv5T"
#define PORT_CORE_VARIANT_NAME "ARM9"
#elif ARM_CORE == ARM_CORE_CORTEX_A5
#define PORT_ARCHITECTURE_ARM_CORTEXA5
#define PORT_ARCHITECTURE_NAME "ARMv7"
#define PORT_CORE_VARIANT_NAME "ARM Cortex-A5"
#elif ARM_CORE == ARM_CORE_CORTEX_A7
#define PORT_ARCHITECTURE_ARM_CORTEXA5
#define PORT_ARCHITECTURE_NAME "ARMv7"
#define PORT_CORE_VARIANT_NAME "ARM Cortex-A7"
#elif ARM_CORE == ARM_CORE_CORTEX_A8
#define PORT_ARCHITECTURE_ARM_CORTEXA8
#define PORT_ARCHITECTURE_NAME "ARMv7"
#define PORT_CORE_VARIANT_NAME "ARM Cortex-A8"
#elif ARM_CORE == ARM_CORE_CORTEX_A9
#define PORT_ARCHITECTURE_ARM_CORTEXA9
#define PORT_ARCHITECTURE_NAME "ARMv7"
#define PORT_CORE_VARIANT_NAME "ARM Cortex-A9"
#else
#error "unknown or unsupported ARM core"
#endif
#if defined(THUMB_PRESENT)
#if defined(THUMB_NO_INTERWORKING)
#define PORT_INFO "Pure THUMB mode"
#else
#define PORT_INFO "Interworking mode"
#endif
#else
#define PORT_INFO "Pure ARM mode"
#endif
#if ARM_CORE < 100
#define ARM_CORE_CLASSIC 1
#define ARM_CORE_CORTEX_A 0
#elif ARM_CORE < 200
#define ARM_CORE_CLASSIC 0
#define ARM_CORE_CORTEX_A 1
#else
#error "unknown or unsupported ARM core"
#endif
/** @} */
/*===========================================================================*/ /*===========================================================================*/
/* Module pre-compile time settings. */ /* Module pre-compile time settings. */
@ -149,66 +205,6 @@
/* Derived constants and error checks. */ /* Derived constants and error checks. */
/*===========================================================================*/ /*===========================================================================*/
#if ARM_CORE < 100
#define ARM_CORE_CLASSIC 1
#define ARM_CORE_CORTEX_A 0
#elif ARM_CORE < 200
#define ARM_CORE_CLASSIC 0
#define ARM_CORE_CORTEX_A 1
#else
#endif
/* The following code is not processed when the file is included from an
asm module.*/
#if !defined(_FROM_ASM_)
/* ARM core check.*/
#if (ARM_CORE == ARM_CORE_ARM7TDMI) || defined(__DOXYGEN__)
#define PORT_ARCHITECTURE_ARM_ARM7
#define PORT_ARCHITECTURE_NAME "ARMv4T"
#define PORT_CORE_VARIANT_NAME "ARM7"
#elif ARM_CORE == ARM_CORE_ARM9
#define PORT_ARCHITECTURE_ARM_ARM9
#define PORT_ARCHITECTURE_NAME "ARMv5T"
#define PORT_CORE_VARIANT_NAME "ARM9"
#elif ARM_CORE == ARM_CORE_CORTEX_A5
#define PORT_ARCHITECTURE_ARM_CORTEXA5
#define PORT_ARCHITECTURE_NAME "ARMv7"
#define PORT_CORE_VARIANT_NAME "ARM Cortex-A5"
#elif ARM_CORE == ARM_CORE_CORTEX_A7
#define PORT_ARCHITECTURE_ARM_CORTEXA5
#define PORT_ARCHITECTURE_NAME "ARMv7"
#define PORT_CORE_VARIANT_NAME "ARM Cortex-A7"
#elif ARM_CORE == ARM_CORE_CORTEX_A8
#define PORT_ARCHITECTURE_ARM_CORTEXA8
#define PORT_ARCHITECTURE_NAME "ARMv7"
#define PORT_CORE_VARIANT_NAME "ARM Cortex-A8"
#elif ARM_CORE == ARM_CORE_CORTEX_A9
#define PORT_ARCHITECTURE_ARM_CORTEXA9
#define PORT_ARCHITECTURE_NAME "ARMv7"
#define PORT_CORE_VARIANT_NAME "ARM Cortex-A9"
#else
#error "unknown or unsupported ARM core"
#endif
#if defined(THUMB_PRESENT)
#if defined(THUMB_NO_INTERWORKING)
#define PORT_INFO "Pure THUMB mode"
#else
#define PORT_INFO "Interworking mode"
#endif
#else
#define PORT_INFO "Pure ARM mode"
#endif
#endif /* !defined(_FROM_ASM_) */
/*===========================================================================*/ /*===========================================================================*/
/* Module data structures and types. */ /* Module data structures and types. */
/*===========================================================================*/ /*===========================================================================*/
@ -275,6 +271,18 @@ struct port_context {
/* Module macros. */ /* Module macros. */
/*===========================================================================*/ /*===========================================================================*/
/**
* @brief Priority level verification macro.
* @note Not applicable in this architecture.
*/
#define PORT_IRQ_IS_VALID_PRIORITY(n) false
/**
* @brief Priority level verification macro.
* @note Not applicable in this architecture.
*/
#define PORT_IRQ_IS_VALID_KERNEL_PRIORITY(n) false
/** /**
* @brief Platform dependent part of the @p chThdCreateI() API. * @brief Platform dependent part of the @p chThdCreateI() API.
* @details This code usually setup the context switching frame represented * @details This code usually setup the context switching frame represented
@ -285,7 +293,7 @@ struct port_context {
sizeof (struct port_intctx)); \ sizeof (struct port_intctx)); \
(tp)->ctx.sp->r4 = (regarm_t)(pf); \ (tp)->ctx.sp->r4 = (regarm_t)(pf); \
(tp)->ctx.sp->r5 = (regarm_t)(arg); \ (tp)->ctx.sp->r5 = (regarm_t)(arg); \
(tp)->ctx.sp->lr = (regarm_t)(_port_thread_start); \ (tp)->ctx.sp->lr = (regarm_t)(__port_thread_start); \
} }
/** /**
@ -364,10 +372,10 @@ struct port_context {
register struct port_intctx *r13 asm ("r13"); \ register struct port_intctx *r13 asm ("r13"); \
if ((stkalign_t *)(r13 - 1) < otp->wabase) \ if ((stkalign_t *)(r13 - 1) < otp->wabase) \
chSysHalt("stack overflow"); \ chSysHalt("stack overflow"); \
_port_switch_thumb(ntp, otp); \ __port_switch_thumb(ntp, otp); \
} }
#else #else
#define port_switch(ntp, otp) _port_switch_thumb(ntp, otp) #define port_switch(ntp, otp) __port_switch_thumb(ntp, otp)
#endif #endif
#else /* !defined(THUMB) */ #else /* !defined(THUMB) */
@ -377,10 +385,10 @@ struct port_context {
register struct port_intctx *r13 asm ("r13"); \ register struct port_intctx *r13 asm ("r13"); \
if ((stkalign_t *)(r13 - 1) < otp->wabase) \ if ((stkalign_t *)(r13 - 1) < otp->wabase) \
chSysHalt("stack overflow"); \ chSysHalt("stack overflow"); \
_port_switch_arm(ntp, otp); \ __port_switch_arm(ntp, otp); \
} }
#else #else
#define port_switch(ntp, otp) _port_switch_arm(ntp, otp) #define port_switch(ntp, otp) __port_switch_arm(ntp, otp)
#endif #endif
#endif /* !defined(THUMB) */ #endif /* !defined(THUMB) */
@ -393,14 +401,14 @@ struct port_context {
extern "C" { extern "C" {
#endif #endif
#if defined(THUMB_PRESENT) #if defined(THUMB_PRESENT)
syssts_t _port_get_cpsr(void); syssts_t __port_get_cpsr(void);
#endif #endif
#if defined(THUMB) #if defined(THUMB)
void _port_switch_thumb(thread_t *ntp, thread_t *otp); void __port_switch_thumb(thread_t *ntp, thread_t *otp);
#else #else
void _port_switch_arm(thread_t *ntp, thread_t *otp); void __port_switch_arm(thread_t *ntp, thread_t *otp);
#endif #endif
void _port_thread_start(void); void __port_thread_start(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
@ -412,8 +420,9 @@ extern "C" {
/** /**
* @brief Port-related initialization code. * @brief Port-related initialization code.
*/ */
static inline void port_init(void) { static inline void port_init(os_instance_t *oip) {
(void)oip;
} }
/** /**
@ -425,7 +434,7 @@ static inline syssts_t port_get_irq_status(void) {
syssts_t sts; syssts_t sts;
#if defined(THUMB) #if defined(THUMB)
sts = _port_get_cpsr(); sts = __port_get_cpsr();
#else #else
__asm volatile ("mrs %[p0], CPSR" : [p0] "=r" (sts) :); __asm volatile ("mrs %[p0], CPSR" : [p0] "=r" (sts) :);
#endif #endif
@ -459,7 +468,7 @@ static inline bool port_is_isr_context(void) {
syssts_t sts; syssts_t sts;
#if defined(THUMB) #if defined(THUMB)
sts = _port_get_cpsr(); sts = __port_get_cpsr();
#else #else
__asm volatile ("mrs %[p0], CPSR" : [p0] "=r" (sts) :); __asm volatile ("mrs %[p0], CPSR" : [p0] "=r" (sts) :);
#endif #endif
@ -477,7 +486,7 @@ static inline bool port_is_isr_context(void) {
static inline void port_lock(void) { static inline void port_lock(void) {
#if defined(THUMB) #if defined(THUMB)
__asm volatile ("bl _port_lock_thumb" : : : "r3", "lr", "memory"); __asm volatile ("bl __port_lock_thumb" : : : "r3", "lr", "memory");
#else #else
__asm volatile ("msr CPSR_c, #0x9F" : : : "memory"); __asm volatile ("msr CPSR_c, #0x9F" : : : "memory");
#endif #endif
@ -490,7 +499,7 @@ static inline void port_lock(void) {
static inline void port_unlock(void) { static inline void port_unlock(void) {
#if defined(THUMB) #if defined(THUMB)
__asm volatile ("bl _port_unlock_thumb" : : : "r3", "lr", "memory"); __asm volatile ("bl __port_unlock_thumb" : : : "r3", "lr", "memory");
#else #else
__asm volatile ("msr CPSR_c, #0x1F" : : : "memory"); __asm volatile ("msr CPSR_c, #0x1F" : : : "memory");
#endif #endif
@ -521,7 +530,7 @@ static inline void port_unlock_from_isr(void) {
static inline void port_disable(void) { static inline void port_disable(void) {
#if defined(THUMB) #if defined(THUMB)
__asm volatile ("bl _port_disable_thumb" : : : "r3", "lr", "memory"); __asm volatile ("bl __port_disable_thumb" : : : "r3", "lr", "memory");
#else #else
__asm volatile ("mrs r3, CPSR \n\t" __asm volatile ("mrs r3, CPSR \n\t"
"orr r3, #0x80 \n\t" "orr r3, #0x80 \n\t"
@ -540,7 +549,7 @@ static inline void port_disable(void) {
static inline void port_suspend(void) { static inline void port_suspend(void) {
#if defined(THUMB) #if defined(THUMB)
__asm volatile ("bl _port_suspend_thumb" : : : "r3", "lr", "memory"); __asm volatile ("bl __port_suspend_thumb" : : : "r3", "lr", "memory");
#else #else
__asm volatile ("msr CPSR_c, #0x9F" : : : "memory"); __asm volatile ("msr CPSR_c, #0x9F" : : : "memory");
#endif #endif
@ -553,7 +562,7 @@ static inline void port_suspend(void) {
static inline void port_enable(void) { static inline void port_enable(void) {
#if defined(THUMB) #if defined(THUMB)
__asm volatile ("bl _port_enable_thumb" : : : "r3", "lr", "memory"); __asm volatile ("bl __port_enable_thumb" : : : "r3", "lr", "memory");
#else #else
__asm volatile ("msr CPSR_c, #0x1F" : : : "memory"); __asm volatile ("msr CPSR_c, #0x1F" : : : "memory");
#endif #endif

18
os/common/ports/ARM/compilers/GCC/chcoreasm.S
View File

@ -72,8 +72,8 @@
.balign 16 .balign 16
.code 32 .code 32
.global _port_switch_arm .global __port_switch_arm
_port_switch_arm: __port_switch_arm:
stmfd sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr} stmfd sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
str sp, [r1, #CONTEXT_OFFSET] str sp, [r1, #CONTEXT_OFFSET]
ldr sp, [r0, #CONTEXT_OFFSET] ldr sp, [r0, #CONTEXT_OFFSET]
@ -134,11 +134,11 @@ _irq_ret_arm:
// Context switch. // Context switch.
#if CH_DBG_SYSTEM_STATE_CHECK #if CH_DBG_SYSTEM_STATE_CHECK
bl _dbg_check_lock bl __dbg_check_lock
#endif #endif
bl chSchDoReschedule bl chSchDoPreemption
#if CH_DBG_SYSTEM_STATE_CHECK #if CH_DBG_SYSTEM_STATE_CHECK
bl _dbg_check_unlock bl __dbg_check_unlock
#endif #endif
// Re-establish the IRQ conditions again. // Re-establish the IRQ conditions again.
@ -158,10 +158,10 @@ _irq_ret_arm:
*/ */
.balign 16 .balign 16
.code 32 .code 32
.globl _port_thread_start .globl __port_thread_start
_port_thread_start: __port_thread_start:
#if CH_DBG_SYSTEM_STATE_CHECK #if CH_DBG_SYSTEM_STATE_CHECK
bl _dbg_check_unlock bl __dbg_check_unlock
#endif #endif
msr CPSR_c, #MODE_SYS msr CPSR_c, #MODE_SYS
mov r0, r5 mov r0, r5
@ -169,7 +169,7 @@ _port_thread_start:
bx r4 bx r4
mov r0, #0 /* MSG_OK */ mov r0, #0 /* MSG_OK */
bl chThdExit bl chThdExit
_zombies: b _zombies .zombies: b .zombies
#endif /* !defined(__DOXYGEN__) */ #endif /* !defined(__DOXYGEN__) */