Deleted Added
full compact
trap.c (134568) trap.c (134571)
1/*-
2 * Copyright (c) 2001, Jake Burkholder
3 * Copyright (C) 1994, David Greenman
4 * Copyright (c) 1990, 1993
5 * The Regents of the University of California. All rights reserved.
6 *
7 * This code is derived from software contributed to Berkeley by
8 * the University of Utah, and William Jolitz.

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

32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * from: @(#)trap.c 7.4 (Berkeley) 5/13/91
39 * from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19
1/*-
2 * Copyright (c) 2001, Jake Burkholder
3 * Copyright (C) 1994, David Greenman
4 * Copyright (c) 1990, 1993
5 * The Regents of the University of California. All rights reserved.
6 *
7 * This code is derived from software contributed to Berkeley by
8 * the University of Utah, and William Jolitz.

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

32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * from: @(#)trap.c 7.4 (Berkeley) 5/13/91
39 * from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19
40 * $FreeBSD: head/sys/sparc64/sparc64/trap.c 134568 2004-08-31 06:12:13Z julian $
40 * $FreeBSD: head/sys/sparc64/sparc64/trap.c 134571 2004-08-31 07:34:54Z julian $
41 */
42
43#include "opt_ddb.h"
44#include "opt_ktr.h"
45#include "opt_ktrace.h"
46
47#include <sys/param.h>
48#include <sys/kdb.h>

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

518 reg = 0;
519 regcnt = REG_MAXARGS;
520
521 sticks = td->td_sticks;
522 td->td_frame = tf;
523 if (td->td_ucred != p->p_ucred)
524 cred_update_thread(td);
525 if (p->p_flag & P_SA)
41 */
42
43#include "opt_ddb.h"
44#include "opt_ktr.h"
45#include "opt_ktrace.h"
46
47#include <sys/param.h>
48#include <sys/kdb.h>

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

518 reg = 0;
519 regcnt = REG_MAXARGS;
520
521 sticks = td->td_sticks;
522 td->td_frame = tf;
523 if (td->td_ucred != p->p_ucred)
524 cred_update_thread(td);
525 if (p->p_flag & P_SA)
526 thread_user_enter(p, td);
526 thread_user_enter(td);
527 code = tf->tf_global[1];
528
529 /*
530 * For syscalls, we don't want to retry the faulting instruction
531 * (usually), instead we need to advance one instruction.
532 */
533 tpc = tf->tf_tpc;
534 TF_DONE(tf);

--- 129 unchanged lines hidden ---
527 code = tf->tf_global[1];
528
529 /*
530 * For syscalls, we don't want to retry the faulting instruction
531 * (usually), instead we need to advance one instruction.
532 */
533 tpc = tf->tf_tpc;
534 TF_DONE(tf);

--- 129 unchanged lines hidden ---