summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2022-06-14 10:41:18 +0000
committermartin <martin@NetBSD.org>2022-06-14 10:41:18 +0000
commit65ee42026a3b32448b48d70e53f09a0b21c20ad2 (patch)
tree6f8c2cc1dc2e97b9fc85bfc8e3009c5ec4f03fad
parent7f6a5db7485a9bc12201d1fecdd48579fe673842 (diff)
Pull up following revision(s) (requested by skrll in ticket #1472):
sys/lib/libkern/arch/hppa/Makefile.inc: revision 1.13 sys/lib/libkern/arch/hppa/milli.S: revision 1.3 sys/lib/libkern/arch/hppa/milli_extra.S: revision 1.1 Don't need $$sh_func_adrs Provide a __canonicalize_funcptr_for_compare which only needs to return the passed value as the kernel doesn't do PLABELS. PR/56878 (hppa: kernel module lua fails to load)
-rw-r--r--sys/lib/libkern/arch/hppa/Makefile.inc3
-rw-r--r--sys/lib/libkern/arch/hppa/milli.S4
-rw-r--r--sys/lib/libkern/arch/hppa/milli_extra.S42
3 files changed, 46 insertions, 3 deletions
diff --git a/sys/lib/libkern/arch/hppa/Makefile.inc b/sys/lib/libkern/arch/hppa/Makefile.inc
index 2b2db0b988c..fa0164ead36 100644
--- a/sys/lib/libkern/arch/hppa/Makefile.inc
+++ b/sys/lib/libkern/arch/hppa/Makefile.inc
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.12 2014/03/13 16:09:11 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.12.34.1 2022/06/14 10:41:18 martin Exp $
SRCS+= milli.S
SRCS+= bcopy.S memcpy.S memmove.S
+SRCS+= milli_extra.S
# XXX: spcopy does not really belong in libkern in the first place
.ifndef RUMPKERNEL
diff --git a/sys/lib/libkern/arch/hppa/milli.S b/sys/lib/libkern/arch/hppa/milli.S
index adc7ca13c33..9da85f853c2 100644
--- a/sys/lib/libkern/arch/hppa/milli.S
+++ b/sys/lib/libkern/arch/hppa/milli.S
@@ -1,4 +1,4 @@
-; $NetBSD: milli.S,v 1.1 2002/06/06 20:03:39 fredette Exp $
+; $NetBSD: milli.S,v 1.1.204.1 2022/06/14 10:41:18 martin Exp $
;
; $OpenBSD: milli.S,v 1.5 2001/03/29 04:08:20 mickey Exp $
;
@@ -443,7 +443,6 @@ noshlibs:
be 0(sr0,r22)
stw rp,-24(sp)
.procend
-#endif
$$sh_func_adrs:
.proc
@@ -456,6 +455,7 @@ $$sh_func_adrs:
bv r0(r31)
ldws 0(r26),ret1
.procend
+#endif
temp: .EQU r1
diff --git a/sys/lib/libkern/arch/hppa/milli_extra.S b/sys/lib/libkern/arch/hppa/milli_extra.S
new file mode 100644
index 00000000000..587e0f23304
--- /dev/null
+++ b/sys/lib/libkern/arch/hppa/milli_extra.S
@@ -0,0 +1,42 @@
+/*-
+ * Copyright (c) 2022 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nick Hudson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "machine/asm.h"
+
+
+#define MILLI_ENTRY(x) !\
+ .text ! .align 4 !\
+ .export x, millicode ! .label x ! .proc !\
+ .callinfo no_calls !\
+ .entry
+
+MILLI_ENTRY(__canonicalize_funcptr_for_compare)
+ bv %r0(%sp)
+ copy %arg0, %ret0
+EXIT(__canonicalize_funcptr_for_compare)