Mon Jan 25 13:08:05 2021 UTC ()
Remove #undefs against INTERRUPT_SAVEREG and INTERRUPT_RESTOREREG.

They have been defined in <m68k/asm.h> for years.


(tsutsui)
diff -r1.64 -r1.65 src/sys/arch/luna68k/luna68k/locore.s
diff -r1.115 -r1.116 src/sys/arch/mvme68k/mvme68k/locore.s
diff -r1.66 -r1.67 src/sys/arch/next68k/next68k/locore.s
diff -r1.66 -r1.67 src/sys/arch/sun3/sun3x/locore.s
cvs diff -r1.64 -r1.65 src/sys/arch/luna68k/luna68k/locore.s (expand / switch to unified diff)

--- src/sys/arch/luna68k/luna68k/locore.s 2019/06/30 05:04:49 1.64
+++ src/sys/arch/luna68k/luna68k/locore.s 2021/01/25 13:08:04 1.65
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: locore.s,v 1.64 2019/06/30 05:04:49 tsutsui Exp $ */ 1/* $NetBSD: locore.s,v 1.65 2021/01/25 13:08:04 tsutsui Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1988 University of Utah. 4 * Copyright (c) 1988 University of Utah.
5 * Copyright (c) 1980, 1990, 1993 5 * Copyright (c) 1980, 1990, 1993
6 * The Regents of the University of California. All rights reserved. 6 * The Regents of the University of California. All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to Berkeley by 8 * This code is derived from software contributed to Berkeley by
9 * the Systems Programming Group of the University of Utah Computer 9 * the Systems Programming Group of the University of Utah Computer
10 * Science Department. 10 * Science Department.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -652,29 +652,26 @@ ENTRY_NOPROFILE(lev5intr) @@ -652,29 +652,26 @@ ENTRY_NOPROFILE(lev5intr)
652 jeq 1f 652 jeq 1f
653 INTERRUPT_SAVEREG 653 INTERRUPT_SAVEREG
654 lea %sp@(16),%a1 | %a1 = &clockframe 654 lea %sp@(16),%a1 | %a1 = &clockframe
655 movl %a1,%sp@- 655 movl %a1,%sp@-
656 jbsr _C_LABEL(hardclock) | hardclock(&frame) 656 jbsr _C_LABEL(hardclock) | hardclock(&frame)
657 addql #4,%sp 657 addql #4,%sp
658 addql #1,_C_LABEL(intrcnt)+20 658 addql #1,_C_LABEL(intrcnt)+20
659 INTERRUPT_RESTOREREG 659 INTERRUPT_RESTOREREG
6601: 6601:
661 subql #1,_C_LABEL(idepth) 661 subql #1,_C_LABEL(idepth)
662 jra _ASM_LABEL(rei) | all done 662 jra _ASM_LABEL(rei) | all done
663#endif 663#endif
664 664
665#undef INTERRUPT_SAVEREG 
666#undef INTERRUPT_RESTOREREG 
667 
668/* 665/*
669 * Emulation of VAX REI instruction. 666 * Emulation of VAX REI instruction.
670 * 667 *
671 * This code deals with checking for and servicing ASTs 668 * This code deals with checking for and servicing ASTs
672 * (profiling, scheduling) and software interrupts (network, softclock). 669 * (profiling, scheduling) and software interrupts (network, softclock).
673 * We check for ASTs first, just like the VAX. To avoid excess overhead 670 * We check for ASTs first, just like the VAX. To avoid excess overhead
674 * the T_ASTFLT handling code will also check for software interrupts so we 671 * the T_ASTFLT handling code will also check for software interrupts so we
675 * do not have to do it here. After identifing that we need an AST we 672 * do not have to do it here. After identifing that we need an AST we
676 * drop the IPL to allow device interrupts. 673 * drop the IPL to allow device interrupts.
677 * 674 *
678 * This code is complicated by the fact that sendsig may have been called 675 * This code is complicated by the fact that sendsig may have been called
679 * necessitating a stack cleanup. 676 * necessitating a stack cleanup.
680 */ 677 */
cvs diff -r1.115 -r1.116 src/sys/arch/mvme68k/mvme68k/locore.s (expand / switch to unified diff)

