From 20e1fcfd316129586e78b67d2d7c963d7d50c852 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Wed, 1 Jun 2005 19:23:58 +0000 Subject: [PATCH] gas/: * config/tc-mips.c (load_register): Add leading "0x" to the output of sprintf_vma(). (macro): Likewise. gas/testsuite/: * gas/mips/ldstla-32-1.l: Update to handle leading zeroes. * gas/mips/ldstla-32-mips3-1.l: Likewise. --- gas/ChangeLog | 6 ++ gas/config/tc-mips.c | 6 +- gas/testsuite/ChangeLog | 5 ++ gas/testsuite/gas/mips/ldstla-32-1.l | 84 +++++++++++----------- gas/testsuite/gas/mips/ldstla-32-mips3-1.l | 108 ++++++++++++++--------------- 5 files changed, 110 insertions(+), 99 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 0aee8df..e1c8ce3 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2005-06-01 Maciej W. Rozycki + + * config/tc-mips.c (load_register): Add leading "0x" to the + output of sprintf_vma(). + (macro): Likewise. + 2005-06-01 Nick Clifton * config/tc-arm.c (TxCE, TxC3, TxCM, TUE, TUF): Remove redundant diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 9eae5e3..fb256e4 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -3558,7 +3558,7 @@ load_register (int reg, expressionS *ep, int dbl) char value[32]; sprintf_vma (value, ep->X_add_number); - as_bad (_("Number (%s) larger than 32 bits"), value); + as_bad (_("Number (0x%s) larger than 32 bits"), value); macro_build (ep, "addiu", "t,r,j", reg, 0, BFD_RELOC_LO16); return; } @@ -5805,7 +5805,7 @@ macro (struct mips_cl_insn *ip) char value [32]; sprintf_vma (value, offset_expr.X_add_number); - as_bad (_("Number (%s) larger than 32 bits"), value); + as_bad (_("Number (0x%s) larger than 32 bits"), value); } /* A constant expression in PIC code can be handled just as it @@ -6399,7 +6399,7 @@ macro (struct mips_cl_insn *ip) char value [32]; sprintf_vma (value, offset_expr.X_add_number); - as_bad (_("Number (%s) larger than 32 bits"), value); + as_bad (_("Number (0x%s) larger than 32 bits"), value); } /* Even on a big endian machine $fn comes before $fn+1. We have diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index d94416a..84261dc 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-06-01 Maciej W. Rozycki + + * gas/mips/ldstla-32-1.l: Update to handle leading zeroes. + * gas/mips/ldstla-32-mips3-1.l: Likewise. + 2005-05-27 Jan Beulich * gas/ia64/proc.l: Adjust. diff --git a/gas/testsuite/gas/mips/ldstla-32-1.l b/gas/testsuite/gas/mips/ldstla-32-1.l index 0ee83c9..264b616 100644 --- a/gas/testsuite/gas/mips/ldstla-32-1.l +++ b/gas/testsuite/gas/mips/ldstla-32-1.l @@ -2,80 +2,80 @@ .*:3: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:4: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:5: Error: Number \(0xabcdef0123456789\) larger than 32 bits -.*:6: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:7: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:8: Error: Number \(0x100000000\) larger than 32 bits +.*:6: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:7: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:8: Error: Number \(0x0*100000000\) larger than 32 bits .*:10: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:11: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:12: Error: Number \(0xabcdef0123456789\) larger than 32 bits -.*:13: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:14: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:15: Error: Number \(0x100000000\) larger than 32 bits +.*:13: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:14: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:15: Error: Number \(0x0*100000000\) larger than 32 bits .*:17: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:18: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:19: Error: Number \(0xabcdef0123456789\) larger than 32 bits -.*:20: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:21: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:22: Error: Number \(0x100000000\) larger than 32 bits +.*:20: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:21: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:22: Error: Number \(0x0*100000000\) larger than 32 bits .*:24: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:25: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:26: Error: Number \(0xabcdef0123456789\) larger than 32 bits -.*:27: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:28: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:29: Error: Number \(0x100000000\) larger than 32 bits +.*:27: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:28: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:29: Error: Number \(0x0*100000000\) larger than 32 bits .*:31: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:32: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:32: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:33: Error: Number \(0xabcdef0123456789\) larger than 32 bits .*:33: Error: Number \(0xabcdef0123450000\) larger than 32 bits -.*:34: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:34: Error: Number \(0x123456789ac0000\) larger than 32 bits -.*:35: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:35: Error: Number \(0x200000000\) larger than 32 bits -.*:36: Error: Number \(0x100000000\) larger than 32 bits -.*:36: Error: Number \(0x100000000\) larger than 32 bits +.*:34: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:34: Error: Number \(0x0*123456789ac0000\) larger than 32 bits +.*:35: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:35: Error: Number \(0x0*200000000\) larger than 32 bits +.*:36: Error: Number \(0x0*100000000\) larger than 32 bits +.*:36: Error: Number \(0x0*100000000\) larger than 32 bits .*:38: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:39: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:39: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:40: Error: Number \(0xabcdef0123456789\) larger than 32 bits .*:40: Error: Number \(0xabcdef0123450000\) larger than 32 bits -.*:41: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:41: Error: Number \(0x123456789ac0000\) larger than 32 bits -.*:42: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:42: Error: Number \(0x200000000\) larger than 32 bits -.*:43: Error: Number \(0x100000000\) larger than 32 bits -.*:43: Error: Number \(0x100000000\) larger than 32 bits +.*:41: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:41: Error: Number \(0x0*123456789ac0000\) larger than 32 bits +.*:42: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:42: Error: Number \(0x0*200000000\) larger than 32 bits +.*:43: Error: Number \(0x0*100000000\) larger than 32 bits +.*:43: Error: Number \(0x0*100000000\) larger than 32 bits .*:45: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:46: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:46: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:47: Error: Number \(0xabcdef0123456789\) larger than 32 bits .*:47: Error: Number \(0xabcdef0123450000\) larger than 32 bits -.*:48: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:48: Error: Number \(0x123456789ac0000\) larger than 32 bits -.*:49: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:49: Error: Number \(0x200000000\) larger than 32 bits -.*:50: Error: Number \(0x100000000\) larger than 32 bits -.*:50: Error: Number \(0x100000000\) larger than 32 bits +.*:48: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:48: Error: Number \(0x0*123456789ac0000\) larger than 32 bits +.*:49: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:49: Error: Number \(0x0*200000000\) larger than 32 bits +.*:50: Error: Number \(0x0*100000000\) larger than 32 bits +.*:50: Error: Number \(0x0*100000000\) larger than 32 bits .*:52: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:53: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:53: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:54: Error: Number \(0xabcdef0123456789\) larger than 32 bits .*:54: Error: Number \(0xabcdef0123450000\) larger than 32 bits -.*:55: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:55: Error: Number \(0x123456789ac0000\) larger than 32 bits -.*:56: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:56: Error: Number \(0x200000000\) larger than 32 bits -.*:57: Error: Number \(0x100000000\) larger than 32 bits -.*:57: Error: Number \(0x100000000\) larger than 32 bits +.*:55: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:55: Error: Number \(0x0*123456789ac0000\) larger than 32 bits +.*:56: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:56: Error: Number \(0x0*200000000\) larger than 32 bits +.*:57: Error: Number \(0x0*100000000\) larger than 32 bits +.*:57: Error: Number \(0x0*100000000\) larger than 32 bits .*:59: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:60: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:61: Error: Number \(0xabcdef0123456789\) larger than 32 bits -.*:62: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:63: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:64: Error: Number \(0x100000000\) larger than 32 bits +.*:62: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:63: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:64: Error: Number \(0x0*100000000\) larger than 32 bits .*:66: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:67: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:68: Error: Number \(0xabcdef0123456789\) larger than 32 bits -.*:69: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:70: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:71: Error: Number \(0x100000000\) larger than 32 bits +.*:69: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:70: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:71: Error: Number \(0x0*100000000\) larger than 32 bits diff --git a/gas/testsuite/gas/mips/ldstla-32-mips3-1.l b/gas/testsuite/gas/mips/ldstla-32-mips3-1.l index 26a0a4f..3ac3497 100644 --- a/gas/testsuite/gas/mips/ldstla-32-mips3-1.l +++ b/gas/testsuite/gas/mips/ldstla-32-mips3-1.l @@ -4,98 +4,98 @@ .*:4: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:5: Error: Number \(0xabcdef0123456789\) larger than 32 bits .*:5: Error: Number \(0xabcdef0123450000\) larger than 32 bits -.*:6: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:6: Error: Number \(0x123456789ac0000\) larger than 32 bits -.*:7: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:7: Error: Number \(0x200000000\) larger than 32 bits -.*:8: Error: Number \(0x100000000\) larger than 32 bits -.*:8: Error: Number \(0x100000000\) larger than 32 bits +.*:6: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:6: Error: Number \(0x0*123456789ac0000\) larger than 32 bits +.*:7: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:7: Error: Number \(0x0*200000000\) larger than 32 bits +.*:8: Error: Number \(0x0*100000000\) larger than 32 bits +.*:8: Error: Number \(0x0*100000000\) larger than 32 bits .*:10: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:11: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:11: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:12: Error: Number \(0xabcdef0123456789\) larger than 32 bits .*:12: Error: Number \(0xabcdef0123450000\) larger than 32 bits -.*:13: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:13: Error: Number \(0x123456789ac0000\) larger than 32 bits -.*:14: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:14: Error: Number \(0x200000000\) larger than 32 bits -.*:15: Error: Number \(0x100000000\) larger than 32 bits -.*:15: Error: Number \(0x100000000\) larger than 32 bits +.*:13: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:13: Error: Number \(0x0*123456789ac0000\) larger than 32 bits +.*:14: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:14: Error: Number \(0x0*200000000\) larger than 32 bits +.*:15: Error: Number \(0x0*100000000\) larger than 32 bits +.*:15: Error: Number \(0x0*100000000\) larger than 32 bits .*:17: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:18: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:18: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:19: Error: Number \(0xabcdef0123456789\) larger than 32 bits .*:19: Error: Number \(0xabcdef0123450000\) larger than 32 bits -.*:20: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:20: Error: Number \(0x123456789ac0000\) larger than 32 bits -.*:21: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:21: Error: Number \(0x200000000\) larger than 32 bits -.*:22: Error: Number \(0x100000000\) larger than 32 bits -.*:22: Error: Number \(0x100000000\) larger than 32 bits +.*:20: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:20: Error: Number \(0x0*123456789ac0000\) larger than 32 bits +.*:21: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:21: Error: Number \(0x0*200000000\) larger than 32 bits +.*:22: Error: Number \(0x0*100000000\) larger than 32 bits +.*:22: Error: Number \(0x0*100000000\) larger than 32 bits .*:24: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:25: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:25: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:26: Error: Number \(0xabcdef0123456789\) larger than 32 bits .*:26: Error: Number \(0xabcdef0123450000\) larger than 32 bits -.*:27: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:27: Error: Number \(0x123456789ac0000\) larger than 32 bits -.*:28: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:28: Error: Number \(0x200000000\) larger than 32 bits -.*:29: Error: Number \(0x100000000\) larger than 32 bits -.*:29: Error: Number \(0x100000000\) larger than 32 bits +.*:27: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:27: Error: Number \(0x0*123456789ac0000\) larger than 32 bits +.*:28: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:28: Error: Number \(0x0*200000000\) larger than 32 bits +.*:29: Error: Number \(0x0*100000000\) larger than 32 bits +.*:29: Error: Number \(0x0*100000000\) larger than 32 bits .*:31: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:32: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:32: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:33: Error: Number \(0xabcdef0123456789\) larger than 32 bits .*:33: Error: Number \(0xabcdef0123450000\) larger than 32 bits -.*:34: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:34: Error: Number \(0x123456789ac0000\) larger than 32 bits -.*:35: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:35: Error: Number \(0x200000000\) larger than 32 bits -.*:36: Error: Number \(0x100000000\) larger than 32 bits -.*:36: Error: Number \(0x100000000\) larger than 32 bits +.*:34: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:34: Error: Number \(0x0*123456789ac0000\) larger than 32 bits +.*:35: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:35: Error: Number \(0x0*200000000\) larger than 32 bits +.*:36: Error: Number \(0x0*100000000\) larger than 32 bits +.*:36: Error: Number \(0x0*100000000\) larger than 32 bits .*:38: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:39: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:39: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:40: Error: Number \(0xabcdef0123456789\) larger than 32 bits .*:40: Error: Number \(0xabcdef0123450000\) larger than 32 bits -.*:41: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:41: Error: Number \(0x123456789ac0000\) larger than 32 bits -.*:42: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:42: Error: Number \(0x200000000\) larger than 32 bits -.*:43: Error: Number \(0x100000000\) larger than 32 bits -.*:43: Error: Number \(0x100000000\) larger than 32 bits +.*:41: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:41: Error: Number \(0x0*123456789ac0000\) larger than 32 bits +.*:42: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:42: Error: Number \(0x0*200000000\) larger than 32 bits +.*:43: Error: Number \(0x0*100000000\) larger than 32 bits +.*:43: Error: Number \(0x0*100000000\) larger than 32 bits .*:45: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:46: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:46: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:47: Error: Number \(0xabcdef0123456789\) larger than 32 bits .*:47: Error: Number \(0xabcdef0123450000\) larger than 32 bits -.*:48: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:48: Error: Number \(0x123456789ac0000\) larger than 32 bits -.*:49: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:49: Error: Number \(0x200000000\) larger than 32 bits -.*:50: Error: Number \(0x100000000\) larger than 32 bits -.*:50: Error: Number \(0x100000000\) larger than 32 bits +.*:48: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:48: Error: Number \(0x0*123456789ac0000\) larger than 32 bits +.*:49: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:49: Error: Number \(0x0*200000000\) larger than 32 bits +.*:50: Error: Number \(0x0*100000000\) larger than 32 bits +.*:50: Error: Number \(0x0*100000000\) larger than 32 bits .*:52: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:53: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:53: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:54: Error: Number \(0xabcdef0123456789\) larger than 32 bits .*:54: Error: Number \(0xabcdef0123450000\) larger than 32 bits -.*:55: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:55: Error: Number \(0x123456789ac0000\) larger than 32 bits -.*:56: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:56: Error: Number \(0x200000000\) larger than 32 bits -.*:57: Error: Number \(0x100000000\) larger than 32 bits -.*:57: Error: Number \(0x100000000\) larger than 32 bits +.*:55: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:55: Error: Number \(0x0*123456789ac0000\) larger than 32 bits +.*:56: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:56: Error: Number \(0x0*200000000\) larger than 32 bits +.*:57: Error: Number \(0x0*100000000\) larger than 32 bits +.*:57: Error: Number \(0x0*100000000\) larger than 32 bits .*:59: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:60: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:61: Error: Number \(0xabcdef0123456789\) larger than 32 bits -.*:62: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:63: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:64: Error: Number \(0x100000000\) larger than 32 bits +.*:62: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:63: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:64: Error: Number \(0x0*100000000\) larger than 32 bits .*:66: Error: Number \(0xfffffffeffffffff\) larger than 32 bits .*:67: Error: Number \(0xfffffffe00000000\) larger than 32 bits .*:68: Error: Number \(0xabcdef0123456789\) larger than 32 bits -.*:69: Error: Number \(0x123456789abcdef\) larger than 32 bits -.*:70: Error: Number \(0x1ffffffff\) larger than 32 bits -.*:71: Error: Number \(0x100000000\) larger than 32 bits +.*:69: Error: Number \(0x0*123456789abcdef\) larger than 32 bits +.*:70: Error: Number \(0x0*1ffffffff\) larger than 32 bits +.*:71: Error: Number \(0x0*100000000\) larger than 32 bits -- 2.7.4