Skip to content
Browse files

Sync with -current

  • Loading branch information...
1 parent 8d56497 commit f9361ae7cdfe31f6ff2689a92db47e4bf92616fd fvdl committed Nov 15, 1999
Showing with 10,919 additions and 4,105 deletions.
  1. +7 −7 sys/arch/amiga/dev/sbic.c
  2. +1 −6 sys/arch/amiga/include/svr4_machdep.h
  3. +4 −4 sys/arch/arm32/arm32/bcopyinout.S
  4. +5 −5 sys/arch/arm32/arm32/blockio.S
  5. +5 −6 sys/arch/arm32/arm32/bus_dma.c
  6. +17 −19 sys/arch/arm32/arm32/copystr.S
  7. +14 −14 sys/arch/arm32/arm32/cpufunc_asm.S
  8. +21 −21 sys/arch/arm32/arm32/cpuswitch.S
  9. +5 −5 sys/arch/arm32/arm32/db_interface.c
  10. +18 −18 sys/arch/arm32/arm32/exception.S
  11. +10 −10 sys/arch/arm32/arm32/fusu.S
  12. +17 −17 sys/arch/arm32/arm32/locore.S
  13. +4 −4 sys/arch/arm32/arm32/machdep.c
  14. +2 −2 sys/arch/arm32/arm32/mem.c
  15. +18 −16 sys/arch/arm32/arm32/pmap.c
  16. +9 −9 sys/arch/arm32/arm32/spl.S
  17. +2 −2 sys/arch/arm32/arm32/vm_machdep.c
  18. +5 −4 sys/arch/arm32/dev/bus_space_notimpl.S
  19. +34 −34 sys/arch/arm32/footbridge/footbridge_irq.S
  20. +2 −2 sys/arch/arm32/fpe-arm/armfpe_glue.S
  21. +20 −8 sys/arch/arm32/include/asm.h
  22. +7 −7 sys/arch/arm32/iomd/iomd_fiq.S
  23. +3 −3 sys/arch/arm32/iomd/iomd_iic.S
  24. +3 −3 sys/arch/arm32/iomd/iomd_io_asm.S
  25. +31 −31 sys/arch/arm32/iomd/iomd_irq.S
  26. +33 −33 sys/arch/arm32/isa/isa_irq.S
  27. +3 −3 sys/arch/arm32/mainbus/mainbus_io_asm.S
  28. +2 −2 sys/arch/arm32/ofw/ofrom.c
  29. +35 −35 sys/arch/arm32/ofw/ofw_irq.S
  30. +3 −3 sys/arch/arm32/podulebus/icside_io_asm.S
  31. +4 −2 sys/arch/arm32/podulebus/podule_data.h
  32. +3 −3 sys/arch/arm32/podulebus/podulebus_io_asm.S
  33. +3 −1 sys/arch/arm32/podulebus/podules
  34. +4 −2 sys/arch/arm32/podulebus/podules.h
  35. +5 −5 sys/arch/arm32/podulebus/sfas.c
  36. +3 −3 sys/arch/arm32/podulebus/simide_io_asm.S
  37. +10 −9 sys/arch/arm32/shark/fiq.S
  38. +31 −1 sys/arch/atari/atari/atari_init.c
  39. +121 −12 sys/arch/atari/atari/bus.c
  40. +5 −3 sys/arch/atari/atari/conf.c
  41. +2 −1 sys/arch/atari/atari/genassym.cf
  42. +11 −3 sys/arch/atari/atari/locore.s
  43. +10 −4 sys/arch/atari/atari/machdep.c
  44. +2 −2 sys/arch/atari/atari/mem.c
  45. +13 −11 sys/arch/atari/atari/pmap.c
  46. +11 −15 sys/arch/atari/atari/trap.c
  47. +5 −4 sys/arch/atari/atari/vm_machdep.c
  48. +9 −6 sys/arch/atari/dev/hdfd.c
  49. +9 −7 sys/arch/atari/dev/hdfdreg.h
  50. +4 −1 sys/arch/atari/include/bus.h
  51. +2 −1 sys/arch/atari/include/isa_machdep.h
  52. +1 −6 sys/arch/atari/include/svr4_machdep.h
  53. +45 −3 sys/arch/atari/isa/isa_machdep.c
  54. +33 −4 sys/arch/atari/pci/pci_machdep.c
  55. +4 −5 sys/arch/atari/vme/et4000.c
  56. +7 −7 sys/arch/atari/vme/if_le_vme.c
  57. +4 −5 sys/arch/atari/vme/leo.c
  58. +3 −3 sys/arch/bebox/bebox/bus_dma.c
  59. +6 −6 sys/arch/bebox/bebox/machdep.c
  60. +4 −3 sys/arch/bebox/stand/elf2pef/elf2pef.c
  61. +4 −3 sys/arch/hp300/dev/scsi.c
  62. +2 −1 sys/arch/hp300/hp300/genassym.cf
  63. +2 −2 sys/arch/hp300/hp300/leds.c
  64. +713 −705 sys/arch/hp300/hp300/locore.s
  65. +5 −5 sys/arch/hp300/hp300/machdep.c
  66. +2 −2 sys/arch/hp300/hp300/mem.c
  67. +16 −14 sys/arch/hp300/hp300/pmap.c
  68. +7 −6 sys/arch/hp300/hp300/trap.c
  69. +5 −4 sys/arch/hp300/hp300/vm_machdep.c
  70. +109 −109 sys/arch/hp300/include/bus.h
  71. +1 −6 sys/arch/hp300/include/svr4_machdep.h
  72. +1 −1 sys/arch/hp300/stand/Makefile.buildboot
  73. +1 −1 sys/arch/hp300/stand/common/netio.c
  74. +100 −100 sys/arch/hp300/stand/common/srt0.S
  75. +30 −28 sys/arch/hpcmips/conf/GENERIC
  76. +5 −175 sys/arch/hpcmips/conf/GENERIC_JP
  77. +25 −25 sys/arch/hpcmips/conf/RAMDISK
  78. +10 −5 sys/arch/hpcmips/conf/files.hpcmips
  79. +23 −3 sys/arch/hpcmips/dev/bicons.c
  80. +2 −1 sys/arch/hpcmips/dev/bicons.h
  81. +216 −31 sys/arch/hpcmips/dev/fb.c
  82. +13 −1 sys/arch/hpcmips/dev/fbvar.h
  83. +0 −59 sys/arch/hpcmips/dev/findcons.c
  84. +170 −0 sys/arch/hpcmips/dev/fontconv.c
  85. +3,592 −0 sys/arch/hpcmips/dev/vt220l8x10.h
  86. +2 −1 sys/arch/hpcmips/hpcmips/disksubr.c
  87. +30 −32 sys/arch/hpcmips/hpcmips/machdep.c
  88. +18 −4 sys/arch/hpcmips/hpcmips/platid.def
  89. +33 −9 sys/arch/hpcmips/hpcmips/platid_mask.c
  90. +2 −2 sys/arch/hpcmips/include/Makefile
  91. +0 −3 sys/arch/hpcmips/include/elf.h
  92. +2 −2 sys/arch/hpcmips/include/elf_machdep.h
  93. +39 −16 sys/arch/hpcmips/include/platid_generated.h
  94. +33 −9 sys/arch/hpcmips/include/platid_mask.h
  95. +22 −21 sys/arch/hpcmips/stand/libsa/winblk.c
  96. +4 −4 sys/arch/hpcmips/stand/pbsdboot/elf.c
  97. +14 −2 sys/arch/hpcmips/stand/pbsdboot/main.c
  98. +34 −9 sys/arch/hpcmips/stand/pbsdboot/mips.c
  99. +2 −1 sys/arch/hpcmips/stand/pbsdboot/pbsdboot.h
  100. +2,520 −1,746 sys/arch/hpcmips/stand/pbsdboot/pbsdboot.uu
  101. +173 −80 sys/arch/hpcmips/stand/pbsdboot/tx39xx.c
  102. +1 −0 sys/arch/hpcmips/stand/pbsdboot/vr41xx.c
  103. +36 −2 sys/arch/hpcmips/vr/vr.c
  104. +5 −3 sys/arch/hpcmips/vr/vrgiu.c
  105. +340 −271 sys/arch/hpcmips/vr/vrkiu.c
  106. +3 −19 sys/arch/hpcmips/vr/vrkiuvar.h
  107. +3 −5 sys/arch/i386/conf/CARDBUS
  108. +62 −3 sys/arch/i386/conf/GENERIC
  109. +0 −27 sys/arch/i386/conf/GENERIC.v6
  110. +9 −1 sys/arch/i386/conf/INSTALL
  111. +6 −1 sys/arch/i386/conf/files.i386
  112. +23 −2 sys/arch/i386/i386/apm.c
  113. +19 −5 sys/arch/i386/i386/autoconf.c
  114. +8 −4 sys/arch/i386/i386/locore.s
  115. +6 −6 sys/arch/i386/i386/machdep.c
  116. +29 −8 sys/arch/i386/i386/mainbus.c
  117. +2 −2 sys/arch/i386/i386/mem.c
  118. +8 −6 sys/arch/i386/i386/pmap.c
  119. +33 −12 sys/arch/i386/i386/svr4_machdep.c
  120. +2 −2 sys/arch/i386/i386/vm_machdep.c
  121. +2 −2 sys/arch/i386/include/Makefile
  122. +15 −9 sys/arch/i386/include/asm.h
  123. +2 −1 sys/arch/i386/include/cpu.h
  124. +4 −4 sys/arch/i386/include/elf_machdep.h
  125. +6 −2 sys/arch/i386/include/segments.h
  126. +2 −3 sys/arch/i386/isa/clock.c
  127. +9 −5 sys/arch/i386/isa/isa_machdep.c
  128. +1 −1 sys/arch/i386/isa/pcvt/pcvt_kbd.c
  129. +116 −0 sys/arch/i386/pnpbios/com_pnpbios.c
  130. +27 −0 sys/arch/i386/pnpbios/files.pnpbios
  131. +93 −0 sys/arch/i386/pnpbios/lpt_pnpbios.c
  132. +158 −0 sys/arch/i386/pnpbios/pciide_pnpbios.c
  133. +883 −0 sys/arch/i386/pnpbios/pnpbios.c
  134. +94 −0 sys/arch/i386/pnpbios/pnpbioscall.s
  135. +98 −0 sys/arch/i386/pnpbios/pnpbiosvar.h
  136. +118 −0 sys/arch/i386/pnpbios/sb_pnpbios.c
