oops - omitted from previous delta.

1 files changed, 31 insertions, 248 deletions

diff --git a/newlib/libc/sys/arm/crt0.S b/newlib/libc/sys/arm/crt0.S
index c750ca819..a5ac0406b 100644
--- a/newlib/libc/sys/arm/crt0.S
+++ b/newlib/libc/sys/arm/crt0.S
@@ -1,4 +1,5 @@
 #include "newlib.h"
+#include "arm.h"
 #include "swi.h"
 
 /* ANSI concatenation macros.  */
@@ -18,11 +19,11 @@
 
 /* .text is used instead of .section .text so it works with arm-aout too.  */
 	.text
-#if defined(__thumb2__)
 	.syntax unified
+#ifdef THUMB_V7_V6M
 	.thumb
 .macro FUNC_START name
-	.global	\name
+	.global \name
 	.thumb_func
 \name:
 .endm	
@@ -33,6 +34,16 @@
 \name:
 .endm	
 #endif
+
+.macro indirect_call reg
+#ifdef HAVE_CALL_INDIRECT
+	blx \reg
+#else
+	mov	lr, pc
+	mov	pc, \reg
+#endif
+.endm
+
 	.align 	0
 
 	FUNC_START	_mainCRTStartup
@@ -48,258 +59,30 @@
 	/*  Issue Demon SWI to read stack info */
 	swi	SWI_GetEnv	/*  Returns command line in r0 */
 	mov	sp,r1		/*  and the highest memory address in r1 */
-	ldr	sl, .LC2	/*  stack limit is at end of data */
-	add	sl, sl, #256	/*  allow slop for stack overflow handling */
-				/*  and small frames */
+
+	/*  stack limit is at end of data */
+	/*  allow slop for stack overflow handling and small frames */
+#ifdef __ARM_ARCH_6M__
+	ldr	r0, .LC2
+	adds	r0, #128
+	adds	r0, #128
+	mov	sl, r0
+#else
+	ldr	sl, .LC2
+	add	sl, sl, #256
+#endif
 #else
 #ifdef ARM_RDI_MONITOR
 	/*  Issue Angel SWI to read stack info */
-	mov	r0, #AngelSWI_Reason_HeapInfo
+	movs	r0, #AngelSWI_Reason_HeapInfo
 	adr	r1, .LC0	/*  point at ptr to 4 words to receive data */
-#if defined(__thumb2__)
+#ifdef THUMB_V7M_V6M
 	bkpt	AngelSWI
+#elif defined(__thumb2__)
+	/*  We are in thumb mode for startup on armv7 architectures. */
+	AngelSWIAsm	AngelSWI
 #else
-	/*  We are always in ARM mode for startup */
+	/*  We are always in ARM mode for startup on pre armv7 archs. */
 	AngelSWIAsm	AngelSWI_ARM
 #endif
 	ldr	r0, .LC0	/*  point at values read */
