[src/netbsd-1-5]: src/sys/arch/mac68k/mac68k Pullup 1.18 [scottr]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/789f27087b7e
branches:  netbsd-1-5
changeset: 490252:789f27087b7e
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Nov 15 20:29:30 2000 +0000

description:
Pullup 1.18 [scottr]:
As was the original intent a long, long time ago -- but in this galaxy, and
in fact on this planet -- generate a SIGILL for user-mode A-line traps.
The core of this change is taken verbatim from PR 10511, submitted by
Christian Bauer.

diffstat:

 sys/arch/mac68k/mac68k/macromasm.s |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r d956315f588c -r 789f27087b7e sys/arch/mac68k/mac68k/macromasm.s
--- a/sys/arch/mac68k/mac68k/macromasm.s        Wed Nov 15 20:28:43 2000 +0000
+++ b/sys/arch/mac68k/mac68k/macromasm.s        Wed Nov 15 20:29:30 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: macromasm.s,v 1.17 1998/02/21 00:37:08 scottr Exp $    */
+/*     $NetBSD: macromasm.s,v 1.17.26.1 2000/11/15 20:29:30 tv Exp $   */
 
 /*-
  * Copyright (C) 1994  Bradley A. Grantham
@@ -37,6 +37,8 @@
 
 #include "opt_adb.h"
 #include "assym.h"
+#include <machine/asm.h>
+#include <machine/trap.h>
 
 
        /* Define this symbol as global with (v) value */
@@ -425,7 +427,6 @@
  * 1010 line emulator; A-line trap
  * (we fake MacOS traps from here)
  */
-       .global _mrg_aline_user
        .global _mrg_aline_super
        .global _mrg_ToolBoxtraps
        .global _alinetrap
@@ -437,8 +438,9 @@
        movw    sp@(FR_HW + 4), d0      | retrieve status register
        andw    #PSL_S, d0      | supervisor state?
        bne     Lalnosup        | branch if supervisor
-       jbsr    _mrg_aline_user | user a-line trap
-       bra     Lalrts
+       addql   #4, sp          | pop frame ptr
+       movql   #T_ILLINST, d0  | user-mode fault
+       jra     _ASM_LABEL(fault)
 Lalnosup:
 #define FR_PC (FR_HW+2)
        movl    sp@(FR_PC + 4), a0      | retrieve PC