Rev 1357 | Rev 1501 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1357 | Rev 1363 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright (C) 2006 Jakub Jermar |
2 | * Copyright (C) 2006 Jakub Jermar |
3 | * All rights reserved. |
3 | * All rights reserved. |
4 | * |
4 | * |
5 | * Redistribution and use in source and binary forms, with or without |
5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions |
6 | * modification, are permitted provided that the following conditions |
7 | * are met: |
7 | * are met: |
8 | * |
8 | * |
9 | * - Redistributions of source code must retain the above copyright |
9 | * - Redistributions of source code must retain the above copyright |
10 | * notice, this list of conditions and the following disclaimer. |
10 | * notice, this list of conditions and the following disclaimer. |
11 | * - Redistributions in binary form must reproduce the above copyright |
11 | * - Redistributions in binary form must reproduce the above copyright |
12 | * notice, this list of conditions and the following disclaimer in the |
12 | * notice, this list of conditions and the following disclaimer in the |
13 | * documentation and/or other materials provided with the distribution. |
13 | * documentation and/or other materials provided with the distribution. |
14 | * - The name of the author may not be used to endorse or promote products |
14 | * - The name of the author may not be used to endorse or promote products |
15 | * derived from this software without specific prior written permission. |
15 | * derived from this software without specific prior written permission. |
16 | * |
16 | * |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ |
27 | */ |
28 | 28 | ||
29 | #include <as.h> |
29 | #include <as.h> |
30 | #include <libc.h> |
30 | #include <libc.h> |
31 | #include <unistd.h> |
31 | #include <unistd.h> |
32 | #include <task.h> |
32 | #include <task.h> |
33 | 33 | ||
34 | /** Create address space area. |
34 | /** Create address space area. |
35 | * |
35 | * |
36 | * @param address Virtual address where to place new address space area. |
36 | * @param address Virtual address where to place new address space area. |
37 | * @param size Size of the area. |
37 | * @param size Size of the area. |
38 | * @param flags Flags describing type of the area. |
38 | * @param flags Flags describing type of the area. |
39 | * |
39 | * |
40 | * @return address on success, (void *) -1 otherwise. |
40 | * @return address on success, (void *) -1 otherwise. |
41 | */ |
41 | */ |
42 | void *as_area_create(void *address, size_t size, int flags) |
42 | void *as_area_create(void *address, size_t size, int flags) |
43 | { |
43 | { |
44 | return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags); |
44 | return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags); |
45 | } |
45 | } |
46 | 46 | ||
47 | /** Resize address space area. |
47 | /** Resize address space area. |
48 | * |
48 | * |
49 | * @param address Virtual address pointing into already existing address space area. |
49 | * @param address Virtual address pointing into already existing address space area. |
50 | * @param size New requested size of the area. |
50 | * @param size New requested size of the area. |
51 | * @param flags Currently unused. |
51 | * @param flags Currently unused. |
52 | * |
52 | * |
53 | * @return Zero on success or a code from @ref errno.h on failure. |
53 | * @return Zero on success or a code from @ref errno.h on failure. |
54 | */ |
54 | */ |
55 | int as_area_resize(void *address, size_t size, int flags) |
55 | int as_area_resize(void *address, size_t size, int flags) |
56 | { |
56 | { |
57 | return __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags); |
57 | return __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags); |
58 | } |
58 | } |
59 | 59 | ||
60 | /** Destroy address space area. |
60 | /** Destroy address space area. |
61 | * |
61 | * |
62 | * @param address Virtual address pointing into the address space area being destroyed. |
62 | * @param address Virtual address pointing into the address space area being destroyed. |
63 | * |
63 | * |
64 | * @return Zero on success or a code from @ref errno.h on failure. |
64 | * @return Zero on success or a code from @ref errno.h on failure. |
65 | */ |
65 | */ |
66 | int as_area_destroy(void *address) |
66 | int as_area_destroy(void *address) |
67 | { |
67 | { |
68 | return __SYSCALL1(SYS_AS_AREA_DESTROY, (sysarg_t ) address); |
68 | return __SYSCALL1(SYS_AS_AREA_DESTROY, (sysarg_t ) address); |
69 | } |
69 | } |
70 | 70 | ||
71 | static size_t heapsize = 0; |
71 | static size_t heapsize = 0; |
- | 72 | static size_t maxheapsize = (size_t)(-1); |
|
72 | /* Start of heap linker symbol */ |
73 | /* Start of heap linker symbol */ |
73 | extern char _heap; |
74 | extern char _heap; |
74 | 75 | ||
75 | /** Sbrk emulation |
76 | /** Sbrk emulation |
76 | * |
77 | * |
77 | * @param size New area that should be allocated or negative, |
78 | * @param size New area that should be allocated or negative, |
78 | if it should be shrinked |
79 | if it should be shrinked |
79 | * @return Pointer to newly allocated area |
80 | * @return Pointer to newly allocated area |
80 | */ |
81 | */ |
81 | void *sbrk(ssize_t incr) |
82 | void *sbrk(ssize_t incr) |
82 | { |
83 | { |
83 | int rc; |
84 | int rc; |
84 | void *res; |
85 | void *res; |
85 | /* Check for invalid values */ |
86 | /* Check for invalid values */ |
86 | if (incr < 0 && -incr > heapsize) |
87 | if (incr < 0 && -incr > heapsize) |
87 | return NULL; |
88 | return NULL; |
88 | /* Check for too large value */ |
89 | /* Check for too large value */ |
89 | if (incr > 0 && incr+heapsize < heapsize) |
90 | if (incr > 0 && incr+heapsize < heapsize) |
90 | return NULL; |
91 | return NULL; |
91 | /* Check for too small values */ |
92 | /* Check for too small values */ |
92 | if (incr < 0 && incr+heapsize > heapsize) |
93 | if (incr < 0 && incr+heapsize > heapsize) |
93 | return NULL; |
94 | return NULL; |
- | 95 | /* Check for user limit */ |
|
- | 96 | if ((maxheapsize!=(size_t)(-1)) && (heapsize + incr)>maxheapsize) return NULL; |
|
94 | 97 | ||
95 | rc = as_area_resize(&_heap, heapsize + incr,0); |
98 | rc = as_area_resize(&_heap, heapsize + incr,0); |
96 | if (rc != 0) |
99 | if (rc != 0) |
97 | return NULL; |
100 | return NULL; |
98 | 101 | ||
99 | /* Compute start of new area */ |
102 | /* Compute start of new area */ |
100 | res = (void *)&_heap + heapsize; |
103 | res = (void *)&_heap + heapsize; |
101 | 104 | ||
102 | heapsize += incr; |
105 | heapsize += incr; |
103 | 106 | ||
104 | return res; |
107 | return res; |
105 | } |
108 | } |
- | 109 | ||
- | 110 | void *set_maxheapsize(size_t mhs) |
|
- | 111 | { |
|
- | 112 | maxheapsize=mhs; |
|
- | 113 | /* Return pointer to area not managed by sbrk */ |
|
- | 114 | return (void *)&_heap + maxheapsize; |
|
- | 115 | ||
- | 116 | } |
|
106 | 117 |