Deleted Added
full compact
ia32_trap.c (162361) ia32_trap.c (170291)
1/*-
2 * Copyright (c) 2004 Marcel Moolenaar
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2004 Marcel Moolenaar
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/ia64/ia32/ia32_trap.c 162361 2006-09-16 17:03:02Z rwatson $");
28__FBSDID("$FreeBSD: head/sys/ia64/ia32/ia32_trap.c 170291 2007-06-04 21:38:48Z attilio $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/ktr.h>
33#include <sys/sysproto.h>
34#include <sys/kernel.h>
35#include <sys/lock.h>
36#include <sys/mutex.h>

--- 22 unchanged lines hidden (view full) ---

59 struct proc *p;
60 struct sysent *callp;
61 caddr_t params;
62 register_t eflags;
63 u_int code;
64 int error, i, narg;
65 ksiginfo_t ksi;
66
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/ktr.h>
33#include <sys/sysproto.h>
34#include <sys/kernel.h>
35#include <sys/lock.h>
36#include <sys/mutex.h>

--- 22 unchanged lines hidden (view full) ---

59 struct proc *p;
60 struct sysent *callp;
61 caddr_t params;
62 register_t eflags;
63 u_int code;
64 int error, i, narg;
65 ksiginfo_t ksi;
66
67 PCPU_LAZY_INC(cnt.v_syscall);
67 PCPU_INC(cnt.v_syscall);
68
69 td = curthread;
70 params = (caddr_t)(tf->tf_special.sp & ((1L<<32)-1)) +
71 sizeof(uint32_t);
72 code = tf->tf_scratch.gr8; /* eax */
73 eflags = ia64_get_eflag();
74 p = td->td_proc;
75

--- 139 unchanged lines hidden (view full) ---

215 struct thread *td;
216 uint64_t ucode;
217 int sig;
218 ksiginfo_t ksi;
219
220 KASSERT(TRAPF_USERMODE(tf), ("%s: In kernel mode???", __func__));
221
222 ia64_set_fpsr(IA64_FPSR_DEFAULT);
68
69 td = curthread;
70 params = (caddr_t)(tf->tf_special.sp & ((1L<<32)-1)) +
71 sizeof(uint32_t);
72 code = tf->tf_scratch.gr8; /* eax */
73 eflags = ia64_get_eflag();
74 p = td->td_proc;
75

--- 139 unchanged lines hidden (view full) ---

215 struct thread *td;
216 uint64_t ucode;
217 int sig;
218 ksiginfo_t ksi;
219
220 KASSERT(TRAPF_USERMODE(tf), ("%s: In kernel mode???", __func__));
221
222 ia64_set_fpsr(IA64_FPSR_DEFAULT);
223 PCPU_LAZY_INC(cnt.v_trap);
223 PCPU_INC(cnt.v_trap);
224
225 td = curthread;
226 td->td_frame = tf;
227 td->td_pticks = 0;
228 p = td->td_proc;
229 if (td->td_ucred != p->p_ucred)
230 cred_update_thread(td);
231 sig = 0;

--- 81 unchanged lines hidden ---
224
225 td = curthread;
226 td->td_frame = tf;
227 td->td_pticks = 0;
228 p = td->td_proc;
229 if (td->td_ucred != p->p_ucred)
230 cred_update_thread(td);
231 sig = 0;

--- 81 unchanged lines hidden ---