Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cpu/cortexm_common: make SVC call always available #20603

Closed
wants to merge 3 commits into from
Closed

cpu/cortexm_common: make SVC call always available #20603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cc94fe
cpu/cortexm: make SVC call non removable
dylad Apr 19, 2024
2fa1c78
features.yalm: remove cortexm_svc entry
dylad Apr 19, 2024
4dc8a4a
pkg/wamr: replace cortexm_svc FEATURE by arch_arm
dylad Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cpu/cortexm_common/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FEATURES_PROVIDED += arch_32bit
FEATURES_PROVIDED += arch_arm
FEATURES_PROVIDED += cortexm_svc
FEATURES_PROVIDED += cpp
FEATURES_PROVIDED += cpu_check_address
FEATURES_PROVIDED += cpu_core_cortexm
Expand Down
8 changes: 0 additions & 8 deletions cpu/cortexm_common/thread_arch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,6 @@ void __attribute__((naked)) __attribute__((used)) isr_pendsv(void) {
}
#endif

#ifdef MODULE_CORTEXM_SVC
void __attribute__((naked)) __attribute__((used)) isr_svc(void)
{
/* these two variants do exactly the same, but Cortex-M3 can use Thumb2
Expand Down Expand Up @@ -522,13 +521,6 @@ static void __attribute__((used)) _svc_dispatch(unsigned int *svc_args)
}
}

#else /* MODULE_CORTEXM_SVC */
void __attribute__((used)) isr_svc(void)
{
SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
}
#endif /* MODULE_CORTEXM_SVC */

void sched_arch_idle(void)
{
#ifdef MODULE_PM_LAYERED
Expand Down
2 changes: 0 additions & 2 deletions features.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ groups:
accessing a given address would cause a bus fault.
- name: cortexm_stack_limit
help: ARM Cortex-M PSPLIM/MSPLIM registers are available.
- name: cortexm_svc
help: ARM Cortex-M Supervisor Calls are available.
- name: cortexm_fpu
help: A hardware floating point unit is available.
- name: cortexm_mpu
Expand Down
1 change: 0 additions & 1 deletion makefiles/features_existing.inc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ FEATURES_EXISTING := \
cortexm_fpu \
cortexm_mpu \
cortexm_stack_limit \
cortexm_svc \
cpp \
cpu_arm7tdmi_gba \
cpu_atmega1281 \
Expand Down
3 changes: 0 additions & 3 deletions makefiles/features_modules.inc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@ endif
# feature is used
USEMODULE += $(filter cortexm_stack_limit, $(FEATURES_USED))

# select cortexm_svc pseudomodule if the corresponding feature is used
USEMODULE += $(filter cortexm_svc, $(FEATURES_USED))

# select core_idle_thread if the feature no_idle_thread is *not* used
ifeq (, $(filter no_idle_thread, $(FEATURES_USED)))
ifneq (,$(filter core_thread, $(USEMODULE)))
Expand Down
1 change: 0 additions & 1 deletion makefiles/pseudomodules.inc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ PSEUDOMODULES += conn_can_isotp_multi
PSEUDOMODULES += cord_ep_standalone
PSEUDOMODULES += core_%
PSEUDOMODULES += cortexm_fpu
PSEUDOMODULES += cortexm_svc
PSEUDOMODULES += cpp
PSEUDOMODULES += cpu_check_address
PSEUDOMODULES += crc16_fast
Expand Down
3 changes: 2 additions & 1 deletion pkg/wamr/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ USEMODULE += ztimer_usec


#WAMR supports "X86_32/64", "AARCH64", "ARM", "THUMB", "XTENSA" and RISCV
FEATURES_REQUIRED_ANY += arch_native|arch_esp32|arch_riscv|cortexm_svc
FEATURES_BLACKLIST += arch_arm7
FEATURES_REQUIRED_ANY += arch_native|arch_esp32|arch_riscv|arch_arm
#arch_arm|arch_esp need modified
# build/pkg/wamr/core/iwasm/common/arch/invokeNative_<arch>.s
Loading