--- src/sys/arch/mvme68k/mvme68k/locore.s 2018/12/19 13:57:48 1.115
+++ src/sys/arch/mvme68k/mvme68k/locore.s 2021/01/25 13:08:05 1.116
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: locore.s,v 1.115 2018/12/19 13:57:48 maxv Exp $ */ 1/* $NetBSD: locore.s,v 1.116 2021/01/25 13:08:05 tsutsui Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1988 University of Utah. 4 * Copyright (c) 1988 University of Utah.
5 * Copyright (c) 1980, 1990, 1993 5 * Copyright (c) 1980, 1990, 1993
6 * The Regents of the University of California. All rights reserved. 6 * The Regents of the University of California. All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to Berkeley by 8 * This code is derived from software contributed to Berkeley by
9 * the Systems Programming Group of the University of Utah Computer 9 * the Systems Programming Group of the University of Utah Computer
10 * Science Department. 10 * Science Department.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -964,29 +964,26 @@ ENTRY_NOPROFILE(intrhand_vectored) @@ -964,29 +964,26 @@ ENTRY_NOPROFILE(intrhand_vectored)
964 lea %sp@(16),%a1 | get pointer to frame 964 lea %sp@(16),%a1 | get pointer to frame
965 movl %a1,%sp@- 965 movl %a1,%sp@-
966 movw %sr,%d0 966 movw %sr,%d0
967 bfextu %d0,21,3,%d0 | Get current ipl 967 bfextu %d0,21,3,%d0 | Get current ipl
968 movl %d0,%sp@- | Push it 968 movl %d0,%sp@- | Push it
969 jbsr _C_LABEL(isrdispatch_vectored) | call dispatcher 969 jbsr _C_LABEL(isrdispatch_vectored) | call dispatcher
970 addql #8,%sp 970 addql #8,%sp
971Lintrhand_exit: 971Lintrhand_exit:
972 INTERRUPT_RESTOREREG 972 INTERRUPT_RESTOREREG
973 subql #1,_C_LABEL(interrupt_depth) 973 subql #1,_C_LABEL(interrupt_depth)
974 974
975 /* FALLTHROUGH to rei */ 975 /* FALLTHROUGH to rei */
976 976
977#undef INTERRUPT_SAVEREG 
978#undef INTERRUPT_RESTOREREG 
979 
980/* 977/*
981 * Emulation of VAX REI instruction. 978 * Emulation of VAX REI instruction.
982 * 979 *
983 * This code deals with checking for and servicing ASTs 980 * This code deals with checking for and servicing ASTs
984 * (profiling, scheduling). 981 * (profiling, scheduling).
985 * After identifing that we need an AST we drop the IPL to allow device 982 * After identifing that we need an AST we drop the IPL to allow device
986 * interrupts. 983 * interrupts.
987 * 984 *
988 * This code is complicated by the fact that sendsig may have been called 985 * This code is complicated by the fact that sendsig may have been called
989 * necessitating a stack cleanup. 986 * necessitating a stack cleanup.
990 */ 987 */
991ASENTRY_NOPROFILE(rei) 988ASENTRY_NOPROFILE(rei)
992 tstl _C_LABEL(astpending) | AST pending? 989 tstl _C_LABEL(astpending) | AST pending?
cvs diff -r1.66 -r1.67 src/sys/arch/next68k/next68k/locore.s (expand / switch to unified diff)

