Changeset b905002 in mainline

Timestamp:

2010-02-23T22:24:57Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

153fbf9

Parents:

7da160b

Message:

More reliable version of hypercall_fast_ret1().

File:

• kernel/arch/sparc64/include/sun4v/hypercall.h (modified) (1 diff)

kernel/arch/sparc64/include/sun4v/hypercall.h

@@ -190 +190 @@
 __hypercall_fast_ret1(const uint64_t p1, const uint64_t p2, const uint64_t p3,
     const uint64_t p4, const uint64_t p5, const uint64_t function_number,
-    uint64_t * const ret1)
+    uint64_t *ret1)
 {
-        uint64_t errno = __hypercall_fast(p1, p2, p3, p4, p5, function_number);
-        if (ret1 != NULL) {
-                asm volatile ("mov %%o1, %0\n" : "=r" (*ret1));
-        }
-        return errno;
+        register uint64_t a6 asm("o5") = function_number;
+        register uint64_t a1 asm("o0") = p1;
+        register uint64_t a2 asm("o1") = p2;
+        register uint64_t a3 asm("o2") = p3;
+        register uint64_t a4 asm("o3") = p4;
+        register uint64_t a5 asm("o4") = p5;
+        
+        asm volatile (
+                "ta %8\n"
+                : "=r" (a1), "=r" (a2)
+                : "r" (a1), "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6),
+                  "i" (FAST_TRAP)
+                : "memory"
+        );
+
+        if (ret1)
+                *ret1 = a2;
+
+        return a1;
 }