Closes T118: libbarrelfish: Extract common syscalls into architecture-independant...

Signed-off-by: Moritz Hoffmann <moritz.hoffmann@inf.ethz.ch>

diff --git a/lib/barrelfish/Hakefile b/lib/barrelfish/Hakefile
index bf31e4e..34dc33d 100644 (file)
--- a/lib/barrelfish/Hakefile
+++ b/lib/barrelfish/Hakefile
@@ -27,7 +27,7 @@
                       "slot_alloc/single_slot_alloc.c", "slot_alloc/multi_slot_alloc.c",
                       "slot_alloc/slot_alloc.c", "slot_alloc/range_slot_alloc.c",
                       "bulk_transfer.c", "trace.c", "resource_ctrl.c", "coreset.c",
-                      "inthandler.c", "deferred.c"
+                      "inthandler.c", "deferred.c", "syscalls.c"
                     ]
 
       idc_srcs = concat $ map getsrcs $ optInterconnectDrivers $ options arch
@@ -127,7 +127,7 @@
                       "slot_alloc/single_slot_alloc.c", "slot_alloc/multi_slot_alloc.c",
                       "slot_alloc/slot_alloc.c", "slot_alloc/range_slot_alloc.c",
                       "bulk_transfer.c", "trace.c", "resource_ctrl.c", "coreset.c",
-                      "inthandler.c", "deferred.c"
+                      "inthandler.c", "deferred.c", "syscalls.c"
                     ]
 
       idc_srcs = concat $ map getsrcs $ optInterconnectDrivers $ options arch

diff --git a/lib/barrelfish/arch/arm/syscalls.c b/lib/barrelfish/arch/arm/syscalls.c
index 53fc128..cfec6a3 100644 (file)
--- a/lib/barrelfish/arch/arm/syscalls.c
+++ b/lib/barrelfish/arch/arm/syscalls.c
@@ -24,23 +24,6 @@ STATIC_ASSERT(SYSCALL_REG == 0, "Bad register for system call argument.");
 // System call wrappers
 //
 
-errval_t sys_print(const char* string, size_t length)
-{
-    return syscall3(SYSCALL_PRINT, (uintptr_t)string, (uintptr_t)length).error;
-}
-
-errval_t sys_suspend(bool halt)
-{
-    return syscall2(SYSCALL_SUSPEND, halt).error;
-}
-
-errval_t sys_yield(capaddr_t target)
-{
-    STATIC_ASSERT_SIZEOF(target, sizeof(uintptr_t));
-    return syscall2(SYSCALL_YIELD, (uintptr_t) target).error;
-}
-
-
 #ifdef __ARM_ARCH_7M__  //cortex-m3 on pandaboard
 //add syscall for restoring a context that the dispatcher can not restore by itself
 errval_t sys_resume_context(arch_registers_state_t* registers){

diff --git a/lib/barrelfish/arch/x86_32/syscalls.c b/lib/barrelfish/arch/x86_32/syscalls.c
index 341113e..500aa5a 100644 (file)
--- a/lib/barrelfish/arch/x86_32/syscalls.c
+++ b/lib/barrelfish/arch/x86_32/syscalls.c
@@ -12,28 +12,6 @@
  * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
  */
 
-#include <barrelfish/barrelfish.h>
-#include <barrelfish/caddr.h>
-#include <barrelfish/dispatch.h>
-#include <barrelfish/syscall_arch.h>
-
-/* For documentation on system calls see include/barrelfish/syscalls.h
+/*
+ * No architecture specific system calls.
  */
-
-// XXX: sleep hack
-uint32_t yield_timeslices = 0;
-
-errval_t sys_yield(capaddr_t target)
-{
-    return syscall3(SYSCALL_YIELD, target, yield_timeslices).error;
-}
-
-errval_t sys_suspend(bool halt)
-{
-    return syscall2(SYSCALL_SUSPEND, halt).error;
-}
-
-errval_t sys_print(const char *string, size_t length)
-{
-    return syscall3(SYSCALL_PRINT, (uintptr_t)string, length).error;
-}

diff --git a/lib/barrelfish/arch/x86_64/syscalls.c b/lib/barrelfish/arch/x86_64/syscalls.c
index a7b20d0..538e561 100644 (file)
--- a/lib/barrelfish/arch/x86_64/syscalls.c
+++ b/lib/barrelfish/arch/x86_64/syscalls.c
@@ -20,21 +20,6 @@
 /* For documentation on system calls see include/barrelfish/syscalls.h
  */
 
-errval_t sys_yield(capaddr_t target)
-{
-    return syscall2(SYSCALL_YIELD, target).error;
-}
-
-errval_t sys_suspend(bool halt)
-{
-    return syscall2(SYSCALL_SUSPEND, halt).error;
-}
-
-errval_t sys_print(const char *string, size_t length)
-{
-    return syscall3(SYSCALL_PRINT, (uintptr_t)string, length).error;
-}
-
 uint64_t sys_get_absolute_time(void)
 {
     struct sysret r = syscall1(SYSCALL_GET_ABS_TIME);

diff --git a/lib/barrelfish/syscalls.c b/lib/barrelfish/syscalls.c
new file mode 100644 (file)
index 0000000..4a629e5
--- /dev/null
+++ b/lib/barrelfish/syscalls.c
@@ -0,0 +1,41 @@
+/**
+ * \file
+ * \brief User-side system call implementation, architecture-independent
+ */
+
+/*
+ * Copyright (c) 2007, 2008, 2009, 2010, ETH Zurich.
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached LICENSE file.
+ * If you do not find this file, copies can be found by writing to:
+ * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
+ */
+
+#include <barrelfish/barrelfish.h>
+#include <barrelfish/caddr.h>
+#include <barrelfish/dispatch.h>
+#include <barrelfish/syscall_arch.h>
+
+/* For documentation on system calls see include/barrelfish/syscalls.h
+ */
+
+errval_t sys_yield(capaddr_t target)
+{
+    return syscall2(SYSCALL_YIELD, target).error;
+}
+
+errval_t sys_suspend(bool halt)
+{
+    return syscall2(SYSCALL_SUSPEND, halt).error;
+}
+
+errval_t sys_print(const char *string, size_t length)
+{
+    return syscall3(SYSCALL_PRINT, (uintptr_t)string, length).error;
+}
+
+errval_t
+sys_debug_print_capabilities(void) {
+    return syscall1(SYSCALL_DEBUG_PRINT_CAPABILITIES).error;
+}