This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
PATCH: Add i386_regtab_size and i386_float_regtab_size
- From: "H. J. Lu" <hjl at lucon dot org>
- To: binutils at sources dot redhat dot com
- Date: Thu, 15 Mar 2007 10:27:45 -0700
- Subject: PATCH: Add i386_regtab_size and i386_float_regtab_size
When DEBUG is defined, config/tc-i386.c will use ARRAY_SIZE
on i386_regtab. It won't work since i386_regtab is an external
array now. I am checking this patch to add i386_regtab_size and
i386_float_regtab_size.
H.J.
---
gas/
2007-03-15 H.J. Lu <hongjiu.lu@intel.com>
* config/tc-i386.c (md_begin): Use i386_regtab_size to scan
i386_regtab.
(parse_register): Use i386_regtab_size instead of ARRAY_SIZE
on i386_regtab.
opcodes/
2007-03-14 H.J. Lu <hongjiu.lu@intel.com>
* i386-opc.c: Include "libiberty.h".
(i386_regtab): Remove the last entry.
(i386_regtab_size): New.
(i386_float_regtab_size): Likewise.
* i386-opc.h (i386_regtab_size): New.
(i386_float_regtab_size): Likewise.
--- binutils/gas/config/tc-i386.c.sizeof 2007-03-15 07:46:29.000000000 -0700
+++ binutils/gas/config/tc-i386.c 2007-03-15 10:20:30.000000000 -0700
@@ -1238,8 +1238,9 @@ md_begin ()
reg_hash = hash_new ();
{
const reg_entry *regtab;
+ unsigned int regtab_size = i386_regtab_size;
- for (regtab = i386_regtab; regtab->reg_name != NULL; regtab++)
+ for (regtab = i386_regtab; regtab_size--; regtab++)
{
hash_err = hash_insert (reg_hash, regtab->reg_name, (PTR) regtab);
if (hash_err)
@@ -5791,7 +5792,7 @@ parse_register (char *reg_string, char *
know (e->X_op == O_register);
know (e->X_add_number >= 0
- && (valueT) e->X_add_number < ARRAY_SIZE (i386_regtab));
+ && (valueT) e->X_add_number < i386_regtab_size);
r = i386_regtab + e->X_add_number;
*end_op = input_line_pointer;
}
--- binutils/opcodes/i386-opc.c.sizeof 2007-03-15 07:31:24.000000000 -0700
+++ binutils/opcodes/i386-opc.c 2007-03-15 10:20:02.000000000 -0700
@@ -19,6 +19,7 @@
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
#include "sysdep.h"
+#include "libiberty.h"
#include "i386-opc.h"
const template i386_optab[] =
@@ -1631,11 +1632,10 @@ const reg_entry i386_regtab[] =
/* No type will make this register rejected for all purposes except
for addressing. This saves creating one extra type for RIP. */
{"rip", BaseIndex, 0, 0},
-
- /* sentinel */
- {NULL, 0, 0, 0}
};
+const unsigned int i386_regtab_size = ARRAY_SIZE (i386_regtab);
+
const reg_entry i386_float_regtab[] =
{
{"st(0)", FloatReg|FloatAcc, 0, 0},
@@ -1648,6 +1648,8 @@ const reg_entry i386_float_regtab[] =
{"st(7)", FloatReg, 0, 7}
};
+const unsigned int i386_float_regtab_size = ARRAY_SIZE (i386_float_regtab);
+
/* Segment stuff. */
const seg_entry cs = { "cs", 0x2e };
const seg_entry ds = { "ds", 0x3e };
--- binutils/opcodes/i386-opc.h.sizeof 2007-03-15 07:31:24.000000000 -0700
+++ binutils/opcodes/i386-opc.h 2007-03-15 10:20:13.000000000 -0700
@@ -214,7 +214,9 @@ reg_entry;
#define REGNAM_EAX 41
extern const reg_entry i386_regtab[];
+extern const unsigned int i386_regtab_size;
extern const reg_entry i386_float_regtab[];
+extern const unsigned int i386_float_regtab_size;
typedef struct
{