ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-18 07:08:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move server API concept to base framework

Browse Source 
This commit introduces the new `Component` interface in the form of the
headers base/component.h and base/entrypoint.h. The os/server.h API
has become merely a compatibilty wrapper and will eventually be removed.
The same holds true for os/signal_rpc_dispatcher.h. The mechanism has
moved to base/signal.h and is now called 'Signal_handler'.

Since the patch shuffles headers around, please do a 'make clean' in the
build directory.

Issue #1832
This commit is contained in:
Norman Feske
2015-12-23 15:22:33 +01:00
committed by Christian Helmuth
parent 4ac7127f89
commit 051e84c4b4
74 changed files with 1730 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
repos/base/src/lib/ldso/main.cc
View File

@ -12,7 +12,7 @@
*/
/* Genode includes */
#include <base/env.h>
#include <base/component.h>
#include <base/printf.h>
#include <os/config.h>
#include <util/list.h>
@ -35,13 +35,6 @@ namespace Linker {
};
/**
* Genode args to the 'main' function
*/
extern char **genode_argv;
extern int genode_argc;
extern char **genode_envp;
static Binary *binary = 0;
bool Linker::bind_now = false;
Link_map *Link_map::first;
@ -364,7 +357,7 @@ struct Linker::Binary : Root_object, Elf_object
return 0;
}
int call_entry_point()
void call_entry_point(Genode::Environment &env)
{
/* call static construtors and register destructors */
Func * const ctors_start = (Func *)lookup_symbol("_ctors_start");
@ -375,11 +368,13 @@ struct Linker::Binary : Root_object, Elf_object
Func * const dtors_end = (Func *)lookup_symbol("_dtors_end");
for (Func * dtor = dtors_start; dtor != dtors_end; genode_atexit(*dtor++));
/* call main function of the program */
typedef int (*Main)(int, char **, char **);
Main const main = reinterpret_cast<Main>(_file->entry);
/* call component entry point */
/* XXX the function type for call_component_construct() is a candidate
* for a base-internal header */
typedef void (*Entry)(Genode::Environment &);
Entry const entry = reinterpret_cast<Entry>(_file->entry);
return main(genode_argc, genode_argv, genode_envp);
entry(env);
}
void relocate() override
@ -558,7 +553,12 @@ static void dump_loaded()
}
int main()
Genode::size_t Component::stack_size() { return 16*1024*sizeof(long); }
char const * Component::name() { return "ep"; }
struct Failed_to_load_program { };
void Component::construct(Genode::Environment &env)
{
/* load program headers of linker now */
if (!Ld::linker()->file())
@ -575,7 +575,7 @@ int main()
binary = new(Genode::env()->heap()) Binary();
} catch (...) {
PERR("LD: Failed to load program");
return -1;
throw Failed_to_load_program();
}
/* print loaded object information */
@ -592,6 +592,5 @@ int main()
Link_map::dump();
/* start binary */
return binary->call_entry_point();
binary->call_entry_point(env);
}