Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/amiga/stand/bootblock More missing register prefixe...



details:   https://anonhg.NetBSD.org/src/rev/55263010d09c
branches:  trunk
changeset: 504438:55263010d09c
user:      mhitch <mhitch%NetBSD.org@localhost>
date:      Fri Mar 02 16:43:25 2001 +0000

description:
More missing register prefixes and _C_LABEL()s for ELF.  Should now compile
with ELF, but still needs an "elf2bb" program.

diffstat:

 sys/arch/amiga/stand/bootblock/boot/alloc.s    |    6 +-
 sys/arch/amiga/stand/bootblock/boot/ashrdi3.s  |    6 +-
 sys/arch/amiga/stand/bootblock/boot/bbstart.s  |   36 ++++----
 sys/arch/amiga/stand/bootblock/boot/bcopy.s    |    8 +-
 sys/arch/amiga/stand/bootblock/boot/libstubs.s |  104 ++++++++++++------------
 sys/arch/amiga/stand/bootblock/boot/muldi3.s   |   16 +-
 sys/arch/amiga/stand/bootblock/boot/printf.s   |    5 +-
 sys/arch/amiga/stand/bootblock/boot/startit.s  |   70 ++++++++--------
 sys/arch/amiga/stand/bootblock/txlt/txlt.l     |    4 +-
 9 files changed, 127 insertions(+), 128 deletions(-)

diffs (truncated from 702 to 300 lines):

diff -r 8acdba3df7e4 -r 55263010d09c sys/arch/amiga/stand/bootblock/boot/alloc.s
--- a/sys/arch/amiga/stand/bootblock/boot/alloc.s       Fri Mar 02 16:29:41 2001 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/alloc.s       Fri Mar 02 16:43:25 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: alloc.s,v 1.6 2001/03/01 21:32:53 is Exp $ */
+/* $NetBSD: alloc.s,v 1.7 2001/03/02 16:43:25 mhitch Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 #include <machine/asm.h>
 
 ENTRY_NOPROFILE(alloc)
-       movl    %a6,sp@-
+       movl    %a6,%sp@-
        movl    %pc@(_C_LABEL(SysBase):w),%a6
        movl    %sp@(8),%d0
        movl    #0x50001,%d1    | MEMF_CLEAR|MEMF_REVERSE|MEMF_PUBLIC for now.
@@ -52,7 +52,7 @@
        rts
 
 ENTRY_NOPROFILE(free)
-       movl    %a6,sp@-
+       movl    %a6,%sp@-
        movl    %pc@(_C_LABEL(SysBase):w),%a6
        movl    %sp@(8),%a1
        jsr     %a6@(-0x2b2)    | FreeVec
diff -r 8acdba3df7e4 -r 55263010d09c sys/arch/amiga/stand/bootblock/boot/ashrdi3.s
--- a/sys/arch/amiga/stand/bootblock/boot/ashrdi3.s     Fri Mar 02 16:29:41 2001 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/ashrdi3.s     Fri Mar 02 16:43:25 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ashrdi3.s,v 1.5 2001/03/01 21:32:53 is Exp $ */
+/*     $NetBSD: ashrdi3.s,v 1.6 2001/03/02 16:43:25 mhitch Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -39,8 +39,8 @@
 #include <machine/asm.h>
 
 ENTRY_NOPROFILE(__ashrdi3)
-       movl %d2,sp@-           | 0 reg, 1 %pc, 2..4 parameters
-       movml %sp@(8),%d0-d2
+       movl %d2,%sp@-          | 0 reg, 1 %pc, 2..4 parameters
+       movml %sp@(8),%d0-%d2
        jra L2
 L1:
        asrl #1,%d0
diff -r 8acdba3df7e4 -r 55263010d09c sys/arch/amiga/stand/bootblock/boot/bbstart.s
--- a/sys/arch/amiga/stand/bootblock/boot/bbstart.s     Fri Mar 02 16:29:41 2001 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/bbstart.s     Fri Mar 02 16:43:25 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bbstart.s,v 1.7 2001/03/01 21:32:53 is Exp $ */
+/* $NetBSD: bbstart.s,v 1.8 2001/03/02 16:43:26 mhitch Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -80,28 +80,28 @@
  * autoload
  */
 Lautoload:
-       movl    %a6,sp@-                        |SysBase
-       movl    %a1,sp@-                        |IORequest
+       movl    %a6,%sp@-                       |SysBase
+       movl    %a1,%sp@-                       |IORequest
 
        movl    #AUTOLOAD,%d0           |Howmuch
