[Gmp-commit] /var/hg/gmp-5.1: 2 new changesets

[mercurial at gmplib.org]

details:   /var/hg/gmp-5.1/rev/fdddde0346bc
changeset: 15413:fdddde0346bc
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Thu May 16 12:35:24 2013 +0200
description:
(LEA): Rewrite to properly handle repeated use.

details:   /var/hg/gmp-5.1/rev/aa40d0c7f7ae
changeset: 15414:aa40d0c7f7ae
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Thu May 16 13:11:15 2013 +0200
description:
(m4append): Move definition.

diffstat:

 ChangeLog           |   6 ++++++
 mpn/arm/arm-defs.m4 |  18 ++++++++++++------
 mpn/asm-defs.m4     |   7 +++++++
 mpn/x86/darwin.m4   |   7 -------
 4 files changed, 25 insertions(+), 13 deletions(-)

diffs (95 lines):

diff -r ac1ca7f2b551 -r aa40d0c7f7ae ChangeLog
--- a/ChangeLog	Thu May 16 12:09:05 2013 +0200
+++ b/ChangeLog	Thu May 16 13:11:15 2013 +0200
@@ -34,6 +34,12 @@
 	* tests/arm32call.asm: New file.
 	* tests/arm32check.c: New file.
 
+	* mpn/arm/arm-defs.m4 (LEA): Rewrite to properly handle repeated use.
+	(EPILOGUE_cpu): Define.
+
+	* mpn/x86/darwin.m4 (m4append): Move definition from here...
+	* mpn/asm-defs.m4: ...to here.
+
 2012-03-17  Marc Glisse  <marc.glisse at inria.fr>
 
 	* tests/cxx/t-do-exceptions-work-at-all-with-this-compiler.cc: New file.
diff -r ac1ca7f2b551 -r aa40d0c7f7ae mpn/arm/arm-defs.m4
--- a/mpn/arm/arm-defs.m4	Thu May 16 12:09:05 2013 +0200
+++ b/mpn/arm/arm-defs.m4	Thu May 16 13:11:15 2013 +0200
@@ -2,7 +2,7 @@
 
 dnl  m4 macros for ARM assembler.
 
-dnl  Copyright 2001, 2012 Free Software Foundation, Inc.
+dnl  Copyright 2001, 2012, 2013 Free Software Foundation, Inc.
 dnl
 dnl  This file is part of the GNU MP Library.
 dnl
@@ -48,6 +48,7 @@
 deflit(pc,r15)
 
 
+define(`lea_list', `')
 define(`lea_num',0)
 
 dnl  LEA(reg,gmp_symbol)
@@ -59,16 +60,21 @@
 define(`LEA',`dnl
 ldr	$1, L(ptr`'lea_num)
 ifdef(`PIC',dnl
-`
+`dnl
 L(bas`'lea_num):dnl
 	add	$1, $1, pc`'dnl
-	define(`EPILOGUE_cpu',
-		L(ptr`'lea_num):	.word	GSYM_PREFIX`'$2-L(bas`'lea_num)-8)dnl
+	m4append(`lea_list',`
+L(ptr'lea_num`):	.word	GSYM_PREFIX`'$2-L(bas'lea_num`)-8')
 	define(`lea_num', eval(lea_num+1))dnl
 ',`dnl
-	define(`EPILOGUE_cpu',
-		L(ptr`'lea_num):	.word	GSYM_PREFIX`'$2)')dnl
+	m4append(`lea_list',`
+L(ptr'lea_num`):	.word	GSYM_PREFIX`'$2')
+	define(`lea_num', eval(lea_num+1))dnl
+')dnl
 ')
 
+define(`EPILOGUE_cpu',
+`lea_list
+	SIZE(`$1',.-`$1')')
 
 divert
diff -r ac1ca7f2b551 -r aa40d0c7f7ae mpn/asm-defs.m4
--- a/mpn/asm-defs.m4	Thu May 16 12:09:05 2013 +0200
+++ b/mpn/asm-defs.m4	Thu May 16 13:11:15 2013 +0200
@@ -1740,4 +1740,11 @@
 `m4_hex_lowmask(GMP_NUMB_BITS)')
 
 
+dnl  Usage: m4append(`variable',`value-to-append')
+
+define(`m4append',
+`define(`$1',  defn(`$1')`$2')
+'
+)
+
 divert`'dnl
diff -r ac1ca7f2b551 -r aa40d0c7f7ae mpn/x86/darwin.m4
--- a/mpn/x86/darwin.m4	Thu May 16 12:09:05 2013 +0200
+++ b/mpn/x86/darwin.m4	Thu May 16 13:11:15 2013 +0200
@@ -19,13 +19,6 @@
 define(`DARWIN')
 
 
-dnl m4append is used below.  Consider moving it to mpn/asm-defs.m4.
-
-define(`m4append',
-`define(`$1',  defn(`$1')`$2')'
-)
-
-
 dnl  Usage LEA(symbol,reg)
 dnl
 dnl  We maintain lists of stuff to append in load_eip and darwin_bd.  The