[src/trunk]: src/sys/rump/kern/lib/libsljit Add sljit rump glue for aarch64.

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

details:   https://anonhg.NetBSD.org/src/rev/f9d9813f8b1e
branches:  trunk
changeset: 447672:f9d9813f8b1e
user:      alnsn <alnsn%NetBSD.org@localhost>
date:      Mon Jan 21 00:30:14 2019 +0000

description:
Add sljit rump glue for aarch64.

XXX arm_icache_sync_range() and mips_icache_sync_range() call

        (void)rumpcomp_sync_icache((void *)va, (uint64_t)sz);

but linking fails if I do the same on aarch64 (I suspect it also
fails on 32bit arm and mips).

As a workaround, I call __builtin___clear_cache().

diffstat:

 sys/rump/kern/lib/libsljit/Makefile                  |  11 +++-
 sys/rump/kern/lib/libsljit/arch/aarch64/cpufunc.c    |  51 ++++++++++++++++++++
 sys/rump/kern/lib/libsljit/arch/aarch64/sljit_rump.c |  45 +++++++++++++++++
 3 files changed, 106 insertions(+), 1 deletions(-)

diffs (128 lines):

diff -r 9a7bc2648ef1 -r f9d9813f8b1e sys/rump/kern/lib/libsljit/Makefile
--- a/sys/rump/kern/lib/libsljit/Makefile       Mon Jan 21 00:22:24 2019 +0000
+++ b/sys/rump/kern/lib/libsljit/Makefile       Mon Jan 21 00:30:14 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2016/01/05 13:07:47 christos Exp $
+#      $NetBSD: Makefile,v 1.6 2019/01/21 00:30:14 alnsn Exp $
 #
 # Public Domain.
 #
@@ -38,5 +38,14 @@
 LIBDPLIBS+=    arm ${NETBSDSRCDIR}/lib/libarch
 .endif
 
+.if !empty(MACHINE_ARCH:Maarch64*)
+SRCS+=                 cpufunc.c
+RUMPCOMP_USER_SRCS=    sljit_rump.c
+.PATH:                 ${.CURDIR}/arch/aarch64
+
+RUMPCOMP_INCS_DIR:=    ${.PARSEDIR}
+RUMPCOMP_USER_CPPFLAGS=-I${RUMPCOMP_INCS_DIR}
+.endif
+
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r 9a7bc2648ef1 -r f9d9813f8b1e sys/rump/kern/lib/libsljit/arch/aarch64/cpufunc.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/kern/lib/libsljit/arch/aarch64/cpufunc.c Mon Jan 21 00:30:14 2019 +0000
@@ -0,0 +1,51 @@
+/*     $NetBSD: cpufunc.c,v 1.1 2019/01/21 00:30:14 alnsn Exp $        */
+
+/*-
+ * Copyright (c) 2019 Alexander Nasonov.
+ * All rights reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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 <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.1 2019/01/21 00:30:14 alnsn Exp $");
+
+/*
+ * Barebone implementation of arm cpufunc routines for rump.
+ */
+
+#include <machine/types.h>
+#include <sys/types.h>
+
+#include "sljit_rump.h"
+
+void aarch64_icache_sync_range(vaddr_t, vsize_t);
+
+void
+aarch64_icache_sync_range(vaddr_t va, vsize_t sz)
+{
+
+       // XXX MIPS and 32-bit ARM make this call:
+       // (void)rumpcomp_sync_icache((void *)va, (uint64_t)sz);
+       // but it doesn't link. Fix Makefiles to make it link.
+       __builtin___clear_cache((void *)va, (char *)va + sz);
+}
diff -r 9a7bc2648ef1 -r f9d9813f8b1e sys/rump/kern/lib/libsljit/arch/aarch64/sljit_rump.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/kern/lib/libsljit/arch/aarch64/sljit_rump.c      Mon Jan 21 00:30:14 2019 +0000
@@ -0,0 +1,45 @@
+/*      $NetBSD: sljit_rump.c,v 1.1 2019/01/21 00:30:14 alnsn Exp $    */
+
+/*-
+ * Copyright (c) 2019 Alexander Nasonov.
+ * All rights reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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 <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: sljit_rump.c,v 1.1 2019/01/21 00:30:14 alnsn Exp $");
+
+#ifndef _KERNEL
+
+#include <sys/types.h>
+
+#include "sljit_rump.h"
+
+int
+rumpcomp_sync_icache(void *addr, uint64_t len)
+{
+
+       __builtin___clear_cache(addr, (char *)addr + len);
+       return 0;
+}
+#endif