Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/atari/atari Throw in a bunch of _C_LABEL macro's. (...
details: https://anonhg.NetBSD.org/src/rev/ba0c5a552515
branches: trunk
changeset: 487832:ba0c5a552515
user: leo <leo%NetBSD.org@localhost>
date: Tue Jun 13 14:48:44 2000 +0000
description:
Throw in a bunch of _C_LABEL macro's. (Hi Klaus ;-)
diffstat:
sys/arch/atari/atari/locore.s | 450 ++++++++++++++++++++---------------------
1 files changed, 222 insertions(+), 228 deletions(-)
diffs (truncated from 1150 to 300 lines):
diff -r 6f6aa2cd2d3f -r ba0c5a552515 sys/arch/atari/atari/locore.s
--- a/sys/arch/atari/atari/locore.s Tue Jun 13 14:43:44 2000 +0000
+++ b/sys/arch/atari/atari/locore.s Tue Jun 13 14:48:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.69 2000/06/06 13:44:30 leo Exp $ */
+/* $NetBSD: locore.s,v 1.70 2000/06/13 14:48:44 leo Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -91,11 +91,11 @@
*/
#include <m68k/m68k/trap_subr.s>
- .globl _trap, _nofault, _longjmp
+ .globl _C_LABEL(trap), _C_LABEL(nofault), _C_LABEL(longjmp)
#if defined(M68040) || defined(M68060)
- .globl _addrerr4060
-_addrerr4060:
+ .globl _C_LABEL(addrerr4060)
+_C_LABEL(addrerr4060):
clrl sp@- | stack adjust count
moveml #0xFFFF,sp@- | save user registers
movl usp,a0 | save the user SP
@@ -107,8 +107,8 @@
#endif /* defined(M68040) || defined(M68060) */
#if defined(M68060)
- .globl _buserr60
-_buserr60:
+ .globl _C_LABEL(buserr60)
+_C_LABEL(buserr60):
clrl sp@- | stack adjust count
moveml #0xFFFF,sp@- | save user registers
movl usp,a0 | save the user SP
@@ -142,8 +142,8 @@
#endif /* defined(M68060) */
#if defined(M68040)
- .globl _buserr40
-_buserr40:
+ .globl _C_LABEL(buserr40)
+_C_LABEL(buserr40):
clrl sp@- | stack adjust count
moveml #0xFFFF,sp@- | save user registers
movl usp,a0 | save the user SP
@@ -165,9 +165,9 @@
#endif /* defined(M68040) */
#if defined(M68020) || defined(M68030)
- .globl _buserr2030, _addrerr2030
-_buserr2030:
-_addrerr2030:
+ .globl _C_LABEL(buserr2030), _C_LABEL(addrerr2030)
+_C_LABEL(buserr2030):
+_C_LABEL(addrerr2030):
clrl sp@- | stack adjust count
moveml #0xFFFF,sp@- | save user registers
movl usp,a0 | save the user SP
@@ -249,10 +249,10 @@
#endif /* !(defined(M68020) || defined(M68030)) */
Lisberr: | also used by M68040/60
- tstl _nofault | device probe?
+ tstl _C_LABEL(nofault) | device probe?
jeq LberrIsProbe | no, handle as usual
- movl _nofault,sp@- | yes,
- jbsr _longjmp | longjmp(nofault)
+ movl _C_LABEL(nofault),sp@- | yes,
+ jbsr _C_LABEL(longjmp) | longjmp(nofault)
/* NOTREACHED */
LberrIsProbe:
movl #T_BUSERR,sp@- | mark bus error
@@ -265,24 +265,24 @@
* yet setup at this point, the real fault handlers sometimes
* misinterpret the cause of the fault.
*/
-_buserr:
-_addrerr:
- tstl _nofault | device probe?
+_C_LABEL(buserr):
+_C_LABEL(addrerr):
+ tstl _C_LABEL(nofault) | device probe?
jeq 1f | no, halt...
- movl _nofault,sp@- | yes,
- jbsr _longjmp | longjmp(nofault)
+ movl _C_LABEL(nofault),sp@- | yes,
+ jbsr _C_LABEL(longjmp) | longjmp(nofault)
/* NOTREACHED */
1:
- jra _badtrap | only catch probes!
+ jra _C_LABEL(badtrap) | only catch probes!
/*
* FP exceptions.
*/
-_fpfline:
- cmpl #MMU_68040,_mmutype | an 040 FPU
- jne fpfline_not40 | no, do 6888? emulation
+_C_LABEL(fpfline):
+ cmpl #MMU_68040,_C_LABEL(mmutype)
+ jne fpfline_not40 | not a 040 FPU, do 6888? emulation
cmpw #0x202c,sp@(6) | format type 2?
- jne _illinst | no, not an FP emulation
+ jne _C_LABEL(illinst) | no, not an FP emulation
#ifdef FPSP
.globl fpsp_unimp
jmp fpsp_unimp | yes, go handle it
@@ -293,9 +293,9 @@
moveq #T_FPEMULI,d0 | denote as FP emulation trap
jra fault | do it
-_fpunsupp:
- cmpl #MMU_68040,_mmutype | an 040 FPU?
- jne fpunsupp_not40
+_C_LABEL(fpunsupp):
+ cmpl #MMU_68040,_C_LABEL(mmutype)
+ jne fpunsupp_not40 | not a 040 FPU, try 6888?
#ifdef FPSP
.globl fpsp_unsupp
jmp fpsp_unsupp | yes, go handle it
@@ -312,20 +312,20 @@
* and may cause signal delivery, we need to test for stack adjustment
* after the trap call.
*/
- .globl _fpfault
-_fpfault:
+ .globl _C_LABEL(fpfault)
+_C_LABEL(fpfault):
clrl sp@- | stack adjust count
moveml #0xFFFF,sp@- | save user registers
movl usp,a0 | and save
movl a0,sp@(FR_SP) | the user stack pointer
clrl sp@- | no VA arg
- movl _curpcb,a0 | current pcb
+ movl _C_LABEL(curpcb),a0 | current pcb
lea a0@(PCB_FPCTX),a0 | address of FP savearea
fsave a0@ | save state
#if defined(M68040) || defined(M68060)
#ifdef notdef /* XXX: Can't use this while we don't have the cputype */
- movb _cputype, d0
+ movb _C_LABEL(cputype), d0
andb #(ATARI_68040|ATARI_68060), d0
jne Lfptnull
#else
@@ -350,12 +350,12 @@
* no post-trap stack adjustment.
*/
- .globl _straytrap
+ .globl _C_LABEL(straytrap)
- .globl _intr_glue
-_intr_glue:
+ .globl _C_LABEL(intr_glue)
+_C_LABEL(intr_glue):
moveml d0-d1/a0-a1,sp@- | Save scratch registers
- jbsr _intr_dispatch | handle interrupt
+ jbsr _C_LABEL(intr_dispatch) | handle interrupt
moveml sp@+,d0-d1/a0-a1
jra rei
@@ -364,48 +364,48 @@
_lev4intr: | VBL interrupt
#ifdef FALCON_VIDEO
- tstl _falcon_needs_vbl | Do we need to service a VBL-request?
- jne 1f
+ tstl _C_LABEL(falcon_needs_vbl)
+ jne 1f | Yes, go service a VBL-request
rte | Nothing to do.
1:
moveml d0-d1/a0-a1,sp@-
- jbsr _falcon_display_switch
+ jbsr _C_LABEL(falcon_display_switch)
moveml sp@+,d0-d1/a0-a1
#endif /* FALCON_VIDEO */
rte
-_lev3intr:
-_lev5intr:
-_lev6intr:
-_badtrap:
+_C_LABEL(lev3intr):
+_C_LABEL(lev5intr):
+_C_LABEL(lev6intr):
+_C_LABEL(badtrap):
moveml #0xC0C0,sp@- | save scratch regs
movw sp@(22),sp@- | push exception vector info
clrw sp@-
movl sp@(22),sp@- | and PC
- jbsr _straytrap | report
+ jbsr _C_LABEL(straytrap) | report
addql #8,sp | pop args
moveml sp@+,#0x0303 | restore regs
jra rei | all done
- .globl _straymfpint
-_badmfpint:
+ .globl _C_LABEL(straymfpint)
+_C_LABEL(badmfpint):
moveml #0xC0C0,sp@- | save scratch regs
movw sp@(22),sp@- | push exception vector info
clrw sp@-
movl sp@(22),sp@- | and PC
- jbsr _straymfpint | report
+ jbsr _C_LABEL(straymfpint) | report
addql #8,sp | pop args
moveml sp@+,#0x0303 | restore regs
jra rei | all done
- .globl _syscall
-_trap0:
+ .globl _C_LABEL(syscall)
+_C_LABEL(trap0):
clrl sp@- | stack adjust count
moveml #0xFFFF,sp@- | save user registers
movl usp,a0 | save the user SP
movl a0,sp@(FR_SP) | in the savearea
movl d0,sp@- | push syscall number
- jbsr _syscall | handle it
+ jbsr _C_LABEL(syscall) | handle it
addql #4,sp | pop syscall arg
movl sp@(FR_SP),a0 | grab and restore
movl a0,usp | user SP
@@ -418,13 +418,13 @@
* cachectl(command, addr, length)
* command in d0, addr in a1, length in d1
*/
- .globl _cachectl1
-_trap12:
- movl _curproc,sp@- | push curproc pointer
+ .globl _C_LABEL(cachectl1)
+_C_LABEL(trap12):
+ movl _C_LABEL(curproc),sp@- | push curproc pointer
movl d1,sp@- | push length
movl a1,sp@- | push addr
movl d0,sp@- | push command
- jbsr _cachectl1 | do it
+ jbsr _C_LABEL(cachectl1) | do it
lea sp@(16),sp | pop args
jra rei | all done
@@ -432,7 +432,7 @@
* Trace (single-step) trap. Kernel-mode is special.
* User mode traps are simply passed on to trap().
*/
-_trace:
+_C_LABEL(trace):
clrl sp@- | stack adjust count
moveml #0xFFFF,sp@-
moveq #T_TRACE,d0
@@ -456,7 +456,7 @@
* - trace traps for SUN binaries (not fully supported yet)
* User mode traps are simply passed to trap().
*/
-_trap15:
+_C_LABEL(trap15):
clrl sp@-
moveml #0xFFFF,sp@-
moveq #T_TRAP15,d0
@@ -500,7 +500,7 @@
| Let KGDB handle it (if connected)
movl a2,sp@- | push frame ptr
movl d2,sp@- | push trap type
- jbsr _kgdb_trap | handle the trap
+ jbsr _C_LABEL(kgdb_trap) | handle the trap
addql #8,sp | pop args
cmpl #0,d0 | did kgdb handle it?
jne Lbrkpt3 | yes, done
@@ -509,7 +509,7 @@
| Let DDB handle it
movl a2,sp@- | push frame ptr
movl d2,sp@- | push trap type
- jbsr _kdb_trap | handle the trap
+ jbsr _C_LABEL(kdb_trap) | handle the trap
addql #8,sp | pop args
#if 0 /* not needed on atari */
cmpl #0,d0 | did ddb handle it?
@@ -552,10 +552,10 @@
* specially, to improve performance
*/
- .globl _hardclock
+ .globl _C_LABEL(hardclock)
-_spurintr:
- addql #1,_intrcnt+0
+_C_LABEL(spurintr):
+ addql #1,_C_LABEL(intrcnt)+0
addql #1,_C_LABEL(uvmexp)+UVMEXP_INTRS
jra rei
@@ -563,9 +563,10 @@
mfp_tima:
moveml d0-d1/a0-a1,sp@- | save scratch registers
movl sp,sp@- | push pointer to clockframe
- jbsr _hardclock | call generic clock int routine
+ jbsr _C_LABEL(hardclock) | call generic clock int routine
Home |
Main Index |
Thread Index |
Old Index