Module Name: src
Committed By: alnsn
Date: Tue Jun 17 06:36:40 UTC 2014
Modified Files:
src/distrib/sets/lists/comp: ad.arm
src/sys/arch/arm/include: Makefile
src/sys/arch/evbarm/include: Makefile
src/sys/arch/hpcarm/include: Makefile
src/sys/arch/iyonix/include: Makefile
src/sys/arch/zaurus/include: Makefile
Added Files:
src/sys/arch/arm/include: sljitarch.h
src/sys/arch/evbarm/include: sljitarch.h
src/sys/arch/hpcarm/include: sljitarch.h
src/sys/arch/iyonix/include: sljitarch.h
src/sys/arch/zaurus/include: sljitarch.h
Log Message:
Add sljit support to arm.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/arm/include/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/include/sljitarch.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/include/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/include/sljitarch.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hpcarm/include/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/hpcarm/include/sljitarch.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/iyonix/include/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/iyonix/include/sljitarch.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/include/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/zaurus/include/sljitarch.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.55 src/distrib/sets/lists/comp/ad.arm:1.56
--- src/distrib/sets/lists/comp/ad.arm:1.55 Thu Jan 2 16:46:40 2014
+++ src/distrib/sets/lists/comp/ad.arm Tue Jun 17 06:36:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.55 2014/01/02 16:46:40 tho Exp $
+# $NetBSD: ad.arm,v 1.56 2014/06/17 06:36:40 alnsn Exp $
./usr/include/acorn26 comp-c-include
./usr/include/acorn26/ansi.h comp-obsolete obsolete
./usr/include/acorn26/aout_machdep.h comp-obsolete obsolete
@@ -172,6 +172,7 @@
./usr/include/arm/rwlock.h comp-c-include
./usr/include/arm/setjmp.h comp-c-include
./usr/include/arm/signal.h comp-c-include
+./usr/include/arm/sljitarch.h comp-c-include
./usr/include/arm/stdarg.h comp-obsolete obsolete
./usr/include/arm/swi.h comp-c-include
./usr/include/arm/sysarch.h comp-c-include
@@ -378,6 +379,7 @@
./usr/include/evbarm/rwlock.h comp-obsolete obsolete
./usr/include/evbarm/setjmp.h comp-obsolete obsolete
./usr/include/evbarm/signal.h comp-obsolete obsolete
+./usr/include/evbarm/sljitarch.h comp-c-include
./usr/include/evbarm/stdarg.h comp-obsolete obsolete
./usr/include/evbarm/sysarch.h comp-obsolete obsolete
./usr/include/evbarm/trap.h comp-obsolete obsolete
@@ -435,6 +437,7 @@
./usr/include/hpcarm/rwlock.h comp-obsolete obsolete
./usr/include/hpcarm/setjmp.h comp-obsolete obsolete
./usr/include/hpcarm/signal.h comp-obsolete obsolete
+./usr/include/hpcarm/sljitarch.h comp-c-include
./usr/include/hpcarm/stdarg.h comp-obsolete obsolete
./usr/include/hpcarm/sysarch.h comp-obsolete obsolete
./usr/include/hpcarm/trap.h comp-obsolete obsolete
@@ -486,6 +489,7 @@
./usr/include/iyonix/rwlock.h comp-obsolete obsolete
./usr/include/iyonix/setjmp.h comp-obsolete obsolete
./usr/include/iyonix/signal.h comp-obsolete obsolete
+./usr/include/iyonix/sljitarch.h comp-c-include
./usr/include/iyonix/stdarg.h comp-obsolete obsolete
./usr/include/iyonix/sysarch.h comp-obsolete obsolete
./usr/include/iyonix/trap.h comp-obsolete obsolete
@@ -636,6 +640,7 @@
./usr/include/zaurus/rwlock.h comp-obsolete obsolete
./usr/include/zaurus/setjmp.h comp-obsolete obsolete
./usr/include/zaurus/signal.h comp-obsolete obsolete
+./usr/include/zaurus/sljitarch.h comp-c-include
./usr/include/zaurus/stdarg.h comp-obsolete obsolete
./usr/include/zaurus/sysarch.h comp-obsolete obsolete
./usr/include/zaurus/trap.h comp-obsolete obsolete
Index: src/sys/arch/arm/include/Makefile
diff -u src/sys/arch/arm/include/Makefile:1.47 src/sys/arch/arm/include/Makefile:1.48
--- src/sys/arch/arm/include/Makefile:1.47 Thu May 2 03:56:40 2013
+++ src/sys/arch/arm/include/Makefile Tue Jun 17 06:36:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2013/05/02 03:56:40 matt Exp $
+# $NetBSD: Makefile,v 1.48 2014/06/17 06:36:39 alnsn Exp $
INCSDIR= /usr/include/arm
@@ -17,7 +17,7 @@ INCS= aeabi.h ansi.h aout_machdep.h apmv
param.h pcb.h pmc.h proc.h profile.h rwlock.h \
ptrace.h \
reg.h rwlock.h \
- setjmp.h signal.h swi.h sysarch.h \
+ setjmp.h signal.h sljitarch.h swi.h sysarch.h \
trap.h types.h \
vfpreg.h vmparam.h \
wchar_limits.h
Index: src/sys/arch/evbarm/include/Makefile
diff -u src/sys/arch/evbarm/include/Makefile:1.20 src/sys/arch/evbarm/include/Makefile:1.21
--- src/sys/arch/evbarm/include/Makefile:1.20 Thu May 2 03:56:40 2013
+++ src/sys/arch/evbarm/include/Makefile Tue Jun 17 06:36:40 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2013/05/02 03:56:40 matt Exp $
+# $NetBSD: Makefile,v 1.21 2014/06/17 06:36:40 alnsn Exp $
INCSDIR= /usr/include/evbarm
-INCS=
+INCS= sljitarch.h
.include "../../arm/include/Makefile.common"
Index: src/sys/arch/hpcarm/include/Makefile
diff -u src/sys/arch/hpcarm/include/Makefile:1.29 src/sys/arch/hpcarm/include/Makefile:1.30
--- src/sys/arch/hpcarm/include/Makefile:1.29 Thu May 2 03:56:41 2013
+++ src/sys/arch/hpcarm/include/Makefile Tue Jun 17 06:36:40 2014
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2013/05/02 03:56:41 matt Exp $
+# $NetBSD: Makefile,v 1.30 2014/06/17 06:36:40 alnsn Exp $
INCSDIR= /usr/include/hpcarm
-INCS=
+INCS= sljitarch.h
.include "../../arm/include/Makefile.common"
Index: src/sys/arch/iyonix/include/Makefile
diff -u src/sys/arch/iyonix/include/Makefile:1.9 src/sys/arch/iyonix/include/Makefile:1.10
--- src/sys/arch/iyonix/include/Makefile:1.9 Thu May 2 03:56:41 2013
+++ src/sys/arch/iyonix/include/Makefile Tue Jun 17 06:36:40 2014
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2013/05/02 03:56:41 matt Exp $
+# $NetBSD: Makefile,v 1.10 2014/06/17 06:36:40 alnsn Exp $
INCSDIR= /usr/include/iyonix
-INCS=
+INCS= sljitarch.h
.include "../../arm/include/Makefile.common"
Index: src/sys/arch/zaurus/include/Makefile
diff -u src/sys/arch/zaurus/include/Makefile:1.9 src/sys/arch/zaurus/include/Makefile:1.10
--- src/sys/arch/zaurus/include/Makefile:1.9 Thu May 2 03:56:41 2013
+++ src/sys/arch/zaurus/include/Makefile Tue Jun 17 06:36:40 2014
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2013/05/02 03:56:41 matt Exp $
+# $NetBSD: Makefile,v 1.10 2014/06/17 06:36:40 alnsn Exp $
INCSDIR= /usr/include/zaurus
-INCS=
+INCS= sljitarch.h
.include "../../arm/include/Makefile.common"
Added files:
Index: src/sys/arch/arm/include/sljitarch.h
diff -u /dev/null src/sys/arch/arm/include/sljitarch.h:1.1
--- /dev/null Tue Jun 17 06:36:40 2014
+++ src/sys/arch/arm/include/sljitarch.h Tue Jun 17 06:36:39 2014
@@ -0,0 +1,59 @@
+/* $NetBSD: sljitarch.h,v 1.1 2014/06/17 06:36:39 alnsn Exp $ */
+
+/*-
+ * Copyright (c) 2014 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 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.
+ */
+
+#ifndef _ARM_SLJITARCH_H
+#define _ARM_SLJITARCH_H
+
+#include <sys/cdefs.h>
+
+#ifdef _KERNEL
+#include <machine/types.h>
+#include <arm/cpufunc.h>
+#else
+#include <stddef.h>
+#include <stdint.h>
+#include <arm/sysarch.h>
+#endif
+
+#if defined(_ARM_ARCH_T2)
+#define SLJIT_CONFIG_ARM_THUMB2 1
+#elif defined(_ARM_ARCH_7)
+#define SLJIT_CONFIG_ARM_V7 1
+#else
+#define SLJIT_CONFIG_ARM_V5 1
+#endif
+
+#ifdef _KERNEL
+#define SLJIT_CACHE_FLUSH(from, to) \
+ cpu_icache_sync_range((vaddr_t)(from), (vsize_t)((to) - (from)))
+#else
+#define SLJIT_CACHE_FLUSH(from, to) \
+ (void)arm_sync_icache((uintptr_t)(from), (size_t)(to - from))
+#endif
+
+#endif
Index: src/sys/arch/evbarm/include/sljitarch.h
diff -u /dev/null src/sys/arch/evbarm/include/sljitarch.h:1.1
--- /dev/null Tue Jun 17 06:36:40 2014
+++ src/sys/arch/evbarm/include/sljitarch.h Tue Jun 17 06:36:40 2014
@@ -0,0 +1,3 @@
+/* $NetBSD: sljitarch.h,v 1.1 2014/06/17 06:36:40 alnsn Exp $ */
+
+#include <arm/sljitarch.h>
Index: src/sys/arch/hpcarm/include/sljitarch.h
diff -u /dev/null src/sys/arch/hpcarm/include/sljitarch.h:1.1
--- /dev/null Tue Jun 17 06:36:40 2014
+++ src/sys/arch/hpcarm/include/sljitarch.h Tue Jun 17 06:36:40 2014
@@ -0,0 +1,3 @@
+/* $NetBSD: sljitarch.h,v 1.1 2014/06/17 06:36:40 alnsn Exp $ */
+
+#include <arm/sljitarch.h>
Index: src/sys/arch/iyonix/include/sljitarch.h
diff -u /dev/null src/sys/arch/iyonix/include/sljitarch.h:1.1
--- /dev/null Tue Jun 17 06:36:40 2014
+++ src/sys/arch/iyonix/include/sljitarch.h Tue Jun 17 06:36:40 2014
@@ -0,0 +1,3 @@
+/* $NetBSD: sljitarch.h,v 1.1 2014/06/17 06:36:40 alnsn Exp $ */
+
+#include <arm/sljitarch.h>
Index: src/sys/arch/zaurus/include/sljitarch.h
diff -u /dev/null src/sys/arch/zaurus/include/sljitarch.h:1.1
--- /dev/null Tue Jun 17 06:36:40 2014
+++ src/sys/arch/zaurus/include/sljitarch.h Tue Jun 17 06:36:40 2014
@@ -0,0 +1,3 @@
+/* $NetBSD: sljitarch.h,v 1.1 2014/06/17 06:36:40 alnsn Exp $ */
+
+#include <arm/sljitarch.h>
