Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/mvme68k Add register prefixes.
details: https://anonhg.NetBSD.org/src/rev/d745d1a1906c
branches: trunk
changeset: 499780:d745d1a1906c
user: scw <scw%NetBSD.org@localhost>
date: Wed Nov 29 09:09:39 2000 +0000
description:
Add register prefixes.
diffstat:
sys/arch/mvme68k/include/prom.h | 10 +-
sys/arch/mvme68k/mvme68k/locore.s | 1324 ++++++++++++++++++------------------
2 files changed, 667 insertions(+), 667 deletions(-)
diffs (truncated from 2116 to 300 lines):
diff -r 16b4d4929381 -r d745d1a1906c sys/arch/mvme68k/include/prom.h
--- a/sys/arch/mvme68k/include/prom.h Wed Nov 29 08:28:55 2000 +0000
+++ b/sys/arch/mvme68k/include/prom.h Wed Nov 29 09:09:39 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: prom.h,v 1.5 1998/08/01 11:22:51 scw Exp $ */
+/* $NetBSD: prom.h,v 1.6 2000/11/29 09:10:10 scw Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -158,13 +158,13 @@
#define MVMEPROM_CALL(x) \
__asm__ __volatile (__CONCAT("trap #15; .short ", __STRING(x)) )
#define MVMEPROM_NOARG() \
- __asm__ __volatile ("clrl sp@-")
+ __asm__ __volatile ("clrl %%sp@-")
#define MVMEPROM_ARG1(arg) \
- __asm__ __volatile ("movel %0, sp@-"::"d" (arg))
+ __asm__ __volatile ("movel %0, %%sp@-"::"d" (arg))
#define MVMEPROM_ARG2(arg) \
- __asm__ __volatile ("movel %0, sp@-"::"d" (arg))
+ __asm__ __volatile ("movel %0, %%sp@-"::"d" (arg))
#define MVMEPROM_GETRES(ret) \
- __asm__ __volatile ("movel sp@+,%0": "=d" (ret):)
+ __asm__ __volatile ("movel %%sp@+,%0": "=d" (ret):)
#define MVMEPROM_RETURN(ret) \
MVMEPROM_GETRES(ret); \
return (ret); /* return a value (int) */
diff -r 16b4d4929381 -r d745d1a1906c sys/arch/mvme68k/mvme68k/locore.s
--- a/sys/arch/mvme68k/mvme68k/locore.s Wed Nov 29 08:28:55 2000 +0000
+++ b/sys/arch/mvme68k/mvme68k/locore.s Wed Nov 29 09:09:39 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.70 2000/11/26 11:47:25 jdolecek Exp $ */
+/* $NetBSD: locore.s,v 1.71 2000/11/29 09:09:39 scw Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -110,83 +110,83 @@
* start of kernel and .text!
*/
ASENTRY_NOPROFILE(start)
- movw #PSL_HIGHIPL,sr | no interrupts
- movl #0,a5 | RAM starts at 0 (a5)
- movl sp@(4), d7 | get boothowto
- movl sp@(8), d6 | get bootaddr
- movl sp@(12),d5 | get bootctrllun
- movl sp@(16),d4 | get bootdevlun
- movl sp@(20),d3 | get bootpart
- movl sp@(24),d2 | get esyms
+ movw #PSL_HIGHIPL,%sr | no interrupts
+ movl #0,%a5 | RAM starts at 0 (a5)
+ movl %sp@(4), %d7 | get boothowto
+ movl %sp@(8), %d6 | get bootaddr
+ movl %sp@(12),%d5 | get bootctrllun
+ movl %sp@(16),%d4 | get bootdevlun
+ movl %sp@(20),%d3 | get bootpart
+ movl %sp@(24),%d2 | get esyms
- RELOC(bootpart,a0)
- movl d3, a0@ | save bootpart
- RELOC(bootdevlun,a0)
- movl d4, a0@ | save bootdevlun
- RELOC(bootctrllun,a0)
- movl d5, a0@ | save booctrllun
- RELOC(bootaddr,a0)
- movl d6, a0@ | save bootaddr
- RELOC(boothowto,a0)
- movl d7, a0@ | save boothowto
+ RELOC(bootpart,%a0)
+ movl %d3, %a0@ | save bootpart
+ RELOC(bootdevlun,%a0)
+ movl %d4, %a0@ | save bootdevlun
+ RELOC(bootctrllun,%a0)
+ movl %d5, %a0@ | save booctrllun
+ RELOC(bootaddr,%a0)
+ movl %d6, %a0@ | save bootaddr
+ RELOC(boothowto,%a0)
+ movl %d7, %a0@ | save boothowto
/* note: d3-d7 free, d2 still in use */
- ASRELOC(tmpstk, a0)
- movl a0,sp | give ourselves a temporary stack
+ ASRELOC(tmpstk, %a0)
+ movl %a0,%sp | give ourselves a temporary stack
- RELOC(edata,a0) | clear out BSS
- movl #_C_LABEL(end) - 4, d0 | (must be <= 256 kB)
- subl #_C_LABEL(edata), d0
- lsrl #2,d0
-1: clrl a0@+
- dbra d0,1b
+ RELOC(edata,%a0) | clear out BSS
+ movl #_C_LABEL(end) - 4, %d0 | (must be <= 256 kB)
+ subl #_C_LABEL(edata), %d0
+ lsrl #2,%d0
+1: clrl %a0@+
+ dbra %d0,1b
- RELOC(esym, a0)
- movl d2,a0@ | store end of symbol table
+ RELOC(esym, %a0)
+ movl %d2,%a0@ | store end of symbol table
/* d2 now free */
- RELOC(lowram, a0)
- movl a5,a0@ | store start of physical memory
- movl #CACHE_OFF,d0
- movc d0,cacr | clear and disable on-chip cache(s)
+ RELOC(lowram, %a0)
+ movl %a5,%a0@ | store start of physical memory
+ movl #CACHE_OFF,%d0
+ movc %d0,%cacr | clear and disable on-chip cache(s)
/* ask the Bug what we are... */
- clrl sp@-
+ clrl %sp@-
CALLBUG(MVMEPROM_GETBRDID)
- movl sp@+,a1
+ movl %sp@+,%a1
/* copy to a struct mvmeprom_brdid */
- movl #MVMEPROM_BRDID_SIZE,d0
- RELOC(boardid,a0)
-1: movb a1@+,a0@+
- subql #1,d0
+ movl #MVMEPROM_BRDID_SIZE,%d0
+ RELOC(boardid,%a0)
+1: movb %a1@+,%a0@+
+ subql #1,%d0
bne 1b
/*
* Grab the model number from _boardid and use the value
* to setup machineid, cputype, and mmutype.
*/
- clrl d0
- RELOC(boardid,a1)
- movw a1@(MVMEPROM_BRDID_MODEL_OFFSET),d0
- RELOC(machineid,a0)
- movl d0,a0@
+ clrl %d0
+ RELOC(boardid,%a1)
+ movw %a1@(MVMEPROM_BRDID_MODEL_OFFSET),%d0
+ RELOC(machineid,%a0)
+ movl %d0,%a0@
- ASRELOC(Lbrdid2mach,a0)
+ ASRELOC(Lbrdid2mach,%a0)
Lbrdmatch:
- cmpw a0@+,d0
+ cmpw %a0@+,%d0
beqs Lgotmatch
- addw #0x12,a0 | Each entry is 20-2 bytes long
- tstw a0@
+ addw #0x12,%a0 | Each entry is 20-2 bytes long
+ tstw %a0@
bnes Lbrdmatch
/*
* If we fall to here, the board is not supported.
* Print a warning, then drop out to the Bug.
*/
- movl #Lenotconf,sp@-
- movl #Lnotconf,sp@-
+ movl #Lenotconf,%sp@-
+ movl #Lnotconf,%sp@-
CALLBUG(MVMEPROM_OUTSTRCRLF)
- addql #8,sp | clean up stack after call
+ addql #8,%sp | clean up stack after call
CALLBUG(MVMEPROM_EXIT)
/* NOTREACHED */
@@ -252,25 +252,25 @@
* a0 points to the matching entry in Lbrdid2mach.
*/
Lgotmatch:
- movew a0@+,d1 | Copy the CPU type
- extl d1
- RELOC(cputype,a1)
- movel d1,a1@
- movew a0@+,d1 | Copy the MMU type
- extl d1
- RELOC(mmutype,a1)
- movel d1,a1@
- movew a0@+,d1 | Copy the FPU type
- extl d1
- RELOC(fputype,a1)
- movel d1,a1@
- movel a0@+,a2 | Fetch the bus error vector
- RELOC(vectab,a1)
- movl a2,a1@(8)
- movel a0@+,a2 | Fetch the address error vector
- movl a2,a1@(12)
- movel a0@,a0 | Finally, the board-specific init code
- jmp a0@
+ movew %a0@+,%d1 | Copy the CPU type
+ extl %d1
+ RELOC(cputype,%a1)
+ movel %d1,%a1@
+ movew %a0@+,%d1 | Copy the MMU type
+ extl %d1
+ RELOC(mmutype,%a1)
+ movel %d1,%a1@
+ movew %a0@+,%d1 | Copy the FPU type
+ extl %d1
+ RELOC(fputype,%a1)
+ movel %d1,%a1@
+ movel %a0@+,%a2 | Fetch the bus error vector
+ RELOC(vectab,%a1)
+ movl %a2,%a1@(8)
+ movel %a0@+,%a2 | Fetch the address error vector
+ movl %a2,%a1@(12)
+ movel %a0@,%a0 | Finally, the board-specific init code
+ jmp %a0@
#ifdef MVME147
@@ -283,68 +283,68 @@
/* XXXCDC SHUTUP 147 CALL */
/* Save our ethernet address */
- RELOC(mvme_ea, a0)
- lea 0xfffe0778,a1 | XXXCDC -- HARDWIRED HEX
- movb #0x08,a0@+
- clrb a0@+
- movb #0x3e,a0@+
- movql #0x0f,d0
- andb a1@+,d0
- orb #0x20,d0
- movb d0,a0@+
- movb a1@+,a0@+
- movb a1@,a0@
+ RELOC(mvme_ea, %a0)
+ lea 0xfffe0778,%a1 | XXXCDC -- HARDWIRED HEX
+ movb #0x08,%a0@+
+ clrb %a0@+
+ movb #0x3e,%a0@+
+ movql #0x0f,%d0
+ andb %a1@+,%d0
+ orb #0x20,%d0
+ movb %d0,%a0@+
+ movb %a1@+,%a0@+
+ movb %a1@,%a0@
/*
* Fix up the physical addresses of the MVME147's onboard
* I/O registers.
*/
- RELOC(intiobase_phys, a0);
- movl #INTIOBASE147,a0@
- RELOC(intiotop_phys, a0);
- movl #INTIOTOP147,a0@
+ RELOC(intiobase_phys, %a0);
+ movl #INTIOBASE147,%a0@
+ RELOC(intiotop_phys, %a0);
+ movl #INTIOTOP147,%a0@
/* initialise list of physical memory segments for pmap_bootstrap */
- RELOC(phys_seg_list, a0)
- movl a5,a0@ | phys_seg_list[0].ps_start
- movl 0xfffe0774,d1 | End + 1 of onboard memory
- movl d1,a0@(4) | phys_seg_list[0].ps_end
- clrl a0@(8) | phys_seg_list[0].ps_startpage
+ RELOC(phys_seg_list, %a0)
+ movl %a5,%a0@ | phys_seg_list[0].ps_start
+ movl 0xfffe0774,%d1 | End + 1 of onboard memory
+ movl %d1,%a0@(4) | phys_seg_list[0].ps_end
+ clrl %a0@(8) | phys_seg_list[0].ps_startpage
/* offboard RAM */
- clrl a0@(0x0c) | phys_seg_list[1].ps_start
- movl #NBPG-1,d0
- addl 0xfffe0764,d0 | Start of offboard segment
- andl #-NBPG,d0 | Round up to page boundary
+ clrl %a0@(0x0c) | phys_seg_list[1].ps_start
+ movl #NBPG-1,%d0
+ addl 0xfffe0764,%d0 | Start of offboard segment
+ andl #-NBPG,%d0 | Round up to page boundary
beq Lsavmaxmem | Jump if none defined
- movl #NBPG,d1 | Note: implicit '+1'
- addl 0xfffe0768,d1 | End of offboard segment
- andl #-NBPG,d1 | Round up to page boundary
- cmpl d1,d0 | Quick and dirty validity check
+ movl #NBPG,%d1 | Note: implicit '+1'
+ addl 0xfffe0768,%d1 | End of offboard segment
+ andl #-NBPG,%d1 | Round up to page boundary
+ cmpl %d1,%d0 | Quick and dirty validity check
bcss Loff_ok | Yup, looks good.
- movel a0@(4),d1 | Just use onboard RAM otherwise
+ movel %a0@(4),%d1 | Just use onboard RAM otherwise
bras Lsavmaxmem
Loff_ok:
- movl d0,a0@(0x0c) | phys_seg_list[1].ps_start
- movl d1,a0@(0x10) | phys_seg_list[1].ps_end
- clrl a0@(0x14) | phys_seg_list[1].ps_startpage
+ movl %d0,%a0@(0x0c) | phys_seg_list[1].ps_start
+ movl %d1,%a0@(0x10) | phys_seg_list[1].ps_end
+ clrl %a0@(0x14) | phys_seg_list[1].ps_startpage
/*
* Offboard RAM needs to be cleared to zero to initialise parity
* on most VMEbus RAM cards. Without this, some cards will buserr
Home |
Main Index |
Thread Index |
Old Index