1.1 --- a/client/file.cc Sun Apr 11 19:34:07 2021 +0200
1.2 +++ b/client/file.cc Mon Apr 12 00:33:14 2021 +0200
1.3 @@ -124,7 +124,8 @@
1.4 return -L4_EINVAL;
1.5
1.6 client_Opener opener(server);
1.7 - unsigned long size, flags;
1.8 + offset_t size;
1.9 + flags_t flags;
1.10 long err;
1.11
1.12 file_init(file);
2.1 --- a/files/file_pager.cc Sun Apr 11 19:34:07 2021 +0200
2.2 +++ b/files/file_pager.cc Mon Apr 12 00:33:14 2021 +0200
2.3 @@ -56,7 +56,7 @@
2.4
2.5 /* Generic pager operations. */
2.6
2.7 -long FilePager::map(unsigned long offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region)
2.8 +long FilePager::map(offset_t offset, address_t hot_spot, flags_t flags, l4_snd_fpage_t *region)
2.9 {
2.10 return Pager::map(offset, hot_spot, flags, region);
2.11 }
3.1 --- a/files/file_pager.h Sun Apr 11 19:34:07 2021 +0200
3.2 +++ b/files/file_pager.h Mon Apr 12 00:33:14 2021 +0200
3.3 @@ -36,7 +36,7 @@
3.4
3.5 /* Pager and mapped file methods. */
3.6
3.7 - virtual long map(unsigned long offset, l4_addr_t hot_spot, flags_t flags,
3.8 + virtual long map(offset_t offset, address_t hot_spot, flags_t flags,
3.9 l4_snd_fpage_t *region);
3.10
3.11 virtual long mmap(offset_t position, offset_t length, offset_t *start_pos,
4.1 --- a/files/opener_context_resource.cc Sun Apr 11 19:34:07 2021 +0200
4.2 +++ b/files/opener_context_resource.cc Mon Apr 12 00:33:14 2021 +0200
4.3 @@ -45,7 +45,7 @@
4.4
4.5 /* Opener context interface methods. */
4.6
4.7 -long OpenerContextResource::open(flags_t flags, size_t *size, l4_cap_idx_t *file)
4.8 +long OpenerContextResource::open(flags_t flags, offset_t *size, l4_cap_idx_t *file)
4.9 {
4.10 char *path = get_path();
4.11
5.1 --- a/files/opener_context_resource.h Sun Apr 11 19:34:07 2021 +0200
5.2 +++ b/files/opener_context_resource.h Mon Apr 12 00:33:14 2021 +0200
5.3 @@ -36,11 +36,11 @@
5.4
5.5 /* Opener context interface methods. */
5.6
5.7 - long open(flags_t flags, size_t *size, l4_cap_idx_t *file);
5.8 + long open(flags_t flags, offset_t *size, l4_cap_idx_t *file);
5.9
5.10 /* Pager/dataspace methods. */
5.11
5.12 - long map(unsigned long offset, l4_addr_t hot_spot, flags_t flags,
5.13 + long map(unsigned long offset, address_t hot_spot, flags_t flags,
5.14 l4_snd_fpage_t *region)
5.15 { return SimplePager::map(offset, hot_spot, flags, region); }
5.16
6.1 --- a/generic/pager.cc Sun Apr 11 19:34:07 2021 +0200
6.2 +++ b/generic/pager.cc Mon Apr 12 00:33:14 2021 +0200
6.3 @@ -66,7 +66,7 @@
6.4 /* Map a flexpage corresponding to the dataspace 'offset' involving a 'hot_spot'
6.5 (flexpage offset). */
6.6
6.7 -long Pager::map(offset_t offset, l4_addr_t hot_spot, flags_t flags,
6.8 +long Pager::map(offset_t offset, address_t hot_spot, flags_t flags,
6.9 l4_snd_fpage_t *region)
6.10 {
6.11 offset_t file_offset = _start + offset;
7.1 --- a/generic/pager.h Sun Apr 11 19:34:07 2021 +0200
7.2 +++ b/generic/pager.h Mon Apr 12 00:33:14 2021 +0200
7.3 @@ -23,7 +23,7 @@
7.4
7.5 /* Paging methods. */
7.6
7.7 - virtual long map(offset_t offset, l4_addr_t hot_spot, flags_t flags,
7.8 + virtual long map(offset_t offset, address_t hot_spot, flags_t flags,
7.9 l4_snd_fpage_t *region);
7.10
7.11 /* Limit methods. */
8.1 --- a/generic/simple_pager.cc Sun Apr 11 19:34:07 2021 +0200
8.2 +++ b/generic/simple_pager.cc Mon Apr 12 00:33:14 2021 +0200
8.3 @@ -29,7 +29,7 @@
8.4 /* Map a flexpage corresponding to the dataspace 'offset' involving a 'hot_spot'
8.5 (flexpage offset). */
8.6
8.7 -long SimplePager::map(offset_t offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region)
8.8 +long SimplePager::map(offset_t offset, address_t hot_spot, flags_t flags, l4_snd_fpage_t *region)
8.9 {
8.10 Flexpage flexpage(_region);
8.11
9.1 --- a/generic/simple_pager.h Sun Apr 11 19:34:07 2021 +0200
9.2 +++ b/generic/simple_pager.h Mon Apr 12 00:33:14 2021 +0200
9.3 @@ -22,7 +22,7 @@
9.4
9.5 /* Paging methods. */
9.6
9.7 - long map(offset_t offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region);
9.8 + long map(offset_t offset, address_t hot_spot, flags_t flags, l4_snd_fpage_t *region);
9.9
9.10 long info(offset_t *size, flags_t *flags);
9.11 };
10.1 --- a/mapping/ipc.cc Sun Apr 11 19:34:07 2021 +0200
10.2 +++ b/mapping/ipc.cc Mon Apr 12 00:33:14 2021 +0200
10.3 @@ -17,8 +17,8 @@
10.4
10.5 /* Make a representation of a flexpage for the IPC system. */
10.6
10.7 -long ipc_prepare_flexpage(Flexpage *flexpage, unsigned long offset,
10.8 - unsigned long max_offset, l4_addr_t hot_spot,
10.9 +long ipc_prepare_flexpage(Flexpage *flexpage, offset_t offset,
10.10 + offset_t max_offset, address_t hot_spot,
10.11 flags_t flags, l4_snd_fpage_t *region)
10.12 {
10.13 SendFlexpage send_flexpage = flexpage->to_send(offset, hot_spot, flags,
11.1 --- a/mapping/ipc.h Sun Apr 11 19:34:07 2021 +0200
11.2 +++ b/mapping/ipc.h Mon Apr 12 00:33:14 2021 +0200
11.3 @@ -6,8 +6,8 @@
11.4
11.5
11.6
11.7 -long ipc_prepare_flexpage(Flexpage *flexpage, unsigned long offset,
11.8 - unsigned long max_offset, l4_addr_t hot_spot,
11.9 +long ipc_prepare_flexpage(Flexpage *flexpage, offset_t offset,
11.10 + offset_t max_offset, address_t hot_spot,
11.11 flags_t flags, l4_snd_fpage_t *region);
11.12
11.13 void ipc_unmap_flexpage(Flexpage *flexpage);
12.1 --- a/pipes/pipe_pager.cc Sun Apr 11 19:34:07 2021 +0200
12.2 +++ b/pipes/pipe_pager.cc Mon Apr 12 00:33:14 2021 +0200
12.3 @@ -38,7 +38,7 @@
12.4
12.5 /* Support paging. */
12.6
12.7 -long PipePager::map(unsigned long offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region)
12.8 +long PipePager::map(offset_t offset, address_t hot_spot, 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/pipes/pipe_pager.h Sun Apr 11 19:34:07 2021 +0200
13.2 +++ b/pipes/pipe_pager.h Mon Apr 12 00:33:14 2021 +0200
13.3 @@ -35,7 +35,7 @@
13.4
13.5 /* Pager methods. */
13.6
13.7 - virtual long map(unsigned long offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region);
13.8 + virtual long map(offset_t offset, address_t hot_spot, flags_t flags, l4_snd_fpage_t *region);
13.9
13.10 /* Pipe methods. */
13.11