-	ldr	sp, [r0, #8]
-	ldr	sl, [r0, #12]
-	add	sl, sl, #256	/*  allow slop for stack overflow handling */
-				/*  and small frames */
-#else
-	/*  Set up the stack pointer to a fixed value */
-	ldr	r3, .LC0
-	mov 	sp, r3
-	/* Setup a default stack-limit in-case the code has been
-	   compiled with "-mapcs-stack-check".  Hard-wiring this value
-	   is not ideal, since there is currently no support for
-	   checking that the heap and stack have not collided, or that
-	   this default 64k is enough for the program being executed.
-	   However, it ensures that this simple crt0 world will not
-	   immediately cause an overflow event:  */
-	sub	sl, sp, #64 << 10	/* Still assumes 256bytes below sl */
-#endif
-#endif
-	/* Zero the memory in the .bss section.  */
-	mov 	a2, #0			/* Second arg: fill value */
-	mov	fp, a2			/* Null frame pointer */
-	mov	r7, a2			/* Null frame pointer for Thumb */
-	
-	ldr	a1, .LC1		/* First arg: start of memory block */
-	ldr	a3, .LC2	
-	sub	a3, a3, a1		/* Third arg: length of block */
-	
-
-#if defined(__thumb__) && !defined(__thumb2__)
-	/* Enter Thumb mode.... */
-	add	a4, pc, #1	/* Get the address of the Thumb block */
-	bx	a4		/* Go there and start Thumb decoding  */
-
-	.code 16
-	.global __change_mode
-	.thumb_func
-__change_mode:	
-#endif
-	
-	bl	FUNCTION (memset)
-#if !defined (ARM_RDP_MONITOR) && !defined (ARM_RDI_MONITOR)
-	mov	r0, #0		/*  no arguments  */
-	mov	r1, #0		/*  no argv either */
-#else
-	/* Need to set up standard file handles */
-	bl	FUNCTION (initialise_monitor_handles)
-	
-#ifdef ARM_RDP_MONITOR
-	swi	SWI_GetEnv	/*  sets r0 to point to the command line */
-	mov	r1, r0
-#else
-	mov	r0, #AngelSWI_Reason_GetCmdLine
-	adr	r1, .LC30	/*  Space for command line */
-	AngelSWIAsm	AngelSWI
-	ldr	r1, .LC30
-#endif
-	/*  Parse string at r1 */
-	mov	r0, #0		/*  count of arguments so far */
-	/* Push a NULL argument onto the end of the list.  */
-#ifdef __thumb__
-	push	{r0}
-#else
-	stmfd	sp!, {r0}
-#endif
-.LC10:
-/*  Skip leading blanks */
-#ifdef __thumb__
-	ldrb	r3, [r1]
-	add	r1, #1
-#else
-	ldrb	r3, [r1], #1
-#endif
-	cmp	r3, #0
-	beq	.LC12
-	cmp	r3, #' '
-	beq	.LC10
-
-/*  See whether we are scanning a string */
-	cmp	r3, #'"'
-#ifdef __thumb__
-	beq	.LC20
-	cmp	r3, #'\''
-	bne	.LC21
-.LC20:
-	mov	r2, r3
-	b	.LC22
-
-.LC21:
-	mov	r2, #' '	/*  terminator type */
-	sub	r1, r1, #1	/*  adjust back to point at start char */
-.LC22:
-#else
-	cmpne	r3, #'\''
-	moveq	r2, r3
-	movne	r2, #' '	/*  terminator type */
-	subne	r1, r1, #1	/*  adjust back to point at start char */
-#endif
-
-/*  Stack a pointer to the current argument */
-#ifdef __thumb__
-	push	{r1}
-#else
-	stmfd	sp!, {r1}
-#endif
-	add	r0, r0, #1
-.LC11:
-#ifdef __thumb__
-	ldrb	r3, [r1]
-	add	r1, #1
-#else
-	ldrb	r3, [r1], #1
-#endif
-	cmp	r3, #0
-	beq	.LC12
-	cmp	r2, r3		/*  reached terminator? */
-	bne	.LC11
-	mov	r2, #0
-	sub	r3, r1, #1
-	strb	r2, [r3]	/*  terminate the arg string */
-	b	.LC10
-
-.LC12:
-	mov	r1, sp		/*  point at stacked arg pointers */
-	/* We've now got the stacked args in order reverse the */
-#ifdef __thumb__
-	mov	r2, r0
-	lsl	r2, #2
-	add	r2, sp
-	mov	r3, sp
-.LC15:	cmp	r2, r3
-	bls	.LC14
-	sub	r2, #4
-	ldr	r4, [r2]
-	ldr	r5, [r3]
-	str	r5, [r2]
-	str	r4, [r3]
-	add	r3, #4
-	b	.LC15
-.LC14:	
-	/* Ensure doubleword stack alignment.  */
-	mov	r4, sp
-	mov	r5, #7
-	bic	r4, r5
-	mov	sp, r4
-#else
-	add	r2, sp, r0, LSL #2	/* End of args */
-	mov	r3, sp			/* Start of args */
-.LC13:	cmp	r2, r3
-	ldrhi	r4,[r2, #-4]		/* Reverse ends of list */
-	ldrhi	r5, [r3]
-	strhi	r5, [r2, #-4]!
-	strhi	r4, [r3], #4
-	bhi	.LC13
-	/* Ensure doubleword stack alignment.  */
-	bic	sp, sp, #7
-#endif
-#endif
-
-#ifdef __USES_INITFINI__
-	/* Some arm/elf targets use the .init and .fini sections
-	   to create constructors and destructors, and for these
-	   targets we need to call the _init function and arrange
-	   for _fini to be called at program exit.  */
-	mov	r4, r0
-	mov	r5, r1
-	ldr	r0, .Lfini
-	bl	FUNCTION (atexit)
-	bl	FUNCTION (_init)
-	mov	r0, r4
-	mov	r1, r5
-#endif	
-	bl	FUNCTION (main)
-
-	bl	FUNCTION (exit)		/* Should not return.  */
-
-#if defined(__thumb__) && !defined(__thumb2__)
-	/* Come out of Thumb mode.  This code should be redundant.  */
-
-	mov	a4, pc
-	bx	a4
-
-	.code 32
-	.global change_back
-change_back:
-	/* Halt the execution.  This code should never be executed.  */
-	/* With no debug monitor, this probably aborts (eventually).
-	   With a Demon debug monitor, this halts cleanly.
-	   With an Angel debug monitor, this will report 'Unknown SWI'.	 */
-	swi	SWI_Exit
-#endif
-	
-	/* For Thumb, constants must be after the code since only 
-	   positive offsets are supported for PC relative addresses.  */
-	
-	.align 0
-.LC0:
-#ifdef ARM_RDI_MONITOR
-	.word	HeapBase
-#else
-#ifndef ARM_RDP_MONITOR
-#ifdef __pe__
-	.word	0x800000
-#else
-/*	.word	0x80000	*/		/* Top of RAM on the PIE board.  */
-#endif
-#endif
-#endif
-#if defined(__ELF__) && !defined(__USING_SJLJ_EXCEPTIONS__)
-	/* Protect against unhandled exceptions.  */
-	.cantunwind
-	.fnend
-#endif
-.LC1:
-	.word	__bss_start__
-.LC2:
-	.word	__bss_end__
-#ifdef __USES_INITFINI__
-.Lfini:
-	.word	FUNCTION(_fini)
-#endif
-#ifdef ARM_RDI_MONITOR
-.LC30:
-	.word	CommandLine
-	.word	255
-
-/*  Workspace for Angel calls.  */
-	.data
-/*  Data returned by monitor SWI.  */
-.global	__stack_base__
-HeapBase:	.word	0
-HeapLimit:	.word	0
-__stack_base__:	.word	0
-StackLimit:	.word	0
-CommandLine:	.space	256,0	/*  Maximum length of 255 chars handled.  */
-#endif
-	
-#ifdef __pe__
-	.section .idata$3
-	.long	0,0,0,0,0,0,0,0
-#endif