aboutsummaryrefslogtreecommitdiff
path: root/gcc/dwarf2out.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/dwarf2out.c')
-rw-r--r--gcc/dwarf2out.c125
1 files changed, 65 insertions, 60 deletions
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 8fd1945..f90329b 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -71,6 +71,7 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "hard-reg-set.h"
#include "regs.h"
+#include "rtlhash.h"
#include "insn-config.h"
#include "reload.h"
#include "function.h"
@@ -3277,7 +3278,7 @@ static void gen_scheduled_generic_parms_dies (void);
static const char *comp_dir_string (void);
-static hashval_t hash_loc_operands (dw_loc_descr_ref, hashval_t);
+static void hash_loc_operands (dw_loc_descr_ref, inchash::hash &);
/* enum for tracking thread-local variables whose address is really an offset
relative to the TLS pointer, which will need link-time relocation, but will
@@ -4190,17 +4191,22 @@ static hashval_t
addr_table_entry_do_hash (const void *x)
{
const addr_table_entry *a = (const addr_table_entry *) x;
+ inchash::hash hstate;
switch (a->kind)
{
case ate_kind_rtx:
- return iterative_hash_rtx (a->addr.rtl, 0);
+ hstate.add_int (0);
+ break;
case ate_kind_rtx_dtprel:
- return iterative_hash_rtx (a->addr.rtl, 1);
+ hstate.add_int (1);
+ break;
case ate_kind_label:
return htab_hash_string (a->addr.label);
default:
gcc_unreachable ();
}
+ inchash::add_rtx (a->addr.rtl, hstate);
+ return hstate.end ();
}
/* Determine equality for two address_table_entries. */
@@ -5544,11 +5550,13 @@ static inline void
loc_checksum (dw_loc_descr_ref loc, struct md5_ctx *ctx)
{
int tem;
- hashval_t hash = 0;
+ inchash::hash hstate;
+ hashval_t hash;
tem = (loc->dtprel << 8) | ((unsigned int) loc->dw_loc_opc);
CHECKSUM (tem);
- hash = hash_loc_operands (loc, hash);
+ hash_loc_operands (loc, hstate);
+ hash = hstate.end();
CHECKSUM (hash);
}
@@ -5758,11 +5766,13 @@ loc_checksum_ordered (dw_loc_descr_ref loc, struct md5_ctx *ctx)
/* Otherwise, just checksum the raw location expression. */
while (loc != NULL)
{
- hashval_t hash = 0;
+ inchash::hash hstate;
+ hashval_t hash;
CHECKSUM_ULEB128 (loc->dtprel);
CHECKSUM_ULEB128 (loc->dw_loc_opc);
- hash = hash_loc_operands (loc, hash);
+ hash_loc_operands (loc, hstate);
+ hash = hstate.end ();
CHECKSUM (hash);
loc = loc->dw_loc_next;
}
@@ -23619,10 +23629,10 @@ resolve_addr (dw_die_ref die)
This pass tries to share identical local lists in .debug_loc
section. */
-/* Iteratively hash operands of LOC opcode. */
+/* Iteratively hash operands of LOC opcode into HSTATE. */
-static hashval_t
-hash_loc_operands (dw_loc_descr_ref loc, hashval_t hash)
+static void
+hash_loc_operands (dw_loc_descr_ref loc, inchash::hash &hstate)
{
dw_val_ref val1 = &loc->dw_loc_oprnd1;
dw_val_ref val2 = &loc->dw_loc_oprnd2;
@@ -23681,7 +23691,7 @@ hash_loc_operands (dw_loc_descr_ref loc, hashval_t hash)
case DW_OP_piece:
case DW_OP_deref_size:
case DW_OP_xderef_size:
- hash = iterative_hash_object (val1->v.val_int, hash);
+ hstate.add_object (val1->v.val_int);
break;
case DW_OP_skip:
case DW_OP_bra:
@@ -23690,36 +23700,35 @@ hash_loc_operands (dw_loc_descr_ref loc, hashval_t hash)
gcc_assert (val1->val_class == dw_val_class_loc);
offset = val1->v.val_loc->dw_loc_addr - (loc->dw_loc_addr + 3);
- hash = iterative_hash_object (offset, hash);
+ hstate.add_object (offset);
}
break;
case DW_OP_implicit_value:
- hash = iterative_hash_object (val1->v.val_unsigned, hash);
+ hstate.add_object (val1->v.val_unsigned);
switch (val2->val_class)
{
case dw_val_class_const:
- hash = iterative_hash_object (val2->v.val_int, hash);
+ hstate.add_object (val2->v.val_int);
break;
case dw_val_class_vec:
{
unsigned int elt_size = val2->v.val_vec.elt_size;
unsigned int len = val2->v.val_vec.length;
- hash = iterative_hash_object (elt_size, hash);
- hash = iterative_hash_object (len, hash);
- hash = iterative_hash (val2->v.val_vec.array,
- len * elt_size, hash);
+ hstate.add_int (elt_size);
+ hstate.add_int (len);
+ hstate.add (val2->v.val_vec.array, len * elt_size);
}
break;
case dw_val_class_const_double:
- hash = iterative_hash_object (val2->v.val_double.low, hash);
- hash = iterative_hash_object (val2->v.val_double.high, hash);
+ hstate.add_object (val2->v.val_double.low);
+ hstate.add_object (val2->v.val_double.high);
break;
case dw_val_class_wide_int:
- hash = iterative_hash_object (*val2->v.val_wide, hash);
+ hstate.add_object (*val2->v.val_wide);
break;
- case dw_val_class_addr:
- hash = iterative_hash_rtx (val2->v.val_addr, hash);
+ case dw_val_class_addr:
+ inchash::add_rtx (val2->v.val_addr, hstate);
break;
default:
gcc_unreachable ();
@@ -23727,17 +23736,17 @@ hash_loc_operands (dw_loc_descr_ref loc, hashval_t hash)
break;
case DW_OP_bregx:
case DW_OP_bit_piece:
- hash = iterative_hash_object (val1->v.val_int, hash);
- hash = iterative_hash_object (val2->v.val_int, hash);
+ hstate.add_object (val1->v.val_int);
+ hstate.add_object (val2->v.val_int);
break;
case DW_OP_addr:
hash_addr:
if (loc->dtprel)
{
unsigned char dtprel = 0xd1;
- hash = iterative_hash_object (dtprel, hash);
+ hstate.add_object (dtprel);
}
- hash = iterative_hash_rtx (val1->v.val_addr, hash);
+ inchash::add_rtx (val1->v.val_addr, hstate);
break;
case DW_OP_GNU_addr_index:
case DW_OP_GNU_const_index:
@@ -23745,16 +23754,16 @@ hash_loc_operands (dw_loc_descr_ref loc, hashval_t hash)
if (loc->dtprel)
{
unsigned char dtprel = 0xd1;
- hash = iterative_hash_object (dtprel, hash);
+ hstate.add_object (dtprel);
}
- hash = iterative_hash_rtx (val1->val_entry->addr.rtl, hash);
+ inchash::add_rtx (val1->val_entry->addr.rtl, hstate);
}
break;
case DW_OP_GNU_implicit_pointer:
- hash = iterative_hash_object (val2->v.val_int, hash);
+ hstate.add_int (val2->v.val_int);
break;
case DW_OP_GNU_entry_value:
- hash = hash_loc_operands (val1->v.val_loc, hash);
+ hstate.add_object (val1->v.val_loc);
break;
case DW_OP_GNU_regval_type:
case DW_OP_GNU_deref_type:
@@ -23763,16 +23772,16 @@ hash_loc_operands (dw_loc_descr_ref loc, hashval_t hash)
= get_AT_unsigned (val2->v.val_die_ref.die, DW_AT_byte_size);
unsigned int encoding
= get_AT_unsigned (val2->v.val_die_ref.die, DW_AT_encoding);
- hash = iterative_hash_object (val1->v.val_int, hash);
- hash = iterative_hash_object (byte_size, hash);
- hash = iterative_hash_object (encoding, hash);
+ hstate.add_object (val1->v.val_int);
+ hstate.add_object (byte_size);
+ hstate.add_object (encoding);
}
break;
case DW_OP_GNU_convert:
case DW_OP_GNU_reinterpret:
if (val1->val_class == dw_val_class_unsigned_const)
{
- hash = iterative_hash_object (val1->v.val_unsigned, hash);
+ hstate.add_object (val1->v.val_unsigned);
break;
}
/* FALLTHRU */
@@ -23782,33 +23791,32 @@ hash_loc_operands (dw_loc_descr_ref loc, hashval_t hash)
= get_AT_unsigned (val1->v.val_die_ref.die, DW_AT_byte_size);
unsigned int encoding
= get_AT_unsigned (val1->v.val_die_ref.die, DW_AT_encoding);
- hash = iterative_hash_object (byte_size, hash);
- hash = iterative_hash_object (encoding, hash);
+ hstate.add_object (byte_size);
+ hstate.add_object (encoding);
if (loc->dw_loc_opc != DW_OP_GNU_const_type)
break;
- hash = iterative_hash_object (val2->val_class, hash);
+ hstate.add_object (val2->val_class);
switch (val2->val_class)
{
case dw_val_class_const:
- hash = iterative_hash_object (val2->v.val_int, hash);
+ hstate.add_object (val2->v.val_int);
break;
case dw_val_class_vec:
{
unsigned int elt_size = val2->v.val_vec.elt_size;
unsigned int len = val2->v.val_vec.length;
- hash = iterative_hash_object (elt_size, hash);
- hash = iterative_hash_object (len, hash);
- hash = iterative_hash (val2->v.val_vec.array,
- len * elt_size, hash);
+ hstate.add_object (elt_size);
+ hstate.add_object (len);
+ hstate.add (val2->v.val_vec.array, len * elt_size);
}
break;
case dw_val_class_const_double:
- hash = iterative_hash_object (val2->v.val_double.low, hash);
- hash = iterative_hash_object (val2->v.val_double.high, hash);
+ hstate.add_object (val2->v.val_double.low);
+ hstate.add_object (val2->v.val_double.high);
break;
case dw_val_class_wide_int:
- hash = iterative_hash_object (*val2->v.val_wide, hash);
+ hstate.add_object (*val2->v.val_wide);
break;
default:
gcc_unreachable ();
@@ -23820,13 +23828,12 @@ hash_loc_operands (dw_loc_descr_ref loc, hashval_t hash)
/* Other codes have no operands. */
break;
}
- return hash;
}
-/* Iteratively hash the whole DWARF location expression LOC. */
+/* Iteratively hash the whole DWARF location expression LOC into HSTATE. */
-static inline hashval_t
-hash_locs (dw_loc_descr_ref loc, hashval_t hash)
+static inline void
+hash_locs (dw_loc_descr_ref loc, inchash::hash &hstate)
{
dw_loc_descr_ref l;
bool sizes_computed = false;
@@ -23836,15 +23843,14 @@ hash_locs (dw_loc_descr_ref loc, hashval_t hash)
for (l = loc; l != NULL; l = l->dw_loc_next)
{
enum dwarf_location_atom opc = l->dw_loc_opc;
- hash = iterative_hash_object (opc, hash);
+ hstate.add_object (opc);
if ((opc == DW_OP_skip || opc == DW_OP_bra) && !sizes_computed)
{
size_of_locs (loc);
sizes_computed = true;
}
- hash = hash_loc_operands (l, hash);
+ hash_loc_operands (l, hstate);
}
- return hash;
}
/* Compute hash of the whole location list LIST_HEAD. */
@@ -23853,18 +23859,17 @@ static inline void
hash_loc_list (dw_loc_list_ref list_head)
{
dw_loc_list_ref curr = list_head;
- hashval_t hash = 0;
+ inchash::hash hstate;
for (curr = list_head; curr != NULL; curr = curr->dw_loc_next)
{
- hash = iterative_hash (curr->begin, strlen (curr->begin) + 1, hash);
- hash = iterative_hash (curr->end, strlen (curr->end) + 1, hash);
+ hstate.add (curr->begin, strlen (curr->begin) + 1);
+ hstate.add (curr->end, strlen (curr->end) + 1);
if (curr->section)
- hash = iterative_hash (curr->section, strlen (curr->section) + 1,
- hash);
- hash = hash_locs (curr->expr, hash);
+ hstate.add (curr->section, strlen (curr->section) + 1);
+ hash_locs (curr->expr, hstate);
}
- list_head->hash = hash;
+ list_head->hash = hstate.end ();
}
/* Return true if X and Y opcodes have the same operands. */
generated by cgit v1.1 at 2025-08-09 07:24:21 +0000