1.1 --- a/libfsclient/lib/src/file.cc Tue Sep 13 00:47:33 2022 +0200
1.2 +++ b/libfsclient/lib/src/file.cc Tue Sep 13 00:52:06 2022 +0200
1.3 @@ -255,7 +255,7 @@
1.4
1.5 client_Opener opener(server);
1.6 offset_t size;
1.7 - flags_t flags;
1.8 + map_flags_t flags;
1.9 long err;
1.10
1.11 file_init(file);
2.1 --- a/libfsserver/include/fsserver/file_pager.h Tue Sep 13 00:47:33 2022 +0200
2.2 +++ b/libfsserver/include/fsserver/file_pager.h Tue Sep 13 00:52:06 2022 +0200
2.3 @@ -71,7 +71,7 @@
2.4
2.5 /* Pager and mapped file methods. */
2.6
2.7 - virtual long map(offset_t offset, address_t hot_spot, map_flags_t flags,
2.8 + virtual long map(offset_t offset, map_address_t hot_spot, map_flags_t flags,
2.9 l4_snd_fpage_t *region);
2.10
2.11 virtual long mmap(offset_t position, offset_t length,
3.1 --- a/libfsserver/include/fsserver/ipc.h Tue Sep 13 00:47:33 2022 +0200
3.2 +++ b/libfsserver/include/fsserver/ipc.h Tue Sep 13 00:52:06 2022 +0200
3.3 @@ -28,7 +28,7 @@
3.4
3.5
3.6 long ipc_prepare_flexpage(Flexpage *flexpage, offset_t offset,
3.7 - offset_t max_offset, address_t hot_spot,
3.8 + offset_t max_offset, map_address_t hot_spot,
3.9 map_flags_t flags, l4_snd_fpage_t *region);
3.10
3.11 void ipc_unmap_flexpage(Flexpage *flexpage);
4.1 --- a/libfsserver/include/fsserver/opener_context_resource.h Tue Sep 13 00:47:33 2022 +0200
4.2 +++ b/libfsserver/include/fsserver/opener_context_resource.h Tue Sep 13 00:52:06 2022 +0200
4.3 @@ -70,11 +70,11 @@
4.4
4.5 /* Pager/dataspace methods. */
4.6
4.7 - long map(unsigned long offset, address_t hot_spot, map_flags_t flags,
4.8 + long map(offset_t offset, map_address_t hot_spot, map_flags_t flags,
4.9 l4_snd_fpage_t *region)
4.10 { return SimplePager::map(offset, hot_spot, flags, region); }
4.11
4.12 - long info(unsigned long *size, unsigned long *flags)
4.13 + long info(offset_t *size, map_flags_t *flags)
4.14 { return SimplePager::info(size, flags); }
4.15 };
4.16
5.1 --- a/libfsserver/include/fsserver/pager.h Tue Sep 13 00:47:33 2022 +0200
5.2 +++ b/libfsserver/include/fsserver/pager.h Tue Sep 13 00:52:06 2022 +0200
5.3 @@ -44,7 +44,7 @@
5.4
5.5 /* Paging methods. */
5.6
5.7 - virtual long map(offset_t offset, address_t hot_spot, map_flags_t map_flags,
5.8 + virtual long map(offset_t offset, map_address_t hot_spot, map_flags_t map_flags,
5.9 l4_snd_fpage_t *region);
5.10
5.11 /* Limit methods. */
6.1 --- a/libfsserver/include/fsserver/pipe_pager.h Tue Sep 13 00:47:33 2022 +0200
6.2 +++ b/libfsserver/include/fsserver/pipe_pager.h Tue Sep 13 00:52:06 2022 +0200
6.3 @@ -60,7 +60,7 @@
6.4
6.5 /* Pager methods. */
6.6
6.7 - virtual long map(offset_t offset, address_t hot_spot, map_flags_t flags, l4_snd_fpage_t *region);
6.8 + virtual long map(offset_t offset, map_address_t hot_spot, map_flags_t flags, l4_snd_fpage_t *region);
6.9
6.10 /* Pipe methods. */
6.11
7.1 --- a/libfsserver/include/fsserver/simple_pager.h Tue Sep 13 00:47:33 2022 +0200
7.2 +++ b/libfsserver/include/fsserver/simple_pager.h Tue Sep 13 00:52:06 2022 +0200
7.3 @@ -43,7 +43,7 @@
7.4
7.5 /* Paging methods. */
7.6
7.7 - long map(offset_t offset, address_t hot_spot, map_flags_t flags, l4_snd_fpage_t *region);
7.8 + long map(offset_t offset, map_address_t hot_spot, map_flags_t flags, l4_snd_fpage_t *region);
7.9
7.10 long info(offset_t *size, map_flags_t *flags);
7.11 };
8.1 --- a/libfsserver/lib/files/file_pager.cc Tue Sep 13 00:47:33 2022 +0200
8.2 +++ b/libfsserver/lib/files/file_pager.cc Tue Sep 13 00:52:06 2022 +0200
8.3 @@ -129,7 +129,7 @@
8.4
8.5 /* Generic pager operations. */
8.6
8.7 -long FilePager::map(offset_t offset, address_t hot_spot, map_flags_t map_flags, l4_snd_fpage_t *region)
8.8 +long FilePager::map(offset_t offset, map_address_t hot_spot, map_flags_t map_flags, l4_snd_fpage_t *region)
8.9 {
8.10 return Pager::map(offset, hot_spot, map_flags, region);
8.11 }
9.1 --- a/libfsserver/lib/generic/pager.cc Tue Sep 13 00:47:33 2022 +0200
9.2 +++ b/libfsserver/lib/generic/pager.cc Tue Sep 13 00:52:06 2022 +0200
9.3 @@ -114,7 +114,7 @@
9.4 /* Map a flexpage corresponding to the dataspace 'offset' involving a 'hot_spot'
9.5 (flexpage offset). */
9.6
9.7 -long Pager::map(offset_t offset, address_t hot_spot, map_flags_t map_flags,
9.8 +long Pager::map(offset_t offset, map_address_t hot_spot, map_flags_t map_flags,
9.9 l4_snd_fpage_t *region)
9.10 {
9.11 offset_t file_offset = _start + offset;
10.1 --- a/libfsserver/lib/generic/simple_pager.cc Tue Sep 13 00:47:33 2022 +0200
10.2 +++ b/libfsserver/lib/generic/simple_pager.cc Tue Sep 13 00:52:06 2022 +0200
10.3 @@ -51,7 +51,7 @@
10.4 /* Map a flexpage corresponding to the dataspace 'offset' involving a 'hot_spot'
10.5 (flexpage offset). */
10.6
10.7 -long SimplePager::map(offset_t offset, address_t hot_spot, map_flags_t flags, l4_snd_fpage_t *region)
10.8 +long SimplePager::map(offset_t offset, map_address_t hot_spot, map_flags_t flags, l4_snd_fpage_t *region)
10.9 {
10.10 Flexpage flexpage(_region);
10.11
11.1 --- a/libfsserver/lib/mapping/ipc.cc Tue Sep 13 00:47:33 2022 +0200
11.2 +++ b/libfsserver/lib/mapping/ipc.cc Tue Sep 13 00:52:06 2022 +0200
11.3 @@ -44,7 +44,7 @@
11.4 /* Make a representation of a flexpage for the IPC system. */
11.5
11.6 long ipc_prepare_flexpage(Flexpage *flexpage, offset_t offset,
11.7 - offset_t max_offset, address_t hot_spot,
11.8 + offset_t max_offset, map_address_t hot_spot,
11.9 map_flags_t flags, l4_snd_fpage_t *region)
11.10 {
11.11 SendFlexpage send_flexpage = flexpage->to_send(offset, hot_spot, flags,
12.1 --- a/libfsserver/lib/pipes/pipe_pager.cc Tue Sep 13 00:47:33 2022 +0200
12.2 +++ b/libfsserver/lib/pipes/pipe_pager.cc Tue Sep 13 00:52:06 2022 +0200
12.3 @@ -81,7 +81,7 @@
12.4
12.5 /* Support paging. */
12.6
12.7 -long PipePager::map(offset_t offset, address_t hot_spot, map_flags_t flags, l4_snd_fpage_t *region)
12.8 +long PipePager::map(offset_t offset, map_address_t hot_spot, map_flags_t flags, l4_snd_fpage_t *region)
12.9 {
12.10 return Pager::map(offset, hot_spot, flags, region);
12.11 }
13.1 --- a/libsystypes/idl/dataspace.idl Tue Sep 13 00:47:33 2022 +0200
13.2 +++ b/libsystypes/idl/dataspace.idl Tue Sep 13 00:52:06 2022 +0200
13.3 @@ -1,5 +1,5 @@
13.4 #include <l4/re/protocols.h> /* L4RE_PROTO_DATASPACE */
13.5 -#include <systypes/base.h> /* address_t, offset_t */
13.6 +#include <systypes/base.h> /* map_address_t, offset_t */
13.7
13.8 /* A dataspace interface. */
13.9
13.10 @@ -8,12 +8,12 @@
13.11 {
13.12 /* Map memory within a dataspace. */
13.13
13.14 - [opcode(0)] void map(in offset_t offset, in address_t hot_spot,
13.15 + [opcode(0)] void map(in offset_t offset, in map_address_t hot_spot,
13.16 in map_flags_t flags, out fpage region);
13.17
13.18 /* Clear a dataspace. */
13.19
13.20 - [opcode(1)] void clear(in address_t offset, in offset_t size);
13.21 + [opcode(1)] void clear(in offset_t offset, in offset_t size);
13.22
13.23 /* Obtain statistics about a dataspace. */
13.24
13.25 @@ -21,24 +21,10 @@
13.26
13.27 /* Copy data between dataspaces. */
13.28
13.29 - [opcode(3)] void copy_in(in address_t dest_offset, in cap source,
13.30 - in address_t source_offset, in offset_t size);
13.31 -
13.32 - /* Deprecated: take a reference to a dataspace. */
13.33 -
13.34 - [opcode(4)] void take();
13.35 -
13.36 - /* Deprecated: release a reference to a dataspace. */
13.37 -
13.38 - [opcode(5)] void release();
13.39 -
13.40 - /* Obtain the physical address of the given offset in a dataspace, along with
13.41 - the largest physically contiguous region at or after the address in the
13.42 - dataspace. */
13.43 -
13.44 - [opcode(6)] void phys(in address_t offset, out address_t address, out l4_size_t size);
13.45 + [opcode(3)] void copy_in(in offset_t dest_offset, in cap source,
13.46 + in offset_t source_offset, in offset_t size);
13.47
13.48 /* Allocate at least the given size at the given address in a dataspace. */
13.49
13.50 - [opcode(7)] void allocate(in address_t offset, in l4_size_t size);
13.51 + [opcode(6)] void allocate(in offset_t offset, in l4_size_t size);
13.52 };
14.1 --- a/libsystypes/include/systypes/base.h Tue Sep 13 00:47:33 2022 +0200
14.2 +++ b/libsystypes/include/systypes/base.h Tue Sep 13 00:52:06 2022 +0200
14.3 @@ -27,23 +27,21 @@
14.4
14.5 EXTERN_C_BEGIN
14.6
14.7 -/* unsigned long is a 64-bit type.
14.8 - See: pkg/l4re-core/l4sys/include/l4int.h */
14.9 -
14.10 /* Types for file access (access flags, offsets) and IPC operations. */
14.11
14.12 -typedef unsigned long flags_t; /* see systypes/fcntl.h */
14.13 -typedef unsigned long offset_t;
14.14 +typedef l4_uint64_t flags_t; /* see systypes/fcntl.h */
14.15 +typedef l4_uint64_t offset_t;
14.16 typedef l4_addr_t address_t; /* unsigned long */
14.17
14.18 /* Dataspace mapping flags.
14.19 See: pkg/l4re-core/l4re_c/include/dataspace.h */
14.20
14.21 -typedef unsigned long map_flags_t; /* 64-bit */
14.22 +typedef l4_uint64_t map_address_t;
14.23 +typedef unsigned long map_flags_t;
14.24
14.25 /* Types and values for notification. */
14.26
14.27 -typedef unsigned long notify_flags_t;
14.28 +typedef l4_uint64_t notify_flags_t;
14.29
14.30 enum notify_flags
14.31 {