sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Syscall instrumentation build system support for Arm and RISC-V

Browse Source
This commit is contained in:
Nakamura, Yuuichi 2020-07-22 22:21:42 +09:00 committed by Xiang Xiao
parent 376786288e
commit 02718f0827
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/Kconfig
View File

@ -14,6 +14,7 @@ config ARCH_ARM
select ARCH_HAVE_STACKCHECK select ARCH_HAVE_STACKCHECK
select ARCH_HAVE_CUSTOMOPT select ARCH_HAVE_CUSTOMOPT
select ARCH_HAVE_STDARG_H select ARCH_HAVE_STDARG_H
select ARCH_HAVE_SYSCALL_HOOKS
---help--- ---help---
The ARM architectures The ARM architectures
@ -60,6 +61,7 @@ config ARCH_RISCV
select ARCH_HAVE_STACKCHECK select ARCH_HAVE_STACKCHECK
select ARCH_HAVE_CUSTOMOPT select ARCH_HAVE_CUSTOMOPT
select ARCH_HAVE_STDARG_H select ARCH_HAVE_STDARG_H
select ARCH_HAVE_SYSCALL_HOOKS
---help--- ---help---
RISC-V 32 and 64-bit RV32 / RV64 architectures. RISC-V 32 and 64-bit RV32 / RV64 architectures.

8
arch/arm/src/Makefile
View File

@ -69,6 +69,12 @@ else
NUTTX = "$(TOPDIR)$(DELIM)nuttx$(EXEEXT)" NUTTX = "$(TOPDIR)$(DELIM)nuttx$(EXEEXT)"
endif endif
# Additional rules for system call wrapper
ifeq ($(CONFIG_SCHED_INSTRUMENTATION_SYSCALL),y)
EXTRALINKCMDS += @$(TOPDIR)/syscall/syscall_wraps.ldcmd
endif
# The "head" object # The "head" object
HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT)) HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT))
@ -99,7 +105,7 @@ UOBJS = $(UAOBJS) $(UCOBJS)
KBIN = libkarch$(LIBEXT) KBIN = libkarch$(LIBEXT)
BIN = libarch$(LIBEXT) BIN = libarch$(LIBEXT)
LDFLAGS += $(ARCHSCRIPT) LDFLAGS += $(ARCHSCRIPT) $(EXTRALINKCMDS)
# Override in Make.defs if linker is not 'ld' # Override in Make.defs if linker is not 'ld'

8
arch/risc-v/src/Makefile
View File

@ -66,6 +66,12 @@ else
NUTTX = "$(TOPDIR)$(DELIM)nuttx$(EXEEXT)" NUTTX = "$(TOPDIR)$(DELIM)nuttx$(EXEEXT)"
endif endif
# Additional rules for system call wrapper
ifeq ($(CONFIG_SCHED_INSTRUMENTATION_SYSCALL),y)
EXTRALINKCMDS += @$(TOPDIR)/syscall/syscall_wraps.ldcmd
endif
# The "head" object # The "head" object
HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT)) HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT))
@ -96,7 +102,7 @@ UOBJS = $(UAOBJS) $(UCOBJS)
KBIN = libkarch$(LIBEXT) KBIN = libkarch$(LIBEXT)
BIN = libarch$(LIBEXT) BIN = libarch$(LIBEXT)
LDFLAGS += $(ARCHSCRIPT) LDFLAGS += $(ARCHSCRIPT) $(EXTRALINKCMDS)
LDSTARTGROUP ?= --start-group LDSTARTGROUP ?= --start-group
LDENDGROUP ?= --end-group LDENDGROUP ?= --end-group

2
sched/Kconfig
View File

@ -975,7 +975,7 @@ config SCHED_INSTRUMENTATION_SPINLOCKS
config SCHED_INSTRUMENTATION_SYSCALL config SCHED_INSTRUMENTATION_SYSCALL
bool "System call monitor hooks" bool "System call monitor hooks"
default n default n
depends on LIB_SYSCALL && ARCH_HAVE_SYSCALL_HOOKS depends on ARCH_HAVE_SYSCALL_HOOKS
---help--- ---help---
Enables additional hooks for entry and exit from system call. Enables additional hooks for entry and exit from system call.
Board-specific logic must provide this additional logic. Board-specific logic must provide this additional logic.