[src/trunk]: src/libexec/ld.elf_so/arch/vax Fix two bugs. (jump past entry m...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bc12a8f91887
branches:  trunk
changeset: 794606:bc12a8f91887
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Mar 19 15:34:30 2014 +0000

description:
Fix two bugs.  (jump past entry mask, fix insv)

diffstat:

 libexec/ld.elf_so/arch/vax/rtld_start.S |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r fb4af979d80b -r bc12a8f91887 libexec/ld.elf_so/arch/vax/rtld_start.S
--- a/libexec/ld.elf_so/arch/vax/rtld_start.S   Wed Mar 19 15:26:41 2014 +0000
+++ b/libexec/ld.elf_so/arch/vax/rtld_start.S   Wed Mar 19 15:34:30 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld_start.S,v 1.18 2014/03/19 02:39:22 matt Exp $     */
+/*     $NetBSD: rtld_start.S,v 1.19 2014/03/19 15:34:30 matt Exp $     */
 
 /*
  * Copyright 1996 Matt Thomas <matt%3am-software.com@localhost>
@@ -71,7 +71,7 @@
        pushl   %r0             /* push address of obj entry */
        calls   $2,_rtld_bind
 
-       movl    %r0,%r3         /* save routine address */
+       addl3   $2,%r0,%r3              /* save routine address */
        extzv   $0,$12,(%r0),%r1        /* get entry mask */
        extzv   $0,$12,6(%fp),%r2       /* get saved mask */
        cmpw    %r1,%r2         /* compare them */
@@ -151,7 +151,7 @@
        movq    (%sp)+,-(%r0)   /* move PSW/save-mask/etc + AP into place */
        movq    %r3,-(%r0)      /* move routine address + cond handle slot */
        addl3   $4,%r0,%fp      /* get start of new callframe */
-       insv    $0,$12,%r1,6(%fp) /* insert new saved mask */
+       insv    %r1,$0,$12,6(%fp) /* insert new saved mask */
        popr    $0x3f           /* restore R0-R5 (cond flags not modified) */
        subl3   $4,%fp,%sp      /* sp needs to be equal to fp */
        rsb                     /* and jmp to the routine */