From owner-svn-src-projects@FreeBSD.ORG  Sun Aug 29 02:42:03 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3066106566B;
	Sun, 29 Aug 2010 02:42:03 +0000 (UTC)
	(envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C4BD48FC0A;
	Sun, 29 Aug 2010 02:42:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7T2g3Lg050414;
	Sun, 29 Aug 2010 02:42:03 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7T2g3U0050411;
	Sun, 29 Aug 2010 02:42:03 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201008290242.o7T2g3U0050411@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 29 Aug 2010 02:42:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211954 - projects/arm_eabi/sys/arm/arm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Aug 2010 02:42:03 -0000

Author: andrew
Date: Sun Aug 29 02:42:03 2010
New Revision: 211954
URL: http://svn.freebsd.org/changeset/base/211954

Log:
  Align the stack to an 8 byte boundary as required by the AAPCS

Modified:
  projects/arm_eabi/sys/arm/arm/exception.S
  projects/arm_eabi/sys/arm/arm/vm_machdep.c

Modified: projects/arm_eabi/sys/arm/arm/exception.S
==============================================================================
--- projects/arm_eabi/sys/arm/arm/exception.S	Sat Aug 28 23:50:09 2010	(r211953)
+++ projects/arm_eabi/sys/arm/arm/exception.S	Sun Aug 29 02:42:03 2010	(r211954)
@@ -80,7 +80,9 @@ ASENTRY_NP(swi_entry)
 	PUSHFRAME
 
 	mov	r0, sp			/* Pass the frame to any function */
+	sub	sp, sp, #4
 	bl	_C_LABEL(swi_handler)	/* It's a SWI ! */
+	add	sp, sp, #4
 
 	DO_AST
 	PULLFRAME

Modified: projects/arm_eabi/sys/arm/arm/vm_machdep.c
==============================================================================
--- projects/arm_eabi/sys/arm/arm/vm_machdep.c	Sat Aug 28 23:50:09 2010	(r211953)
+++ projects/arm_eabi/sys/arm/arm/vm_machdep.c	Sun Aug 29 02:42:03 2010	(r211954)
@@ -391,6 +391,8 @@ cpu_thread_alloc(struct thread *td)
 	    PAGE_SIZE) - 1;
 	td->td_frame = (struct trapframe *)
 	    ((u_int)td->td_kstack + USPACE_SVC_STACK_TOP - sizeof(struct pcb)) - 1;
+	/* Ensure the frame is aligned to an 8 byte boundary */
+	td->td_frame = (struct trapframe *)((u_int)td->td_frame & ~7);
 #ifdef __XSCALE__
 #ifndef CPU_XSCALE_CORE3
 	pmap_use_minicache(td->td_kstack, td->td_kstack_pages * PAGE_SIZE);