Changeset 96b02eb9 in mainline for kernel/generic/src

Timestamp:

2010-12-14T12:52:38Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6b10dab

Parents:

554debd

Message:

more unification of basic types

• use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
• remove ipcarg_t in favour of sysarg_t

(no change in functionality)

Location:

kernel/generic/src

Files:

• adt/hash_table.c (modified) (3 diffs)
• console/cmd.c (modified) (9 diffs)
• console/console.c (modified) (5 diffs)
• console/kconsole.c (modified) (4 diffs)
• ddi/ddi.c (modified) (3 diffs)
• ddi/device.c (modified) (1 diff)
• ddi/irq.c (modified) (9 diffs)
• interrupt/interrupt.c (modified) (2 diffs)
• ipc/event.c (modified) (3 diffs)
• ipc/ipc.c (modified) (1 diff)
• ipc/ipcrsc.c (modified) (2 diffs)
• ipc/irq.c (modified) (4 diffs)
• ipc/sysipc.c (modified) (32 diffs)
• lib/memstr.c (modified) (1 diff)
• lib/rd.c (modified) (1 diff)
• mm/as.c (modified) (1 diff)
• mm/slab.c (modified) (1 diff)
• proc/program.c (modified) (2 diffs)
• proc/task.c (modified) (4 diffs)
• proc/thread.c (modified) (8 diffs)
• security/cap.c (modified) (5 diffs)
• synch/futex.c (modified) (8 diffs)
• synch/smc.c (modified) (1 diff)
• syscall/syscall.c (modified) (2 diffs)
• sysinfo/stats.c (modified) (1 diff)
• sysinfo/sysinfo.c (modified) (10 diffs)
• time/clock.c (modified) (2 diffs)
• udebug/udebug.c (modified) (2 diffs)
• udebug/udebug_ipc.c (modified) (6 diffs)
• udebug/udebug_ops.c (modified) (7 diffs)

kernel/generic/src/adt/hash_table.c

@@ -82 +82 @@
  * @param item Item to be inserted into the hash table.
  */
