Changeset 26e7d6d in mainline for uspace/lib/c/arch/mips64/src/syscall.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/c/arch/mips64/src/syscall.c (moved) (moved from uspace/srv/hid/fb/msim.c ) (2 diffs)

uspace/lib/c/arch/mips64/src/syscall.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2005 Martin Decky
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @defgroup msimfb MSIM text console
- * @brief HelenOS MSIM text console.
- * @ingroup fbs
+/** @addtogroup libcmips64
  * @{
  */
 /** @file
+  * @ingroup libcmips64
  */
 
-#include <async.h>
 #include <libc.h>
-#include <sysinfo.h>
-#include <as.h>
-#include <ddi.h>
-#include <errno.h>
 
-#include "serial_console.h"
-#include "msim.h"
-
-#define WIDTH 80
-#define HEIGHT 24
-
-static char *virt_addr;
-
-static void msim_putc(const char c)
+sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3,
+    const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, const syscall_t id)
 {
-        *virt_addr = c;
-}
-
-int msim_init(void)
-{
-        sysarg_t phys_addr;
-        if (sysinfo_get_value("fb.address.physical", &phys_addr) != EOK)
-                return -1;
+        register sysarg_t __mips_reg_a0 asm("$4") = p1;
+        register sysarg_t __mips_reg_a1 asm("$5") = p2;
+        register sysarg_t __mips_reg_a2 asm("$6") = p3;
+        register sysarg_t __mips_reg_a3 asm("$7") = p4;
+        register sysarg_t __mips_reg_t0 asm("$8") = p5;
+        register sysarg_t __mips_reg_t1 asm("$9") = p6;
+        register sysarg_t __mips_reg_v0 asm("$2") = id;
         
-        virt_addr = (char *) as_get_mappable_page(1);
+        asm volatile (
+                "syscall\n"
+                : "=r" (__mips_reg_v0)
+                : "r" (__mips_reg_a0),
+                  "r" (__mips_reg_a1),
+                  "r" (__mips_reg_a2),
+                  "r" (__mips_reg_a3),
+                  "r" (__mips_reg_t0),
+                  "r" (__mips_reg_t1),
+                  "r" (__mips_reg_v0)
+                /*
+                 * We are a function call, although
+                 * C does not know it
+                 */
+                : "%ra"
+        );
         
-        if (physmem_map((void *) phys_addr, virt_addr, 1,
-            AS_AREA_READ | AS_AREA_WRITE) != 0)
-                return -1;
-        
-        serial_console_init(msim_putc, WIDTH, HEIGHT);
-        
-        async_set_client_connection(serial_client_connection);
-        return 0;
+        return __mips_reg_v0;
 }