diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:26:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:05 -0400 |
commit | 42daba316557e597a90a730f61c762602b7f0e0c (patch) | |
tree | 9b7e9da84cef7d2547c577f1cf94b408cf308619 /arch/um/os-Linux/sys-x86_64 | |
parent | 5c8aaceab88ac787c0a4038b29143c954c2a45e0 (diff) |
uml: stop saving process FP state
Throw out a lot of code dealing with saving and restoring floating-point
state. In skas mode, where processes run in a restoring floating-point state
on kernel entry and exit is pointless.
This eliminates most of arch/um/os-Linux/sys-{i386,x86_64}/registers.c. Most
of what remained is now arch-indpendent, and can be moved up to
arch/um/os-Linux/registers.c. Both arches need the jmp_buf accessor
get_thread_reg, and i386 needs {save,restore}_fp_regs because it cheats during
sigreturn by getting the fp state using ptrace rather than copying it out of
the process sigcontext.
After this, it turns out that arch/um/include/skas/mode-skas.h is almost
completely unneeded. The declarations in it are variables which either don't
exist or which don't have global scope. The one exception is
kill_off_processes_skas. If that's removed, this header can be deleted.
This uncovered a bug in user.h, which wasn't correctly making sure that a
size_t definition was available to both userspace and kernelspace files.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/os-Linux/sys-x86_64')
-rw-r--r-- | arch/um/os-Linux/sys-x86_64/Makefile | 2 | ||||
-rw-r--r-- | arch/um/os-Linux/sys-x86_64/registers.c | 75 |
2 files changed, 4 insertions, 73 deletions
diff --git a/arch/um/os-Linux/sys-x86_64/Makefile b/arch/um/os-Linux/sys-x86_64/Makefile index 7955e061a678..eac8c0db3001 100644 --- a/arch/um/os-Linux/sys-x86_64/Makefile +++ b/arch/um/os-Linux/sys-x86_64/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2000 Jeff Dike (jdike@karaya.com) | 2 | # Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) |
3 | # Licensed under the GPL | 3 | # Licensed under the GPL |
4 | # | 4 | # |
5 | 5 | ||
diff --git a/arch/um/os-Linux/sys-x86_64/registers.c b/arch/um/os-Linux/sys-x86_64/registers.c index 9467315b8059..9bfa789992de 100644 --- a/arch/um/os-Linux/sys-x86_64/registers.c +++ b/arch/um/os-Linux/sys-x86_64/registers.c | |||
@@ -1,23 +1,15 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2004 PathScale, Inc | 2 | * Copyright (C) 2006-2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) |
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <errno.h> | 6 | #include <errno.h> |
7 | #include <sys/ptrace.h> | 7 | #include <sys/ptrace.h> |
8 | #include <string.h> | 8 | #define __FRAME_OFFSETS |
9 | #include "ptrace_user.h" | 9 | #include <asm/ptrace.h> |
10 | #include "uml-config.h" | ||
11 | #include "skas_ptregs.h" | ||
12 | #include "registers.h" | ||
13 | #include "longjmp.h" | 10 | #include "longjmp.h" |
14 | #include "user.h" | 11 | #include "user.h" |
15 | 12 | ||
16 | /* These are set once at boot time and not changed thereafter */ | ||
17 | |||
18 | static unsigned long exec_regs[MAX_REG_NR]; | ||
19 | static unsigned long exec_fp_regs[HOST_FP_SIZE]; | ||
20 | |||
21 | int save_fp_registers(int pid, unsigned long *fp_regs) | 13 | int save_fp_registers(int pid, unsigned long *fp_regs) |
22 | { | 14 | { |
23 | if(ptrace(PTRACE_GETFPREGS, pid, 0, fp_regs) < 0) | 15 | if(ptrace(PTRACE_GETFPREGS, pid, 0, fp_regs) < 0) |
@@ -32,67 +24,6 @@ int restore_fp_registers(int pid, unsigned long *fp_regs) | |||
32 | return 0; | 24 | return 0; |
33 | } | 25 | } |
34 | 26 | ||
35 | void init_thread_registers(union uml_pt_regs *to) | ||
36 | { | ||
37 | memcpy(to->skas.regs, exec_regs, sizeof(to->skas.regs)); | ||
38 | memcpy(to->skas.fp, exec_fp_regs, sizeof(to->skas.fp)); | ||
39 | } | ||
40 | |||
41 | static int move_registers(int pid, int int_op, int fp_op, | ||
42 | union uml_pt_regs *regs) | ||
43 | { | ||
44 | if(ptrace(int_op, pid, 0, regs->skas.regs) < 0) | ||
45 | return -errno; | ||
46 | |||
47 | if(ptrace(fp_op, pid, 0, regs->skas.fp) < 0) | ||
48 | return -errno; | ||
49 | |||
50 | return 0; | ||
51 | } | ||
52 | |||
53 | void save_registers(int pid, union uml_pt_regs *regs) | ||
54 | { | ||
55 | int err; | ||
56 | |||
57 | err = move_registers(pid, PTRACE_GETREGS, PTRACE_GETFPREGS, regs); | ||
58 | if(err) | ||
59 | panic("save_registers - saving registers failed, errno = %d\n", | ||
60 | -err); | ||
61 | } | ||
62 | |||
63 | void restore_registers(int pid, union uml_pt_regs *regs) | ||
64 | { | ||
65 | int err; | ||
66 | |||
67 | err = move_registers(pid, PTRACE_SETREGS, PTRACE_SETFPREGS, regs); | ||
68 | if(err) | ||
69 | panic("restore_registers - saving registers failed, " | ||
70 | "errno = %d\n", -err); | ||
71 | } | ||
72 | |||
73 | void init_registers(int pid) | ||
74 | { | ||
75 | int err; | ||
76 | |||
77 | err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs); | ||
78 | if(err) | ||
79 | panic("check_ptrace : PTRACE_GETREGS failed, errno = %d", | ||
80 | errno); | ||
81 | |||
82 | err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs); | ||
83 | if(err) | ||
84 | panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d", | ||
85 | errno); | ||
86 | } | ||
87 | |||
88 | void get_safe_registers(unsigned long *regs, unsigned long *fp_regs) | ||
89 | { | ||
90 | memcpy(regs, exec_regs, sizeof(exec_regs)); | ||
91 | if(fp_regs != NULL) | ||
92 | memcpy(fp_regs, exec_fp_regs, | ||
93 | HOST_FP_SIZE * sizeof(unsigned long)); | ||
94 | } | ||
95 | |||
96 | unsigned long get_thread_reg(int reg, jmp_buf *buf) | 27 | unsigned long get_thread_reg(int reg, jmp_buf *buf) |
97 | { | 28 | { |
98 | switch(reg){ | 29 | switch(reg){ |