Index: gdb/ia64-tdep.c |
diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c |
index a7a802ab8a6797d3417cf032a6c9e3f73d9805f2..44000b9925574990e43fa2305bfc2df6eb47e251 100644 |
--- a/gdb/ia64-tdep.c |
+++ b/gdb/ia64-tdep.c |
@@ -1,6 +1,6 @@ |
/* Target-dependent code for the IA-64 for GDB, the GNU debugger. |
- Copyright (C) 1999-2012 Free Software Foundation, Inc. |
+ Copyright (C) 1999-2013 Free Software Foundation, Inc. |
This file is part of GDB. |
@@ -370,7 +370,7 @@ ia64_dwarf_reg_to_regnum (struct gdbarch *gdbarch, int reg) |
bit ``from''. */ |
static long long |
-extract_bit_field (const char *bundle, int from, int len) |
+extract_bit_field (const gdb_byte *bundle, int from, int len) |
{ |
long long result = 0LL; |
int to = from + len; |
@@ -406,7 +406,7 @@ extract_bit_field (const char *bundle, int from, int len) |
/* Replace the specified bits in an instruction bundle. */ |
static void |
-replace_bit_field (char *bundle, long long val, int from, int len) |
+replace_bit_field (gdb_byte *bundle, long long val, int from, int len) |
{ |
int to = from + len; |
int from_byte = from / 8; |
@@ -456,7 +456,7 @@ replace_bit_field (char *bundle, long long val, int from, int len) |
and instruction bundle. */ |
static long long |
-slotN_contents (char *bundle, int slotnum) |
+slotN_contents (gdb_byte *bundle, int slotnum) |
{ |
return extract_bit_field (bundle, 5+41*slotnum, 41); |
} |
@@ -464,7 +464,7 @@ slotN_contents (char *bundle, int slotnum) |
/* Store an instruction in an instruction bundle. */ |
static void |
-replace_slotN_contents (char *bundle, long long instr, int slotnum) |
+replace_slotN_contents (gdb_byte *bundle, long long instr, int slotnum) |
{ |
replace_bit_field (bundle, instr, 5+41*slotnum, 41); |
} |
@@ -511,7 +511,7 @@ static const enum instruction_type template_encoding_table[32][3] = |
static CORE_ADDR |
fetch_instruction (CORE_ADDR addr, instruction_type *it, long long *instr) |
{ |
- char bundle[BUNDLE_LEN]; |
+ gdb_byte bundle[BUNDLE_LEN]; |
int slotnum = (int) (addr & 0x0f) / SLOT_MULTIPLIER; |
long long template; |
int val; |
@@ -1165,7 +1165,7 @@ ia64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, |
} |
else |
{ |
- char nat_buf[8]; |
+ gdb_byte nat_buf[8]; |
nat_collection = read_memory_integer (nat_addr, 8, byte_order); |
if (natN_val) |
nat_collection |= natN_mask; |
@@ -1224,7 +1224,7 @@ ia64_register_to_value (struct frame_info *frame, int regnum, |
int *optimizedp, int *unavailablep) |
{ |
struct gdbarch *gdbarch = get_frame_arch (frame); |
- char in[MAX_REGISTER_SIZE]; |
+ gdb_byte in[MAX_REGISTER_SIZE]; |
/* Convert to TYPE. */ |
if (!get_frame_register_bytes (frame, regnum, 0, |
@@ -1242,7 +1242,7 @@ ia64_value_to_register (struct frame_info *frame, int regnum, |
struct type *valtype, const gdb_byte *in) |
{ |
struct gdbarch *gdbarch = get_frame_arch (frame); |
- char out[MAX_REGISTER_SIZE]; |
+ gdb_byte out[MAX_REGISTER_SIZE]; |
convert_typed_floating (in, valtype, out, ia64_ext_type (gdbarch)); |
put_frame_register (frame, regnum, out); |
} |
@@ -1380,7 +1380,7 @@ examine_prologue (CORE_ADDR pc, CORE_ADDR lim_pc, |
int frameless = 1; |
int i; |
CORE_ADDR addr; |
- char buf[8]; |
+ gdb_byte buf[8]; |
CORE_ADDR bof, sor, sol, sof, cfm, rrb_gr; |
memset (instores, 0, sizeof instores); |
@@ -1514,7 +1514,7 @@ examine_prologue (CORE_ADDR pc, CORE_ADDR lim_pc, |
else if (qp == 0 && rN == 2 |
&& ((rM == fp_reg && fp_reg != 0) || rM == 12)) |
{ |
- char buf[MAX_REGISTER_SIZE]; |
+ gdb_byte buf[MAX_REGISTER_SIZE]; |
CORE_ADDR saved_sp = 0; |
/* adds r2, spilloffset, rFramePointer |
or |
@@ -1850,7 +1850,7 @@ ia64_frame_cache (struct frame_info *this_frame, void **this_cache) |
struct gdbarch *gdbarch = get_frame_arch (this_frame); |
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); |
struct ia64_frame_cache *cache; |
- char buf[8]; |
+ gdb_byte buf[8]; |
CORE_ADDR cfm, psr; |
if (*this_cache) |
@@ -1918,7 +1918,7 @@ ia64_frame_prev_register (struct frame_info *this_frame, void **this_cache, |
struct gdbarch *gdbarch = get_frame_arch (this_frame); |
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); |
struct ia64_frame_cache *cache = ia64_frame_cache (this_frame, this_cache); |
- char buf[8]; |
+ gdb_byte buf[8]; |
gdb_assert (regnum >= 0); |
@@ -2238,7 +2238,7 @@ ia64_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) |
struct gdbarch *gdbarch = get_frame_arch (this_frame); |
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); |
struct ia64_frame_cache *cache; |
- char buf[8]; |
+ gdb_byte buf[8]; |
if (*this_cache) |
return *this_cache; |
@@ -2288,7 +2288,7 @@ static struct value * |
ia64_sigtramp_frame_prev_register (struct frame_info *this_frame, |
void **this_cache, int regnum) |
{ |
- char buf[MAX_REGISTER_SIZE]; |
+ gdb_byte buf[MAX_REGISTER_SIZE]; |
struct gdbarch *gdbarch = get_frame_arch (this_frame); |
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); |
@@ -2494,7 +2494,7 @@ ia64_access_reg (unw_addr_space_t as, unw_regnum_t uw_regnum, unw_word_t *val, |
struct gdbarch *gdbarch = get_frame_arch (this_frame); |
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); |
long new_sof, old_sof; |
- char buf[MAX_REGISTER_SIZE]; |
+ gdb_byte buf[MAX_REGISTER_SIZE]; |
/* We never call any libunwind routines that need to write registers. */ |
gdb_assert (!write); |
@@ -2558,7 +2558,7 @@ ia64_access_fpreg (unw_addr_space_t as, unw_regnum_t uw_regnum, |
/* We never call any libunwind routines that need to write registers. */ |
gdb_assert (!write); |
- get_frame_register (this_frame, regnum, (char *) val); |
+ get_frame_register (this_frame, regnum, (gdb_byte *) val); |
return 0; |
} |
@@ -2574,7 +2574,7 @@ ia64_access_rse_reg (unw_addr_space_t as, unw_regnum_t uw_regnum, |
struct gdbarch *gdbarch = get_regcache_arch (regcache); |
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); |
long new_sof, old_sof; |
- char buf[MAX_REGISTER_SIZE]; |
+ gdb_byte buf[MAX_REGISTER_SIZE]; |
/* We never call any libunwind routines that need to write registers. */ |
gdb_assert (!write); |
@@ -2639,7 +2639,7 @@ ia64_access_rse_fpreg (unw_addr_space_t as, unw_regnum_t uw_regnum, |
/* We never call any libunwind routines that need to write registers. */ |
gdb_assert (!write); |
- regcache_cooked_read (regcache, regnum, (char *) val); |
+ regcache_cooked_read (regcache, regnum, (gdb_byte *) val); |
return 0; |
} |
@@ -2664,9 +2664,9 @@ ia64_access_mem (unw_addr_space_t as, |
/* XXX do we need to normalize byte-order here? */ |
if (write) |
- return target_write_memory (addr, (char *) val, sizeof (unw_word_t)); |
+ return target_write_memory (addr, (gdb_byte *) val, sizeof (unw_word_t)); |
else |
- return target_read_memory (addr, (char *) val, sizeof (unw_word_t)); |
+ return target_read_memory (addr, (gdb_byte *) val, sizeof (unw_word_t)); |
} |
/* Call low-level function to access the kernel unwind table. */ |
@@ -2929,7 +2929,7 @@ ia64_libunwind_frame_this_id (struct frame_info *this_frame, void **this_cache, |
struct gdbarch *gdbarch = get_frame_arch (this_frame); |
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); |
struct frame_id id = outer_frame_id; |
- char buf[8]; |
+ gdb_byte buf[8]; |
CORE_ADDR bsp; |
libunwind_frame_this_id (this_frame, this_cache, &id); |
@@ -2981,7 +2981,7 @@ ia64_libunwind_frame_prev_register (struct frame_info *this_frame, |
{ |
int rrb_pr = 0; |
ULONGEST cfm; |
- unsigned char buf[MAX_REGISTER_SIZE]; |
+ gdb_byte buf[MAX_REGISTER_SIZE]; |
/* Fetch predicate register rename base from current frame |
marker for this frame. */ |
@@ -3060,7 +3060,7 @@ ia64_libunwind_sigtramp_frame_this_id (struct frame_info *this_frame, |
{ |
struct gdbarch *gdbarch = get_frame_arch (this_frame); |
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); |
- char buf[8]; |
+ gdb_byte buf[8]; |
CORE_ADDR bsp; |
struct frame_id id = outer_frame_id; |
CORE_ADDR prev_ip; |
@@ -3228,7 +3228,7 @@ ia64_extract_return_value (struct type *type, struct regcache *regcache, |
float_elt_type = is_float_or_hfa_type (type); |
if (float_elt_type != NULL) |
{ |
- char from[MAX_REGISTER_SIZE]; |
+ gdb_byte from[MAX_REGISTER_SIZE]; |
int offset = 0; |
int regnum = IA64_FR8_REGNUM; |
int n = TYPE_LENGTH (type) / TYPE_LENGTH (float_elt_type); |
@@ -3293,7 +3293,7 @@ ia64_store_return_value (struct type *type, struct regcache *regcache, |
float_elt_type = is_float_or_hfa_type (type); |
if (float_elt_type != NULL) |
{ |
- char to[MAX_REGISTER_SIZE]; |
+ gdb_byte to[MAX_REGISTER_SIZE]; |
int offset = 0; |
int regnum = IA64_FR8_REGNUM; |
int n = TYPE_LENGTH (type) / TYPE_LENGTH (float_elt_type); |
@@ -3480,7 +3480,7 @@ ia64_find_global_pointer_from_dynamic_section (struct gdbarch *gdbarch, |
{ |
int status; |
LONGEST tag; |
- char buf[8]; |
+ gdb_byte buf[8]; |
status = target_read_memory (addr, buf, sizeof (buf)); |
if (status != 0) |
@@ -3563,7 +3563,7 @@ find_extant_func_descr (struct gdbarch *gdbarch, CORE_ADDR faddr) |
{ |
int status; |
LONGEST faddr2; |
- char buf[8]; |
+ gdb_byte buf[8]; |
status = target_read_memory (addr, buf, sizeof (buf)); |
if (status != 0) |
@@ -3596,7 +3596,7 @@ find_func_descr (struct regcache *regcache, CORE_ADDR faddr, CORE_ADDR *fdaptr) |
if (fdesc == 0) |
{ |
ULONGEST global_pointer; |
- char buf[16]; |
+ gdb_byte buf[16]; |
fdesc = *fdaptr; |
*fdaptr += 16; |
@@ -3651,11 +3651,11 @@ ia64_convert_from_func_ptr_addr (struct gdbarch *gdbarch, CORE_ADDR addr, |
/* There are also descriptors embedded in vtables. */ |
if (s) |
{ |
- struct minimal_symbol *minsym; |
+ struct bound_minimal_symbol minsym; |
minsym = lookup_minimal_symbol_by_pc (addr); |
- if (minsym && is_vtable_name (SYMBOL_LINKAGE_NAME (minsym))) |
+ if (minsym.minsym && is_vtable_name (SYMBOL_LINKAGE_NAME (minsym.minsym))) |
return read_memory_unsigned_integer (addr, 8, byte_order); |
} |
@@ -3783,7 +3783,7 @@ ia64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, |
&& TYPE_CODE (type) == TYPE_CODE_PTR |
&& TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC) |
{ |
- char val_buf[8]; |
+ gdb_byte val_buf[8]; |
ULONGEST faddr = extract_unsigned_integer (value_contents (arg), |
8, byte_order); |
store_unsigned_integer (val_buf, 8, byte_order, |
@@ -3807,7 +3807,7 @@ ia64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, |
argoffset = 0; |
while (len > 0) |
{ |
- char val_buf[8]; |
+ gdb_byte val_buf[8]; |
memset (val_buf, 0, 8); |
if (!ia64_struct_type_p (type) && len < 8) |
@@ -3903,7 +3903,7 @@ static struct frame_id |
ia64_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame) |
{ |
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); |
- char buf[8]; |
+ gdb_byte buf[8]; |
CORE_ADDR sp, bsp; |
get_frame_register (this_frame, sp_regnum, buf); |
@@ -3925,7 +3925,7 @@ static CORE_ADDR |
ia64_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) |
{ |
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); |
- char buf[8]; |
+ gdb_byte buf[8]; |
CORE_ADDR ip, psr, pc; |
frame_unwind_register (next_frame, IA64_IP_REGNUM, buf); |