-       movl    %d0,a1@(IOlen)          | for the actual read...
+       movl    %d0,%a1@(IOlen)         | for the actual read...
        movl    #0x10001,%d1            |MEMF_CLEAR|MEMF_PUBLIC
        jsr     %a6@(LVOAllocMem)
        movl    %sp@+,%a1                       |IORequest
        movl    %sp@+,%a6                       |SysBase
-       orl     %d0,d0
+       orl     %d0,%d0
        jne     Lgotmem
        movql   #1,%d0
        rts
 
 Lgotmem:
-       movl    %d0,sp@-                        |Address
+       movl    %d0,%sp@-                       |Address
        movl    %a1@(IOoff),%sp@-               |Old offset
-       movl    %a1,sp@-
-       movl    %a6,sp@-
+       movl    %a1,%sp@-
+       movl    %a6,%sp@-
 
 /* we've set IOlen above */
-       movl    %d0,a1@(IObuf)
+       movl    %d0,%a1@(IObuf)
        movw    #Cmd_Rd,%a1@(IOcmd)
        jsr     %a6@(LVODoIO)
 
@@ -113,7 +113,7 @@
        jne     Lioerr
        addl    #Lrelocate-Lzero,%sp@
 
-       movl    %a6,sp@-
+       movl    %a6,%sp@-
        jsr     %a6@(LVOCacheClearU)
        movl    %sp@+,%a6
        rts
@@ -140,17 +140,17 @@
  
 Lrelocate:
        lea     %pc@(Lzero),%a0
-       movl    %a0,d1
+       movl    %a0,%d1
        movw    %pc@(Lreltab),%a2
-       addl    %d1,a2
+       addl    %d1,%a2
        jra     Loopend
        
 Loopw:
        clrw    %a2@+
-       movl    %d1,a0  | for a variant with relative words, erase this line
+       movl    %d1,%a0 | for a variant with relative words, erase this line
 Loopb:
-       addl    %d0,a0
-       addl    %d1,a0@
+       addl    %d0,%a0
+       addl    %d1,%a0@
 Loopend:
        movq    #0,%d0
        movb    %a2@,%d0
@@ -162,15 +162,15 @@
        jne     Loopw
 
 Lendtab:
-       movl    %a6,sp@-
+       movl    %a6,%sp@-
        jsr     %a6@(LVOCacheClearU)
        movl    %sp@+,%a6
 
 /* We are relocated. Now it is safe to initialize _SysBase: */
 
-       movl    %a6,_SysBase
+       movl    %a6,_C_LABEL(SysBase)
 
-       movl    %a1,sp@-
+       movl    %a1,%sp@-
        bsr     _C_LABEL(pain)
 
 Lerr:
