Changeset d3b8c1f in mainline

Timestamp:

2006-04-23T16:34:45Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4309741

Parents:

cdafab1

Message:

Reflect changes in syscall names in userspace.

Files:

• init/init.c (modified) (2 diffs)
• libc/generic/mmap.c (modified) (4 diffs)
• libc/generic/task.c (modified) (1 diff)
• libc/include/task.h (modified) (1 diff)
• libc/include/unistd.h (modified) (1 diff)

init/init.c

@@ -95 +95 @@
 {
         printf("Writing to good memory\n");
-        mremap(&_heap, 120000, 0);
+        as_area_resize(&_heap, 120000, 0);
         printf("%P\n", ((char *)&_heap));
         printf("%P\n", ((char *)&_heap) + 80000);
         *(((char *)&_heap) + 80000) = 10;
         printf("Making small\n");
-        mremap(&_heap, 16000, 0);
+        as_area_resize(&_heap, 16000, 0);
         printf("Failing..\n");
         *((&_heap) + 80000) = 10;
@@ -306 +306 @@
 //      test_slam();
         
-        printf("Userspace task, taskid=%llX\n", get_task_id());
+        printf("Userspace task, taskid=%llX\n", task_get_id());
 
         futex_initialize(&ftx, 1);

libc/generic/mmap.c

@@ -30 +30 @@
 #include <unistd.h>
 
-/** mmap syscall
+/** Create address space area.
  *
  * @param address Virtual address where to place new address space area.
@@ -38 +38 @@
  * @return address on success, (void *) -1 otherwise.
  */
-void *mmap(void *address, size_t size, int flags)
+void *as_area_create(void *address, size_t size, int flags)
 {
-        return (void *) __SYSCALL3(SYS_MMAP, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags);
+        return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags);
 }
 
-/** mremap syscall
+/** Resize address space area.
  *
  * @param address Virtual address pointing into already existing address space area.
@@ -51 +51 @@
  * @return address on success, (void *) -1 otherwise.
  */
-void *mremap(void *address, size_t size, int flags)
+void *as_area_resize(void *address, size_t size, int flags)
 {
-        return (void *) __SYSCALL3(SYS_MREMAP, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags);
+        return (void *) __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags);
 }
 
@@ -79 +79 @@
                 return NULL;
 
-        res = mremap(&_heap, heapsize + incr,0);
+        res = as_area_resize(&_heap, heapsize + incr,0);
         if (!res)
                 return NULL;

libc/generic/task.c

@@ -30 +30 @@
 #include <libc.h>
 
-task_id_t get_task_id(void)
+task_id_t task_get_id(void)
 {
         task_id_t task_id;
 
-        (void) __SYSCALL1(SYS_GET_TASK_ID, (sysarg_t) &task_id);
+        (void) __SYSCALL1(SYS_TASK_GET_ID, (sysarg_t) &task_id);
 
         return task_id;

libc/include/task.h

@@ -34 +34 @@
 typedef uint64_t task_id_t;
 
-extern task_id_t get_task_id(void);
+extern task_id_t task_get_id(void);
 
 #endif

libc/include/unistd.h

@@ -38 +38 @@
 extern ssize_t write(int fd, const void * buf, size_t count);
 extern void _exit(int status);
-void *mmap(void *address, size_t size, int flags);
-void *mremap(void *address, size_t size, int flags);
+void *as_area_create(void *address, size_t size, int flags);
+void *as_area_resize(void *address, size_t size, int flags);
 void *sbrk(ssize_t incr);