ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base-hw mbi: do not copy Mmap MMIO objects

This commit is contained in:
Martin Stein 2017-03-06 13:33:43 +01:00 committed by Christian Helmuth
parent 5366c8cf7e
commit c5cb6cb410
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/base-hw/src/bootstrap/spec/x86_64/platform.cc
View File

@ -36,7 +36,7 @@ Platform::Board::Board()
static constexpr size_t initial_map_max = 1024 * 1024 * 1024;
for (unsigned i = 0; true; i++) {
Mmap v = Multiboot_info(__initial_bx).phys_ram(i);
Mmap v(Multiboot_info(__initial_bx).phys_ram_mmap_base(i));
if (!v.base) break;
Mmap::Addr::access_t base = v.read<Mmap::Addr>();

11
repos/base-hw/src/core/include/spec/x86_64/multiboot.h
View File

@ -48,10 +48,10 @@ class Genode::Multiboot_info : Mmio
/**
* Physical ram regions
*/
Mmap phys_ram(unsigned i, bool solely_within_4k_base = true) {
addr_t phys_ram_mmap_base(unsigned i, bool solely_within_4k_base = true) {
if (!read<Flags::Mem_map>())
return Mmap(0);
return 0;
Mmap_length::access_t const mmap_length = read<Mmap_length>();
Mmap_addr::access_t const mmap_start = read<Mmap_addr>();
@ -63,21 +63,22 @@ class Genode::Multiboot_info : Mmio
if (solely_within_4k_base &&
(mmap + MMAP_SIZE_OF >= Genode::align_addr(base + 1, 12)))
return Mmap(0);
return 0;
Mmap r(mmap);
addr_t last_mmap = mmap;
mmap += r.read<Mmap::Size>() + MMAP_SIZE_SIZE_OF;
if (r.read<Mmap::Type>() != Mmap::Type::MEMORY)
continue;
if (i == j)
return r;
return last_mmap;
j++;
}
return Mmap(0);
return 0;
}
};