X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fhppa-tdep.c;h=866e6cf6dea3dc5cc8e9fb7a4dd2dc9cbb75b7c8;hb=be6d4f74c77c6f521afc873d226480e001cb99c2;hp=81e8a4cc6f805899d62c263d81c0fb4cba17c4a5;hpb=73bb0000525a67694c1e8921e7c34ee0d985787e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 81e8a4cc6f..866e6cf6de 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -1,6 +1,6 @@ /* Target-dependent code for the HP PA-RISC architecture. - Copyright (C) 1986-2018 Free Software Foundation, Inc. + Copyright (C) 1986-2019 Free Software Foundation, Inc. Contributed by the Center for Software Science at the University of Utah (pa-gdb-bugs@cs.utah.edu). @@ -483,7 +483,6 @@ struct unwind_table_entry * find_unwind_entry (CORE_ADDR pc) { int first, middle, last; - struct objfile *objfile; struct hppa_objfile_private *priv; if (hppa_debug) @@ -498,61 +497,61 @@ find_unwind_entry (CORE_ADDR pc) return NULL; } - ALL_OBJFILES (objfile) - { - struct hppa_unwind_info *ui; - ui = NULL; - priv = ((struct hppa_objfile_private *) - objfile_data (objfile, hppa_objfile_priv_data)); - if (priv) - ui = ((struct hppa_objfile_private *) priv)->unwind_info; - - if (!ui) - { - read_unwind_info (objfile); - priv = ((struct hppa_objfile_private *) - objfile_data (objfile, hppa_objfile_priv_data)); - if (priv == NULL) - error (_("Internal error reading unwind information.")); - ui = ((struct hppa_objfile_private *) priv)->unwind_info; - } + for (objfile *objfile : current_program_space->objfiles ()) + { + struct hppa_unwind_info *ui; + ui = NULL; + priv = ((struct hppa_objfile_private *) + objfile_data (objfile, hppa_objfile_priv_data)); + if (priv) + ui = ((struct hppa_objfile_private *) priv)->unwind_info; + + if (!ui) + { + read_unwind_info (objfile); + priv = ((struct hppa_objfile_private *) + objfile_data (objfile, hppa_objfile_priv_data)); + if (priv == NULL) + error (_("Internal error reading unwind information.")); + ui = ((struct hppa_objfile_private *) priv)->unwind_info; + } - /* First, check the cache. */ + /* First, check the cache. */ - if (ui->cache - && pc >= ui->cache->region_start - && pc <= ui->cache->region_end) - { - if (hppa_debug) - fprintf_unfiltered (gdb_stdlog, "%s (cached) }\n", - hex_string ((uintptr_t) ui->cache)); - return ui->cache; - } + if (ui->cache + && pc >= ui->cache->region_start + && pc <= ui->cache->region_end) + { + if (hppa_debug) + fprintf_unfiltered (gdb_stdlog, "%s (cached) }\n", + hex_string ((uintptr_t) ui->cache)); + return ui->cache; + } - /* Not in the cache, do a binary search. */ + /* Not in the cache, do a binary search. */ - first = 0; - last = ui->last; + first = 0; + last = ui->last; - while (first <= last) - { - middle = (first + last) / 2; - if (pc >= ui->table[middle].region_start - && pc <= ui->table[middle].region_end) - { - ui->cache = &ui->table[middle]; - if (hppa_debug) - fprintf_unfiltered (gdb_stdlog, "%s }\n", - hex_string ((uintptr_t) ui->cache)); - return &ui->table[middle]; - } + while (first <= last) + { + middle = (first + last) / 2; + if (pc >= ui->table[middle].region_start + && pc <= ui->table[middle].region_end) + { + ui->cache = &ui->table[middle]; + if (hppa_debug) + fprintf_unfiltered (gdb_stdlog, "%s }\n", + hex_string ((uintptr_t) ui->cache)); + return &ui->table[middle]; + } - if (pc < ui->table[middle].region_start) - last = middle - 1; - else - first = middle + 1; - } - } /* ALL_OBJFILES() */ + if (pc < ui->table[middle].region_start) + last = middle - 1; + else + first = middle + 1; + } + } if (hppa_debug) fprintf_unfiltered (gdb_stdlog, "NULL (not found) }\n"); @@ -714,7 +713,8 @@ static CORE_ADDR hppa32_push_dummy_call (struct gdbarch *gdbarch, struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, - int struct_return, CORE_ADDR struct_addr) + function_call_return_method return_method, + CORE_ADDR struct_addr) { enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); @@ -849,7 +849,7 @@ hppa32_push_dummy_call (struct gdbarch *gdbarch, struct value *function, /* If a structure has to be returned, set up register 28 to hold its address. */ - if (struct_return) + if (return_method == return_method_struct) regcache_cooked_write_unsigned (regcache, 28, struct_addr); gp = tdep->find_global_pointer (gdbarch, function); @@ -969,7 +969,8 @@ static CORE_ADDR hppa64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, - int struct_return, CORE_ADDR struct_addr) + function_call_return_method return_method, + CORE_ADDR struct_addr) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); @@ -1044,8 +1045,8 @@ hppa64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, passed in floating-point registers, are passed in the right halves of the floating point registers; the left halves are unused." */ - regcache_cooked_write_part (regcache, regnum, offset % 8, - len, value_contents (arg)); + regcache->cooked_write_part (regnum, offset % 8, len, + value_contents (arg)); } } } @@ -1086,8 +1087,8 @@ hppa64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, regnum = HPPA_ARG0_REGNUM - offset / 8; while (regnum > HPPA_ARG0_REGNUM - 8 && len > 0) { - regcache_cooked_write_part (regcache, regnum, - offset % 8, std::min (len, 8), valbuf); + regcache->cooked_write_part (regnum, offset % 8, std::min (len, 8), + valbuf); offset += std::min (len, 8); valbuf += std::min (len, 8); len -= std::min (len, 8); @@ -1113,7 +1114,7 @@ hppa64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, /* If a structure has to be returned, set up GR 28 (%ret0) to hold its address. */ - if (struct_return) + if (return_method == return_method_struct) regcache_cooked_write_unsigned (regcache, HPPA_RET0_REGNUM, struct_addr); /* Set up GR27 (%dp) to hold the global pointer (gp). */ @@ -1154,8 +1155,7 @@ hppa32_return_value (struct gdbarch *gdbarch, struct value *function, if (readbuf != NULL) regcache->cooked_read_part (reg, 4 - part, part, readbuf); if (writebuf != NULL) - regcache_cooked_write_part (regcache, reg, 4 - part, - part, writebuf); + regcache->cooked_write_part (reg, 4 - part, part, writebuf); reg++; } /* Now transfer the remaining register values. */ @@ -1254,8 +1254,8 @@ hppa64_return_value (struct gdbarch *gdbarch, struct value *function, { while (len > 0) { - regcache_cooked_write_part (regcache, regnum, offset, - std::min (len, 8), writebuf); + regcache->cooked_write_part (regnum, offset, std::min (len, 8), + writebuf); writebuf += std::min (len, 8); len -= std::min (len, 8); regnum++; @@ -2436,9 +2436,7 @@ static struct hppa_stub_unwind_cache * hppa_stub_frame_unwind_cache (struct frame_info *this_frame, void **this_cache) { - struct gdbarch *gdbarch = get_frame_arch (this_frame); struct hppa_stub_unwind_cache *info; - struct unwind_table_entry *u; if (*this_cache) return (struct hppa_stub_unwind_cache *) *this_cache; @@ -2542,24 +2540,25 @@ struct bound_minimal_symbol hppa_lookup_stub_minimal_symbol (const char *name, enum unwind_stub_types stub_type) { - struct objfile *objfile; - struct minimal_symbol *msym; struct bound_minimal_symbol result = { NULL, NULL }; - ALL_MSYMBOLS (objfile, msym) + for (objfile *objfile : current_program_space->objfiles ()) { - if (strcmp (MSYMBOL_LINKAGE_NAME (msym), name) == 0) - { - struct unwind_table_entry *u; - - u = find_unwind_entry (MSYMBOL_VALUE (msym)); - if (u != NULL && u->stub_unwind.stub_type == stub_type) + for (minimal_symbol *msym : objfile->msymbols ()) + { + if (strcmp (MSYMBOL_LINKAGE_NAME (msym), name) == 0) { - result.objfile = objfile; - result.minsym = msym; - return result; + struct unwind_table_entry *u; + + u = find_unwind_entry (MSYMBOL_VALUE (msym)); + if (u != NULL && u->stub_unwind.stub_type == stub_type) + { + result.objfile = objfile; + result.minsym = msym; + return result; + } } - } + } } return result;