1.1 --- a/libexec/include/exec/external_pager.h Fri Sep 16 15:17:22 2022 +0200
1.2 +++ b/libexec/include/exec/external_pager.h Fri Sep 16 15:24:38 2022 +0200
1.3 @@ -54,7 +54,7 @@
1.4
1.5 /* Region manager/mapper methods. */
1.6
1.7 - virtual long attach(address_t *start, offset_t size, map_flags_t flags,
1.8 + virtual long attach(address_t *start, address_t size, map_flags_t flags,
1.9 l4_cap_idx_t ds, address_t offset, unsigned char align);
1.10
1.11 };
2.1 --- a/libexec/include/exec/internal_pager.h Fri Sep 16 15:17:22 2022 +0200
2.2 +++ b/libexec/include/exec/internal_pager.h Fri Sep 16 15:24:38 2022 +0200
2.3 @@ -55,7 +55,7 @@
2.4
2.5 /* Region manager/mapper methods. */
2.6
2.7 - virtual long attach(address_t *start, offset_t size, map_flags_t flags,
2.8 + virtual long attach(address_t *start, address_t size, map_flags_t flags,
2.9 l4_cap_idx_t ds, address_t offset, unsigned char align);
2.10
2.11 };
3.1 --- a/libexec/include/exec/pager.h Fri Sep 16 15:17:22 2022 +0200
3.2 +++ b/libexec/include/exec/pager.h Fri Sep 16 15:24:38 2022 +0200
3.3 @@ -42,7 +42,7 @@
3.4
3.5 /* Region manager/mapper methods. */
3.6
3.7 - virtual long attach(address_t *start, offset_t size, map_flags_t flags,
3.8 + virtual long attach(address_t *start, address_t size, map_flags_t flags,
3.9 l4_cap_idx_t ds, address_t offset, unsigned char align);
3.10
3.11 };
4.1 --- a/libexec/lib/src/external_pager.cc Fri Sep 16 15:17:22 2022 +0200
4.2 +++ b/libexec/lib/src/external_pager.cc Fri Sep 16 15:24:38 2022 +0200
4.3 @@ -154,7 +154,7 @@
4.4 the initialisation of a program by the C library which requires a region
4.5 mapper. */
4.6
4.7 -long ExternalPager::attach(address_t *start, offset_t size, map_flags_t flags,
4.8 +long ExternalPager::attach(address_t *start, address_t size, map_flags_t flags,
4.9 l4_cap_idx_t ds, address_t offset,
4.10 unsigned char align)
4.11 {
4.12 @@ -165,8 +165,8 @@
4.13 if (align < L4_PAGESHIFT)
4.14 align = L4_PAGESHIFT;
4.15
4.16 - offset_t increment = 1UL << align;
4.17 - offset_t region_size = round(size, increment);
4.18 + address_t increment = 1UL << align;
4.19 + address_t region_size = round(size, increment);
4.20
4.21 /* Either attempt to find an address for the specified region, starting from
4.22 any indicated address. */
5.1 --- a/libexec/lib/src/internal_pager.cc Fri Sep 16 15:17:22 2022 +0200
5.2 +++ b/libexec/lib/src/internal_pager.cc Fri Sep 16 15:24:38 2022 +0200
5.3 @@ -110,9 +110,9 @@
5.4
5.5 if ((addr >= r.start) && (addr < r.start + r.size))
5.6 {
5.7 - offset_t window_size = L4_PAGESIZE;
5.8 + address_t window_size = L4_PAGESIZE;
5.9 address_t window_base = trunc(addr, window_size);
5.10 - offset_t offset = addr - r.start;
5.11 + address_t offset = addr - r.start;
5.12 address_t page_addr = trunc(addr, L4_PAGESIZE);
5.13 address_t hot_spot = page_addr - window_base;
5.14
5.15 @@ -153,7 +153,7 @@
5.16 the initialisation of a program by the C library which requires a region
5.17 mapper. */
5.18
5.19 -long InternalPager::attach(address_t *start, offset_t size, map_flags_t flags,
5.20 +long InternalPager::attach(address_t *start, address_t size, map_flags_t flags,
5.21 l4_cap_idx_t ds, address_t offset,
5.22 unsigned char align)
5.23 {
5.24 @@ -164,8 +164,8 @@
5.25 if (align < L4_PAGESHIFT)
5.26 align = L4_PAGESHIFT;
5.27
5.28 - offset_t increment = 1UL << align;
5.29 - offset_t region_size = round(size, increment);
5.30 + address_t increment = 1UL << align;
5.31 + address_t region_size = round(size, increment);
5.32
5.33 /* Either attempt to find an address for the specified region, starting from
5.34 any indicated address. */
6.1 --- a/libsystypes/idl/region_mapper.idl Fri Sep 16 15:17:22 2022 +0200
6.2 +++ b/libsystypes/idl/region_mapper.idl Fri Sep 16 15:24:38 2022 +0200
6.3 @@ -1,5 +1,5 @@
6.4 #include <l4/re/protocols.h> /* L4RE_PROTO_RM */
6.5 -#include <systypes/base.h> /* address_t, offset_t */
6.6 +#include <systypes/base.h> /* address_t */
6.7
6.8 /* A region mapper/manager interface. */
6.9
6.10 @@ -9,27 +9,27 @@
6.11 /* Attach the memory associated with a dataspace, employing the given start
6.12 address to search for a suitable address for the region. */
6.13
6.14 - [opcode(0)] void attach(inout address_t start, in offset_t size,
6.15 + [opcode(0)] void attach(inout address_t start, in address_t size,
6.16 in map_flags_t flags, in cap ds,
6.17 in address_t offset, in unsigned char align);
6.18
6.19 /* Detach memory from the task, searching from the given address for a region
6.20 of the given size. Return the start address, region size and dataspace. */
6.21
6.22 - [opcode(1)] void detach(in address_t addr, in offset_t size,
6.23 + [opcode(1)] void detach(in address_t addr, in address_t size,
6.24 in map_flags_t flags, out address_t start,
6.25 - out offset_t rsize, out cap ds);
6.26 + out address_t rsize, out cap ds);
6.27
6.28 /* Find a region starting from the given address and having the given size.
6.29 Return the start address, region size and dataspace. */
6.30
6.31 - [opcode(2)] void find(inout address_t addr, inout offset_t size,
6.32 + [opcode(2)] void find(inout address_t addr, inout address_t size,
6.33 out map_flags_t flags, out address_t offset,
6.34 out cap ds);
6.35
6.36 /* Reserve an area in the region map. */
6.37
6.38 - [opcode(3)] void reserve_area(inout address_t start, in offset_t size,
6.39 + [opcode(3)] void reserve_area(inout address_t start, in address_t size,
6.40 in map_flags_t flags, in unsigned char align);
6.41
6.42 /* Free (or unreserve) an area in the region map. */