summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2002-02-24 01:06:18 +0000
committermatt <matt@NetBSD.org>2002-02-24 01:06:18 +0000
commit0ce5ca145fe1707cd325c59ab7848f331dc4c8c8 (patch)
treed664eae50083e0c865350360142abab9fdc7f7e7 /libexec
parent28b1aa2b30d8fd0f10e70d369cd54b4bc840e70a (diff)
Change to use a register prefix.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.aout_so/arch/vax/mdprologue.S32
-rw-r--r--libexec/ld.elf_so/arch/vax/rtld_start.S32
2 files changed, 32 insertions, 32 deletions
diff --git a/libexec/ld.aout_so/arch/vax/mdprologue.S b/libexec/ld.aout_so/arch/vax/mdprologue.S
index 19a8a268733..849747c2a10 100644
--- a/libexec/ld.aout_so/arch/vax/mdprologue.S
+++ b/libexec/ld.aout_so/arch/vax/mdprologue.S
@@ -1,4 +1,4 @@
-/* $NetBSD: mdprologue.S,v 1.10 1999/06/28 17:28:56 ragge Exp $ */
+/* $NetBSD: mdprologue.S,v 1.11 2002/02/24 01:06:21 matt Exp $ */
/*
* Copyright (c) 1998 Matt Thomas <matt@3am-software.com>
@@ -43,24 +43,24 @@
.align 2
_rtl: /* crt0 calls us here */
.word 0 /* no registers to save */
- movl 8(ap),r0 /* load crtp into r0 */
+ movl 8(%ap),%r0 /* load crtp into %r0 */
/* setup arguments for rtld() */
/*
* Add the 1st entry in the GOT (e.g. __DYNAMIC) to the base
* address of ld.so and pushd that onto the stack.
*/
- addl3 __GLOBAL_OFFSET_TABLE_,(r0),-(sp)
- pushl r0 /* 2nd arg == crtp */
- pushl 4(ap) /* 1st arg == version */
+ addl3 __GLOBAL_OFFSET_TABLE_,(%r0),-(%sp)
+ pushl %r0 /* 2nd arg == crtp */
+ pushl 4(%ap) /* 1st arg == version */
calls $3,_rtld /* _rtld(version, crtp, DYNAMIC) */
- movpsl -(sp) /* flush the instruction cache */
+ movpsl -(%sp) /* flush the instruction cache */
pushab 1f /* by issuing an */
rei /* rei. */
1: ret
/*
* First call to a procedure generally comes through here for binding.
- * We got here via JSB so now (sp) is inside our jmpslot_t. So we
+ * We got here via JSB so now (%sp) is inside our jmpslot_t. So we
* simply preserve our registers, push the address of jmpslot_t for
* _binder. Save the address we are supported to call (which was
* returned in R0) in the stack location that the JSB used to store
@@ -78,26 +78,26 @@ _rtl: /* crt0 calls us here */
.align 1
.type _binder_entry,@label
_binder_entry:
- pushr $0x3f /* save r0 to r5 */
+ pushr $0x3f /* save %r0 to %r5 */
#ifdef DEBUG
pushl $29
pushab LC1
pushl $2
calls $3,_write
#endif
- subl3 $8, 24(sp), -(sp) /* point to beginning of jmpslot */
- bicl2 $3, (sp)
+ subl3 $8, 24(%sp), -(%sp) /* point to beginning of jmpslot */
+ bicl2 $3, (%sp)
calls $1, _binder /* _binder(jsp) */
- movpsl -(sp) /* flush the instruction cache */
+ movpsl -(%sp) /* flush the instruction cache */
pushab 1f /* by issuing an */
rei /* rei. */
-1: movl r0, 24(sp) /* save return address onto stack */
- bicw3 6(fp),(r0),r0 /* does the entry mask save any additional regs */
- popr $0x3f /* restore r0 to r5 (cond flags aren't modified) */
+1: movl %r0, 24(%sp) /* save return address onto stack */
+ bicw3 6(%fp),(%r0),%r0 /* does the entry mask save any additional regs */
+ popr $0x3f /* restore %r0 to %r5 (cond flags aren't modified) */
bneq 2f /* yes? do it the hard way */
- addl2 $2,(sp) /* no? skip past the mask */
+ addl2 $2,(%sp) /* no? skip past the mask */
rsb /* and jump to it */
-2: callg (ap), *(sp)+ /* return value from _binder() == actual */
+2: callg (%ap), *(%sp)+ /* return value from _binder() == actual */
ret
#ifdef DEBUG
LC1: .asciz "ld.so: entered _binder_entry\n"
diff --git a/libexec/ld.elf_so/arch/vax/rtld_start.S b/libexec/ld.elf_so/arch/vax/rtld_start.S
index 83ea63c64b5..35b4fa7c5b9 100644
--- a/libexec/ld.elf_so/arch/vax/rtld_start.S
+++ b/libexec/ld.elf_so/arch/vax/rtld_start.S
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld_start.S,v 1.6 2000/08/07 01:47:07 matt Exp $ */
+/* $NetBSD: rtld_start.S,v 1.7 2002/02/24 01:06:22 matt Exp $ */
/*
* Copyright 1996 Matt Thomas <matt@3am-software.com>
@@ -39,34 +39,34 @@ ENTRY(_rtld_start, 0)
/* Allocate space on the stack for the cleanup and obj_main
* entries that _rtld() will provide for us.
*/
- clrl fp
- subl2 $8,sp
- pushl sp
+ clrl %fp
+ subl2 $8,%sp
+ pushl %sp
calls $1,_rtld
- movq (sp)+,r7 /* grab cleanup and obj_main into r7/r8 */
- jmp 2(r0) /* jump to entry point + 2 */
+ movq (%sp)+,%r7 /* grab cleanup and obj_main into %r7/%r8 */
+ jmp 2(%r0) /* jump to entry point + 2 */
/*
* Lazy binding entry point, called via PLT.
*/
ALTENTRY(_rtld_bind_start)
pushr $0xff /* save R0-R7 */
- movq 32(sp),r0 /* get addresses of plt.got & reloc index */
- pushl (r1) /* push relocation index */
- pushl r0 /* push address of obj entry */
+ movq 32(%sp),%r0 /* get addresses of plt.got & reloc index */
+ pushl (%r1) /* push relocation index */
+ pushl %r0 /* push address of obj entry */
calls $2,_rtld_bind
- movpsl -(sp) /* flush the instruction cache */
+ movpsl -(%sp) /* flush the instruction cache */
pushab 1f /* by issuing an */
rei /* rei. */
-1: movl r0,36(sp) /* save return address onto stack */
-2: bicw3 6(fp),(r0),r0 /* does the entry mask save any additional regs */
+1: movl %r0,36(%sp) /* save return address onto stack */
+2: bicw3 6(%fp),(%r0),%r0 /* does the entry mask save any additional regs */
popr $0xff /* restore R0-R7 (cond flags not modified) */
bneq 4f /* yes? do it the hard way */
-3: addl2 $4,sp /* no? skip past plt.got on stack */
- addl2 $2,(sp) /* skip past the mask */
+3: addl2 $4,%sp /* no? skip past plt.got on stack */
+ addl2 $2,(%sp) /* skip past the mask */
rsb /* and jump to it */
-4: addl2 $4,sp
- callg (ap),*(sp)+ /* return value from _rtld_bind() == actual */
+4: addl2 $4,%sp
+ callg (%ap),*(%sp)+ /* return value from _rtld_bind() == actual */
ret