lx_kit: split includes and setjmp into arm_v(6|7|8)

Move 'arch_execute.h' headers and 'setjmp/longjmp' implementation from
arm/arm_64 to arm_v(6|7|8).

issue #5104

repos/dde_linux/lib/import/import-lx_emul_common.inc

@@ -70,16 +70,22 @@ SRC_C += lx_emul/shadow/arch/x86/kernel/irq.c
 SRC_C += lx_emul/shadow/arch/x86/kernel/setup_percpu.c
 endif
 
-ifeq ($(filter-out $(SPECS),arm),)
+ifeq ($(filter-out $(SPECS),arm_v6),)
 LX_ARCH   := arm
 GEN_ARCH  := arm
-SPEC_ARCH := arm
+SPEC_ARCH := arm_v6
 endif
 
-ifeq ($(filter-out $(SPECS),arm_64),)
+ifeq ($(filter-out $(SPECS),arm_v7),)
+LX_ARCH   := arm
+GEN_ARCH  := arm
+SPEC_ARCH := arm_v7
+endif
+
+ifeq ($(filter-out $(SPECS),arm_v8),)
 LX_ARCH   := arm64
 GEN_ARCH  := arm
-SPEC_ARCH := arm_64
+SPEC_ARCH := arm_v8
 endif
 
 ifneq ($(SHARED_LIB),)

repos/dde_linux/src/include/spec/arm_v7/lx_kit/arch_execute.h

@@ -0,0 +1,43 @@
+/**
+ * \brief  Platform specific code
+ * \author Sebastian Sumpf
+ * \date   2012-06-10
+ */
+
+/*
+ * Copyright (C) 2012-2017 Genode Labs GmbH
+ *
+ * This file is distributed under the terms of the GNU General Public License
+ * version 2.
+ */
+
+#ifndef _ARCH_EXECUTE_H_
+#define _ARCH_EXECUTE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define _JBLEN  64
+typedef struct _jmp_buf { long _jb[_JBLEN + 1]; } jmp_buf[1];
+
+void _longjmp(jmp_buf, int);
+int  _setjmp(jmp_buf);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+static inline
+void arch_execute(void *sp, void *func, void *arg)
+{
+	asm volatile ("mov r0, %2;"  /* set arg */
+	              "mov sp, %0;"  /* set stack */
+	              "mov fp, #0;"  /* clear frame pointer */
+	              "mov pc, %1;"  /* call func */
+	              ""
+	              : : "r"(sp), "r"(func), "r"(arg) : "r0");
+}
+
+#endif /* _ARCH_EXECUTE_H_ */

repos/dde_linux/src/lib/lx_kit/spec/arm_v7/setjmp.S

@@ -0,0 +1,122 @@
+/*	$NetBSD: _setjmp.S,v 1.5 2003/04/05 23:08:51 bjh21 Exp $	*/
+
+/*
+ * Copyright (c) 1997 Mark Brinicombe
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Mark Brinicombe
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 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.
+ */
+
+/* needed parts from <machine/asm.h> */
+#define __FBSDID(x)
+#define ENTRY(x)           .text; .align 0; .globl x; .type x,#function; x:;
+#define WEAK_ALIAS(x,y)
+#define RET                mov pc, lr
+#define _JB_MAGIC__SETJMP  0x4278f500
+#define _JB_REG_FPSCR      13
+#define _JB_REG_R4         14
+#define _JB_REG_D8         32
+
+#define _STANDALONE
+/* end of <machine/asm.h> */
+
+__FBSDID("$FreeBSD: release/8.2.0/lib/libc/arm/gen/_setjmp.S 193145 2009-05-31 02:03:40Z marcel $");
+
+/*
+ * C library -- _setjmp, _longjmp
+ *
+ *	_longjmp(a,v)
+ * will generate a "return(v)" from the last call to
+ *	_setjmp(a)
+ * by restoring registers from the stack.
+ * The previous signal state is NOT restored.
+ *
+ * Note: r0 is the return value
+ *       r1-r3 are scratch registers in functions
+ */
+
+ENTRY(_setjmp)
+	ldr	r1, .L_setjmp_magic
+
+#if __ARM_ARCH >= 6
+	add	r2, r0, #(_JB_REG_D8 * 4)
+	vstmia	r2, {d8-d15}
+	vmrs	r2, fpscr
+	str	r2, [r0, #(_JB_REG_FPSCR * 4)]
+#endif
+
+	str	r1, [r0]
+
+	add	r0, r0, #(_JB_REG_R4 * 4)
+	/* Store integer registers */
+	stmia	r0, {r4-r14}
+
+	mov	r0, #0x00000000
+	RET
+
+.L_setjmp_magic:
+	.word	_JB_MAGIC__SETJMP
+
+WEAK_ALIAS(___longjmp, _longjmp)
+ENTRY(_longjmp)
+	ldr	r2, [r0]			/* get magic from jmp_buf */
+	ldr	ip, .L_setjmp_magic		/* load magic */
+	teq	ip, r2				/* magic correct? */
+	bne	botch				/*   no, botch */
+
+#if __ARM_ARCH >= 6
+	add	ip, r0, #(_JB_REG_D8 * 4)
+	vldmia	ip, {d8-d15}
+	ldr	ip, [r0, #(_JB_REG_FPSCR * 4)]
+	vmsr	fpscr, ip
+#endif
+
+	add	r0, r0, #(_JB_REG_R4 * 4)
+	/* Restore integer registers */
+	ldmia	r0, {r4-r14}
+
+	/* Validate sp and r14 */
+	teq	sp, #0
+	teqne	r14, #0
+	beq	botch
+
+	/* Set return value */
+	mov	r0, r1
+	teq	r0, #0x00000000
+	moveq	r0, #0x00000001
+	RET
+
+	/* validation failed, die die die. */
+botch:
+#if !defined(_STANDALONE)
+	bl	PIC_SYM(_C_LABEL(longjmperror), PLT)
+	bl	PIC_SYM(_C_LABEL(abort), PLT)
+	b	. - 8		/* Cannot get here */
+#else
+	b	.
+#endif