mirror of
https://github.com/genodelabs/genode.git
synced 2025-06-18 07:08:18 +00:00
@ -75,11 +75,11 @@ struct Linker::File
|
||||
*/
|
||||
struct Linker::Elf_file : File
|
||||
{
|
||||
Env &env;
|
||||
Lazy_volatile_object<Rom_connection> rom_connection;
|
||||
Rom_session_client rom;
|
||||
Ram_dataspace_capability ram_cap[Phdr::MAX_PHDR];
|
||||
bool const loaded;
|
||||
Env &env;
|
||||
Constructible<Rom_connection> rom_connection;
|
||||
Rom_session_client rom;
|
||||
Ram_dataspace_capability ram_cap[Phdr::MAX_PHDR];
|
||||
bool const loaded;
|
||||
|
||||
typedef String<64> Name;
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <region_map/client.h>
|
||||
#include <base/allocator_avl.h>
|
||||
#include <util/retry.h>
|
||||
#include <util/volatile_object.h>
|
||||
#include <util/reconstructible.h>
|
||||
|
||||
/* base-internal includes */
|
||||
#include <base/internal/page_size.h>
|
||||
@ -60,7 +60,7 @@ class Linker::Region_map
|
||||
|
||||
public:
|
||||
|
||||
typedef Lazy_volatile_object<Region_map> Constructible_region_map;
|
||||
typedef Constructible<Region_map> Constructible_region_map;
|
||||
|
||||
static Constructible_region_map &r();
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include <base/exception.h>
|
||||
#include <base/env.h>
|
||||
#include <base/shared_object.h>
|
||||
#include <util/volatile_object.h>
|
||||
#include <util/reconstructible.h>
|
||||
#include <util/fifo.h>
|
||||
#include <util/misc_math.h>
|
||||
#include <util/string.h>
|
||||
|
@ -89,7 +89,7 @@ class Linker::Elf_object : public Object, public Fifo<Elf_object>::Element
|
||||
/*
|
||||
* Optional ELF file, skipped for initial 'Ld' initialization
|
||||
*/
|
||||
Lazy_volatile_object<Elf_file> _elf_file;
|
||||
Constructible<Elf_file> _elf_file;
|
||||
|
||||
|
||||
bool _object_init(Object::Name const &name, Elf::Addr reloc_base)
|
||||
@ -557,9 +557,9 @@ class Linker::Config
|
||||
};
|
||||
|
||||
|
||||
static Genode::Lazy_volatile_object<Heap> &heap()
|
||||
static Genode::Constructible<Heap> &heap()
|
||||
{
|
||||
return *unmanaged_singleton<Lazy_volatile_object<Heap>>();
|
||||
return *unmanaged_singleton<Constructible<Heap>>();
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user