Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/hppa/hppa Implement DIR17R. All the module tests pa...



details:   https://anonhg.NetBSD.org/src/rev/942a7cd3a97c
branches:  trunk
changeset: 789078:942a7cd3a97c
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Aug 06 07:10:04 2013 +0000

description:
Implement DIR17R. All the module tests pass now.

diffstat:

 sys/arch/hppa/hppa/kobj_machdep.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r d9409e1a78c2 -r 942a7cd3a97c sys/arch/hppa/hppa/kobj_machdep.c
--- a/sys/arch/hppa/hppa/kobj_machdep.c Tue Aug 06 07:07:53 2013 +0000
+++ b/sys/arch/hppa/hppa/kobj_machdep.c Tue Aug 06 07:10:04 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kobj_machdep.c,v 1.9 2013/08/06 07:07:53 skrll Exp $   */
+/*     $NetBSD: kobj_machdep.c,v 1.10 2013/08/06 07:10:04 skrll Exp $  */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.9 2013/08/06 07:07:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.10 2013/08/06 07:10:04 skrll Exp $");
 
 #define        ELFSIZE         ARCH_ELFSIZE
 
@@ -136,6 +136,13 @@
                value = LR(addr, value);
                break;
 
+       case R_TYPE(DIR17R):
+               /* RR(symbol, addend) */
+               addr = kobj_sym_lookup(ko, symidx);
+               value = RR(addr, value);
+               value >>= 2;            /* bottom two bits not needed */
+               break;
+
        case R_TYPE(DIR14R):
                /* RR(symbol, addend) */
                addr = kobj_sym_lookup(ko, symidx);
@@ -193,6 +200,7 @@
                     (((value >> 13) & 0x1) << 0);
                break;
 
+       case R_TYPE(DIR17R):
        case R_TYPE(PCREL17F):
                *where |=
                    (((value & 0x10000) >> 16) << 0) |          /* w */



Home | Main Index | Thread Index | Old Index