Module Name: src
Committed By: skrll
Date: Tue Apr 30 15:59:34 UTC 2013
Modified Files:
src/lib/libc/arch/arm/sys: getcontext.S
Log Message:
Don't hardcode offset in assembler. This ensures the return value in the
context is the correct value (0) on earm*
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/arm/sys/getcontext.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/arm/sys/getcontext.S
diff -u src/lib/libc/arch/arm/sys/getcontext.S:1.6 src/lib/libc/arch/arm/sys/getcontext.S:1.7
--- src/lib/libc/arch/arm/sys/getcontext.S:1.6 Mon Apr 28 20:22:55 2008
+++ src/lib/libc/arch/arm/sys/getcontext.S Tue Apr 30 15:59:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: getcontext.S,v 1.6 2008/04/28 20:22:55 martin Exp $ */
+/* $NetBSD: getcontext.S,v 1.7 2013/04/30 15:59:34 skrll Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "SYS.h"
#if defined(SYSLIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: getcontext.S,v 1.6 2008/04/28 20:22:55 martin Exp $")
+ RCSID("$NetBSD: getcontext.S,v 1.7 2013/04/30 15:59:34 skrll Exp $")
#endif /* SYSLIBC_SCCS && !lint */
#ifdef WEAK_ALIAS
@@ -43,12 +43,12 @@ ENTRY(_getcontext)
mov r2, r0 /* Must save argument pointer. */
SYSTRAP (getcontext)
bcs PIC_SYM(CERROR, PLT)
- str lr, [r2, #(36 + 15*4)] /* Adjust PC. */
+ str lr, [r2, #_UC_REGS_PC] /* Adjust PC. */
#ifdef SOFTFLOAT
/* Ahem. */
/* Judging from the softfloat code we should at least save
the exception codes and rounding mode here. */
#endif
mov r0, #0
- str r0, [r2, #(36 + 0*4)] /* Return 0. */
+ str r0, [r2, #_UC_REGS_R0] /* Return 0. */
RET
