portugalfuturista/seL4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SELFOUR-862: CONFIG_PRINTING --> seL4_DebugPutChar

Browse source 
seL4_DebugPutChar is only available when CONFIG_PRINTING is enabled
This commit is contained in:
Anna Lyons 2017-05-04 15:20:21 +10:00
parent 8ce9513d7a
commit 50d72007c6
6 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/api/types.h
View file

@ -20,6 +20,7 @@
#include <api/macros.h>
#include <api/constants.h>
#include <api/shared_types.h>
#include <machine/io.h>
/* seL4_CapRights_t defined in mode/api/shared_types.bf */

4
libsel4/arch_include/arm/sel4/arch/syscalls.h
View file

@ -308,7 +308,7 @@ seL4_Yield(void)
asm volatile("" ::: "memory");
}
#ifdef CONFIG_DEBUG_BUILD
#ifdef CONFIG_PRINTING
LIBSEL4_INLINE_FUNC void
seL4_DebugPutChar(char c)
{
@ -321,7 +321,9 @@ seL4_DebugPutChar(char c)
arm_sys_send_recv(seL4_SysDebugPutChar, c, &unused0, 0, &unused1, &unused2, &unused3, &unused4, &unused5);
}
#endif
#if CONFIG_DEBUG_BUILD
LIBSEL4_INLINE_FUNC void
seL4_DebugHalt(void)
{

4
libsel4/include/api/syscall.xml
View file

@ -25,8 +25,10 @@
</api>
<!-- Syscalls on the unknown syscall path. These definitions will be wrapped in #ifdef name -->
<debug>
<config condition="defined CONFIG_DEBUG_BUILD">
<config condition="defined CONFIG_PRINTING">
<syscall name="DebugPutChar" />
</config>
<config condition="defined CONFIG_DEBUG_BUILD">
<syscall name="DebugHalt" />
<syscall name="DebugCapIdentify" />
<syscall name="DebugSnapshot" />

2
libsel4/sel4_arch_include/ia32/sel4/sel4_arch/syscalls.h
View file

@ -521,7 +521,7 @@ seL4_VMEnter(seL4_CPtr vcpu, seL4_Word *sender)
}
#endif
#if defined(CONFIG_DEBUG_BUILD)
#ifdef CONFIG_PRINTING
LIBSEL4_INLINE_FUNC void
seL4_DebugPutChar(char c)
{

2
libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/syscalls.h
View file

@ -326,7 +326,7 @@ seL4_VMEnter(seL4_CPtr vcpu, seL4_Word *sender)
}
#endif
#if defined(CONFIG_DEBUG_BUILD)
#ifdef CONFIG_PRINTING
LIBSEL4_INLINE_FUNC void
seL4_DebugPutChar(char c)
{

4
src/api/syscall.c
View file

@ -61,11 +61,13 @@ handleInterruptEntry(void)
exception_t
handleUnknownSyscall(word_t w)
{
#ifdef CONFIG_DEBUG_BUILD
#ifdef CONFIG_PRINTING
if (w == SysDebugPutChar) {
kernel_putchar(getRegister(NODE_STATE(ksCurThread), capRegister));
return EXCEPTION_NONE;
}
#endif
#ifdef CONFIG_DEBUG_BUILD
if (w == SysDebugHalt) {
printf("Debug halt syscall from user thread %p\n", NODE_STATE(ksCurThread));
halt();