diff -r 8acdba3df7e4 -r 55263010d09c sys/arch/amiga/stand/bootblock/boot/bcopy.s
--- a/sys/arch/amiga/stand/bootblock/boot/bcopy.s       Fri Mar 02 16:29:41 2001 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/bcopy.s       Fri Mar 02 16:43:25 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcopy.s,v 1.6 2001/03/01 21:32:53 is Exp $     */
+/*     $NetBSD: bcopy.s,v 1.7 2001/03/02 16:43:26 mhitch Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
 Lcpy:
        movel %sp@(12),%d0
        jeq L1
-       cmpl %a1,a0
+       cmpl %a1,%a0
        jcc L3
 L4:
        moveb %a1@+,%a0@+
@@ -64,8 +64,8 @@
        jne L4
        rts
 L3:
-       addl %d0,a1
-       addl %d0,a0
+       addl %d0,%a1
+       addl %d0,%a0
 L9:
        moveb %a1@-,%a0@-
        subql #1,%d0
diff -r 8acdba3df7e4 -r 55263010d09c sys/arch/amiga/stand/bootblock/boot/libstubs.s
--- a/sys/arch/amiga/stand/bootblock/boot/libstubs.s    Fri Mar 02 16:29:41 2001 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/libstubs.s    Fri Mar 02 16:43:25 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: libstubs.s,v 1.5 2001/03/01 21:32:53 is Exp $ */
+/* $NetBSD: libstubs.s,v 1.6 2001/03/02 16:43:26 mhitch Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -43,8 +43,8 @@
        .comm _C_LABEL(SysBase),4
 
 ENTRY_NOPROFILE(OpenLibrary)
-       movl    %a6,sp@-
-       movl    %pc@(_SysBase:w),%a6
+       movl    %a6,%sp@-
+       movl    %pc@(_C_LABEL(SysBase):w),%a6
        movl    %sp@(8),%a1
        movl    %sp@(12),%d0
        jsr     %a6@(-0x228)
@@ -52,16 +52,16 @@
        rts
 #ifdef notyet
 ENTRY_NOPROFILE(CloseLibrary)
-       movl    %a6,sp@-
-       movl    %pc@(_SysBase:w),%a6
+       movl    %a6,%sp@-
+       movl    %pc@(_C_LABEL(SysBase):w),%a6
        movl    %sp@(8),%a1
        jsr     %a6@(-0x19e)
        movl    %sp@+,%a6
        rts
 #endif
 ENTRY_NOPROFILE(CreateIORequest)
-       movl    %a6,sp@-
-       movl    %pc@(_SysBase:w),%a6
+       movl    %a6,%sp@-
+       movl    %pc@(_C_LABEL(SysBase):w),%a6
        movl    %sp@(8),%a0
        movl    %sp@(12),%d0
        jsr     %a6@(-0x28e)
@@ -69,24 +69,24 @@
        rts
 
 ENTRY_NOPROFILE(CreateMsgPort)
-       movl    %a6,sp@-
-       movl    %pc@(_SysBase:w),%a6
+       movl    %a6,%sp@-
+       movl    %pc@(_C_LABEL(SysBase):w),%a6
        jsr     %a6@(-0x29a)
        movl    %sp@+,%a6
        rts
        
 #ifdef notyet
 ENTRY_NOPROFILE(DeleteMsgPort)
-       movl    %a6,sp@-
-       movl    %pc@(_SysBase:w),%a6
+       movl    %a6,%sp@-
+       movl    %pc@(_C_LABEL(SysBase):w),%a6
        movl    %sp@(8),%a0
-       jsr     %a6@(-0x2%a0)
+       jsr     %a6@(-0x2a0)
        movl    %sp@+,%a6
        rts
        
 ENTRY_NOPROFILE(DeleteIORequest)
-       movl    %a6,sp@-
-       movl    %pc@(_SysBase:w),%a6
+       movl    %a6,%sp@-
+       movl    %pc@(_C_LABEL(SysBase):w),%a6
        movl    %sp@(8),%a0
        jsr     %a6@(-0x294)
        movl    %sp@+,%a6
@@ -94,8 +94,8 @@
 #endif
        
 ENTRY_NOPROFILE(OpenDevice)
-       movl    %a6,sp@-
-       movl    %pc@(_SysBase:w),%a6
+       movl    %a6,%sp@-
+       movl    %pc@(_C_LABEL(SysBase):w),%a6
        movl    %sp@(8),%a0
        movl    %sp@(12),%d0
        movl    %sp@(16),%a1
@@ -105,48 +105,48 @@
        rts
 
 ENTRY_NOPROFILE(DoIO)
-       movl    %a6,sp@-
-       movl    %pc@(_SysBase:w),%a6
+       movl    %a6,%sp@-
+       movl    %pc@(_C_LABEL(SysBase):w),%a6
        movl    %sp@(8),%a1
        jsr     %a6@(-0x1c8)
        movl    %sp@+,%a6
        rts
 #ifdef nomore
 ENTRY_NOPROFILE(CheckIO)
-       movl    %a6,sp@-
-       movl    %pc@(_SysBase:w),%a6
+       movl    %a6,%sp@-
+       movl    %pc@(_C_LABEL(SysBase):w),%a6
        movl    %sp@(8),%a1
-       jsr     %a6@(-0x1%d4)
+       jsr     %a6@(-0x1d4)
        movl    %sp@+,%a6
        rts
 #endif
 ENTRY_NOPROFILE(WaitIO)
-       movl    %a6,sp@-
-       movl    %pc@(_SysBase:w),%a6
+       movl    %a6,%sp@-
+       movl    %pc@(_C_LABEL(SysBase):w),%a6
        movl    %sp@(8),%a1
        jsr     %a6@(-0x1da)
        movl    %sp@+,%a6
        rts
 
 ENTRY_NOPROFILE(SendIO)
-       movl    %a6,sp@-
-       movl    %pc@(_SysBase:w),%a6
+       movl    %a6,%sp@-
+       movl    %pc@(_C_LABEL(SysBase):w),%a6
        movl    %sp@(8),%a1
        jsr     %a6@(-0x1ce)
        movl    %sp@+,%a6
        rts



Home | Main Index | Thread Index | Old Index