--- src/sys/arch/next68k/next68k/locore.s 2018/12/19 13:57:49 1.66
+++ src/sys/arch/next68k/next68k/locore.s 2021/01/25 13:08:05 1.67
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: locore.s,v 1.66 2018/12/19 13:57:49 maxv Exp $ */ 1/* $NetBSD: locore.s,v 1.67 2021/01/25 13:08:05 tsutsui Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1998 Darrin B. Jewell 4 * Copyright (c) 1998 Darrin B. Jewell
5 * Copyright (c) 1980, 1990, 1993 5 * Copyright (c) 1980, 1990, 1993
6 * The Regents of the University of California. All rights reserved. 6 * The Regents of the University of California. All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to Berkeley by 8 * This code is derived from software contributed to Berkeley by
9 * the Systems Programming Group of the University of Utah Computer 9 * the Systems Programming Group of the University of Utah Computer
10 * Science Department. 10 * Science Department.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -796,29 +796,26 @@ ENTRY_NOPROFILE(intrhand_vectored) @@ -796,29 +796,26 @@ ENTRY_NOPROFILE(intrhand_vectored)
796 movl %a1,%sp@- 796 movl %a1,%sp@-
797 movw %sr,%d0 797 movw %sr,%d0
798 bfextu %d0,21,3,%d0 | Get current ipl 798 bfextu %d0,21,3,%d0 | Get current ipl
799 movl %d0,%sp@- | Push it 799 movl %d0,%sp@- | Push it
800 jbsr _C_LABEL(isrdispatch_vectored) | call dispatcher 800 jbsr _C_LABEL(isrdispatch_vectored) | call dispatcher
801 addql #8,%sp 801 addql #8,%sp
802Lintrhand_exit: 802Lintrhand_exit:
803 INTERRUPT_RESTOREREG 803 INTERRUPT_RESTOREREG
804 subql #1,_C_LABEL(interrupt_depth) 804 subql #1,_C_LABEL(interrupt_depth)
805 805
806 /* FALLTHROUGH to rei */ 806 /* FALLTHROUGH to rei */
807 jra _ASM_LABEL(rei) | all done 807 jra _ASM_LABEL(rei) | all done
808 808
809#undef INTERRUPT_SAVEREG 
810#undef INTERRUPT_RESTOREREG 
811 
812/* 809/*
813 * Emulation of VAX REI instruction. 810 * Emulation of VAX REI instruction.
814 * 811 *
815 * This code deals with checking for and servicing ASTs 812 * This code deals with checking for and servicing ASTs
816 * (profiling, scheduling) and software interrupts (network, softclock). 813 * (profiling, scheduling) and software interrupts (network, softclock).
817 * We check for ASTs first, just like the VAX. To avoid excess overhead 814 * We check for ASTs first, just like the VAX. To avoid excess overhead
818 * the T_ASTFLT handling code will also check for software interrupts so we 815 * the T_ASTFLT handling code will also check for software interrupts so we
819 * do not have to do it here. After identifing that we need an AST we 816 * do not have to do it here. After identifing that we need an AST we
820 * drop the IPL to allow device interrupts. 817 * drop the IPL to allow device interrupts.
821 * 818 *
822 * This code is complicated by the fact that sendsig may have been called 819 * This code is complicated by the fact that sendsig may have been called
823 * necessitating a stack cleanup. 820 * necessitating a stack cleanup.
824 */ 821 */
cvs diff -r1.66 -r1.67 src/sys/arch/sun3/sun3x/locore.s (expand / switch to unified diff)

--- src/sys/arch/sun3/sun3x/locore.s 2018/12/19 13:57:51 1.66
+++ src/sys/arch/sun3/sun3x/locore.s 2021/01/25 13:08:05 1.67
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: locore.s,v 1.66 2018/12/19 13:57:51 maxv Exp $ */ 1/* $NetBSD: locore.s,v 1.67 2021/01/25 13:08:05 tsutsui Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1988 University of Utah. 4 * Copyright (c) 1988 University of Utah.
5 * Copyright (c) 1980, 1990, 1993 5 * Copyright (c) 1980, 1990, 1993
6 * The Regents of the University of California. All rights reserved. 6 * The Regents of the University of California. All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to Berkeley by 8 * This code is derived from software contributed to Berkeley by
9 * the Systems Programming Group of the University of Utah Computer 9 * the Systems Programming Group of the University of Utah Computer
10 * Science Department. 10 * Science Department.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -460,29 +460,26 @@ GLOBAL(_isr_clock) @@ -460,29 +460,26 @@ GLOBAL(_isr_clock)
460 460
461| Handler for all vectored interrupts (i.e. VME interrupts) 461| Handler for all vectored interrupts (i.e. VME interrupts)
462#ifdef __ELF__ 462#ifdef __ELF__
463 .align 4 463 .align 4
464#else 464#else
465 .align 2 465 .align 2
466#endif 466#endif
467GLOBAL(_isr_vectored) 467GLOBAL(_isr_vectored)
468 INTERRUPT_SAVEREG 468 INTERRUPT_SAVEREG
469 jbsr _C_LABEL(isr_vectored) 469 jbsr _C_LABEL(isr_vectored)
470 INTERRUPT_RESTOREREG 470 INTERRUPT_RESTOREREG
471 jra _ASM_LABEL(rei) 471 jra _ASM_LABEL(rei)
472 472
473#undef INTERRUPT_SAVEREG 
474#undef INTERRUPT_RESTOREREG 
475 
476/* interrupt counters (needed by vmstat) */ 473/* interrupt counters (needed by vmstat) */
477GLOBAL(intrnames) 474GLOBAL(intrnames)
478 .asciz "spur" | 0 475 .asciz "spur" | 0
479 .asciz "lev1" | 1 476 .asciz "lev1" | 1
480 .asciz "lev2" | 2 477 .asciz "lev2" | 2
481 .asciz "lev3" | 3 478 .asciz "lev3" | 3
482 .asciz "lev4" | 4 479 .asciz "lev4" | 4
483 .asciz "clock" | 5 480 .asciz "clock" | 5
484 .asciz "lev6" | 6 481 .asciz "lev6" | 6
485 .asciz "nmi" | 7 482 .asciz "nmi" | 7
486GLOBAL(eintrnames) 483GLOBAL(eintrnames)
487 484
488 .data 485 .data