ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-29 13:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sel4: enable core console

Browse Source
This commit is contained in:
Norman Feske 2014-10-15 18:17:08 +02:00 committed by Christian Helmuth
parent 666c74345f
commit 6b9185ab34
4 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
repos/base-sel4/doc/notes.txt
View File

@ -762,20 +762,19 @@ The next problem is more tricky:
! include/sel4/arch/syscalls.h:481:6: error: impossible register constraint in ‘asm’ ! include/sel4/arch/syscalls.h:481:6: error: impossible register constraint in ‘asm’
The error refers to the system-call binding for 'seL4_DebugPutChar'. After The error refers to the system-call binding for 'seL4_DebugPutChar'. After
twiddling with the asm constraints, it turns twiddling with the asm constraints, it turns out that the error is caused by
out that the error is caused by the use of an enum value as input argument. the use of an enum value as input argument. The C++ compiler is free to pick
The C++ compiler is free to pick any integer type that it sees fit for any integer type that it sees fit for representing an enum value. Even though
representing an enum value. Even though the seL4 developers use a helper the seL4 developers use a helper macro (SEL4_FORCE_LONG_ENUM) to force a
macro (SEL4_FORCE_LONG_ENUM) to force a certain minimum bit width for the certain minimum bit width for the used type, the C++ compiler complains. By
used type, the C++ compiler complains. By explicitly casting the input explicitly casting the input argument to 'int', this ambiguity can be resolved
argument to 'int', this ambiguity can be resolved and the compiler becomes and the compiler becomes happy. Unfortunately, this means that I will have to
happy. Unfortunately, this means that I will have to patch the system-call patch the system-call bindings to make them fit for the use with C++. But
bindings to make them fit for the use with C++. But looking at the bindings, looking at the bindings, I think that a patch won't be avoidable anyway
I think that a patch won't be avoidable anyway because the bindings clobber because the bindings clobber the EBX register. This means that we won't be
the EBX register. This means that we won't be able to use the headers for able to use the headers for compiling position-independent code (as is the
compiling position-independent code (as is the case for Genode). For now, case for Genode). For now, we have are not compiling with '-fPIC' enabled but
we have are not compiling with '-fPIC' enabled but this issue is clear this issue is clear in front of us.
in front of us.
Patches for the seL4 code will be reside at _base-sel4/src/kernel/_. E.g., Patches for the seL4 code will be reside at _base-sel4/src/kernel/_. E.g.,
we just added the current modification of the _syscalls.h_ header by we just added the current modification of the _syscalls.h_ header by
@ -802,10 +801,20 @@ built. Executing the run script produces the result that we longed for:
The first line is produced by our test program. Knowing how to print The first line is produced by our test program. Knowing how to print
characters using the kernel's debug interface, filling out the empty characters using the kernel's debug interface, filling out the empty
stub function 'Genode::Core_console::_out_char' in _core_console.h_ stub function 'Genode::Core_console::_out_char' in _core_console.h_
is easy. is easy. We can replace the main program with this version:
! #include <base/printf.h>
!
! int main()
! {
! PDBG("a message printed via Genode's PDBG");
!
! *(int *)0x1122 = 0;
! return 0;
! }
When running it via 'make run/test', it produces the expected result:
! int main(): a message printed via Genode's PDBG

10
repos/base-sel4/src/base/console/core_console.h
View File

@ -11,8 +11,12 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
/* Genode includes */
#include <base/console.h> #include <base/console.h>
/* seL4 includes */
#include <sel4/arch/functions.h>
#include <sel4/arch/syscalls.h>
namespace Genode namespace Genode
{ {
@ -20,8 +24,10 @@ namespace Genode
{ {
protected: protected:
void _out_char(char c) { } void _out_char(char c)
{
seL4_DebugPutChar(c);
}
}; };
} }

10
repos/base-sel4/src/test/sel4/main.cc
View File

@ -12,17 +12,11 @@
*/ */
/* Genode includes */ /* Genode includes */
#include <util/string.h> #include <base/printf.h>
/* seL4 includes */
#include <sel4/arch/functions.h>
#include <sel4/arch/syscalls.h>
int main() int main()
{ {
char const *string = "\nMessage printed via the kernel\n"; PDBG("a message printed via Genode's PDBG");
for (unsigned i = 0; i < Genode::strlen(string); i++)
seL4_DebugPutChar(string[i]);
*(int *)0x1122 = 0; *(int *)0x1122 = 0;
return 0; return 0;

4
repos/base-sel4/src/test/sel4/thread.cc
View File

@ -46,8 +46,6 @@ Thread_base::Thread_base(size_t, const char *name, size_t stack_size, Type type,
{ {
strncpy(_context->name, name, sizeof(_context->name)); strncpy(_context->name, name, sizeof(_context->name));
_context->thread_base = this; _context->thread_base = this;
_init_platform_thread(type);
} }
@ -55,4 +53,4 @@ Thread_base::Thread_base(size_t quota, const char *name, size_t stack_size, Type
: Thread_base(quota, name, stack_size, type, nullptr) { } : Thread_base(quota, name, stack_size, type, nullptr) { }
Thread_base::~Thread_base() { _deinit_platform_thread(); } Thread_base::~Thread_base() { }