-void hash_table_insert(hash_table_t *h, unative_t key[], link_t *item)
+void hash_table_insert(hash_table_t *h, sysarg_t key[], link_t *item)
 {
         size_t chain;
@@ -105 +105 @@
  * @return Matching item on success, NULL if there is no such item.
  */
-link_t *hash_table_find(hash_table_t *h, unative_t key[])
+link_t *hash_table_find(hash_table_t *h, sysarg_t key[])
 {
         link_t *cur;
@@ -138 +138 @@
  * @param keys Number of keys in the key array.
  */
-void hash_table_remove(hash_table_t *h, unative_t key[], size_t keys)
+void hash_table_remove(hash_table_t *h, sysarg_t key[], size_t keys)
 {
         size_t chain;

kernel/generic/src/console/cmd.c

@@ -601 +601 @@
         
         /* This doesn't have to be very accurate */
-        unative_t sec = uptime->seconds1;
+        sysarg_t sec = uptime->seconds1;
         
         printf("Up %" PRIun " days, %" PRIun " hours, %" PRIun " minutes, %" PRIun " seconds\n",
@@ -656 +656 @@
         uintptr_t symaddr;
         char *symbol;
-        unative_t (*fnc)(void);
+        sysarg_t (*fnc)(void);
         fncptr_t fptr;
         int rc;
@@ -672 +672 @@
 
                 ipl = interrupts_disable();
-                fnc = (unative_t (*)(void)) arch_construct_function(&fptr,
+                fnc = (sysarg_t (*)(void)) arch_construct_function(&fptr,
                     (void *) symaddr, (void *) cmd_call0);
                 printf("Calling %s() (%p)\n", symbol, (void *) symaddr);
@@ -720 +720 @@
         uintptr_t symaddr;
         char *symbol;
-        unative_t (*fnc)(unative_t, ...);
-        unative_t arg1 = argv[1].intval;
+        sysarg_t (*fnc)(sysarg_t, ...);
+        sysarg_t arg1 = argv[1].intval;
         fncptr_t fptr;
         int rc;
@@ -737 +737 @@
 
                 ipl = interrupts_disable();
-                fnc = (unative_t (*)(unative_t, ...))
+                fnc = (sysarg_t (*)(sysarg_t, ...))
                     arch_construct_function(&fptr, (void *) symaddr,
                     (void *) cmd_call1);
@@ -756 +756 @@
         uintptr_t symaddr;
         char *symbol;
-        unative_t (*fnc)(unative_t, unative_t, ...);
-        unative_t arg1 = argv[1].intval;
-        unative_t arg2 = argv[2].intval;
+        sysarg_t (*fnc)(sysarg_t, sysarg_t, ...);
+        sysarg_t arg1 = argv[1].intval;
+        sysarg_t arg2 = argv[2].intval;
         fncptr_t fptr;
         int rc;
@@ -774 +774 @@
 
                 ipl = interrupts_disable();
-                fnc = (unative_t (*)(unative_t, unative_t, ...))
+                fnc = (sysarg_t (*)(sysarg_t, sysarg_t, ...))
                     arch_construct_function(&fptr, (void *) symaddr,
                     (void *) cmd_call2);
@@ -792 +792 @@
         uintptr_t symaddr;
         char *symbol;
-        unative_t (*fnc)(unative_t, unative_t, unative_t, ...);
-        unative_t arg1 = argv[1].intval;
-        unative_t arg2 = argv[2].intval;
-        unative_t arg3 = argv[3].intval;
+        sysarg_t (*fnc)(sysarg_t, sysarg_t, sysarg_t, ...);
+        sysarg_t arg1 = argv[1].intval;
+        sysarg_t arg2 = argv[2].intval;
+        sysarg_t arg3 = argv[3].intval;
         fncptr_t fptr;
         int rc;
@@ -811 +811 @@
 
                 ipl = interrupts_disable();
-                fnc = (unative_t (*)(unative_t, unative_t, unative_t, ...))
+                fnc = (sysarg_t (*)(sysarg_t, sysarg_t, sysarg_t, ...))
                     arch_construct_function(&fptr, (void *) symaddr,
                     (void *) cmd_call3);

kernel/generic/src/console/console.c

@@ -162 +162 @@
         ddi_parea_register(&klog_parea);
         
-        sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);
+        sysinfo_set_item_val("klog.faddr", NULL, (sysarg_t) faddr);
         sysinfo_set_item_val("klog.pages", NULL, KLOG_PAGES);
         
@@ -193 +193 @@
 
 /** Tell kernel to get keyboard/console access again */
-unative_t sys_debug_enable_console(void)
+sysarg_t sys_debug_enable_console(void)
 {
 #ifdef CONFIG_KCONSOLE
@@ -204 +204 @@
 
 /** Tell kernel to relinquish keyboard/console access */
-unative_t sys_debug_disable_console(void)
+sysarg_t sys_debug_disable_console(void)
 {
         release_console();
@@ -333 +333 @@
  *
  */
-unative_t sys_klog(int fd, const void *buf, size_t size)
+sysarg_t sys_klog(int fd, const void *buf, size_t size)
 {
         char *data;
@@ -339 +339 @@
         
         if (size > PAGE_SIZE)
-                return (unative_t) ELIMIT;
+                return (sysarg_t) ELIMIT;
         
         if (size > 0) {
                 data = (char *) malloc(size + 1, 0);
                 if (!data)
-                        return (unative_t) ENOMEM;
+                        return (sysarg_t) ENOMEM;
                 
                 rc = copy_from_uspace(data, buf, size);
                 if (rc) {
                         free(data);
-                        return (unative_t) rc;
+                        return (sysarg_t) rc;
                 }
                 data[size] = 0;

kernel/generic/src/console/kconsole.c

@@ -426 +426 @@
 
 NO_TRACE static bool parse_int_arg(const char *text, size_t len,
-    unative_t *result)
+    sysarg_t *result)
 {
         bool isaddr = false;
@@ -461 +461 @@
                 case EOK:
                         if (isaddr)
-                                *result = (unative_t) symaddr;
+                                *result = (sysarg_t) symaddr;
                         else if (isptr)
-                                *result = **((unative_t **) symaddr);
+                                *result = **((sysarg_t **) symaddr);
                         else
-                                *result = *((unative_t *) symaddr);
+                                *result = *((sysarg_t *) symaddr);
                         break;
                 default:
@@ -483 +483 @@
                         return false;
                 case EOK:
-                        *result = (unative_t) value;
+                        *result = (sysarg_t) value;
                         if (isptr)
-                                *result = *((unative_t *) *result);
+                                *result = *((sysarg_t *) *result);
                         break;
                 default:
@@ -629 +629 @@
                                             cmdline + start + 1,
                                             (end - start) - 1);
-                                        cmd->argv[i].intval = (unative_t) buf;
+                                        cmd->argv[i].intval = (sysarg_t) buf;
                                         cmd->argv[i].vartype = ARG_TYPE_STRING;
                                 } else {

kernel/generic/src/ddi/ddi.c

@@ -232 +232 @@
  *
  */
-unative_t sys_physmem_map(unative_t phys_base, unative_t virt_base,
-    unative_t pages, unative_t flags)
-{
-        return (unative_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
+sysarg_t sys_physmem_map(sysarg_t phys_base, sysarg_t virt_base,
+    sysarg_t pages, sysarg_t flags)
+{
+        return (sysarg_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
             FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
             (size_t) pages, (int) flags);
@@ -247 +247 @@
  *
  */
-unative_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
+sysarg_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
 {
         ddi_ioarg_t arg;
         int rc = copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
         if (rc != 0)
-                return (unative_t) rc;
-        
-        return (unative_t) ddi_iospace_enable((task_id_t) arg.task_id,
+                return (sysarg_t) rc;
+        
+        return (sysarg_t) ddi_iospace_enable((task_id_t) arg.task_id,
             (uintptr_t) arg.ioaddr, (size_t) arg.size);
 }
@@ -265 +265 @@
  * @retutn Zero on success, error code otherwise.
  */
-unative_t sys_interrupt_enable(int irq, int enable)
+sysarg_t sys_interrupt_enable(int irq, int enable)
 {
 /* FIXME: this needs to be generic code, or better not be in kernel at all. */

kernel/generic/src/ddi/device.c

@@ -54 +54 @@
 }
 
-unative_t sys_device_assign_devno(void)
+sysarg_t sys_device_assign_devno(void)
 {
-        return (unative_t) device_assign_devno();
+        return (sysarg_t) device_assign_devno();
 }
 

kernel/generic/src/ddi/irq.c

@@ -106 +106 @@
  *
  */
-static size_t irq_ht_hash(unative_t *key);
-static bool irq_ht_compare(unative_t *key, size_t keys, link_t *item);
+static size_t irq_ht_hash(sysarg_t *key);
+static bool irq_ht_compare(sysarg_t *key, size_t keys, link_t *item);
 static void irq_ht_remove(link_t *item);
 
@@ -123 +123 @@
  *
  */
-static size_t irq_lin_hash(unative_t *key);
-static bool irq_lin_compare(unative_t *key, size_t keys, link_t *item);
+static size_t irq_lin_hash(sysarg_t *key);
+static bool irq_lin_compare(sysarg_t *key, size_t keys, link_t *item);
 static void irq_lin_remove(link_t *item);
 
@@ -194 +194 @@
 void irq_register(irq_t *irq)
 {
-        unative_t key[] = {
-                (unative_t) irq->inr,
-                (unative_t) irq->devno
+        sysarg_t key[] = {
+                (sysarg_t) irq->inr,
+                (sysarg_t) irq->devno
         };
         
@@ -212 +212 @@
 {
         link_t *lnk;
-        unative_t key[] = {
-                (unative_t) inr,
-                (unative_t) -1    /* Search will use claim() instead of devno */
+        sysarg_t key[] = {
+                (sysarg_t) inr,
+                (sysarg_t) -1    /* Search will use claim() instead of devno */
         };
         
@@ -235 +235 @@
 {
         link_t *lnk;
-        unative_t key[] = {
-                (unative_t) inr,
-                (unative_t) -1    /* Search will use claim() instead of devno */
+        sysarg_t key[] = {
+                (sysarg_t) inr,
+                (sysarg_t) -1    /* Search will use claim() instead of devno */
         };
         
@@ -306 +306 @@
  *
  */
-size_t irq_ht_hash(unative_t key[])
+size_t irq_ht_hash(sysarg_t key[])
 {
         inr_t inr = (inr_t) key[KEY_INR];
@@ -333 +333 @@
  *
  */
-bool irq_ht_compare(unative_t key[], size_t keys, link_t *item)
+bool irq_ht_compare(sysarg_t key[], size_t keys, link_t *item)
 {
         irq_t *irq = hash_table_get_instance(item, irq_t, link);
@@ -381 +381 @@
  *
  */
-size_t irq_lin_hash(unative_t key[])
+size_t irq_lin_hash(sysarg_t key[])
 {
         inr_t inr = (inr_t) key[KEY_INR];
@@ -408 +408 @@
  *
  */
-bool irq_lin_compare(unative_t key[], size_t keys, link_t *item)
+bool irq_lin_compare(sysarg_t key[], size_t keys, link_t *item)
 {
         irq_t *irq = list_get_instance(item, irq_t, link);

kernel/generic/src/interrupt/interrupt.c

@@ -197 +197 @@
                 /* Notify the subscriber that a fault occurred. */
                 event_notify_3(EVENT_FAULT, LOWER32(TASK->taskid),
-                    UPPER32(TASK->taskid), (unative_t) THREAD);
+                    UPPER32(TASK->taskid), (sysarg_t) THREAD);
                 
 #ifdef CONFIG_UDEBUG
@@ -263 +263 @@
                 
                 const char *symbol =
-                    symtab_fmt_name_lookup((unative_t) exc_table[i].handler);
+                    symtab_fmt_name_lookup((sysarg_t) exc_table[i].handler);
                 
 #ifdef __32_BITS__

kernel/generic/src/ipc/event.c

@@ -61 +61 @@
 }
 
-static int event_subscribe(event_type_t evno, unative_t method,
+static int event_subscribe(event_type_t evno, sysarg_t method,
     answerbox_t *answerbox)
 {
@@ -84 +84 @@
 }
 
-unative_t sys_event_subscribe(unative_t evno, unative_t method)
+sysarg_t sys_event_subscribe(sysarg_t evno, sysarg_t method)
 {
-        return (unative_t) event_subscribe((event_type_t) evno, (unative_t)
+        return (sysarg_t) event_subscribe((event_type_t) evno, (sysarg_t)
             method, &TASK->answerbox);
 }
@@ -119 +119 @@
 }
 
-void event_notify(event_type_t evno, unative_t a1, unative_t a2, unative_t a3,
-    unative_t a4, unative_t a5)
+void event_notify(event_type_t evno, sysarg_t a1, sysarg_t a2, sysarg_t a3,
+    sysarg_t a4, sysarg_t a5)
 {
         ASSERT(evno < EVENT_END);

kernel/generic/src/ipc/ipc.c

@@ -270 +270 @@
  *
  */
-void ipc_backsend_err(phone_t *phone, call_t *call, unative_t err)
+void ipc_backsend_err(phone_t *phone, call_t *call, sysarg_t err)
 {
         call->data.phone = phone;

kernel/generic/src/ipc/ipcrsc.c

@@ -144 +144 @@
  *
  */
-call_t *get_call(unative_t callid)
+call_t *get_call(sysarg_t callid)
 {
         link_t *lst;
@@ -153 +153 @@
             lst != &TASK->answerbox.dispatched_calls; lst = lst->next) {
                 call_t *call = list_get_instance(lst, call_t, link);
-                if ((unative_t) call == callid) {
+                if ((sysarg_t) call == callid) {
                         result = call;
                         break;

kernel/generic/src/ipc/irq.c

@@ -140 +140 @@
  */
 int ipc_irq_register(answerbox_t *box, inr_t inr, devno_t devno,
-    unative_t method, irq_code_t *ucode)
-{
-        unative_t key[] = {
-                (unative_t) inr,
-                (unative_t) devno
+    sysarg_t method, irq_code_t *ucode)
+{
+        sysarg_t key[] = {
+                (sysarg_t) inr,
+                (sysarg_t) devno
         };
         
@@ -213 +213 @@
 int ipc_irq_unregister(answerbox_t *box, inr_t inr, devno_t devno)
 {
-        unative_t key[] = {
-                (unative_t) inr,
-                (unative_t) devno
+        sysarg_t key[] = {
+                (sysarg_t) inr,
+                (sysarg_t) devno
         };
         
@@ -290 +290 @@
                 }
                 
-                unative_t key[2];
+                sysarg_t key[2];
                 key[0] = irq->inr;
                 key[1] = irq->devno;
@@ -465 +465 @@
  *
  */
-void ipc_irq_send_msg(irq_t *irq, unative_t a1, unative_t a2, unative_t a3,
-    unative_t a4, unative_t a5)
+void ipc_irq_send_msg(irq_t *irq, sysarg_t a1, sysarg_t a2, sysarg_t a3,
+    sysarg_t a4, sysarg_t a5)
 {
         irq_spinlock_lock(&irq->lock, true);

kernel/generic/src/ipc/sysipc.c

@@ -68 +68 @@
  *
  */
-static int phone_get(unative_t phoneid, phone_t **phone)
+static int phone_get(sysarg_t phoneid, phone_t **phone)
 {
         if (phoneid >= IPC_MAX_PHONES)
@@ -84 +84 @@
  *
  */
-static inline bool method_is_system(unative_t method)
+static inline bool method_is_system(sysarg_t method)
 {
         if (method <= IPC_M_LAST_SYSTEM)
@@ -102 +102 @@
  *
  */
-static inline bool method_is_forwardable(unative_t method)
+static inline bool method_is_forwardable(sysarg_t method)
 {
         switch (method) {
@@ -124 +124 @@
  *
  */
-static inline bool method_is_immutable(unative_t method)
+static inline bool method_is_immutable(sysarg_t method)
 {
         switch (method) {
@@ -248 +248 @@
                         /* Set 'phone hash' as arg5 of response */
                         IPC_SET_ARG5(answer->data,
-                            (unative_t) &TASK->phones[phoneid]);
+                            (sysarg_t) &TASK->phones[phoneid]);
                 }
         } else if (IPC_GET_METHOD(*olddata) == IPC_M_CONNECT_ME_TO) {
@@ -399 +399 @@
         }
         case IPC_M_CONNECT_ME:
-                IPC_SET_ARG5(call->data, (unative_t) phone);
+                IPC_SET_ARG5(call->data, (sysarg_t) phone);
                 break;
         case IPC_M_CONNECT_ME_TO: {
@@ -407 +407 @@
                 
                 /* Set arg5 for server */
-                IPC_SET_ARG5(call->data, (unative_t) &TASK->phones[newphid]);
+                IPC_SET_ARG5(call->data, (sysarg_t) &TASK->phones[newphid]);
                 call->flags |= IPC_CALL_CONN_ME_TO;
                 call->priv = newphid;
@@ -541 +541 @@
  *
  */
-unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method,
-    unative_t arg1, unative_t arg2, unative_t arg3, ipc_data_t *data)
+sysarg_t sys_ipc_call_sync_fast(sysarg_t phoneid, sysarg_t method,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, ipc_data_t *data)
 {
         phone_t *phone;
@@ -601 +601 @@
  *
  */
-unative_t sys_ipc_call_sync_slow(unative_t phoneid, ipc_data_t *question,
+sysarg_t sys_ipc_call_sync_slow(sysarg_t phoneid, ipc_data_t *question,
     ipc_data_t *reply)
 {
@@ -613 +613 @@
         if (rc != 0) {
                 ipc_call_free(call);
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         }
         
@@ -677 +677 @@
  *
  */
-unative_t sys_ipc_call_async_fast(unative_t phoneid, unative_t method,
-    unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4)
+sysarg_t sys_ipc_call_async_fast(sysarg_t phoneid, sysarg_t method,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
         phone_t *phone;
@@ -707 +707 @@
                 ipc_backsend_err(phone, call, res);
         
-        return (unative_t) call;
+        return (sysarg_t) call;
 }
 
@@ -718 +718 @@
  *
  */
-unative_t sys_ipc_call_async_slow(unative_t phoneid, ipc_data_t *data)
+sysarg_t sys_ipc_call_async_slow(sysarg_t phoneid, ipc_data_t *data)
 {
         phone_t *phone;
@@ -732 +732 @@
         if (rc != 0) {
                 ipc_call_free(call);
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         }
         
@@ -742 +742 @@
                 ipc_backsend_err(phone, call, res);
         
-        return (unative_t) call;
+        return (sysarg_t) call;
 }
 
@@ -767 +767 @@
  *
  */
-static unative_t sys_ipc_forward_common(unative_t callid, unative_t phoneid,
-    unative_t method, unative_t arg1, unative_t arg2, unative_t arg3,
-    unative_t arg4, unative_t arg5, unsigned int mode, bool slow)
+static sysarg_t sys_ipc_forward_common(sysarg_t callid, sysarg_t phoneid,
+    sysarg_t method, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
+    sysarg_t arg4, sysarg_t arg5, unsigned int mode, bool slow)
 {
         call_t *call = get_call(callid);
@@ -846 +846 @@
  *
  */
-unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid,
-    unative_t method, unative_t arg1, unative_t arg2, unsigned int mode)
+sysarg_t sys_ipc_forward_fast(sysarg_t callid, sysarg_t phoneid,
+    sysarg_t method, sysarg_t arg1, sysarg_t arg2, unsigned int mode)
 {
         return sys_ipc_forward_common(callid, phoneid, method, arg1, arg2, 0, 0,
@@ -870 +870 @@
  *
  */
-unative_t sys_ipc_forward_slow(unative_t callid, unative_t phoneid,
+sysarg_t sys_ipc_forward_slow(sysarg_t callid, sysarg_t phoneid,
     ipc_data_t *data, unsigned int mode)
 {
@@ -877 +877 @@
             sizeof(newdata.args));
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         return sys_ipc_forward_common(callid, phoneid,
@@ -900 +900 @@
  *
  */
-unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval,
-    unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4)
+sysarg_t sys_ipc_answer_fast(sysarg_t callid, sysarg_t retval,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
         /* Do not answer notification callids */
@@ -945 +945 @@
  *
  */
-unative_t sys_ipc_answer_slow(unative_t callid, ipc_data_t *data)
+sysarg_t sys_ipc_answer_slow(sysarg_t callid, ipc_data_t *data)
 {
         /* Do not answer notification callids */
@@ -982 +982 @@
  *
  */
-unative_t sys_ipc_hangup(unative_t phoneid)
+sysarg_t sys_ipc_hangup(sysarg_t phoneid)
 {
         phone_t *phone;
@@ -1008 +1008 @@
  *
  */
-unative_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
+sysarg_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
     unsigned int flags)
 {
@@ -1037 +1037 @@
                 ipc_call_free(call);
                 
-                return ((unative_t) call) | IPC_CALLID_NOTIFICATION;
+                return ((sysarg_t) call) | IPC_CALLID_NOTIFICATION;
         }
         
@@ -1051 +1051 @@
                 ipc_call_free(call);
                 
-                return ((unative_t) call) | IPC_CALLID_ANSWERED;
+                return ((sysarg_t) call) | IPC_CALLID_ANSWERED;
         }
         
@@ -1079 +1079 @@
         }
         
-        return (unative_t) call;
+        return (sysarg_t) call;
 }
 
@@ -1085 +1085 @@
  *
  */
-unative_t sys_ipc_poke(void)
+sysarg_t sys_ipc_poke(void)
 {
         waitq_unsleep(&TASK->answerbox.wq);
@@ -1101 +1101 @@
  *
  */
-unative_t sys_ipc_register_irq(inr_t inr, devno_t devno, unative_t method,
+sysarg_t sys_ipc_register_irq(inr_t inr, devno_t devno, sysarg_t method,
     irq_code_t *ucode)
 {
@@ -1118 +1118 @@
  *
  */
-unative_t sys_ipc_unregister_irq(inr_t inr, devno_t devno)
+sysarg_t sys_ipc_unregister_irq(inr_t inr, devno_t devno)
 {
         if (!(cap_get(TASK) & CAP_IRQ_REG))
@@ -1135 +1135 @@
  *
  */
-unative_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg)
+sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg)
 {
 #ifdef CONFIG_UDEBUG
@@ -1141 +1141 @@
         int rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t));
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         LOG("sys_ipc_connect_kbox(%" PRIu64 ")", taskid_arg.value);
@@ -1147 +1147 @@
         return ipc_connect_kbox(taskid_arg.value);
 #else
-        return (unative_t) ENOTSUP;
+        return (sysarg_t) ENOTSUP;
 #endif
 }

kernel/generic/src/lib/memstr.c

@@ -62 +62 @@
         unsigned int i, j;
         
-        if (ALIGN_UP((uintptr_t) src, sizeof(unative_t)) != (uintptr_t) src ||
-            ALIGN_UP((uintptr_t) dst, sizeof(unative_t)) != (uintptr_t) dst) {
+        if (ALIGN_UP((uintptr_t) src, sizeof(sysarg_t)) != (uintptr_t) src ||
+            ALIGN_UP((uintptr_t) dst, sizeof(sysarg_t)) != (uintptr_t) dst) {
                 for (i = 0; i < cnt; i++)
                         ((uint8_t *) dst)[i] = ((uint8_t *) src)[i];
         } else { 
-                for (i = 0; i < cnt / sizeof(unative_t); i++)
-                        ((unative_t *) dst)[i] = ((unative_t *) src)[i];
+                for (i = 0; i < cnt / sizeof(sysarg_t); i++)
+                        ((sysarg_t *) dst)[i] = ((sysarg_t *) src)[i];
                 
-                for (j = 0; j < cnt % sizeof(unative_t); j++)
-                        ((uint8_t *)(((unative_t *) dst) + i))[j] =
-                            ((uint8_t *)(((unative_t *) src) + i))[j];
+                for (j = 0; j < cnt % sizeof(sysarg_t); j++)
+                        ((uint8_t *)(((sysarg_t *) dst) + i))[j] =
+                            ((uint8_t *)(((sysarg_t *) src) + i))[j];
         }
                 

kernel/generic/src/lib/rd.c

@@ -96 +96 @@
         sysinfo_set_item_val("rd.size", NULL, dsize);
         sysinfo_set_item_val("rd.address.physical", NULL,
-            (unative_t) KA2PA((void *) header + hsize));
+            (sysarg_t) KA2PA((void *) header + hsize));
 
         return RE_OK;

kernel/generic/src/mm/as.c

@@ -2000 +2000 @@
 
 /** Wrapper for as_area_create(). */
-unative_t sys_as_area_create(uintptr_t address, size_t size, unsigned int flags)
+sysarg_t sys_as_area_create(uintptr_t address, size_t size, unsigned int flags)
 {
         if (as_area_create(AS, flags | AS_AREA_CACHEABLE, size, address,
             AS_AREA_ATTR_NONE, &anon_backend, NULL))
-                return (unative_t) address;
+                return (sysarg_t) address;
         else
-                return (unative_t) -1;
+                return (sysarg_t) -1;
 }
 
 /** Wrapper for as_area_resize(). */
-unative_t sys_as_area_resize(uintptr_t address, size_t size, unsigned int flags)
-{
-        return (unative_t) as_area_resize(AS, address, size, 0);
+sysarg_t sys_as_area_resize(uintptr_t address, size_t size, unsigned int flags)
+{
+        return (sysarg_t) as_area_resize(AS, address, size, 0);
 }
 
 /** Wrapper for as_area_change_flags(). */
-unative_t sys_as_area_change_flags(uintptr_t address, unsigned int flags)
-{
-        return (unative_t) as_area_change_flags(AS, flags, address);
+sysarg_t sys_as_area_change_flags(uintptr_t address, unsigned int flags)
+{
+        return (sysarg_t) as_area_change_flags(AS, flags, address);
 }
 
 /** Wrapper for as_area_destroy(). */
-unative_t sys_as_area_destroy(uintptr_t address)
-{
-        return (unative_t) as_area_destroy(AS, address);
+sysarg_t sys_as_area_destroy(uintptr_t address)
+{
+        return (sysarg_t) as_area_destroy(AS, address);
 }
 

kernel/generic/src/mm/slab.c

@@ -612 +612 @@
         cache->name = name;
         
-        if (align < sizeof(unative_t))
-                align = sizeof(unative_t);
+        if (align < sizeof(sysarg_t))
+                align = sizeof(sysarg_t);
         
         size = ALIGN_UP(size, align);

kernel/generic/src/proc/program.c

@@ -210 +210 @@
  *
  */
-unative_t sys_program_spawn_loader(char *uspace_name, size_t name_len)
+sysarg_t sys_program_spawn_loader(char *uspace_name, size_t name_len)
 {
         /* Cap length of name and copy it from userspace. */
@@ -219 +219 @@
         int rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         namebuf[name_len] = 0;

kernel/generic/src/proc/task.c

@@ -298 +298 @@
  *
  */
-unative_t sys_task_get_id(task_id_t *uspace_task_id)
+sysarg_t sys_task_get_id(task_id_t *uspace_task_id)
 {
         /*
@@ -304 +304 @@
          * the lifespan of the task.
          */
-        return (unative_t) copy_to_uspace(uspace_task_id, &TASK->taskid,
+        return (sysarg_t) copy_to_uspace(uspace_task_id, &TASK->taskid,
             sizeof(TASK->taskid));
 }
@@ -318 +318 @@
  *
  */
-unative_t sys_task_set_name(const char *uspace_name, size_t name_len)
+sysarg_t sys_task_set_name(const char *uspace_name, size_t name_len)
 {
         int rc;
@@ -330 +330 @@
         rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         namebuf[name_len] = '\0';

kernel/generic/src/proc/thread.c

@@ -755 +755 @@
  *
  */
-unative_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
+sysarg_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
     size_t name_len, thread_id_t *uspace_thread_id)
 {
@@ -764 +764 @@
         int rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         namebuf[name_len] = 0;
@@ -779 +779 @@
         if (rc != 0) {
                 free(kernel_uarg);
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         }
         
@@ -804 +804 @@
                                 free(kernel_uarg);
                                 
-                                return (unative_t) rc;
+                                return (sysarg_t) rc;
                          }
                 }
@@ -827 +827 @@
                 free(kernel_uarg);
         
-        return (unative_t) ENOMEM;
+        return (sysarg_t) ENOMEM;
 }
 
@@ -833 +833 @@
  *
  */
-unative_t sys_thread_exit(int uspace_status)
+sysarg_t sys_thread_exit(int uspace_status)
 {
         thread_exit();
@@ -849 +849 @@
  *
  */
-unative_t sys_thread_get_id(thread_id_t *uspace_thread_id)
+sysarg_t sys_thread_get_id(thread_id_t *uspace_thread_id)
 {
         /*
@@ -856 +856 @@
          *
          */
-        return (unative_t) copy_to_uspace(uspace_thread_id, &THREAD->tid,
+        return (sysarg_t) copy_to_uspace(uspace_thread_id, &THREAD->tid,
             sizeof(THREAD->tid));
 }
 
 /** Syscall wrapper for sleeping. */
-unative_t sys_thread_usleep(uint32_t usec)
+sysarg_t sys_thread_usleep(uint32_t usec)
 {
         thread_usleep(usec);

kernel/generic/src/security/cap.c

@@ -85 +85 @@
  *
  */
-unative_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps)
+sysarg_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps)
 {
         if (!(cap_get(TASK) & CAP_CAP))
-                return (unative_t) EPERM;
+                return (sysarg_t) EPERM;
         
         sysarg64_t taskid_arg;
         int rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t));
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         irq_spinlock_lock(&tasks_lock, true);
@@ -100 +100 @@
         if ((!task) || (!context_check(CONTEXT, task->context))) {
                 irq_spinlock_unlock(&tasks_lock, true);
-                return (unative_t) ENOENT;
+                return (sysarg_t) ENOENT;
         }
         
@@ -122 +122 @@
  *
  */
-unative_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps)
+sysarg_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps)
 {
         sysarg64_t taskid_arg;
         int rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t));
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         irq_spinlock_lock(&tasks_lock, true);
@@ -134 +134 @@
         if ((!task) || (!context_check(CONTEXT, task->context))) {
                 irq_spinlock_unlock(&tasks_lock, true);
-                return (unative_t) ENOENT;
+                return (sysarg_t) ENOENT;
         }
         
@@ -147 +147 @@
                 irq_spinlock_unlock(&TASK->lock, false);
                 irq_spinlock_unlock(&tasks_lock, true);
-                return (unative_t) EPERM;
+                return (sysarg_t) EPERM;
         }
         

kernel/generic/src/synch/futex.c

@@ -60 +60 @@
 
 static futex_t *futex_find(uintptr_t paddr);
-static size_t futex_ht_hash(unative_t *key);
-static bool futex_ht_compare(unative_t *key, size_t keys, link_t *item);
+static size_t futex_ht_hash(sysarg_t *key);
+static bool futex_ht_compare(sysarg_t *key, size_t keys, link_t *item);
 static void futex_ht_remove_callback(link_t *item);
 
@@ -108 +108 @@
  *                      synch.h.
  */
-unative_t sys_futex_sleep(uintptr_t uaddr)
+sysarg_t sys_futex_sleep(uintptr_t uaddr)
 {
         futex_t *futex;
@@ -122 +122 @@
         if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) {
                 page_table_unlock(AS, true);
-                return (unative_t) ENOENT;
+                return (sysarg_t) ENOENT;
         }
         paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
@@ -136 +136 @@
         udebug_stoppable_end();
 #endif
-        return (unative_t) rc;
+        return (sysarg_t) rc;
 }
 
@@ -145 +145 @@
  * @return              ENOENT if there is no physical mapping for uaddr.
  */
-unative_t sys_futex_wakeup(uintptr_t uaddr)
+sysarg_t sys_futex_wakeup(uintptr_t uaddr)
 {
         futex_t *futex;
@@ -158 +158 @@
         if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) {
                 page_table_unlock(AS, true);
-                return (unative_t) ENOENT;
+                return (sysarg_t) ENOENT;
         }
         paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
@@ -235 +235 @@
  * @return              Index into futex hash table.
  */
-size_t futex_ht_hash(unative_t *key)
+size_t futex_ht_hash(sysarg_t *key)
 {
         return (*key & (FUTEX_HT_SIZE - 1));
@@ -247 +247 @@
  * @return              True if the item matches the key. False otherwise.
  */
-bool futex_ht_compare(unative_t *key, size_t keys, link_t *item)
+bool futex_ht_compare(sysarg_t *key, size_t keys, link_t *item)
 {
         futex_t *futex;

kernel/generic/src/synch/smc.c

@@ -42 +42 @@
 #include <synch/smc.h>
 
-unative_t sys_smc_coherence(uintptr_t va, size_t size)
+sysarg_t sys_smc_coherence(uintptr_t va, size_t size)
 {
         if (overlaps(va, size, (uintptr_t) NULL, PAGE_SIZE))

kernel/generic/src/syscall/syscall.c

@@ -56 +56 @@
 
 /** Dispatch system call */
-unative_t syscall_handler(unative_t a1, unative_t a2, unative_t a3,
-    unative_t a4, unative_t a5, unative_t a6, unative_t id)
+sysarg_t syscall_handler(sysarg_t a1, sysarg_t a2, sysarg_t a3,
+    sysarg_t a4, sysarg_t a5, sysarg_t a6, sysarg_t id)
 {
         /* Do userpace accounting */
@@ -74 +74 @@
 #endif
         
-        unative_t rc;
+        sysarg_t rc;
         if (id < SYSCALL_END) {
                 rc = syscall_table[id](a1, a2, a3, a4, a5, a6);

kernel/generic/src/sysinfo/stats.c

@@ -87 +87 @@
  *
  */
-static unative_t get_stats_uptime(struct sysinfo_item *item)
+static sysarg_t get_stats_uptime(struct sysinfo_item *item)
 {
         /* This doesn't have to be very accurate */

kernel/generic/src/sysinfo/sysinfo.c

@@ -296 +296 @@
  */
 void sysinfo_set_item_val(const char *name, sysinfo_item_t **root,
-    unative_t val)
+    sysarg_t val)
 {
         /* Protect sysinfo tree consistency */
@@ -481 +481 @@
                 sysinfo_indent(depth);
                 
-                unative_t val;
+                sysarg_t val;
                 size_t size;
                 
@@ -660 +660 @@
  *
  */
-unative_t sys_sysinfo_get_tag(void *path_ptr, size_t path_size)
+sysarg_t sys_sysinfo_get_tag(void *path_ptr, size_t path_size)
 {
         /*
@@ -679 +679 @@
                 ret.tag = SYSINFO_VAL_DATA;
         
-        return (unative_t) ret.tag;
+        return (sysarg_t) ret.tag;
 }
 
@@ -696 +696 @@
  *
  */
-unative_t sys_sysinfo_get_value(void *path_ptr, size_t path_size,
+sysarg_t sys_sysinfo_get_value(void *path_ptr, size_t path_size,
     void *value_ptr)
 {
@@ -715 +715 @@
                 rc = EINVAL;
         
-        return (unative_t) rc;
+        return (sysarg_t) rc;
 }
 
@@ -732 +732 @@
  *
  */
-unative_t sys_sysinfo_get_data_size(void *path_ptr, size_t path_size,
+sysarg_t sys_sysinfo_get_data_size(void *path_ptr, size_t path_size,
     void *size_ptr)
 {
@@ -752 +752 @@
                 rc = EINVAL;
         
-        return (unative_t) rc;
+        return (sysarg_t) rc;
 }
 
@@ -774 +774 @@
  *
  */
-unative_t sys_sysinfo_get_data(void *path_ptr, size_t path_size,
+sysarg_t sys_sysinfo_get_data(void *path_ptr, size_t path_size,
     void *buffer_ptr, size_t buffer_size)
 {
@@ -797 +797 @@
                 free(ret.data.data);
         
-        return (unative_t) rc;
+        return (sysarg_t) rc;
 }
 

kernel/generic/src/time/clock.c

@@ -70 +70 @@
  *
  */
-static unative_t secfrag = 0;
+static sysarg_t secfrag = 0;
 
 /** Initialize realtime clock counter
@@ -100 +100 @@
          *
          */
-        sysinfo_set_item_val("clock.cacheable", NULL, (unative_t) true);
-        sysinfo_set_item_val("clock.faddr", NULL, (unative_t) faddr);
+        sysinfo_set_item_val("clock.cacheable", NULL, (sysarg_t) true);
+        sysinfo_set_item_val("clock.faddr", NULL, (sysarg_t) faddr);
 }
 

kernel/generic/src/udebug/udebug.c

@@ -219 +219 @@
  *
  */
-void udebug_syscall_event(unative_t a1, unative_t a2, unative_t a3,
-    unative_t a4, unative_t a5, unative_t a6, unative_t id, unative_t rc,
+void udebug_syscall_event(sysarg_t a1, sysarg_t a2, sysarg_t a3,
+    sysarg_t a4, sysarg_t a5, sysarg_t a6, sysarg_t id, sysarg_t rc,
     bool end_variant)
 {
@@ -314 +314 @@
         IPC_SET_RETVAL(call->data, 0);
         IPC_SET_ARG1(call->data, UDEBUG_EVENT_THREAD_B);
-        IPC_SET_ARG2(call->data, (unative_t) thread);
+        IPC_SET_ARG2(call->data, (sysarg_t) thread);
         
         /*

kernel/generic/src/udebug/udebug_ipc.c

@@ -210 +210 @@
 static void udebug_receive_name_read(call_t *call)
 {
-        unative_t uspace_addr;
-        unative_t to_copy;
+        sysarg_t uspace_addr;
+        sysarg_t to_copy;
         size_t data_size;
         size_t buf_size;
@@ -257 +257 @@
 static void udebug_receive_areas_read(call_t *call)
 {
-        unative_t uspace_addr;
-        unative_t to_copy;
+        sysarg_t uspace_addr;
+        sysarg_t to_copy;
         size_t data_size;
         size_t buf_size;
@@ -304 +304 @@
 {
         thread_t *t;
-        unative_t uspace_addr;
+        sysarg_t uspace_addr;
         int rc;
         void *buffer;
@@ -328 +328 @@
            (no way to distinguish method in answer) */
         IPC_SET_ARG1(call->data, uspace_addr);
-        IPC_SET_ARG2(call->data, 6 * sizeof(unative_t));
+        IPC_SET_ARG2(call->data, 6 * sizeof(sysarg_t));
         call->buffer = buffer;
 
@@ -341 +341 @@
 {
         thread_t *t;
-        unative_t uspace_addr;
-        unative_t to_copy;
+        sysarg_t uspace_addr;
+        sysarg_t to_copy;
         void *buffer;
         int rc;
@@ -382 +382 @@
 static void udebug_receive_mem_read(call_t *call)
 {
-        unative_t uspace_dst;
-        unative_t uspace_src;
+        sysarg_t uspace_dst;
+        sysarg_t uspace_src;
         unsigned size;
         void *buffer;

kernel/generic/src/udebug/udebug_ops.c

@@ -371 +371 @@
         
         /* Allocate a buffer to hold thread IDs */
-        unative_t *id_buffer = malloc(buf_size + 1, 0);
+        sysarg_t *id_buffer = malloc(buf_size + 1, 0);
         
         mutex_lock(&TASK->udebug.lock);
@@ -385 +385 @@
         /* Copy down the thread IDs */
         
-        size_t max_ids = buf_size / sizeof(unative_t);
+        size_t max_ids = buf_size / sizeof(sysarg_t);
         size_t copied_ids = 0;
         size_t extra_ids = 0;
@@ -404 +404 @@
                 if (copied_ids < max_ids) {
                         /* Using thread struct pointer as identification hash */
-                        id_buffer[copied_ids++] = (unative_t) thread;
+                        id_buffer[copied_ids++] = (sysarg_t) thread;
                 } else
                         extra_ids++;
@@ -414 +414 @@
         
         *buffer = id_buffer;
-        *stored = copied_ids * sizeof(unative_t);
-        *needed = (copied_ids + extra_ids) * sizeof(unative_t);
+        *stored = copied_ids * sizeof(sysarg_t);
+        *needed = (copied_ids + extra_ids) * sizeof(sysarg_t);
         
         return 0;
@@ -463 +463 @@
 {
         /* Prepare a buffer to hold the arguments. */
-        unative_t *arg_buffer = malloc(6 * sizeof(unative_t), 0);
+        sysarg_t *arg_buffer = malloc(6 * sizeof(sysarg_t), 0);
         
         /* On success, this will lock t->udebug.lock. */
@@ -478 +478 @@
         
         /* Copy to a local buffer before releasing the lock. */
-        memcpy(arg_buffer, thread->udebug.syscall_args, 6 * sizeof(unative_t));
+        memcpy(arg_buffer, thread->udebug.syscall_args, 6 * sizeof(sysarg_t));
         
         _thread_op_end(thread);
@@ -539 +539 @@
  *
  */
-int udebug_mem_read(unative_t uspace_addr, size_t n, void **buffer)
+int udebug_mem_read(sysarg_t uspace_addr, size_t n, void **buffer)
 {
         /* Verify task state */