Rev 1033 | Rev 1237 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1033 | Rev 1228 | ||
|---|---|---|---|
| Line 27... | Line 27... | ||
| 27 | */ |
27 | */ |
| 28 | 28 | ||
| 29 | #include <libc.h> |
29 | #include <libc.h> |
| 30 | #include <unistd.h> |
30 | #include <unistd.h> |
| 31 | 31 | ||
| 32 | /** mmap syscall |
32 | /** Create address space area. |
| 33 | * |
33 | * |
| 34 | * @param address Virtual address where to place new address space area. |
34 | * @param address Virtual address where to place new address space area. |
| 35 | * @param size Size of the area. |
35 | * @param size Size of the area. |
| 36 | * @param flags Flags describing type of the area. |
36 | * @param flags Flags describing type of the area. |
| 37 | * |
37 | * |
| 38 | * @return address on success, (void *) -1 otherwise. |
38 | * @return address on success, (void *) -1 otherwise. |
| 39 | */ |
39 | */ |
| 40 | void *mmap(void *address, size_t size, int flags) |
40 | void *as_area_create(void *address, size_t size, int flags) |
| 41 | { |
41 | { |
| 42 | return (void *) __SYSCALL3(SYS_MMAP, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags); |
42 | return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags); |
| 43 | } |
43 | } |
| 44 | 44 | ||
| 45 | /** mremap syscall |
45 | /** Resize address space area. |
| 46 | * |
46 | * |
| 47 | * @param address Virtual address pointing into already existing address space area. |
47 | * @param address Virtual address pointing into already existing address space area. |
| 48 | * @param size New requested size of the area. |
48 | * @param size New requested size of the area. |
| 49 | * @param flags Currently unused. |
49 | * @param flags Currently unused. |
| 50 | * |
50 | * |
| 51 | * @return address on success, (void *) -1 otherwise. |
51 | * @return address on success, (void *) -1 otherwise. |
| 52 | */ |
52 | */ |
| 53 | void *mremap(void *address, size_t size, int flags) |
53 | void *as_area_resize(void *address, size_t size, int flags) |
| 54 | { |
54 | { |
| 55 | return (void *) __SYSCALL3(SYS_MREMAP, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags); |
55 | return (void *) __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags); |
| 56 | } |
56 | } |
| 57 | 57 | ||
| 58 | static size_t heapsize = 0; |
58 | static size_t heapsize = 0; |
| 59 | /* Start of heap linker symbol */ |
59 | /* Start of heap linker symbol */ |
| 60 | extern char _heap; |
60 | extern char _heap; |
| Line 76... | Line 76... | ||
| 76 | return NULL; |
76 | return NULL; |
| 77 | /* Check for too small values */ |
77 | /* Check for too small values */ |
| 78 | if (incr < 0 && incr+heapsize > heapsize) |
78 | if (incr < 0 && incr+heapsize > heapsize) |
| 79 | return NULL; |
79 | return NULL; |
| 80 | 80 | ||
| 81 | res = mremap(&_heap, heapsize + incr,0); |
81 | res = as_area_resize(&_heap, heapsize + incr,0); |
| 82 | if (!res) |
82 | if (!res) |
| 83 | return NULL; |
83 | return NULL; |
| 84 | 84 | ||
| 85 | /* Compute start of new area */ |
85 | /* Compute start of new area */ |
| 86 | res = (void *)&_heap + heapsize; |
86 | res = (void *)&_heap + heapsize; |