public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
* [SCM] archer-ratmice-compile-Wc++-compat: rename all "class" identifiers.
@ 2010-09-15 15:30 ratmice
0 siblings, 0 replies; only message in thread
From: ratmice @ 2010-09-15 15:30 UTC (permalink / raw)
To: archer-commits
The branch, archer-ratmice-compile-Wc++-compat has been updated
via 30816909ff94da3319bf78c0193c3118b52daf31 (commit)
via 35644607453554b06399c0a5570b1ff09066e6aa (commit)
from ccf4e4828b269336f4def4cf6a9f3e4fdad54eb1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 30816909ff94da3319bf78c0193c3118b52daf31
Author: matt rice <ratmice@gmail.com>
Date: Wed Sep 15 08:28:10 2010 -0700
rename all "class" identifiers.
commit 35644607453554b06399c0a5570b1ff09066e6aa
Author: matt rice <ratmice@gmail.com>
Date: Wed Sep 15 08:14:49 2010 -0700
Remove erronous const in casts to gdb_byte *.
-----------------------------------------------------------------------
Summary of changes:
gdb/alpha-tdep.c | 4 +-
gdb/amd64-tdep.c | 68 +++++++++++++++++++++++-----------------------
gdb/amd64-tdep.h | 2 +-
gdb/amd64-windows-tdep.c | 12 ++++----
gdb/arm-linux-tdep.c | 2 +-
gdb/breakpoint.c | 4 +-
gdb/i386-tdep.h | 2 +-
gdb/mdebugread.c | 36 ++++++++++++------------
gdb/objc-exp.y | 18 ++++++------
gdb/objc-lang.c | 60 ++++++++++++++++++++--------------------
gdb/objc-lang.h | 2 +-
gdb/parser-defs.h | 2 +-
gdb/psymtab.c | 8 +++---
gdb/python/py-symbol.c | 24 +++++++++-------
gdb/sh64-tdep.c | 2 +-
15 files changed, 124 insertions(+), 122 deletions(-)
First 500 lines of diff:
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 80be4c6..374fbdd 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -208,7 +208,7 @@ alpha_lds (struct gdbarch *gdbarch, void *out, const void *in)
}
reg = (sign << 63) | (exp << 52) | (frac << 29);
- store_unsigned_integer ((const gdb_byte *) out, 8, byte_order, reg);
+ store_unsigned_integer ((gdb_byte *) out, 8, byte_order, reg);
}
/* Similarly, this represents exactly the conversion performed by
@@ -222,7 +222,7 @@ alpha_sts (struct gdbarch *gdbarch, void *out, const void *in)
reg = extract_unsigned_integer ((const gdb_byte *) in, 8, byte_order);
mem = ((reg >> 32) & 0xc0000000) | ((reg >> 29) & 0x3fffffff);
- store_unsigned_integer ((const gdb_byte *) out, 4, byte_order, mem);
+ store_unsigned_integer ((gdb_byte *) out, 4, byte_order, mem);
}
/* The alpha needs a conversion between register and memory format if the
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index f069967..c5b886f 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -428,7 +428,7 @@ amd64_non_pod_p (struct type *type)
arrays) and union types, and store the result in CLASS. */
static void
-amd64_classify_aggregate (struct type *type, enum amd64_reg_class class[2])
+amd64_classify_aggregate (struct type *type, enum amd64_reg_class regclass[2])
{
int len = TYPE_LENGTH (type);
@@ -437,12 +437,12 @@ amd64_classify_aggregate (struct type *type, enum amd64_reg_class class[2])
unaligned fields, it has class memory. */
if (len > 16 || amd64_non_pod_p (type))
{
- class[0] = class[1] = AMD64_MEMORY;
+ regclass[0] = regclass[1] = AMD64_MEMORY;
return;
}
/* 2. Both eightbytes get initialized to class NO_CLASS. */
- class[0] = class[1] = AMD64_NO_CLASS;
+ regclass[0] = regclass[1] = AMD64_NO_CLASS;
/* 3. Each field of an object is classified recursively so that
always two fields are considered. The resulting class is
@@ -454,9 +454,9 @@ amd64_classify_aggregate (struct type *type, enum amd64_reg_class class[2])
struct type *subtype = check_typedef (TYPE_TARGET_TYPE (type));
/* All fields in an array have the same type. */
- amd64_classify (subtype, class);
- if (len > 8 && class[1] == AMD64_NO_CLASS)
- class[1] = class[0];
+ amd64_classify (subtype, regclass);
+ if (len > 8 && regclass[1] == AMD64_NO_CLASS)
+ regclass[1] = regclass[0];
}
else
{
@@ -485,7 +485,7 @@ amd64_classify_aggregate (struct type *type, enum amd64_reg_class class[2])
gdb_assert (pos == 0 || pos == 1);
amd64_classify (subtype, subclass);
- class[pos] = amd64_merge_classes (class[pos], subclass[0]);
+ regclass[pos] = amd64_merge_classes (regclass[pos], subclass[0]);
if (bitsize <= 64 && pos == 0 && endpos == 1)
/* This is a bit of an odd case: We have a field that would
normally fit in one of the two eightbytes, except that
@@ -509,9 +509,9 @@ amd64_classify_aggregate (struct type *type, enum amd64_reg_class class[2])
use up all 16 bytes of the aggregate, and are already
handled just fine (because each portion sits on its own
8-byte). */
- class[1] = amd64_merge_classes (class[1], subclass[0]);
+ regclass[1] = amd64_merge_classes (regclass[1], subclass[0]);
if (pos == 0)
- class[1] = amd64_merge_classes (class[1], subclass[1]);
+ regclass[1] = amd64_merge_classes (regclass[1], subclass[1]);
}
}
@@ -519,26 +519,26 @@ amd64_classify_aggregate (struct type *type, enum amd64_reg_class class[2])
/* Rule (a): If one of the classes is MEMORY, the whole argument is
passed in memory. */
- if (class[0] == AMD64_MEMORY || class[1] == AMD64_MEMORY)
- class[0] = class[1] = AMD64_MEMORY;
+ if (regclass[0] == AMD64_MEMORY || regclass[1] == AMD64_MEMORY)
+ regclass[0] = regclass[1] = AMD64_MEMORY;
/* Rule (b): If SSEUP is not preceeded by SSE, it is converted to
SSE. */
- if (class[0] == AMD64_SSEUP)
- class[0] = AMD64_SSE;
- if (class[1] == AMD64_SSEUP && class[0] != AMD64_SSE)
- class[1] = AMD64_SSE;
+ if (regclass[0] == AMD64_SSEUP)
+ regclass[0] = AMD64_SSE;
+ if (regclass[1] == AMD64_SSEUP && regclass[0] != AMD64_SSE)
+ regclass[1] = AMD64_SSE;
}
/* Classify TYPE, and store the result in CLASS. */
void
-amd64_classify (struct type *type, enum amd64_reg_class class[2])
+amd64_classify (struct type *type, enum amd64_reg_class regclass[2])
{
enum type_code code = TYPE_CODE (type);
int len = TYPE_LENGTH (type);
- class[0] = class[1] = AMD64_NO_CLASS;
+ regclass[0] = regclass[1] = AMD64_NO_CLASS;
/* Arguments of types (signed and unsigned) _Bool, char, short, int,
long, long long, and pointers are in the INTEGER class. Similarly,
@@ -549,33 +549,33 @@ amd64_classify (struct type *type, enum amd64_reg_class class[2])
|| code == TYPE_CODE_CHAR
|| code == TYPE_CODE_PTR || code == TYPE_CODE_REF)
&& (len == 1 || len == 2 || len == 4 || len == 8))
- class[0] = AMD64_INTEGER;
+ regclass[0] = AMD64_INTEGER;
/* Arguments of types float, double, _Decimal32, _Decimal64 and __m64
are in class SSE. */
else if ((code == TYPE_CODE_FLT || code == TYPE_CODE_DECFLOAT)
&& (len == 4 || len == 8))
/* FIXME: __m64 . */
- class[0] = AMD64_SSE;
+ regclass[0] = AMD64_SSE;
/* Arguments of types __float128, _Decimal128 and __m128 are split into
two halves. The least significant ones belong to class SSE, the most
significant one to class SSEUP. */
else if (code == TYPE_CODE_DECFLOAT && len == 16)
/* FIXME: __float128, __m128. */
- class[0] = AMD64_SSE, class[1] = AMD64_SSEUP;
+ regclass[0] = AMD64_SSE, regclass[1] = AMD64_SSEUP;
/* The 64-bit mantissa of arguments of type long double belongs to
class X87, the 16-bit exponent plus 6 bytes of padding belongs to
class X87UP. */
else if (code == TYPE_CODE_FLT && len == 16)
/* Class X87 and X87UP. */
- class[0] = AMD64_X87, class[1] = AMD64_X87UP;
+ regclass[0] = AMD64_X87, regclass[1] = AMD64_X87UP;
/* Aggregates. */
else if (code == TYPE_CODE_ARRAY || code == TYPE_CODE_STRUCT
|| code == TYPE_CODE_UNION)
- amd64_classify_aggregate (type, class);
+ amd64_classify_aggregate (type, regclass);
}
static enum return_value_convention
@@ -584,7 +584,7 @@ amd64_return_value (struct gdbarch *gdbarch, struct type *func_type,
gdb_byte *readbuf, const gdb_byte *writebuf)
{
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
- enum amd64_reg_class class[2];
+ enum amd64_reg_class regclass[2];
int len = TYPE_LENGTH (type);
static int integer_regnum[] = { AMD64_RAX_REGNUM, AMD64_RDX_REGNUM };
static int sse_regnum[] = { AMD64_XMM0_REGNUM, AMD64_XMM1_REGNUM };
@@ -596,7 +596,7 @@ amd64_return_value (struct gdbarch *gdbarch, struct type *func_type,
gdb_assert (tdep->classify);
/* 1. Classify the return type with the classification algorithm. */
- tdep->classify (type, class);
+ tdep->classify (type, regclass);
/* 2. If the type has class MEMORY, then the caller provides space
for the return value and passes the address of this storage in
@@ -605,7 +605,7 @@ amd64_return_value (struct gdbarch *gdbarch, struct type *func_type,
On return %rax will contain the address that has been passed in
by the caller in %rdi. */
- if (class[0] == AMD64_MEMORY)
+ if (regclass[0] == AMD64_MEMORY)
{
/* As indicated by the comment above, the ABI guarantees that we
can always find the return value just after the function has
@@ -622,7 +622,7 @@ amd64_return_value (struct gdbarch *gdbarch, struct type *func_type,
return RETURN_VALUE_ABI_RETURNS_ADDRESS;
}
- gdb_assert (class[1] != AMD64_MEMORY);
+ gdb_assert (regclass[1] != AMD64_MEMORY);
gdb_assert (len <= 16);
for (i = 0; len > 0; i++, len -= 8)
@@ -630,7 +630,7 @@ amd64_return_value (struct gdbarch *gdbarch, struct type *func_type,
int regnum = -1;
int offset = 0;
- switch (class[i])
+ switch (regclass[i])
{
case AMD64_INTEGER:
/* 3. If the class is INTEGER, the next available register
@@ -663,7 +663,7 @@ amd64_return_value (struct gdbarch *gdbarch, struct type *func_type,
case AMD64_X87UP:
/* 7. If the class is X87UP, the value is returned together
with the previous X87 value in %st0. */
- gdb_assert (i > 0 && class[0] == AMD64_X87);
+ gdb_assert (i > 0 && regclass[0] == AMD64_X87);
regnum = AMD64_ST0_REGNUM;
offset = 8;
len = 2;
@@ -732,21 +732,21 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
{
struct type *type = value_type (args[i]);
int len = TYPE_LENGTH (type);
- enum amd64_reg_class class[2];
+ enum amd64_reg_class regclass[2];
int needed_integer_regs = 0;
int needed_sse_regs = 0;
int j;
/* Classify argument. */
- tdep->classify (type, class);
+ tdep->classify (type, regclass);
/* Calculate the number of integer and SSE registers needed for
this argument. */
for (j = 0; j < 2; j++)
{
- if (class[j] == AMD64_INTEGER)
+ if (regclass[j] == AMD64_INTEGER)
needed_integer_regs++;
- else if (class[j] == AMD64_SSE)
+ else if (regclass[j] == AMD64_SSE)
needed_sse_regs++;
}
@@ -763,7 +763,7 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
be passed in one of the integer registers, reserve that
register and associate this value to that register so that
we can store the argument address as soon as we know it. */
- if (class[0] == AMD64_MEMORY
+ if (regclass[0] == AMD64_MEMORY
&& tdep->memory_args_by_pointer
&& integer_reg < tdep->call_dummy_num_integer_regs)
arg_addr_regno[num_stack_args] =
@@ -785,7 +785,7 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
int regnum = -1;
int offset = 0;
- switch (class[j])
+ switch (regclass[j])
{
case AMD64_INTEGER:
regnum = integer_regs[integer_reg++];
diff --git a/gdb/amd64-tdep.h b/gdb/amd64-tdep.h
index e67106d..9812168 100644
--- a/gdb/amd64-tdep.h
+++ b/gdb/amd64-tdep.h
@@ -105,7 +105,7 @@ extern void amd64_collect_fxsave (const struct regcache *regcache, int regnum,
extern void amd64_collect_xsave (const struct regcache *regcache,
int regnum, void *xsave, int gcore);
-void amd64_classify (struct type *type, enum amd64_reg_class class[2]);
+void amd64_classify (struct type *type, enum amd64_reg_class regclass[2]);
\f
diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
index 05d0824..fb6257f 100644
--- a/gdb/amd64-windows-tdep.c
+++ b/gdb/amd64-windows-tdep.c
@@ -37,13 +37,13 @@ static int amd64_windows_dummy_call_integer_regs[] =
for amd64-windows. */
static void
-amd64_windows_classify (struct type *type, enum amd64_reg_class class[2])
+amd64_windows_classify (struct type *type, enum amd64_reg_class regclass[2])
{
switch (TYPE_CODE (type))
{
case TYPE_CODE_ARRAY:
/* Arrays are always passed by memory. */
- class[0] = class[1] = AMD64_MEMORY;
+ regclass[0] = regclass[1] = AMD64_MEMORY;
break;
case TYPE_CODE_STRUCT:
@@ -56,17 +56,17 @@ amd64_windows_classify (struct type *type, enum amd64_reg_class class[2])
|| TYPE_LENGTH (type) == 4
|| TYPE_LENGTH (type) == 8)
{
- class[0] = AMD64_INTEGER;
- class[1] = AMD64_NO_CLASS;
+ regclass[0] = AMD64_INTEGER;
+ regclass[1] = AMD64_NO_CLASS;
}
else
- class[0] = class[1] = AMD64_MEMORY;
+ regclass[0] = regclass[1] = AMD64_MEMORY;
break;
default:
/* For all the other types, the conventions are the same as
with the System V ABI. */
- amd64_classify (type, class);
+ amd64_classify (type, regclass);
}
}
diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
index dfe0faf..427a8bc 100644
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -464,7 +464,7 @@ arm_linux_collect_gregset (const struct regset *regset,
const struct regcache *regcache,
int regnum, void *gregs_buf, size_t len)
{
- gdb_byte *gregs = (const gdb_byte *) gregs_buf;
+ gdb_byte *gregs = (gdb_byte *) gregs_buf;
int regno;
for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index e1839f5..8691731 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4156,7 +4156,7 @@ struct bpstat_what
bpstat_what (bpstat bs)
{
/* Classify each bpstat as one of the following. */
- enum class
+ enum bpstat_class
{
/* This bpstat element has no effect on the main_action. */
no_effect = 0,
@@ -4282,7 +4282,7 @@ bpstat_what (bpstat bs)
retval.call_dummy = STOP_NONE;
for (; bs != NULL; bs = bs->next)
{
- enum class bs_class = no_effect;
+ enum bpstat_class bs_class = no_effect;
if (bs->breakpoint_at == NULL)
/* I suspect this can happen if it was a momentary breakpoint
which has since been deleted. */
diff --git a/gdb/i386-tdep.h b/gdb/i386-tdep.h
index 6520d67..a2e1849 100644
--- a/gdb/i386-tdep.h
+++ b/gdb/i386-tdep.h
@@ -84,7 +84,7 @@ struct gdbarch_tdep
/* Used on amd64 only. Classify TYPE according to calling conventions,
and store the result in CLASS. */
- void (*classify) (struct type *type, enum amd64_reg_class class[2]);
+ void (*classify) (struct type *type, enum amd64_reg_class regclass[2]);
/* Used on amd64 only. Non-zero if the first few MEMORY arguments
should be passed by pointer.
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index d10cc73..189fec7 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -551,7 +551,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
struct type *t;
struct field *f;
int count = 1;
- enum address_class class;
+ enum address_class addr_class;
TIR tir;
long svalue = sh->value;
int bitsize;
@@ -592,7 +592,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
break;
case stGlobal: /* external symbol, goes into global block */
- class = LOC_STATIC;
+ addr_class = LOC_STATIC;
b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (top_stack->cur_st),
GLOBAL_BLOCK);
s = new_symbol (name);
@@ -600,7 +600,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
goto data;
case stStatic: /* static data, goes into current block. */
- class = LOC_STATIC;
+ addr_class = LOC_STATIC;
b = top_stack->cur_block;
s = new_symbol (name);
if (SC_IS_COMMON (sh->sc))
@@ -622,15 +622,15 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
SYMBOL_VALUE (s) = svalue;
if (sh->sc == scRegister)
{
- class = LOC_REGISTER;
+ addr_class = LOC_REGISTER;
SYMBOL_REGISTER_OPS (s) = &mdebug_register_funcs;
}
else
- class = LOC_LOCAL;
+ addr_class = LOC_LOCAL;
data: /* Common code for symbols describing data */
SYMBOL_DOMAIN (s) = VAR_DOMAIN;
- SYMBOL_CLASS (s) = class;
+ SYMBOL_CLASS (s) = addr_class;
add_symbol (s, top_stack->cur_st, b);
/* Type could be missing if file is compiled without debugging info. */
@@ -3393,7 +3393,7 @@ parse_partial_symbols (struct objfile *objfile)
for (cur_sdx = 0; cur_sdx < fh->csym;)
{
char *name;
- enum address_class class;
+ enum address_class addr_class;
(*swap_sym_in) (cur_bfd,
((char *) debug_info->external_sym
@@ -3545,7 +3545,7 @@ parse_partial_symbols (struct objfile *objfile)
SECT_OFF_BSS (objfile),
NULL,
objfile);
- class = LOC_STATIC;
+ addr_class = LOC_STATIC;
break;
case stIndirect: /* Irix5 forward declaration */
@@ -3557,11 +3557,11 @@ parse_partial_symbols (struct objfile *objfile)
structs from alpha and mips cc. */
if (sh.iss == 0 || has_opaque_xref (fh, &sh))
goto skip;
- class = LOC_TYPEDEF;
+ addr_class = LOC_TYPEDEF;
break;
case stConstant: /* Constant decl */
- class = LOC_CONST;
+ addr_class = LOC_CONST;
break;
case stUnion:
@@ -3617,7 +3617,7 @@ parse_partial_symbols (struct objfile *objfile)
}
/* Use this gdb symbol */
add_psymbol_to_list (name, strlen (name), 1,
- VAR_DOMAIN, class,
+ VAR_DOMAIN, addr_class,
&objfile->static_psymbols,
0, sh.value, psymtab_language, objfile);
skip:
@@ -3631,7 +3631,7 @@ parse_partial_symbols (struct objfile *objfile)
PST_PRIVATE (save_pst)->extern_tab = ext_ptr;
for (; --cur_sdx >= 0; ext_ptr++)
{
- enum address_class class;
+ enum address_class addr_class;
SYMR *psh;
char *name;
CORE_ADDR svalue;
@@ -3677,7 +3677,7 @@ parse_partial_symbols (struct objfile *objfile)
Ignore them, as parse_external will ignore them too. */
continue;
case stLabel:
- class = LOC_LABEL;
+ addr_class = LOC_LABEL;
break;
default:
unknown_ext_complaint (debug_info->ssext + psh->iss);
@@ -3688,12 +3688,12 @@ parse_partial_symbols (struct objfile *objfile)
if (SC_IS_COMMON (psh->sc))
continue;
- class = LOC_STATIC;
+ addr_class = LOC_STATIC;
break;
}
name = debug_info->ssext + psh->iss;
add_psymbol_to_list (name, strlen (name), 1,
- VAR_DOMAIN, class,
+ VAR_DOMAIN, addr_class,
&objfile->global_psymbols,
0, svalue,
psymtab_language, objfile);
@@ -4518,7 +4518,7 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp, enum type_code type_cod
static struct symbol *
mylookup_symbol (char *name, struct block *block,
- domain_enum domain, enum address_class class)
+ domain_enum domain, enum address_class addr_class)
{
struct dict_iterator iter;
int inc;
@@ -4529,14 +4529,14 @@ mylookup_symbol (char *name, struct block *block,
{
if (SYMBOL_LINKAGE_NAME (sym)[0] == inc
&& SYMBOL_DOMAIN (sym) == domain
- && SYMBOL_CLASS (sym) == class
+ && SYMBOL_CLASS (sym) == addr_class
&& strcmp (SYMBOL_LINKAGE_NAME (sym), name) == 0)
return sym;
hooks/post-receive
--
Repository for Project Archer.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-09-15 15:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-15 15:30 [SCM] archer-ratmice-compile-Wc++-compat: rename all "class" identifiers ratmice
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).