[PATCH] uml: allow using again x86/x86_64 crypto code

[linux-2.6-omap-h63xx.git] / arch / um / include / sysdep-i386 / stub.h

diff --git a/arch/um/include/sysdep-i386/stub.h b/arch/um/include/sysdep-i386/stub.h
index d3699fe1c6133b001e9b09c50e904f3fc5b944d5..b492b12b4a1054c6d4c69ceb51cabdbc41c713ce 100644 (file)
--- a/arch/um/include/sysdep-i386/stub.h
+++ b/arch/um/include/sysdep-i386/stub.h
@@ -6,8 +6,12 @@
 #ifndef __SYSDEP_STUB_H
 #define __SYSDEP_STUB_H
 
+#include <sys/mman.h>
 #include <asm/ptrace.h>
 #include <asm/unistd.h>
+#include "stub-data.h"
+#include "kern_constants.h"
+#include "uml-config.h"
 
 extern void stub_segv_handler(int sig);
 extern void stub_clone_handler(void);
@@ -16,45 +20,64 @@ extern void stub_clone_handler(void);
 #define STUB_MMAP_NR __NR_mmap2
 #define MMAP_OFFSET(o) ((o) >> PAGE_SHIFT)
 
+static inline long stub_syscall0(long syscall)
+{
+       long ret;
+
+       __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall));
+
+       return ret;
+}
+
+static inline long stub_syscall1(long syscall, long arg1)
+{
+       long ret;
+
+       __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall), "b" (arg1));
+
+       return ret;
+}
+
 static inline long stub_syscall2(long syscall, long arg1, long arg2)
 {
        long ret;
 
-       __asm__("movl %0, %%ecx; " : : "g" (arg2) : "%ecx");
-       __asm__("movl %0, %%ebx; " : : "g" (arg1) : "%ebx");
-       __asm__("movl %0, %%eax; " : : "g" (syscall) : "%eax");
-       __asm__("int $0x80;" : : : "%eax");
-       __asm__ __volatile__("movl %%eax, %0; " : "=g" (ret) :);
-       return(ret);
+       __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall), "b" (arg1),
+                       "c" (arg2));
+
+       return ret;
 }
 
 static inline long stub_syscall3(long syscall, long arg1, long arg2, long arg3)
 {
-       __asm__("movl %0, %%edx; " : : "g" (arg3) : "%edx");
-       return(stub_syscall2(syscall, arg1, arg2));
+       long ret;
+
+       __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall), "b" (arg1),
+                       "c" (arg2), "d" (arg3));
+
+       return ret;
 }
 
 static inline long stub_syscall4(long syscall, long arg1, long arg2, long arg3,
                                 long arg4)
 {
-       __asm__("movl %0, %%esi; " : : "g" (arg4) : "%esi");
-       return(stub_syscall3(syscall, arg1, arg2, arg3));
+       long ret;
+
+       __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall), "b" (arg1),
+                       "c" (arg2), "d" (arg3), "S" (arg4));
+
+       return ret;
 }
 
-static inline long stub_syscall6(long syscall, long arg1, long arg2, long arg3,
-                                long arg4, long arg5, long arg6)
+static inline long stub_syscall5(long syscall, long arg1, long arg2, long arg3,
+                                long arg4, long arg5)
 {
        long ret;
-       __asm__("movl %0, %%eax; " : : "g" (syscall) : "%eax");
-       __asm__("movl %0, %%ebx; " : : "g" (arg1) : "%ebx");
-       __asm__("movl %0, %%ecx; " : : "g" (arg2) : "%ecx");
-       __asm__("movl %0, %%edx; " : : "g" (arg3) : "%edx");
-       __asm__("movl %0, %%esi; " : : "g" (arg4) : "%esi");
-       __asm__("movl %0, %%edi; " : : "g" (arg5) : "%edi");
-       __asm__ __volatile__("pushl %%ebp ; movl %1, %%ebp; "
-               "int $0x80; popl %%ebp ; "
-               "movl %%eax, %0; " : "=g" (ret) : "g" (arg6) : "%eax");
-       return(ret);
+
+       __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall), "b" (arg1),
+                       "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5));
+
+       return ret;
 }
 
 static inline void trap_myself(void)
@@ -62,4 +85,17 @@ static inline void trap_myself(void)
        __asm("int3");
 }
 
+static inline void remap_stack(int fd, unsigned long offset)
+{
+       __asm__ volatile ("movl %%eax,%%ebp ; movl %0,%%eax ; int $0x80 ;"
+                         "movl %7, %%ebx ; movl %%eax, (%%ebx)"
+                         : : "g" (STUB_MMAP_NR), "b" (UML_CONFIG_STUB_DATA), 
+                           "c" (UM_KERN_PAGE_SIZE), 
+                           "d" (PROT_READ | PROT_WRITE),
+                           "S" (MAP_FIXED | MAP_SHARED), "D" (fd), 
+                           "a" (offset), 
+                           "i" (&((struct stub_data *) UML_CONFIG_STUB_DATA)->err) 
+                         : "memory");
+}
+
 #endif