Changeset dd8d5a7 in mainline

Timestamp:

2010-12-14T15:44:23Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

228e490

Parents:

6b10dab

Message:

32/64 ABI split for SYS_TASK_GET_ID

Files:

• kernel/generic/include/proc/task.h (modified) (1 diff)
• kernel/generic/src/ipc/kbox.c (modified) (1 diff)
• kernel/generic/src/proc/task.c (modified) (2 diffs)
• uspace/lib/c/generic/task.c (modified) (1 diff)

kernel/generic/include/proc/task.h

@@ -145 +145 @@
 #endif
 
-extern sysarg_t sys_task_get_id(task_id_t *);
+#ifdef __32_BITS__
+extern sysarg_t sys_task_get_id(sysarg64_t *);
+#endif
+
+#ifdef __64_BITS__
+extern sysarg_t sys_task_get_id(void);
+#endif
+
 extern sysarg_t sys_task_set_name(const char *, size_t);
 

kernel/generic/src/ipc/kbox.c

@@ -192 +192 @@
 }
 
-
 /** Connect phone to a task kernel-box specified by id.
  *

kernel/generic/src/proc/task.c

@@ -290 +290 @@
 }
 
-/** Syscall for reading task ID from userspace.
- *
- * @param uspace_task_id Userspace address of 8-byte buffer
- *                       where to store current task ID.
+#ifdef __32_BITS__
+
+/** Syscall for reading task ID from userspace (32 bits)
+ *
+ * @param uspace_taskid Pointer to user-space buffer
+ *                      where to store current task ID.
  *
  * @return Zero on success or an error code from @ref errno.h.
  *
  */
-sysarg_t sys_task_get_id(task_id_t *uspace_task_id)
+sysarg_t sys_task_get_id(sysarg64_t *uspace_taskid)
 {
         /*
@@ -304 +306 @@
          * the lifespan of the task.
          */
-        return (sysarg_t) copy_to_uspace(uspace_task_id, &TASK->taskid,
+        return (sysarg_t) copy_to_uspace(uspace_taskid, &TASK->taskid,
             sizeof(TASK->taskid));
 }
+
+#endif  /* __32_BITS__ */
+
+#ifdef __64_BITS__
+
+/** Syscall for reading task ID from userspace (64 bits)
+ *
+ * @return Current task ID.
+ *
+ */
+sysarg_t sys_task_get_id(void)
+{
+        /*
+         * No need to acquire lock on TASK because taskid remains constant for
+         * the lifespan of the task.
+         */
+        return TASK->taskid;
+}
+
+#endif  /* __64_BITS__ */
 
 /** Syscall for setting the task name.

uspace/lib/c/generic/task.c

@@ -47 +47 @@
 task_id_t task_get_id(void)
 {
+#ifdef __32_BITS__
         task_id_t task_id;
         (void) __SYSCALL1(SYS_TASK_GET_ID, (sysarg_t) &task_id);
         
         return task_id;
+#endif  /* __32_BITS__ */
+        
+#ifdef __64_BITS__
+        return (task_id_t) __SYSCALL0(SYS_TASK_GET_ID);
+#endif  /* __64_BITS__ */
 }