along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include <stdio.h>
#include "defs.h"
#include "symtab.h"
+#include "gdbtypes.h"
#include "frame.h"
#include "value.h"
#include "gdbcore.h"
if (optimized != NULL)
*optimized = 0;
addr = find_saved_register (frame, regnum);
- if (addr != NULL)
+ if (addr != 0)
{
if (lval != NULL)
*lval = lval_memory;
int optim;
if (regnum == FP_REGNUM && selected_frame)
{
- bcopy (&FRAME_FP(selected_frame), myaddr, sizeof (CORE_ADDR));
- SWAP_TARGET_AND_HOST (myaddr, sizeof (CORE_ADDR)); /* in target order */
+ memcpy (myaddr, &FRAME_FP(selected_frame), REGISTER_RAW_SIZE(FP_REGNUM));
+ SWAP_TARGET_AND_HOST (myaddr, REGISTER_RAW_SIZE(FP_REGNUM)); /* in target order */
return 0;
}
get_saved_register (raw_buffer, &optim, &addr,
selected_frame, regnum, &lval);
- target_convert_to_virtual (regnum, raw_buffer, virtual_buffer);
+ REGISTER_CONVERT_TO_VIRTUAL (regnum, raw_buffer, virtual_buffer);
val = allocate_value (REGISTER_VIRTUAL_TYPE (regnum));
- bcopy (virtual_buffer, VALUE_CONTENTS_RAW (val),
- REGISTER_VIRTUAL_SIZE (regnum));
+ memcpy (VALUE_CONTENTS_RAW (val), virtual_buffer,
+ REGISTER_VIRTUAL_SIZE (regnum));
VALUE_LVAL (val) = lval;
VALUE_ADDRESS (val) = addr;
VALUE_REGNO (val) = regnum;
break;
}
if (myaddr != NULL)
- bcopy (®isters[regbyte], myaddr, len);
+ memcpy (myaddr, ®isters[regbyte], len);
}
/* Read register REGNO into memory at MYADDR, which must be large enough
{
if (!register_valid[regno])
target_fetch_registers (regno);
- bcopy (®isters[REGISTER_BYTE (regno)], myaddr, REGISTER_RAW_SIZE (regno));
+ memcpy (myaddr, ®isters[REGISTER_BYTE (regno)],
+ REGISTER_RAW_SIZE (regno));
}
/* Copy LEN bytes of consecutive data from memory at MYADDR
{
/* Make sure the entire registers array is valid. */
read_register_bytes (0, (char *)NULL, REGISTER_BYTES);
- bcopy (myaddr, ®isters[regbyte], len);
+ memcpy (®isters[regbyte], myaddr, len);
target_store_registers (-1);
}
/* Return the contents of register REGNO, regarding it as an integer. */
+/* FIXME, this loses when the REGISTER_VIRTUAL (REGNO) is true. Also,
+ why is the return type CORE_ADDR rather than some integer type? */
CORE_ADDR
read_register (regno)
int regno;
{
- int reg;
+ unsigned short sval;
+ unsigned int ival;
+ unsigned long lval;
+ LONGEST llval;
+
+ int size;
+
if (!register_valid[regno])
target_fetch_registers (regno);
- /* FIXME, this loses when REGISTER_RAW_SIZE (regno) != sizeof (int) */
- reg = *(int *) ®isters[REGISTER_BYTE (regno)];
- SWAP_TARGET_AND_HOST (®, sizeof (int));
- return reg;
+
+ size = REGISTER_RAW_SIZE(regno);
+
+ if (size == sizeof (unsigned char))
+ return registers[REGISTER_BYTE (regno)];
+ else if (size == sizeof (sval))
+ {
+ memcpy (&sval, ®isters[REGISTER_BYTE (regno)], sizeof (sval));
+ SWAP_TARGET_AND_HOST (&sval, sizeof (sval));
+ return sval;
+ }
+ else if (size == sizeof (ival))
+ {
+ memcpy (&ival, ®isters[REGISTER_BYTE (regno)], sizeof (ival));
+ SWAP_TARGET_AND_HOST (&ival, sizeof (ival));
+ return ival;
+ }
+ else if (size == sizeof (lval))
+ {
+ memcpy (&lval, ®isters[REGISTER_BYTE (regno)], sizeof (lval));
+ SWAP_TARGET_AND_HOST (&lval, sizeof (lval));
+ return lval;
+ }
+ else if (size == sizeof (llval))
+ {
+ memcpy (&llval, ®isters[REGISTER_BYTE (regno)], sizeof (llval));
+ SWAP_TARGET_AND_HOST (&llval, sizeof (llval));
+ return llval;
+ }
+ else
+ {
+ error ("GDB Internal Error in read_register() for register %d, size %d",
+ regno, REGISTER_RAW_SIZE(regno));
+ }
}
/* Registers we shouldn't try to store. */
#endif
/* Store VALUE in the register number REGNO, regarded as an integer. */
+/* FIXME, this loses when REGISTER_VIRTUAL (REGNO) is true. Also,
+ shouldn't the val arg be a LONGEST or something? */
void
write_register (regno, val)
int regno, val;
{
+ unsigned char cval;
+ unsigned short sval;
+ unsigned int ival;
+ unsigned long lval;
+ LONGEST llval;
+ int size;
+ PTR ptr;
+
/* On the sparc, writing %g0 is a no-op, so we don't even want to change
the registers array if something writes to this register. */
if (CANNOT_STORE_REGISTER (regno))
return;
- SWAP_TARGET_AND_HOST (&val, sizeof (int));
+ /* If we have a valid copy of the register, and new value == old value,
+ then don't bother doing the actual store. */
+
+ size = REGISTER_RAW_SIZE(regno);
+ if (size == sizeof(cval))
+ {
+ ptr = (PTR) &cval;
+ cval = val;
+ }
+ else if (size == sizeof(sval))
+ {
+ ptr = (PTR) &sval;
+ sval = val;
+ }
+ else if (size == sizeof(ival))
+ {
+ ptr = (PTR) &ival;
+ ival = val;
+ }
+ else if (size == sizeof(lval))
+ {
+ ptr = (PTR) &lval;
+ lval = val;
+ }
+ else if (size == sizeof(llval))
+ {
+ ptr = (PTR) &llval;
+ llval = val;
+ }
+ else
+ {
+ error ("GDB Internal Error in write_register() for register %d, size %d",
+ regno, size);
+ }
+
+ SWAP_TARGET_AND_HOST (ptr, size);
+ if (register_valid [regno])
+ {
+ if (memcmp (®isters[REGISTER_BYTE (regno)],
+ ptr, size) == 0)
+ return;
+ }
+
target_prepare_to_store ();
+ memcpy (®isters[REGISTER_BYTE (regno)], ptr, size);
+
register_valid [regno] = 1;
- /* FIXME, this loses when REGISTER_RAW_SIZE (regno) != sizeof (int) */
- /* FIXME, this depends on REGISTER_BYTE (regno) being aligned for host */
- *(int *) ®isters[REGISTER_BYTE (regno)] = val;
target_store_registers (regno);
}
char *val;
{
register_valid[regno] = 1;
- bcopy (val, ®isters[REGISTER_BYTE (regno)], REGISTER_RAW_SIZE (regno));
+ memcpy (®isters[REGISTER_BYTE (regno)], val, REGISTER_RAW_SIZE (regno));
+
+ /* On some architectures, e.g. HPPA, there are a few stray bits in some
+ registers, that the rest of the code would like to ignore. */
+#ifdef CLEAN_UP_REGISTER_VALUE
+ CLEAN_UP_REGISTER_VALUE(regno, ®isters[REGISTER_BYTE(regno)]);
+#endif
}
\f
/* Given a struct symbol for a variable,
switch (SYMBOL_CLASS (var))
{
case LOC_CONST:
- bcopy (&SYMBOL_VALUE (var), VALUE_CONTENTS_RAW (v), len);
+ memcpy (VALUE_CONTENTS_RAW (v), &SYMBOL_VALUE (var), len);
SWAP_TARGET_AND_HOST (VALUE_CONTENTS_RAW (v), len);
VALUE_LVAL (v) = not_lval;
return v;
case LOC_LABEL:
addr = SYMBOL_VALUE_ADDRESS (var);
- bcopy (&addr, VALUE_CONTENTS_RAW (v), len);
+ memcpy (VALUE_CONTENTS_RAW (v), &addr, len);
SWAP_TARGET_AND_HOST (VALUE_CONTENTS_RAW (v), len);
VALUE_LVAL (v) = not_lval;
return v;
{
char *bytes_addr;
bytes_addr = SYMBOL_VALUE_BYTES (var);
- bcopy (bytes_addr, VALUE_CONTENTS_RAW (v), len);
+ memcpy (VALUE_CONTENTS_RAW (v), bytes_addr, len);
VALUE_LVAL (v) = not_lval;
return v;
}
addr = SYMBOL_VALUE_ADDRESS (var);
break;
-/* Nonzero if a struct which is located in a register or a LOC_ARG
- really contains
- the address of the struct, not the struct itself. GCC_P is nonzero
- if the function was compiled with GCC. */
-#if !defined (REG_STRUCT_HAS_ADDR)
-#define REG_STRUCT_HAS_ADDR(gcc_p) 0
-#endif
-
case LOC_ARG:
- fi = get_frame_info (frame);
- if (fi == NULL)
- return 0;
- addr = FRAME_ARGS_ADDRESS (fi);
- if (!addr) {
- return 0;
- }
+ if (SYMBOL_BASEREG_VALID (var))
+ {
+ addr = FRAME_GET_BASEREG_VALUE (frame, SYMBOL_BASEREG (var));
+ }
+ else
+ {
+ fi = get_frame_info (frame);
+ if (fi == NULL)
+ return 0;
+ addr = FRAME_ARGS_ADDRESS (fi);
+ }
+ if (!addr)
+ {
+ return 0;
+ }
addr += SYMBOL_VALUE (var);
break;
case LOC_REF_ARG:
- fi = get_frame_info (frame);
- if (fi == NULL)
- return 0;
- addr = FRAME_ARGS_ADDRESS (fi);
- if (!addr) {
- return 0;
- }
+ if (SYMBOL_BASEREG_VALID (var))
+ {
+ addr = FRAME_GET_BASEREG_VALUE (frame, SYMBOL_BASEREG (var));
+ }
+ else
+ {
+ fi = get_frame_info (frame);
+ if (fi == NULL)
+ return 0;
+ addr = FRAME_ARGS_ADDRESS (fi);
+ }
+ if (!addr)
+ {
+ return 0;
+ }
addr += SYMBOL_VALUE (var);
- read_memory (addr, &addr, sizeof (CORE_ADDR));
+ read_memory (addr, (char *) &addr, sizeof (CORE_ADDR));
break;
case LOC_LOCAL:
case LOC_LOCAL_ARG:
- fi = get_frame_info (frame);
- if (fi == NULL)
- return 0;
- addr = SYMBOL_VALUE (var) + FRAME_LOCALS_ADDRESS (fi);
+ if (SYMBOL_BASEREG_VALID (var))
+ {
+ addr = FRAME_GET_BASEREG_VALUE (frame, SYMBOL_BASEREG (var));
+ }
+ else
+ {
+ fi = get_frame_info (frame);
+ if (fi == NULL)
+ return 0;
+ addr = FRAME_LOCALS_ADDRESS (fi);
+ }
+ addr += SYMBOL_VALUE (var);
break;
case LOC_TYPEDEF:
case LOC_REGISTER:
case LOC_REGPARM:
+ case LOC_REGPARM_ADDR:
{
struct block *b;
v = value_from_register (type, SYMBOL_VALUE (var), frame);
- if (REG_STRUCT_HAS_ADDR (BLOCK_GCC_COMPILED (b))
- && TYPE_CODE (type) == TYPE_CODE_STRUCT)
- addr = *(CORE_ADDR *)VALUE_CONTENTS (v);
+ if (SYMBOL_CLASS (var) == LOC_REGPARM_ADDR)
+ {
+ addr = *(CORE_ADDR *)VALUE_CONTENTS (v);
+ VALUE_LVAL (v) = lval_memory;
+ }
else
return v;
}
break;
+ case LOC_OPTIMIZED_OUT:
+ VALUE_LVAL (v) = not_lval;
+ VALUE_OPTIMIZED_OUT (v) = 1;
+ return v;
+
default:
error ("Cannot look up value of a botched symbol.");
break;
((len - 1) / REGISTER_RAW_SIZE (regnum)) + 1 :
1);
- if (num_storage_locs > 1)
+ if (num_storage_locs > 1
+#ifdef GDB_TARGET_IS_H8500
+ || TYPE_CODE (type) == TYPE_CODE_PTR
+#endif
+ )
{
/* Value spread across multiple storage locations. */
/* Copy all of the data out, whereever it may be. */
- for (local_regnum = regnum;
- value_bytes_copied < len;
- (value_bytes_copied += REGISTER_RAW_SIZE (local_regnum),
- ++local_regnum))
+#ifdef GDB_TARGET_IS_H8500
+/* This piece of hideosity is required because the H8500 treats registers
+ differently depending upon whether they are used as pointers or not. As a
+ pointer, a register needs to have a page register tacked onto the front.
+ An alternate way to do this would be to have gcc output different register
+ numbers for the pointer & non-pointer form of the register. But, it
+ doesn't, so we're stuck with this. */
+
+ if (TYPE_CODE (type) == TYPE_CODE_PTR
+ && len > 2)
{
- get_saved_register (value_bytes + value_bytes_copied,
+ int page_regnum;
+
+ switch (regnum)
+ {
+ case R0_REGNUM: case R1_REGNUM: case R2_REGNUM: case R3_REGNUM:
+ page_regnum = SEG_D_REGNUM;
+ break;
+ case R4_REGNUM: case R5_REGNUM:
+ page_regnum = SEG_E_REGNUM;
+ break;
+ case R6_REGNUM: case R7_REGNUM:
+ page_regnum = SEG_T_REGNUM;
+ break;
+ }
+
+ value_bytes[0] = 0;
+ get_saved_register (value_bytes + 1,
&optim,
&addr,
frame,
- local_regnum,
+ page_regnum,
&lval);
+
+ if (lval == lval_register)
+ reg_stor++;
+ else
+ mem_stor++;
+ first_addr = addr;
+ last_addr = addr;
+
+ get_saved_register (value_bytes + 2,
+ &optim,
+ &addr,
+ frame,
+ regnum,
+ &lval);
+
if (lval == lval_register)
reg_stor++;
else
{
mem_stor++;
-
- if (regnum == local_regnum)
- first_addr = addr;
-
- mem_tracking =
- (mem_tracking
- && (regnum == local_regnum
- || addr == last_addr));
+ mem_tracking = mem_tracking && (addr == last_addr);
}
last_addr = addr;
}
+ else
+#endif /* GDB_TARGET_IS_H8500 */
+ for (local_regnum = regnum;
+ value_bytes_copied < len;
+ (value_bytes_copied += REGISTER_RAW_SIZE (local_regnum),
+ ++local_regnum))
+ {
+ get_saved_register (value_bytes + value_bytes_copied,
+ &optim,
+ &addr,
+ frame,
+ local_regnum,
+ &lval);
+
+ if (regnum == local_regnum)
+ first_addr = addr;
+ if (lval == lval_register)
+ reg_stor++;
+ else
+ {
+ mem_stor++;
+
+ mem_tracking =
+ (mem_tracking
+ && (regnum == local_regnum
+ || addr == last_addr));
+ }
+ last_addr = addr;
+ }
if ((reg_stor && mem_stor)
|| (mem_stor && !mem_tracking))
endian machines. */
/* Copy into the contents section of the value. */
- bcopy (value_bytes, VALUE_CONTENTS_RAW (v), len);
+ memcpy (VALUE_CONTENTS_RAW (v), value_bytes, len);
+ /* Finally do any conversion necessary when extracting this
+ type from more than one register. */
+#ifdef REGISTER_CONVERT_TO_TYPE
+ REGISTER_CONVERT_TO_TYPE(regnum, type, VALUE_CONTENTS_RAW(v));
+#endif
return v;
}
/* Convert the raw contents to virtual contents.
(Just copy them if the formats are the same.) */
- target_convert_to_virtual (regnum, raw_buffer, virtual_buffer);
+ REGISTER_CONVERT_TO_VIRTUAL (regnum, raw_buffer, virtual_buffer);
if (REGISTER_CONVERTIBLE (regnum))
{
with raw type `extended' and virtual type `double'.
Fetch it as a `double' and then convert to `float'. */
v = allocate_value (REGISTER_VIRTUAL_TYPE (regnum));
- bcopy (virtual_buffer, VALUE_CONTENTS_RAW (v), len);
+ memcpy (VALUE_CONTENTS_RAW (v), virtual_buffer, len);
v = value_cast (type, v);
}
else
- bcopy (virtual_buffer, VALUE_CONTENTS_RAW (v), len);
+ memcpy (VALUE_CONTENTS_RAW (v), virtual_buffer, len);
}
else
{
}
#endif
- bcopy (virtual_buffer + VALUE_OFFSET (v),
- VALUE_CONTENTS_RAW (v), len);
+ memcpy (VALUE_CONTENTS_RAW (v), virtual_buffer + VALUE_OFFSET (v), len);
}
return v;
lazy_value = read_var_value (var, frame);
if (lazy_value == 0)
- error ("Address of \"%s\" is unknown.", SYMBOL_NAME (var));
+ error ("Address of \"%s\" is unknown.", SYMBOL_SOURCE_NAME (var));
if (VALUE_LAZY (lazy_value)
|| TYPE_CODE (type) == TYPE_CODE_FUNC)
{
addr = VALUE_ADDRESS (lazy_value);
-
- /* C++: The "address" of a reference should yield the address
- * of the object pointed to. So force an extra de-reference. */
-
- if (TYPE_CODE (type) == TYPE_CODE_REF)
- {
- char *buf = alloca (TYPE_LENGTH (type));
- read_memory (addr, buf, TYPE_LENGTH (type));
- addr = unpack_pointer (type, buf);
- type = TYPE_TARGET_TYPE (type);
- }
-
return value_from_longest (lookup_pointer_type (type), (LONGEST) addr);
}
case lval_register:
case lval_reg_frame_relative:
error ("Address requested for identifier \"%s\" which is in a register.",
- SYMBOL_NAME (var));
+ SYMBOL_SOURCE_NAME (var));
break;
default:
error ("Can't take address of \"%s\" which isn't an lvalue.",
- SYMBOL_NAME (var));
+ SYMBOL_SOURCE_NAME (var));
break;
}
return 0; /* For lint -- never reached */