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

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

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

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

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * from: @(#)trap.c 7.4 (Berkeley) 5/13/91
38 * $Id: trap.c,v 1.135 1999/04/19 14:14:13 peter Exp $
38 * $Id: trap.c,v 1.136 1999/04/28 01:03:26 luoqi Exp $
39 */
40
41/*
42 * 386 Trap and System call handling
43 */
44
45#include "opt_cpu.h"
46#include "opt_ddb.h"

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

1086 frame.tf_eip -= frame.tf_err;
1087 break;
1088
1089 case EJUSTRETURN:
1090 break;
1091
1092 default:
1093bad:
39 */
40
41/*
42 * 386 Trap and System call handling
43 */
44
45#include "opt_cpu.h"
46#include "opt_ddb.h"

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

1086 frame.tf_eip -= frame.tf_err;
1087 break;
1088
1089 case EJUSTRETURN:
1090 break;
1091
1092 default:
1093bad:
1094 if (p->p_sysent->sv_errsize)
1094 if (p->p_sysent->sv_errsize) {
1095 if (error >= p->p_sysent->sv_errsize)
1096 error = -1; /* XXX */
1097 else
1098 error = p->p_sysent->sv_errtbl[error];
1095 if (error >= p->p_sysent->sv_errsize)
1096 error = -1; /* XXX */
1097 else
1098 error = p->p_sysent->sv_errtbl[error];
1099 }
1099 frame.tf_eax = error;
1100 frame.tf_eflags |= PSL_C;
1101 break;
1102 }
1103
1104 if ((frame.tf_eflags & PSL_T) && !(frame.tf_eflags & PSL_VM)) {
1105 /* Traced syscall. */
1106 frame.tf_eflags &= ~PSL_T;

--- 38 unchanged lines hidden ---
1100 frame.tf_eax = error;
1101 frame.tf_eflags |= PSL_C;
1102 break;
1103 }
1104
1105 if ((frame.tf_eflags & PSL_T) && !(frame.tf_eflags & PSL_VM)) {
1106 /* Traced syscall. */
1107 frame.tf_eflags &= ~PSL_T;

--- 38 unchanged lines hidden ---