Changeset 6b10dab in mainline for uspace/lib/c

Timestamp:

2010-12-14T15:26:36Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

dd8d5a7

Parents:

96b02eb9

Message:

ABI split: pass 64-bit task ID as plain 64-bit argument to SYS_IPC_CONNECT_KBOX, SYS_CAP_GRANT, SYS_CAP_REVOKE

Location:

uspace/lib/c

Files:

• generic/cap.c (modified) (2 diffs)
• generic/ipc.c (modified) (2 diffs)
• include/libc.h (modified) (2 diffs)

uspace/lib/c/generic/cap.c

@@ -31 +31 @@
  */
 /**
- * @file        cap.c
- * @brief       Functions to grant/revoke capabilities to/from a task.
+ * @file  cap.c
+ * @brief Functions to grant/revoke capabilities to/from a task.
  */
 
@@ -38 +38 @@
 #include <task.h>
 #include <libc.h>
-#include <kernel/syscall/sysarg64.h>
 
 /** Grant capabilities to a task.
  *
- * @param id Destination task ID.
+ * @param id   Destination task ID.
  * @param caps Capabilities to grant.
  *
  * @return Zero on success or a value from @ref errno.h on failure.
+ *
  */
 int cap_grant(task_id_t id, unsigned int caps)
 {
-        sysarg64_t arg;
+#ifdef __32_BITS__
+        sysarg64_t arg = (sysarg64_t) id;
+        return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) &arg, (sysarg_t) caps);
+#endif
         
-        arg.value = (unsigned long long) id;
-
-        return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) &arg, (sysarg_t) caps);
+#ifdef __64_BITS__
+        return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) id, (sysarg_t) caps);
+#endif
 }
 
 /** Revoke capabilities from a task.
  *
- * @param id Destination task ID.
+ * @param id   Destination task ID.
  * @param caps Capabilities to revoke.
  *
  * @return Zero on success or a value from @ref errno.h on failure.
+ *
  */
 int cap_revoke(task_id_t id, unsigned int caps)
 {
-        sysarg64_t arg;
+#ifdef __32_BITS__
+        sysarg64_t arg = (sysarg64_t) id;
+        return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) &arg, (sysarg_t) caps);
+#endif
         
-        arg.value = (unsigned long long) id;
-
-        return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) &arg, (sysarg_t) caps);
+#ifdef __64_BITS__
+        return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) id, (sysarg_t) caps);
+#endif
 }
 

uspace/lib/c/generic/ipc.c

@@ -38 +38 @@
  */
 /** @file
- */ 
+ */
 
 #include <ipc/ipc.h>
@@ -845 +845 @@
 }
 
-#include <kernel/syscall/sysarg64.h>
 /** Connect to a task specified by id.
+ *
  */
 int ipc_connect_kbox(task_id_t id)
 {
-        sysarg64_t arg;
-
-        arg.value = (unsigned long long) id;
-
+#ifdef __32_BITS__
+        sysarg64_t arg = (sysarg64_t) id;
         return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) &arg);
-}
- 
+#endif
+        
+#ifdef __64_BITS__
+        return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) id);
+#endif
+}
+
 /** @}
  */

uspace/lib/c/include/libc.h

@@ -40 +40 @@
 #include <libarch/syscall.h>
 
+#ifdef __32_BITS__
+
+/** Explicit 64-bit arguments passed to syscalls. */
+typedef uint64_t sysarg64_t;
+
+#endif /* __32_BITS__ */
+
 #define __SYSCALL0(id) \
         __syscall0(0, 0, 0, 0, 0, 0, id)
@@ -53 +60 @@
         __syscall5(p1, p2, p3, p4, p5, 0, id)
 #define __SYSCALL6(id, p1, p2, p3, p4, p5, p6) \
-    __syscall6(p1, p2, p3, p4, p5, p6, id)
+        __syscall6(p1, p2, p3, p4, p5, p6, id)
 
 extern void __main(void *pcb_ptr);