Mon Jan 21 15:21:30 2013 UTC ()
Umm, fix botch in previous.


(tsutsui)
diff -r1.51 -r1.52 src/sys/arch/luna68k/luna68k/locore.s
cvs diff -r1.51 -r1.52 src/sys/arch/luna68k/luna68k/locore.s (expand / switch to unified diff)

--- src/sys/arch/luna68k/luna68k/locore.s 2013/01/21 14:42:24 1.51
+++ src/sys/arch/luna68k/luna68k/locore.s 2013/01/21 15:21:30 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: locore.s,v 1.51 2013/01/21 14:42:24 tsutsui Exp $ */ 1/* $NetBSD: locore.s,v 1.52 2013/01/21 15:21:30 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:
@@ -823,27 +823,27 @@ ENTRY_NOPROFILE(lev5intr) @@ -823,27 +823,27 @@ ENTRY_NOPROFILE(lev5intr)
823 btst #7,0x63000000 | check whether system clock 823 btst #7,0x63000000 | check whether system clock
824 beq 1f 824 beq 1f
825 movb #1,0x63000000 | clear the interrupt 825 movb #1,0x63000000 | clear the interrupt
826 tstl _C_LABEL(clock_enable) | is hardclock() available? 826 tstl _C_LABEL(clock_enable) | is hardclock() available?
827 jeq 1f 827 jeq 1f
828 INTERRUPT_SAVEREG 828 INTERRUPT_SAVEREG
829 lea %sp@(16),%a1 | %a1 = &clockframe 829 lea %sp@(16),%a1 | %a1 = &clockframe
830 movl %a1,%sp@- 830 movl %a1,%sp@-
831 jbsr _C_LABEL(hardclock) | hardclock(&frame) 831 jbsr _C_LABEL(hardclock) | hardclock(&frame)
832 addql #4,%sp 832 addql #4,%sp
833 addql #1,_C_LABEL(intrcnt)+20 833 addql #1,_C_LABEL(intrcnt)+20
834 INTERRUPT_RESTOREREG 834 INTERRUPT_RESTOREREG
8351: 8351:
836 addql #1,_C_LABEL(idepth) 836 subql #1,_C_LABEL(idepth)
837 jra _ASM_LABEL(rei) | all done 837 jra _ASM_LABEL(rei) | all done
838#endif 838#endif
839 839
840#undef INTERRUPT_SAVEREG 840#undef INTERRUPT_SAVEREG
841#undef INTERRUPT_RESTOREREG 841#undef INTERRUPT_RESTOREREG
842 842
843/* 843/*
844 * Emulation of VAX REI instruction. 844 * Emulation of VAX REI instruction.
845 * 845 *
846 * This code deals with checking for and servicing ASTs 846 * This code deals with checking for and servicing ASTs
847 * (profiling, scheduling) and software interrupts (network, softclock). 847 * (profiling, scheduling) and software interrupts (network, softclock).
848 * We check for ASTs first, just like the VAX. To avoid excess overhead 848 * We check for ASTs first, just like the VAX. To avoid excess overhead
849 * the T_ASTFLT handling code will also check for software interrupts so we 849 * the T_ASTFLT handling code will also check for software interrupts so we