Sorry, we could not display the entire diff because too many files (730) changed.
View
14 sys/arch/amiga/dev/sbic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbic.c,v 1.36 1999/10/04 20:28:01 is Exp $ */
+/* $NetBSD: sbic.c,v 1.36.4.1 1999/11/15 00:36:58 fvdl Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -524,12 +524,11 @@ sbic_sched(dev)
dev->target = slp->scsipi_scsi.target;
dev->lun = slp->scsipi_scsi.lun;
if ( flags & XS_CTL_POLL || ( !sbic_parallel_operations
- && (/*phase == STATUS_PHASE ||*/
- sbicdmaok(dev, xs) == 0) ) )
+ && (sbicdmaok(dev, xs) == 0)))
stat = sbicicmd(dev, slp->scsipi_scsi.target,
slp->scsipi_scsi.lun, &acb->cmd,
acb->clen, acb->sc_kv.dc_addr, acb->sc_kv.dc_count);
- else if (sbicgo(dev, xs) == 0) {
+ else if (sbicgo(dev, xs) == 0 && xs->error != XS_SELTIMEOUT) {
SBIC_TRACE(dev);
return;
} else
@@ -684,7 +683,8 @@ sbicdmaok(dev, xs)
struct sbic_softc *dev;
struct scsipi_xfer *xs;
{
- if (sbic_no_dma || xs->datalen & 0x1 || (u_int)xs->data & 0x3)
+ if (sbic_no_dma || !xs->datalen || xs->datalen & 0x1 ||
+ (u_int)xs->data & 0x3)
return(0);
/*
* controller supports dma to any addresses?
@@ -1408,7 +1408,7 @@ sbicicmd(dev, target, lun, cbuf, clen, buf, len)
*/
if (!( dev->sc_flags & SBICF_SELECTED )
&& sbicselectbus(dev, regs, target, lun, dev->sc_scsiaddr)) {
- /*printf("sbicicmd trying to select busy bus!\n");*/
+ /* printf("sbicicmd: trying to select busy bus!\n"); */
dev->sc_flags &= ~SBICF_ICMD;
return(-1);
}
@@ -1685,7 +1685,7 @@ sbicgo(dev, xs)
*/
if (sbicselectbus(dev, regs, dev->target, dev->lun,
dev->sc_scsiaddr)) {
-/* printf("sbicgo: Trying to select busy bus!\n"); */
+ /* printf("sbicgo: Trying to select busy bus!\n"); */
SBIC_TRACE(dev);
return(0); /* Not done: needs to be rescheduled */
}
View
7 sys/arch/amiga/include/svr4_machdep.h
@@ -1,8 +1,3 @@
-/* $NetBSD: svr4_machdep.h,v 1.2 1999/04/29 14:38:39 kleink Exp $ */
-
-#ifndef _MACHINE_SVR4_MACHDEP_H_
-#define _MACHINE_SVR4_MACHDEP_H_
+/* $NetBSD: svr4_machdep.h,v 1.2.6.1 1999/11/15 00:37:03 fvdl Exp $ */
#include <m68k/svr4_machdep.h>
-
-#endif
View
8 sys/arch/arm32/arm32/bcopyinout.S
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopyinout.S,v 1.19 1999/05/19 07:50:06 scw Exp $ */
+/* $NetBSD: bcopyinout.S,v 1.19.4.1 1999/11/15 00:37:03 fvdl Exp $ */
/*
* Copyright (c) 1995-1998 Mark Brinicombe.
@@ -47,7 +47,7 @@
.text
.align 0
Lcurpcb:
- .word _curpcb
+ .word _C_LABEL(curpcb)
Lvm_min_address:
.word VM_MIN_ADDRESS
@@ -156,7 +156,7 @@ do_cowfault:
ldr r3, Lpgbase
sub r0, r6, r3
mov r0, r0, lsl #(PGSHIFT-2) /* calculate VA of page */
- bl _cowfault
+ bl _C_LABEL(cowfault)
mov r3, r0
ldmfd sp!, {r0-r2, lr}
teq r3, #0 /* check for error return */
@@ -235,7 +235,7 @@ Lcopyinoutpcbfault:
mov r2, r1
mov r1, r0
add r0, pc, #Lcopyinouttext - . - 8
- b _panic
+ b _C_LABEL(panic)
Lcopyinouttext:
.asciz "No valid PCB during copyinout() addr1=%08x addr2=%08x\n"
View
10 sys/arch/arm32/arm32/blockio.S
@@ -1,4 +1,4 @@
-/* $NetBSD: blockio.S,v 1.8 1998/12/12 17:28:05 mycroft Exp $ */
+/* $NetBSD: blockio.S,v 1.8.10.1 1999/11/15 00:37:04 fvdl Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -175,7 +175,7 @@ ENTRY(insw16)
tst r2, #0x00000007
tsteq r1, #0x00000003
- bne _insw
+ bne _C_LABEL(insw)
/* Word aligned insw */
@@ -233,7 +233,7 @@ ENTRY(outsw16)
tst r2, #0x00000007
tsteq r1, #0x00000003
- bne _outsw
+ bne _C_LABEL(outsw)
/* Word aligned outsw */
@@ -301,7 +301,7 @@ ENTRY(inswm8)
tst r1, #0x00000003
- bne _insw
+ bne _C_LABEL(insw)
/* Word aligned insw */
@@ -397,7 +397,7 @@ ENTRY(outswm8)
tst r1, #0x00000003
- bne _outsw
+ bne _C_LABEL(outsw)
/* Word aligned outsw */
View
11 sys/arch/arm32/arm32/bus_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.16 1999/09/10 10:12:09 is Exp $ */
+/* $NetBSD: bus_dma.c,v 1.16.4.1 1999/11/15 00:37:04 fvdl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -376,9 +376,6 @@ _bus_dmamap_sync(t, map, offset, len, ops)
return;
}
- /* XXX Is this only for BUS_DMASYNC_PREWRITE ? */
- cpu_drain_writebuf();
-
/* Set the starting address and maximum length */
vaddr = seg->_ds_vaddr + offset;
length = seg->ds_len - offset;
@@ -406,6 +403,8 @@ _bus_dmamap_sync(t, map, offset, len, ops)
length = seg->ds_len;
}
} while (len > 0);
+
+ cpu_drain_writebuf();
}
}
@@ -515,8 +514,8 @@ _bus_dmamem_map(t, segs, nsegs, size, kvap, flags)
if (size == 0)
panic("_bus_dmamem_map: size botch");
pmap_enter(pmap_kernel(), va, addr,
- VM_PROT_READ | VM_PROT_WRITE, TRUE,
- VM_PROT_READ | VM_PROT_WRITE);
+ VM_PROT_READ | VM_PROT_WRITE,
+ VM_PROT_READ | VM_PROT_WRITE | PMAP_WIRED);
/*
* If the memory must remain coherent with the
* cache then we must make the memory uncacheable
View
36 sys/arch/arm32/arm32/copystr.S
@@ -1,4 +1,4 @@
-/* $NetBSD: copystr.S,v 1.9 1998/06/17 20:10:39 mark Exp $ */
+/* $NetBSD: copystr.S,v 1.9.16.1 1999/11/15 00:37:06 fvdl Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -45,7 +45,7 @@
.text
.align 0
Lcurpcb:
- .word _curpcb
+ .word _C_LABEL(curpcb)
Lvm_min_address:
.word VM_MIN_ADDRESS
@@ -66,12 +66,10 @@ Lvm_maxkern_address:
ENTRY(copystr)
stmfd sp!, {r4-r5}
teq r2, #0x00000000
- moveq r4, #0x00000000
- moveq r5, #0x00000000
+ mov r5, #0x00000000
+ moveq r0, #ENAMETOOLONG
beq Lcopystrexit
- mov r5, #0x00000000
-
Lcopystr_loop:
ldrb r4, [r0], #0x0001
strb r4, [r1], #0x0001
@@ -80,14 +78,14 @@ Lcopystr_loop:
teqne r5, r2
bne Lcopystr_loop
-Lcopystrexit:
- teq r3, #0x00000000
- strne r5, [r3]
-
teq r4, #0x00000000
moveq r0, #0x00000000
movne r0, #ENAMETOOLONG
+Lcopystrexit:
+ teq r3, #0x00000000
+ strne r5, [r3]
+
ldmfd sp!, {r4-r5}
mov pc, lr
@@ -148,8 +146,8 @@ ENTRY(copyoutstr)
/* Do the actual copy */
do_copyinoutstr:
teq r2, #0x00000000
- moveq r5, #0x00000000
- moveq r6, #0x00000000
+ mov r6, #0x00000000
+ moveq r0, #ENAMETOOLONG
beq Lcopyinoutstrexit
ldr r4, Lcurpcb
@@ -162,7 +160,6 @@ do_copyinoutstr:
add r5, pc, #Lcopystrfault - . - 8
str r5, [r4, #PCB_ONFAULT]
- mov r6, #0x00000000
Lcopyinoutstr_loop:
ldrb r5, [r0], #0x0001
@@ -172,16 +169,17 @@ Lcopyinoutstr_loop:
teqne r6, r2
bne Lcopyinoutstr_loop
-Lcopyinoutstrexit:
- teq r3, #0x00000000
- strne r6, [r3]
+ mov r0, #0x00000000
+ str r0, [r4, #PCB_ONFAULT]
teq r5, #0x00000000
moveq r0, #0x00000000
movne r0, #ENAMETOOLONG
- mov r6, #0x00000000
- str r6, [r4, #PCB_ONFAULT]
+Lcopyinoutstrexit:
+ teq r3, #0x00000000
+ strne r6, [r3]
+
ldmfd sp!, {r4-r6}
mov pc, lr
@@ -203,7 +201,7 @@ Lcopystrpcbfault:
mov r2, r1
mov r1, r0
add r0, pc, #Lcopystrpcbfaulttext - . - 8
- b _panic
+ b _C_LABEL(panic)
Lcopystrpcbfaulttext:
.asciz "No valid PCB during copyinoutstr() addr1=%08x addr2=%08x\n"
View
28 sys/arch/arm32/arm32/cpufunc_asm.S
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc_asm.S,v 1.9 1998/12/12 17:28:05 mycroft Exp $ */
+/* $NetBSD: cpufunc_asm.S,v 1.9.10.1 1999/11/15 00:37:07 fvdl Exp $ */
/*
* arm8 support code Copyright (c) 1997 ARM Limited
@@ -183,7 +183,7 @@ ENTRY(arm8_setttb)
msr cpsr_all , r1
stmfd sp!, {r0-r3, lr}
- bl _arm8_cache_cleanID
+ bl _C_LABEL(arm8_cache_cleanID)
ldmfd sp!, {r0-r3, lr}
mcr 15, 0, r0, c7, c7, 0 /* flush I+D cache */
@@ -207,7 +207,7 @@ ENTRY(arm8_setttb)
#ifdef CPU_SA110
Lblock_userspace_access:
- .word _block_userspace_access
+ .word _C_LABEL(block_userspace_access)
ENTRY(sa110_setttb)
/* We need to flush the cache as it uses virtual addresses that are about to change */
@@ -222,7 +222,7 @@ ENTRY(sa110_setttb)
str r1, [r3]
#endif
stmfd sp!, {r0-r3, lr}
- bl _sa110_cache_cleanID
+ bl _C_LABEL(sa110_cache_cleanID)
ldmfd sp!, {r0-r3, lr}
mcr 15, 0, r0, c7, c5, 0
mcr 15, 0, r0, c7, c10, 4
@@ -486,18 +486,18 @@ ENTRY(sa110_cache_cleanD_E)
*/
.data
- .global _sa110_cache_clean_addr
-_sa110_cache_clean_addr:
+ .global _C_LABEL(sa110_cache_clean_addr)
+_C_LABEL(sa110_cache_clean_addr):
.word 0xf0000000
- .global _sa110_cache_clean_size
-_sa110_cache_clean_size:
+ .global _C_LABEL(sa110_cache_clean_size)
+_C_LABEL(sa110_cache_clean_size):
.word 0x00008000
.text
Lsa110_cache_clean_addr:
- .word _sa110_cache_clean_addr
+ .word _C_LABEL(sa110_cache_clean_addr)
Lsa110_cache_clean_size:
- .word _sa110_cache_clean_size
+ .word _C_LABEL(sa110_cache_clean_size)
ENTRY(sa110_cache_cleanID)
ENTRY(sa110_cache_cleanD)
@@ -645,7 +645,7 @@ Lsa110_cache_syncI_loop:
ENTRY(sa110_cache_cleanID_rng)
ENTRY(sa110_cache_cleanD_rng)
cmp r1, #0x4000
- bcs _sa110_cache_cleanID
+ bcs _C_LABEL(sa110_cache_cleanID)
and r2, r0, #0x1f
add r1, r1, r2
@@ -661,7 +661,7 @@ sa110_cache_cleanD_rng_loop:
ENTRY(sa110_cache_purgeID_rng)
cmp r1, #0x2000
- bcs _sa110_cache_purgeID
+ bcs _C_LABEL(sa110_cache_purgeID)
and r2, r0, #0x1f
add r1, r1, r2
@@ -680,7 +680,7 @@ sa110_cache_purgeID_rng_loop:
ENTRY(sa110_cache_purgeD_rng)
cmp r1, #0x2000
- bcs _sa110_cache_purgeD
+ bcs _C_LABEL(sa110_cache_purgeD)
and r2, r0, #0x1f
add r1, r1, r2
@@ -697,7 +697,7 @@ sa110_cache_purgeD_rng_loop:
ENTRY(sa110_cache_syncI_rng)
cmp r1, #0x4000
- bcs _sa110_cache_syncI
+ bcs _C_LABEL(sa110_cache_syncI)
and r2, r0, #0x1f
add r1, r1, r2
View
42 sys/arch/arm32/arm32/cpuswitch.S
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.30 1999/03/24 12:41:27 tron Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.30.10.1 1999/11/15 00:37:07 fvdl Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -78,10 +78,10 @@
.text
Lwhichqs:
- .word _whichqs
+ .word _C_LABEL(whichqs)
Lqs:
- .word _qs
+ .word _C_LABEL(qs)
/*
* On entry
@@ -142,12 +142,12 @@ Lsetrunqueue_erg:
mov r2, r1
mov r1, r0
add r0, pc, #Ltext1 - . - 8
- bl _printf
+ bl _C_LABEL(printf)
ldr r2, Lqs
ldr r1, [r2]
add r0, pc, #Ltext2 - . - 8
- b _panic
+ b _C_LABEL(panic)
Ltext1:
.asciz "setrunqueue : %08x %08x\n"
@@ -208,25 +208,25 @@ ENTRY(remrunqueue)
*/
Lcurproc:
- .word _curproc
+ .word _C_LABEL(curproc)
Lcurpcb:
- .word _curpcb
+ .word _C_LABEL(curpcb)
Lwant_resched:
- .word _want_resched
+ .word _C_LABEL(want_resched)
Lcpufuncs:
- .word _cpufuncs
+ .word _C_LABEL(cpufuncs)
.data
- .global _curpcb
-_curpcb:
+ .global _C_LABEL(curpcb)
+_C_LABEL(curpcb):
.word 0x00000000
.text
Lblock_userspace_access:
- .word _block_userspace_access
+ .word _C_LABEL(block_userspace_access)
/*
* Idle loop, exercised while waiting for a process to wake up.
@@ -293,9 +293,9 @@ ENTRY(cpu_switch)
#ifdef spl0
mov r0, #(_SPL_0)
- bl _splx
+ bl _C_LABEL(splx)
#else
- bl _spl0
+ bl _C_LABEL(spl0)
#endif
/* Push the old spl level onto the stack */
@@ -336,7 +336,7 @@ sw1:
add r0, pc, #switchpanic - . - 8
mrs r1, cpsr_all
- bl _panic
+ bl _C_LABEL(panic)
switchpanic:
.asciz "Yikes! In cpu_switch() but not in SVC mode (%08x)\n"
@@ -562,7 +562,7 @@ Lcs_context_switched:
#ifdef ARMFPE
add r0, r1, #(USER_SIZE) & 0x00ff
add r0, r0, #(USER_SIZE) & 0xff00
- bl _arm_fpe_core_changecontext
+ bl _C_LABEL(arm_fpe_core_changecontext)
#endif
/* We can enable interrupts again */
@@ -577,7 +577,7 @@ switch_return:
/* Get the spl level from the stack and update the current spl level */
ldr r0, [sp], #0x0004
- bl _splx
+ bl _C_LABEL(splx)
/* cpu_switch returns the proc it switched to. */
mov r0, r6
@@ -589,10 +589,10 @@ switch_return:
ldmfd sp!, {r4-r7, pc}
Lproc0:
- .word _proc0
+ .word _C_LABEL(proc0)
Lkernel_map:
- .word _kernel_map
+ .word _C_LABEL(kernel_map)
ENTRY(switch_exit)
@@ -651,7 +651,7 @@ Lse_context_switched:
* Schedule the vmspace and stack to be freed.
*/
mov r0, r3 /* exit2(p) */
- bl _exit2
+ bl _C_LABEL(exit2)
/* Paranoia */
mov r0, #0x00000000
@@ -662,7 +662,7 @@ Lse_context_switched:
b switch_search
Lcurrent_spl_level:
- .word _current_spl_level
+ .word _C_LABEL(current_spl_level)
ENTRY(savectx)
/*
View
10 sys/arch/arm32/arm32/db_interface.c
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.29 1999/10/12 17:08:57 jdolecek Exp $ */
+/* $NetBSD: db_interface.c,v 1.29.4.1 1999/11/15 00:37:08 fvdl Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -312,16 +312,16 @@ void db_of_exit_cmd __P((db_expr_t addr, int have_addr, db_expr_t count, char *m
#endif
struct db_command arm32_db_command_table[] = {
- { "vmstat", db_show_vmstat_cmd, 0, NULL },
- { "vnode", db_show_vnode_cmd, 0, NULL },
- { "intrchain", db_show_intrchain_cmd, 0, NULL },
- { "panic", db_show_panic_cmd, 0, NULL },
{ "frame", db_show_frame_cmd, 0, NULL },
+ { "intrchain", db_show_intrchain_cmd, 0, NULL },
#ifdef OFW
{ "ofboot", db_of_boot_cmd, 0, NULL },
{ "ofenter", db_of_enter_cmd, 0, NULL },
{ "ofexit", db_of_exit_cmd, 0, NULL },
#endif
+ { "panic", db_show_panic_cmd, 0, NULL },
+ { "vmstat", db_show_vmstat_cmd, 0, NULL },
+ { "vnode", db_show_vnode_cmd, 0, NULL },
{ NULL, NULL, 0, NULL }
};
View
36 sys/arch/arm32/arm32/exception.S
@@ -1,4 +1,4 @@
-/* $NetBSD: exception.S,v 1.12 1998/04/01 22:59:25 mark Exp $ */
+/* $NetBSD: exception.S,v 1.12.16.1 1999/11/15 00:37:08 fvdl Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@@ -55,7 +55,7 @@
.align 0
Lastpending:
- .word _astpending
+ .word _C_LABEL(astpending)
/*
* General exception exit handler
@@ -96,7 +96,7 @@ do_ast:
str r1, [r5]
mov r0, sp /* arg 0 = trap frame */
- bl _ast /* call the AST handler */
+ bl _C_LABEL(ast) /* call the AST handler */
b Lexception_exit_loop /* Try and exit again */
do_exit:
@@ -125,17 +125,17 @@ Ldata_abort_return: /* XXX - could just straight to exception_exit */
b exception_exit
Ldata_abort_handler_address:
- .word _data_abort_handler_address
+ .word _C_LABEL(data_abort_handler_address)
.data
- .global _data_abort_handler_address
-_data_abort_handler_address:
+ .global _C_LABEL(data_abort_handler_address)
+_C_LABEL(data_abort_handler_address):
.word abortdata
.text
abortdata:
add r0, pc, #abortdatamsg - . - 8
- b _panic
+ b _C_LABEL(panic)
abortdatamsg:
.asciz "abortdata"
@@ -158,18 +158,18 @@ Lprefetch_abort_return: /* XXX - could just straight to exception_exit */
b exception_exit
Lprefetch_abort_handler_address:
- .word _prefetch_abort_handler_address
+ .word _C_LABEL(prefetch_abort_handler_address)
.data
- .global _prefetch_abort_handler_address
+ .global _C_LABEL(prefetch_abort_handler_address)
-_prefetch_abort_handler_address:
+_C_LABEL(prefetch_abort_handler_address):
.word abortprefetch
.text
abortprefetch:
add r0, pc, #abortprefetchmsg - . - 8
- b _panic
+ b _C_LABEL(panic)
abortprefetchmsg:
.asciz "abortprefetch"
@@ -192,7 +192,7 @@ ASENTRY_NP(swi_entry)
mov r0, sp /* Pass the frame to any function */
- bl _syscall /* It's a syscall ! */
+ bl _C_LABEL(syscall) /* It's a syscall ! */
ldr r5, Lastpending /* Get address of astpending */
mrs r4, cpsr_all /* Get CPSR */
@@ -215,7 +215,7 @@ do_swi_ast:
str r1, [r5]
mov r0, sp /* arg 0 = trap frame */
- bl _ast /* call the AST handler */
+ bl _C_LABEL(ast) /* call the AST handler */
b swi_exit_loop /* Try and exit again */
@@ -282,7 +282,7 @@ Lprenotuser_push:
*/
Lgoipkdb:
mov r0, sp
- bl _ipkdb_trap_glue
+ bl _C_LABEL(ipkdb_trap_glue)
ldr r1, Lipkdb_trap_return
str r0,[r1]
/*
@@ -367,7 +367,7 @@ Lundefined_handler_indirection:
ENTRY_NP(undefinedinstruction_bounce)
PUSHFRAMEINSVC
mov r0, sp
- bl _undefinedinstruction
+ bl _C_LABEL(undefinedinstruction)
b exception_exit
@@ -389,8 +389,8 @@ Lundefined_handler_indirection_data:
.word 0
.word 0
- .global _undefined_handler_address
-_undefined_handler_address:
- .word _undefinedinstruction_bounce
+ .global _C_LABEL(undefined_handler_address)
+_C_LABEL(undefined_handler_address):
+ .word _C_LABEL(undefinedinstruction_bounce)
/* End of exception.S */
View
20 sys/arch/arm32/arm32/fusu.S
@@ -1,4 +1,4 @@
-/* $NetBSD: fusu.S,v 1.6 1998/08/16 02:11:32 mark Exp $ */
+/* $NetBSD: fusu.S,v 1.6.14.1 1999/11/15 00:37:09 fvdl Exp $ */
/*
* Copyright (c) 1996-1998 Mark Brinicombe.
@@ -78,7 +78,7 @@ ENTRY(fetchuserword)
mov pc, lr
Lcurpcb:
- .word _curpcb
+ .word _C_LABEL(curpcb)
Lvm_min_address:
.word VM_MIN_ADDRESS
@@ -178,7 +178,7 @@ ENTRY(fuswintr)
beq fusupcbfault
#endif
- add r1, pc, #_fusubailout - . - 8
+ add r1, pc, #_C_LABEL(fusubailout) - . - 8
str r1, [r2, #PCB_ONFAULT]
ldr r0, [r0]
@@ -190,12 +190,12 @@ ENTRY(fuswintr)
mov pc, lr
Lblock_userspace_access:
- .word _block_userspace_access
+ .word _C_LABEL(block_userspace_access)
.data
.align 0
- .global _block_userspace_access
-_block_userspace_access:
+ .global _C_LABEL(block_userspace_access)
+_C_LABEL(block_userspace_access):
.word 0
.text
@@ -246,8 +246,8 @@ fusufault:
*/
/* label must be global as fault.c references it */
- .global _fusubailout
-_fusubailout:
+ .global _C_LABEL(fusubailout)
+_C_LABEL(fusubailout):
mov r0, #0x00000000
str r0, [r2, #PCB_ONFAULT]
mvn r0, #0x00000000
@@ -269,7 +269,7 @@ fusuaddrfault:
fusupcbfault:
mov r1, r0
add r0, pc, #fusupcbfaulttext - . - 8
- b _panic
+ b _C_LABEL(panic)
fusupcbfaulttext:
.asciz "Yikes - no valid PCB during fusuxxx() addr=%08x\n"
@@ -334,7 +334,7 @@ ENTRY(suswintr)
beq fusupcbfault
#endif
- add r3, pc, #_fusubailout - . - 8
+ add r3, pc, #_C_LABEL(fusubailout) - . - 8
str r3, [r2, #PCB_ONFAULT]
strb r1, [r0, #0x0000]
View
34 sys/arch/arm32/arm32/locore.S
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.32 1999/03/24 12:16:50 tron Exp $ */
+/* $NetBSD: locore.S,v 1.32.10.1 1999/11/15 00:37:09 fvdl Exp $ */
/*
* Copyright (C) 1994-1997 Mark Brinicombe
@@ -62,7 +62,7 @@ L1:
bgt L1
mov fp, #0x00000000 /* trace back starts here */
- bl _initarm /* Off we go */
+ bl _C_LABEL(initarm) /* Off we go */
/* init arm will return the new stack pointer. */
mov sp, r0
@@ -78,7 +78,7 @@ L1:
mov r0, sp /* parameter to main is trap frame */
- bl _main /* Lets light the flame and start her up */
+ bl _C_LABEL(main) /* Lets light the flame and start her up */
PULLFRAME /* Pull the trap frame, now valid */
@@ -104,8 +104,8 @@ svcstk:
.text
.align 0
- .global _page0, _page0_end
-_page0:
+ .global _C_LABEL(page0), _C_LABEL(page0_end)
+_C_LABEL(page0):
ldr pc, [pc, #Lreset - . - 8]
ldr pc, [pc, #Lundefined - . - 8]
ldr pc, [pc, #Lswi - . - 8]
@@ -131,15 +131,15 @@ Lirq:
.word irq_entry
Lfiq:
.word fiq
-_page0_end = .
+_C_LABEL(page0_end) = .
/* vector 0x00000000 - RESET */
ASENTRY_NP(reset_entry)
PUSHFRAME
mov r0, sp /* Pass the frame to function */
- b _resethandler /* It's a branch throught zero ! */
+ b _C_LABEL(resethandler) /* It's a branch throught zero ! */
/* vector 0x00000008 - ADDRESS EXCEPTION */
@@ -148,7 +148,7 @@ ASENTRY_NP(addrexc)
mrs r2, spsr_all
mov r3, lr
add r0, pc, #Laddrexcmsg - . - 8
- bl _printf
+ bl _C_LABEL(printf)
b data_abort_entry
Laddrexcmsg:
@@ -159,7 +159,7 @@ Laddrexcmsg:
ASENTRY_NP(fiq)
ldr r0, Lfiqmsg
- b _panic
+ b _C_LABEL(panic)
Lfiqmsg:
.asciz "fiq"
@@ -169,7 +169,7 @@ Lfiqmsg:
/* OFW based systems will used OF_boot() */
Lcpufuncs:
- .word _cpufuncs
+ .word _C_LABEL(cpufuncs)
ENTRY_NP(cpu_reset)
mrs r2, cpsr_all
@@ -203,7 +203,7 @@ Lboot_cache_purged:
*/
Lcpu_reset_address:
- .word _cpu_reset_address
+ .word _C_LABEL(cpu_reset_address)
#endif /* OFW */
/*
@@ -232,8 +232,8 @@ ENTRY_NP(sigcode)
b . - 8
.align 0
- .global _esigcode
-_esigcode:
+ .global _C_LABEL(esigcode)
+_C_LABEL(esigcode):
#if NIPKDB > 0
#if 0
@@ -261,7 +261,7 @@ ENTRY_NP(ipkdbsbyte)
mov pc, lr
abortp:
- .word Labortdata - _page0
+ .word Labortdata - _C_LABEL(page0)
ipkdbfault:
mov r0, #0xd3
msr cpsr_all, r0
@@ -320,11 +320,11 @@ ENTRY(longjmp)
mov pc, lr
.data
- .global _esym
-_esym: .word _end
+ .global _C_LABEL(esym)
+_C_LABEL(esym): .word _C_LABEL(end)
ENTRY_NP(abort)
- b _abort
+ b _C_LABEL(abort)
/*
View
8 sys/arch/arm32/arm32/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.71 1999/09/17 19:59:38 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.71.4.1 1999/11/15 00:37:09 fvdl Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -368,8 +368,8 @@ cpu_startup()
for (loop = 0; loop < btoc(MSGBUFSIZE); ++loop)
pmap_enter(pmap_kernel(),
(vm_offset_t)((caddr_t)msgbufaddr + loop * NBPG),
- msgbufphys + loop * NBPG, VM_PROT_READ|VM_PROT_WRITE, TRUE,
- VM_PROT_READ|VM_PROT_WRITE);
+ msgbufphys + loop * NBPG, VM_PROT_READ|VM_PROT_WRITE,
+ VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
initmsgbuf(msgbufaddr, round_page(MSGBUFSIZE));
/*
@@ -426,7 +426,7 @@ cpu_startup()
panic("cpu_startup: not enough memory for buffer cache");
pmap_enter(kernel_map->pmap, curbuf,
VM_PAGE_TO_PHYS(pg), VM_PROT_READ|VM_PROT_WRITE,
- TRUE, VM_PROT_READ|VM_PROT_WRITE);
+ VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
curbuf += PAGE_SIZE;
curbufsize -= PAGE_SIZE;
}
View
4 sys/arch/arm32/arm32/mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.11 1999/03/26 23:41:28 mycroft Exp $ */
+/* $NetBSD: mem.c,v 1.11.10.1 1999/11/15 00:37:10 fvdl Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -125,7 +125,7 @@ mmrw(dev, uio, flags)
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)memhook,
- trunc_page(v), prot, TRUE, prot);
+ trunc_page(v), prot, prot|PMAP_WIRED);
o = uio->uio_offset & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));
error = uiomove((caddr_t)memhook + o, c, uio);
View
34 sys/arch/arm32/arm32/pmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.64 1999/09/12 01:17:01 chs Exp $ */
+/* $NetBSD: pmap.c,v 1.64.4.1 1999/11/15 00:37:11 fvdl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -659,7 +659,7 @@ pmap_map(va, spa, epa, prot)
int prot;
{
while (spa < epa) {
- pmap_enter(pmap_kernel(), va, spa, prot, FALSE, 0);
+ pmap_enter(pmap_kernel(), va, spa, prot, 0);
va += NBPG;
spa += NBPG;
}
@@ -999,7 +999,7 @@ pmap_alloc_l1pt(void)
pa = VM_PAGE_TO_PHYS(m);
pmap_enter(pmap_kernel(), va, pa,
- VM_PROT_READ | VM_PROT_WRITE, TRUE, 0);
+ VM_PROT_READ | VM_PROT_WRITE, PMAP_WIRED);
/* Revoke cacheability and bufferability */
/* XXX should be done better than this */
@@ -1171,7 +1171,7 @@ pmap_pinit(pmap)
/* Map zero page for the pmap. This will also map the L2 for it */
pmap_enter(pmap, 0x00000000, systempage.pv_pa,
- VM_PROT_READ, TRUE, VM_PROT_READ);
+ VM_PROT_READ, VM_PROT_READ | PMAP_WIRED);
}
@@ -1973,7 +1973,7 @@ pmap_protect(pmap, sva, eva, prot)
/*
* void pmap_enter(pmap_t pmap, vm_offset_t va, vm_offset_t pa, vm_prot_t prot,
- * boolean_t wired)
+ * int flags)
*
* Insert the given physical page (p) at
* the specified virtual address (v) in the
@@ -1987,28 +1987,28 @@ pmap_protect(pmap, sva, eva, prot)
* insert this page into the given map NOW.
*/
-void
-pmap_enter(pmap, va, pa, prot, wired, access_type)
+int
+pmap_enter(pmap, va, pa, prot, flags)
pmap_t pmap;
vm_offset_t va;
vm_offset_t pa;
vm_prot_t prot;
- boolean_t wired;
- vm_prot_t access_type;
+ int flags;
{
pt_entry_t *pte;
u_int npte;
int bank, off;
struct pv_entry *pv = NULL;
vm_offset_t opa;
int flags;
+ boolean_t wired = (flags & PMAP_WIRED) != 0;
PDEBUG(5, printf("pmap_enter: V%08lx P%08lx in pmap %p prot=%08x, wired = %d\n",
va, pa, pmap, prot, wired));
/* Valid pmap ? */
if (pmap == NULL)
- return;
+ return (KERN_SUCCESS);
#ifdef DIAGNOSTIC
/* Valid address ? */
@@ -2154,14 +2154,14 @@ pmap_enter(pmap, va, pa, prot, wired, access_type)
if (bank != -1) {
#ifdef DIAGNOSTIC
- if (access_type & ~prot)
+ if ((flags & VM_PROT_ALL) & ~prot)
panic("pmap_enter: access_type exceeds prot");
#endif
npte |= PT_C | PT_B;
- if (access_type & VM_PROT_WRITE) {
+ if (flags & VM_PROT_WRITE) {
npte |= L2_SPAGE | PT_AP(AP_W);
vm_physmem[bank].pmseg.attrs[off] |= PT_H | PT_M;
- } else if (access_type & VM_PROT_ALL) {
+ } else if (flags & VM_PROT_ALL) {
npte |= L2_SPAGE;
vm_physmem[bank].pmseg.attrs[off] |= PT_H;
} else
@@ -2177,7 +2177,7 @@ pmap_enter(pmap, va, pa, prot, wired, access_type)
#ifdef MYCROFT_HACK
if (mycroft_hack)
- printf("pmap_enter: pmap=%p va=%lx pa=%lx prot=%x wired=%d access_type=%x npte=%08x\n", pmap, va, pa, prot, wired, access_type, npte);
+ printf("pmap_enter: pmap=%p va=%lx pa=%lx prot=%x wired=%d access_type=%x npte=%08x\n", pmap, va, pa, prot, wired, flags & VM_PROT_ALL, npte);
#endif
*pte = npte;
@@ -2189,6 +2189,8 @@ pmap_enter(pmap, va, pa, prot, wired, access_type)
cpu_tlb_flushID_SE(va);
PDEBUG(5, printf("pmap_enter: pte = V%p %08x\n", pte, *pte));
+
+ return (KERN_SUCCESS);
}
void
@@ -2197,7 +2199,7 @@ pmap_kenter_pa(va, pa, prot)
paddr_t pa;
vm_prot_t prot;
{
- pmap_enter(pmap_kernel(), va, pa, prot, TRUE, 0);
+ pmap_enter(pmap_kernel(), va, pa, prot, PMAP_WIRED);
}
void
@@ -2210,7 +2212,7 @@ pmap_kenter_pgs(va, pgs, npgs)
for (i = 0; i < npgs; i++, va += PAGE_SIZE) {
pmap_enter(pmap_kernel(), va, VM_PAGE_TO_PHYS(pgs[i]),
- VM_PROT_READ|VM_PROT_WRITE, TRUE, 0);
+ VM_PROT_READ|VM_PROT_WRITE, PMAP_WIRED);
}
}
View
18 sys/arch/arm32/arm32/spl.S
@@ -1,4 +1,4 @@
-/* $NetBSD: spl.S,v 1.6 1998/09/05 04:01:53 mark Exp $ */
+/* $NetBSD: spl.S,v 1.6.14.1 1999/11/15 00:37:11 fvdl Exp $ */
/*
* Copyright (c) 1996-1998 Mark Brinicombe.
@@ -46,13 +46,13 @@
.align 0
Lcurrent_spl_level:
- .word _current_spl_level
+ .word _C_LABEL(current_spl_level)
Lspl_masks:
- .word _spl_masks
+ .word _C_LABEL(spl_masks)
Lspl_mask:
- .word _spl_mask
+ .word _C_LABEL(spl_mask)
ENTRY(raisespl)
mov r3, r0 /* Save the new value */
@@ -70,7 +70,7 @@ ENTRY(raisespl)
str r2, [r1]
stmfd sp!, {r0, lr} /* Preserve registers */
- bl _irq_setmasks /* Update the actual masks */
+ bl _C_LABEL(irq_setmasks) /* Update the actual masks */
ldmfd sp!, {r0, pc} /* Exit */
ENTRY(lowerspl)
@@ -89,8 +89,8 @@ ENTRY(lowerspl)
str r2, [r1]
stmfd sp!, {r0, lr} /* Preserve registers */
- bl _irq_setmasks /* Update the actual masks */
- bl _dosoftints /* Process any pending soft ints */
+ bl _C_LABEL(irq_setmasks) /* Update the actual masks */
+ bl _C_LABEL(dosoftints) /* Process any pending soft ints */
ldmfd sp!, {r0, pc} /* Exit */
ENTRY(splx)
@@ -109,6 +109,6 @@ ENTRY(splx)
str r2, [r1]
stmfd sp!, {r0, lr} /* Preserve registers */
- bl _irq_setmasks /* Update the actual masks */
- bl _dosoftints /* Process any pending soft ints */
+ bl _C_LABEL(irq_setmasks) /* Update the actual masks */
+ bl _C_LABEL(dosoftints) /* Process any pending soft ints */
ldmfd sp!, {r0, pc} /* Exit */
View
4 sys/arch/arm32/arm32/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.45 1999/05/26 22:19:34 thorpej Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.45.4.1 1999/11/15 00:37:12 fvdl Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -248,7 +248,7 @@ cpu_swapin(p)
/* Map the system page */
pmap_enter(p->p_vmspace->vm_map.pmap, 0x00000000, systempage.pv_pa,
- VM_PROT_READ, TRUE, VM_PROT_READ);
+ VM_PROT_READ, VM_PROT_READ|PMAP_WIRED);
}
View
9 sys/arch/arm32/dev/bus_space_notimpl.S
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_notimpl.S,v 1.4 1998/06/28 07:27:51 thorpej Exp $ */
+/* $NetBSD: bus_space_notimpl.S,v 1.4.16.1 1999/11/15 00:37:12 fvdl Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -45,8 +45,9 @@
#define NAME(func) __C(BUS_SPACE,__C(_bs_,func))
#define LNAME(func) __C(L,NAME(func))
-#define GLOBAL(func) .global __C(_,NAME(func))
-#define LABEL(func) __C(_,NAME(func)):
+#define __L(x) _C_LABEL(x)
+#define GLOBAL(func) .global __L(NAME(func))
+#define LABEL(func) __L(NAME(func)):
#define LLABEL(func) LNAME(func):
#define FTEXT(func,text) __S(__C(NAME(func),text))
@@ -58,7 +59,7 @@ LABEL(func) ; \
stmfd sp!, {r0-r3} ; \
adr r0, LNAME(__C(func,_text)) ; \
mov r1, sp ; \
- b _panic ; \
+ b _C_LABEL(panic) ; \
; \
LLABEL(__C(func,_text)) ; \
.asciz FTEXT(func,: args at 0x%08x\n) ; \
View
68 sys/arch/arm32/footbridge/footbridge_irq.S
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_irq.S,v 1.3 1999/03/24 05:50:56 mrg Exp $ */
+/* $NetBSD: footbridge_irq.S,v 1.3.10.1 1999/11/15 00:37:13 fvdl Exp $ */
/*
* Copyright (c) 1998 Mark Brinicombe.
@@ -62,19 +62,19 @@
*/
Lintr_disabled_mask:
- .word _intr_disabled_mask
+ .word _C_LABEL(intr_disabled_mask)
Lintr_claimed_mask:
- .word _intr_claimed_mask
+ .word _C_LABEL(intr_claimed_mask)
Lcurrent_spl_level:
- .word _current_spl_level
+ .word _C_LABEL(current_spl_level)
Lcurrent_intr_depth:
- .word _current_intr_depth
+ .word _C_LABEL(current_intr_depth)
Lspl_masks:
- .word _spl_masks
+ .word _C_LABEL(spl_masks)
/*
* Regsister usage
@@ -157,7 +157,7 @@ Lfind_highest_ipl:
str r6, [r7] /* new current mask */
/* Update the DC21285 irq masks */
- bl _irq_setmasks_nointr
+ bl _C_LABEL(irq_setmasks_nointr)
mrs r0, cpsr_all /* Enable IRQ's */
bic r0, r0, #I32_bit
@@ -175,7 +175,7 @@ irqloop:
teq r6, #0x00000000 /* Do we have a handler */
moveq r0, r8 /* IRQ requests as arg 0 */
- beq _stray_irqhandler /* call special handler */
+ beq _C_LABEL(stray_irqhandler) /* call special handler */
ldr r0, Lcnt
ldr r1, [r0, #(V_INTR)]
@@ -234,9 +234,9 @@ nextirq:
bic r0, r0, r2 /* mask out disabled */
ldr r1, Lintr_current_mask /* get claimed mask */
str r0, [r1] /* new current mask */
- bl _irq_setmasks
+ bl _C_LABEL(irq_setmasks)
- bl _dosoftints /* Handle the soft interrupts */
+ bl _C_LABEL(dosoftints) /* Handle the soft interrupts */
/* Manage AST's. Maybe this should be done as a soft interrupt ? */
ldr r0, [sp] /* Get the SPSR from stack */
@@ -292,7 +292,7 @@ irqast:
msr cpsr_all, r2
mov r0, sp
- bl _ast
+ bl _C_LABEL(ast)
/* Kill IRQ's in preparation for exit */
@@ -305,22 +305,22 @@ irqast:
movs pc, lr /* Exit */
Lcnt:
- .word _uvmexp
+ .word _C_LABEL(uvmexp)
Lintrcnt:
- .word _intrcnt
+ .word _C_LABEL(intrcnt)
irqhandlers:
- .word _irqhandlers /* Pointer to array of irqhandlers */
+ .word _C_LABEL(irqhandlers) /* Pointer to array of irqhandlers */
Lastpending:
- .word _astpending
+ .word _C_LABEL(astpending)
Lspl_mask:
- .word _spl_mask /* irq's allowed at current spl level */
+ .word _C_LABEL(spl_mask) /* irq's allowed at current spl level */
Lintr_current_mask:
- .word _intr_current_mask
+ .word _C_LABEL(intr_current_mask)
ENTRY(irq_setmasks)
/* Disable interrupts */
@@ -363,15 +363,15 @@ ENTRY(irq_setmasks_nointr)
/* These symbols are used by vmstat */
.text
- .global __intrnames
-__intrnames:
- .word _intrnames
+ .global _C_LABEL(_intrnames)
+_C_LABEL(_intrnames):
+ .word _C_LABEL(intrnames)
.data
.align 0
- .global _intrnames, _sintrnames, _eintrnames
- .global _intrcnt, _sintrcnt, _eintrcnt
-_intrnames:
+ .global _C_LABEL(intrnames), _C_LABEL(sintrnames), _C_LABEL(eintrnames)
+ .global _C_LABEL(intrcnt), _C_LABEL(sintrcnt), _C_LABEL(eintrcnt)
+_C_LABEL(intrnames):
.asciz "interrupt 0 "
.asciz "interrupt 1 "
.asciz "interrupt 2 "
@@ -404,7 +404,7 @@ _intrnames:
.asciz "interrupt 29 "
.asciz "interrupt 30 "
.asciz "interrupt 31 "
-_sintrnames:
+_C_LABEL(sintrnames):
.asciz "soft int 0 "
.asciz "soft int 1 "
.asciz "soft int 2 "
@@ -437,29 +437,29 @@ _sintrnames:
.asciz "soft int 29 "
.asciz "soft int 30 "
.asciz "soft int 31 "
-_eintrnames:
+_C_LABEL(eintrnames):
.bss
.align 0
- .global _intrcnt, _sintrcnt, _eintrcnt
-_intrcnt:
+ .global _C_LABEL(intrcnt), _C_LABEL(sintrcnt), _C_LABEL(eintrcnt)
+_C_LABEL(intrcnt):
.space 32*4 /* XXX Should be linked to number of interrupts */
-_sintrcnt:
+_C_LABEL(sintrcnt):
.space 32*4 /* XXX Should be linked to number of soft ints */
-_eintrcnt:
+_C_LABEL(eintrcnt):
#else /* IRQSTATS */
/* Dummy entries to keep vmstat happy */
.text
- .globl _intrnames, _eintrnames, _intrcnt, _eintrcnt
-_intrnames:
+ .globl _C_LABEL(intrnames), _C_LABEL(eintrnames), _C_LABEL(intrcnt), _C_LABEL(eintrcnt)
+_C_LABEL(intrnames):
.long 0
-_eintrnames:
+_C_LABEL(eintrnames):
-_intrcnt:
+_C_LABEL(intrcnt):
.long 0
-_eintrcnt:
+_C_LABEL(eintrcnt):
#endif /* IRQSTATS */
/* End of footbridge_irq.S */
View
4 sys/arch/arm32/fpe-arm/armfpe_glue.S
@@ -1,4 +1,4 @@
-/* $NetBSD: armfpe_glue.S,v 1.12 1998/04/01 22:55:05 mark Exp $ */
+/* $NetBSD: armfpe_glue.S,v 1.12.16.1 1999/11/15 00:37:14 fvdl Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -178,7 +178,7 @@ ENTRY_NP(arm_fpe_post_proc)
ENTRY_NP(arm_fpe_panic)
adr r0, Lfpe_panic_text
- b _panic
+ b _C_LABEL(panic)
Lfpe_panic_text:
.asciz "armfpe: we are panicing"
View
28 sys/arch/arm32/include/asm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: asm.h,v 1.12 1999/05/06 13:54:06 kleink Exp $ */
+/* $NetBSD: asm.h,v 1.12.4.1 1999/11/15 00:37:14 fvdl Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -52,15 +52,25 @@
# define _END_ENTRY _END_ENTRY_NP
#endif
+#ifdef __ELF__
+# define _C_FUNC(x) x
+# define _C_LABEL(x) x
+#else
+# ifdef __STDC__
+# define _C_FUNC(x) _ ## x
+# define _C_LABEL(x) _ ## x
+# else
+# define _C_FUNC(x) _/**/x
+# define _C_LABEL(x) _/**/x
+# endif
+#endif
+
#ifdef __STDC__
-# define _C_FUNC(x) _ ## x
-# define _C_LABEL(x) _ ## x
# define __CONCAT(x,y) x ## y
# define __STRING(x) #x
#else
-# define _C_FUNC(x) _/**/x
-# define _C_LABEL(x) _/**/x
# define __CONCAT(x,y) x/**/y
+# define __STRING(x) "x"
#endif
#define _ASM_FUNC(x) x
@@ -87,12 +97,14 @@
#define RCSID(x) .text; .asciz x
#ifdef __STDC__
-#define __STRING(x) #x
#define WARN_REFERENCES(sym,msg) \
.stabs msg ## ,30,0,0,0 ; \
- .stabs __STRING(_ ## sym) ## ,1,0,0,0
+ .stabs __STRING(_C_LABEL(sym)) ## ,1,0,0,0
+#elifdef __ELF__
+#define WARN_REFERENCES(sym,msg) \
+ .stabs msg,30,0,0,0 ; \
+ .stabs __STRING(sym),1,0,0,0
#else
-#define __STRING(x) "x"
#define WARN_REFERENCES(sym,msg) \
.stabs msg,30,0,0,0 ; \
.stabs __STRING(_/**/sym),1,0,0,0
View
14 sys/arch/arm32/iomd/iomd_fiq.S
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd_fiq.S,v 1.5 1998/04/01 22:53:32 mark Exp $ */
+/* $NetBSD: iomd_fiq.S,v 1.5.16.1 1999/11/15 00:37:15 fvdl Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -73,12 +73,12 @@ ENTRY_NP(floppy_read_fiq)
ldrb r8, [r9]
tst r8, #0x01
addne r13, r13, #0x00000001
- bne _floppy_read_fiq
+ bne _C_LABEL(floppy_read_fiq)
#endif
subs pc, lr, #0x00000004
- .global _floppy_read_fiq_end
-_floppy_read_fiq_end:
+ .global _C_LABEL(floppy_read_fiq_end)
+_C_LABEL(floppy_read_fiq_end):
/*
@@ -103,11 +103,11 @@ ENTRY_NP(floppy_write_fiq)
ldrb r8, [r9]
tst r8, #0x01
addne r13, r13, #0x00000001
- bne _floppy_write_fiq
+ bne _C_LABEL(floppy_write_fiq)
#endif
subs pc, lr, #0x00000004
- .global _floppy_write_fiq_end
-_floppy_write_fiq_end:
+ .global _C_LABEL(floppy_write_fiq_end)
+_C_LABEL(floppy_write_fiq_end):
/* End of fiq.S */
View
6 sys/arch/arm32/iomd/iomd_iic.S
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd_iic.S,v 1.2 1998/04/01 22:52:24 mark Exp $ */
+/* $NetBSD: iomd_iic.S,v 1.2.16.1 1999/11/15 00:37:16 fvdl Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -116,7 +116,7 @@ ENTRY(iic_set_state)
mov r0, #(IIC_BITDELAY)
/* Exit via iic_delay routine */
- b _iic_delay
+ b _C_LABEL(iic_delay)
ENTRY(iic_set_state_and_ack)
/*
@@ -188,7 +188,7 @@ Liic_set_state_and_ack_loop:
mov r0, #(IIC_BITDELAY)
/* Exit via iic_delay routine */
- b _iic_delay
+ b _C_LABEL(iic_delay)
ENTRY(iic_delay)
View
6 sys/arch/arm32/iomd/iomd_io_asm.S
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd_io_asm.S,v 1.3 1998/06/28 07:27:52 thorpej Exp $ */
+/* $NetBSD: iomd_io_asm.S,v 1.3.16.1 1999/11/15 00:37:16 fvdl Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -84,7 +84,7 @@ ENTRY(iomd_bs_rm_2)
add r0, r1, r2, lsl #2
mov r1, r3
ldr r2, [sp, #0]
- b _insw16
+ b _C_LABEL(insw16)
/*
* write multiple
@@ -94,4 +94,4 @@ ENTRY(iomd_bs_wm_2)
add r0, r1, r2, lsl #2
mov r1, r3
ldr r2, [sp, #0]
- b _outsw16
+ b _C_LABEL(outsw16)
View
62 sys/arch/arm32/iomd/iomd_irq.S
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd_irq.S,v 1.20 1999/03/24 05:50:56 mrg Exp $ */
+/* $NetBSD: iomd_irq.S,v 1.20.10.1 1999/11/15 00:37:16 fvdl Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -68,16 +68,16 @@
*/
Ldisabled_mask:
- .word _disabled_mask
+ .word _C_LABEL(disabled_mask)
Lcurrent_spl_level:
- .word _current_spl_level
+ .word _C_LABEL(current_spl_level)
Lcurrent_intr_depth:
- .word _current_intr_depth
+ .word _C_LABEL(current_intr_depth)
Lspl_masks:
- .word _spl_masks
+ .word _C_LABEL(spl_masks)
/*
* Regsister usage
@@ -170,7 +170,7 @@ Lfind_highest_ipl:
stmfd sp!, {r1}
/* Update the IOMD irq masks */
- bl _irq_setmasks
+ bl _C_LABEL(irq_setmasks)
mrs r0, cpsr_all /* Enable IRQ's */
bic r0, r0, #I32_bit
@@ -188,7 +188,7 @@ irqloop:
teq r6, #0x00000000 /* Do we have a handler */
moveq r0, r8 /* IRQ requests as arg 0 */
- beq _stray_irqhandler /* call special handler */
+ beq _C_LABEL(stray_irqhandler) /* call special handler */
ldr r0, Lcnt /* Stat info */
ldr r1, [r0, #(V_INTR)]
@@ -244,9 +244,9 @@ nextirq:
ldmfd sp!, {r2}
ldr r1, Ldisabled_mask
str r2, [r1]
- bl _irq_setmasks
+ bl _C_LABEL(irq_setmasks)
- bl _dosoftints /* Handle the soft interrupts */
+ bl _C_LABEL(dosoftints) /* Handle the soft interrupts */
/* Manage AST's. Maybe this should be done as a soft interrupt ? */
ldr r0, [sp] /* Get the SPSR from stack */
@@ -302,7 +302,7 @@ irqast:
msr cpsr_all, r2
mov r0, sp
- bl _ast
+ bl _C_LABEL(ast)
/* Kill IRQ's in preparation for exit */
mrs r0, cpsr_all
@@ -316,10 +316,10 @@ irqast:
Lspl_mask:
- .word _spl_mask /* irq's allowed at current spl level */
+ .word _C_LABEL(spl_mask) /* irq's allowed at current spl level */
Lcurrent_mask:
- .word _current_mask /* irq's that are usable */
+ .word _C_LABEL(current_mask) /* irq's that are usable */
ENTRY(irq_setmasks)
/* Disable interrupts */
@@ -359,30 +359,30 @@ ENTRY(irq_setmasks)
mov pc, lr
Lcnt:
- .word _uvmexp
+ .word _C_LABEL(uvmexp)
Lintrcnt:
- .word _intrcnt
+ .word _C_LABEL(intrcnt)
Lirqhandlers:
- .word _irqhandlers /* Pointer to array of irqhandlers */
+ .word _C_LABEL(irqhandlers) /* Pointer to array of irqhandlers */
Lastpending:
- .word _astpending
+ .word _C_LABEL(astpending)
#ifdef IRQSTATS
/* These symbols are used by vmstat */
.text
- .global __intrnames
-__intrnames:
- .word _intrnames
+ .global _C_LABEL(_intrnames)
+_C_LABEL(_intrnames):
+ .word _C_LABEL(intrnames)
.data
- .globl _intrnames, _eintrnames, _intrcnt, _sintrcnt, _eintrcnt
-_intrnames:
+ .globl _C_LABEL(intrnames), _C_LABEL(eintrnames), _C_LABEL(intrcnt), _C_LABEL(sintrcnt), _C_LABEL(eintrcnt)
+_C_LABEL(intrnames):
.asciz "interrupt 0 "
.asciz "interrupt 1 " /* reserved0 */
.asciz "interrupt 2 "
@@ -416,7 +416,7 @@ _intrnames:
.asciz "exp card 6 "
.asciz "exp card 7 "
-_sintrnames:
+_C_LABEL(sintrnames):
.asciz "softclock "
.asciz "softnet "
.asciz "softserial "
@@ -449,29 +449,29 @@ _sintrnames:
.asciz "softintr 29 "
.asciz "softintr 30 "
.asciz "softintr 31 "
-_eintrnames:
+_C_LABEL(eintrnames):
.bss
.align 0
-_intrcnt:
+_C_LABEL(intrcnt):
.space 32*4 /* XXX Should be linked to number of interrupts */
-_sintrcnt:
+_C_LABEL(sintrcnt):
.space 32*4 /* XXX Should be linked to number of interrupts */
-_eintrcnt:
+_C_LABEL(eintrcnt):
#else /* IRQSTATS */
/* Dummy entries to keep vmstat happy */
.text
- .globl _intrnames, _eintrnames, _intrcnt, _eintrcnt
-_intrnames:
+ .globl _C_LABEL(intrnames), _C_LABEL(eintrnames), _C_LABEL(intrcnt), _C_LABEL(eintrcnt)
+_C_LABEL(intrnames):
.long 0
-_eintrnames:
+_C_LABEL(eintrnames):
-_intrcnt:
+_C_LABEL(intrcnt):
.long 0
-_eintrcnt:
+_C_LABEL(eintrcnt):
#endif /* IRQSTATS */
/* FIQ code */
View
66 sys/arch/arm32/isa/isa_irq.S
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_irq.S,v 1.6 1999/03/24 05:50:56 mrg Exp $ */
+/* $NetBSD: isa_irq.S,v 1.6.10.1 1999/11/15 00:37:17 fvdl Exp $ */
/*
* Copyright 1997
@@ -104,19 +104,19 @@
*/
Ldisabled_mask:
- .word _disabled_mask
+ .word _C_LABEL(disabled_mask)
Lcurrent_spl_level:
- .word _current_spl_level
+ .word _C_LABEL(current_spl_level)
Lcurrent_intr_depth:
- .word _current_intr_depth
+ .word _C_LABEL(current_intr_depth)
Lvam_io_data:
- .word _isa_io_bs_tag
+ .word _C_LABEL(isa_io_bs_tag)
Lspl_masks:
- .word _spl_masks
+ .word _C_LABEL(spl_masks)
/*
* Register usage
@@ -213,7 +213,7 @@ Lfind_highest_ipl:
stmfd sp!, {r1}
/* Update the IOMD irq masks */
- bl _irq_setmasks
+ bl _C_LABEL(irq_setmasks)
mrs r0, cpsr_all /* Enable IRQ's */
bic r0, r0, #I32_bit
@@ -231,7 +231,7 @@ irqloop:
teq r6, #0x00000000 /* Do we have a handler */
moveq r0, r8 /* IRQ requests as arg 0 */
- beq _stray_irqhandler /* call special handler */
+ beq _C_LABEL(stray_irqhandler) /* call special handler */
ldr r0, Lcnt
ldr r1, [r0, #(V_INTR)]
@@ -283,9 +283,9 @@ nextirq:
ldmfd sp!, {r2}
ldr r1, Ldisabled_mask
str r2, [r1]
- bl _irq_setmasks
+ bl _C_LABEL(irq_setmasks)
- bl _dosoftints /* Handle the soft interrupts */
+ bl _C_LABEL(dosoftints) /* Handle the soft interrupts */
/* Manage AST's. Maybe this should be done as a soft interrupt ? */
ldr r0, [sp] /* Get the SPSR from stack */
@@ -341,7 +341,7 @@ irqast:
msr cpsr_all, r2
mov r0, sp
- bl _ast
+ bl _C_LABEL(ast)
/* Kill IRQ's in preparation for exit */
mrs r0, cpsr_all
@@ -355,10 +355,10 @@ irqast:
Lspl_mask:
- .word _spl_mask /* irq's allowed at current spl level */
+ .word _C_LABEL(spl_mask) /* irq's allowed at current spl level */
Lcurrent_mask:
- .word _current_mask /* irq's that are usable */
+ .word _C_LABEL(current_mask) /* irq's that are usable */
ENTRY(irq_setmasks)
/* Disable interrupts */
@@ -434,33 +434,33 @@ ENTRY(irq_setmasks)
mov pc, lr
Lcnt:
- .word _uvmexp
+ .word _C_LABEL(uvmexp)
Lintrcnt:
- .word _intrcnt
+ .word _C_LABEL(intrcnt)
Li8259_mask:
- .word _i8259_mask
+ .word _C_LABEL(i8259_mask)
Lirqhandlers:
- .word _irqhandlers /* Pointer to array of irqhandlers */
+ .word _C_LABEL(irqhandlers) /* Pointer to array of irqhandlers */
Lastpending:
- .word _astpending
+ .word _C_LABEL(astpending)
#ifdef IRQSTATS
/* These symbols are used by vmstat */
.text
- .global __intrnames
-__intrnames:
- .word _intrnames
+ .global _C_LABEL(_intrnames)
+_C_LABEL(_intrnames):
+ .word _C_LABEL(intrnames)
.data
/* XXX fix */
- .globl _intrnames, _eintrnames, _intrcnt, _sintrcnt, _eintrcnt
-_intrnames:
+ .globl _C_LABEL(intrnames), _C_LABEL(eintrnames), _C_LABEL(intrcnt), _C_LABEL(sintrcnt), _C_LABEL(eintrcnt)
+_C_LABEL(intrnames):
.asciz "interrupt 0 "
.asciz "interrupt 1 "
.asciz "interrupt 2 "
@@ -494,7 +494,7 @@ _intrnames:
.asciz "interrupt 30 "
.asciz "interrupt 31 "
-_sintrnames:
+_C_LABEL(sintrnames):
.asciz "soft int 0 "
.asciz "soft int 1 "
.asciz "soft int 2 "
@@ -527,28 +527,28 @@ _sintrnames:
.asciz "soft int 29 "
.asciz "soft int 30 "
.asciz "soft int 31 "
-_eintrnames:
+_C_LABEL(eintrnames):
.bss
.align 0
-_intrcnt:
+_C_LABEL(intrcnt):
.space 32*4 /* XXX Should be linked to number of interrupts */
-_sintrcnt:
+_C_LABEL(sintrcnt):
.space 32*4 /* XXX Should be linked to number of soft ints */
-_eintrcnt:
+_C_LABEL(eintrcnt):
#else /* IRQSTATS */
/* Dummy entries to keep vmstat happy */
.text
- .globl _intrnames, _eintrnames, _intrcnt, _eintrcnt
-_intrnames:
+ .globl _C_LABEL(intrnames), _C_LABEL(eintrnames), _C_LABEL(intrcnt), _C_LABEL(eintrcnt)
+_C_LABEL(intrnames):
.long 0
-_eintrnames:
+_C_LABEL(eintrnames):
-_intrcnt:
+_C_LABEL(intrcnt):
.long 0
-_eintrcnt:
+_C_LABEL(eintrcnt):