From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2620 invoked by alias); 8 Jun 2003 22:11:00 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 1500 invoked from network); 8 Jun 2003 22:10:31 -0000 Received: from unknown (HELO localhost.redhat.com) (24.157.166.107) by sources.redhat.com with SMTP; 8 Jun 2003 22:10:31 -0000 Received: from redhat.com (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id AE6E22B64; Sun, 8 Jun 2003 18:10:29 -0400 (EDT) Message-ID: <3EE3B455.7080902@redhat.com> Date: Sun, 08 Jun 2003 22:11:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-US; rv:1.0.2) Gecko/20030223 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Andrew Cagney Cc: Mark Kettenis , gdb-patches@sources.redhat.com Subject: Re: [cagney_convert-20030606-branch] Add value to REGISTER_TO_VALUE et.al. References: <3EDE4A9E.70403@redhat.com> <8665nl34ao.fsf@elgar.kettenis.dyndns.org> <3EE0D987.6030207@redhat.com> <200306081643.h58GhiTr048427@elgar.kettenis.dyndns.org> <3EE36F28.9000104@redhat.com> Content-Type: multipart/mixed; boundary="------------010205060102050805040102" X-SW-Source: 2003-06/txt/msg00284.txt.bz2 This is a multi-part message in MIME format. --------------010205060102050805040102 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 583 Ok, I've changed the branch to: > The ``obvious'' interfaces were: > > register_to_value (frame, regnum, type, buffer) > value_to_register (frame, regnum, type, buffer) > > but that tripped up on something (now what ...?). Dig dig. Notice how, to preserve existing behavior, legacy_register_to_value saves the location based on what frame_register returns. We'd have to switch to lval_reg_frame_relative. And this time it appears to be going better. I'll try to attribute it to VALUE_FRAME_ID and the use of put_frame_register (neither of which I did last time). Andrew --------------010205060102050805040102 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 27814 2003-06-06 Andrew Cagney * frame.h (put_frame_register): Declare. * frame.c (put_frame_register): New function. * arch-utils.c: Include "gdbcore.h". (legacy_convert_register_p): Add "type" parameter. (legacy_register_to_value): Rewrite, use "frame" to get the register value. (legacy_value_to_register): Rewrite, use "frame" to find the register's location before storing. * arch-utils.h (legacy_convert_register_p): Update. (legacy_register_to_value, legacy_value_to_register): Update. * Makefile.in (arch-utils.o): Update dependencies. * findvar.c (value_from_register): Rewrite, eliminate use of REGISTER_CONVERT_TO_TYPE, pass "type" to CONVERT_REGISTER_P, pass "frame" to REGISTER_TO_VALUE. * gdbarch.sh (CONVERT_REGISTER_P): Add "type" parameter. (REGISTER_TO_VALUE, VALUE_TO_REGISTER): Replace raw buffer parameter with "frame". * gdbarch.h, gdbarch.c: Re-generate. * mips-tdep.c (mips_convert_register_p): New function. (mips_value_to_register): Replace mips_register_convert_from_type. (mips_register_to_value): Replace mips_register_convert_to_type. (mips_gdbarch_init): Set conver_register_p, value_to_register and register_to_value. * valops.c (value_assign): Move the CONVERT_REGISTER code to the lval_reg_frame_relative + lval_register branch of the switch. Do not use REGISTER_CONVERT_FROM_TYPE. Use put_frame_register. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.391 retrieving revision 1.391.2.1 diff -u -r1.391 -r1.391.2.1 --- Makefile.in 5 Jun 2003 20:59:15 -0000 1.391 +++ Makefile.in 6 Jun 2003 18:02:26 -0000 1.391.2.1 @@ -1539,7 +1539,7 @@ $(inferior_h) $(symtab_h) $(frame_h) $(inferior_h) $(breakpoint_h) \ $(gdb_wait_h) $(gdbcore_h) $(gdbcmd_h) $(target_h) $(annotate_h) \ $(gdb_string_h) $(regcache_h) $(gdb_assert_h) $(sim_regno_h) \ - $(version_h) $(floatformat_h) + $(version_h) $(floatformat_h) $(gdbcore_h) arm-linux-nat.o: arm-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \ $(gdb_string_h) $(regcache_h) $(arm_tdep_h) $(gregset_h) arm-linux-tdep.o: arm-linux-tdep.c $(defs_h) $(target_h) $(value_h) \ Index: arch-utils.c =================================================================== RCS file: /cvs/src/src/gdb/arch-utils.c,v retrieving revision 1.83 diff -u -r1.83 arch-utils.c --- arch-utils.c 15 May 2003 22:58:36 -0000 1.83 +++ arch-utils.c 8 Jun 2003 22:02:33 -0000 @@ -47,6 +47,7 @@ #include "version.h" #include "floatformat.h" +#include "gdbcore.h" /* Implementation of extract return value that grubs around in the register cache. */ @@ -440,23 +441,29 @@ } int -legacy_convert_register_p (int regnum) +legacy_convert_register_p (int regnum, struct type *type) { return REGISTER_CONVERTIBLE (regnum); } void -legacy_register_to_value (int regnum, struct type *type, - char *from, char *to) +legacy_register_to_value (struct frame_info *frame, int regnum, + struct type *type, void *to) { + char from[MAX_REGISTER_SIZE]; + frame_read_register (frame, regnum, from); REGISTER_CONVERT_TO_VIRTUAL (regnum, type, from, to); } void -legacy_value_to_register (struct type *type, int regnum, - char *from, char *to) +legacy_value_to_register (struct frame_info *frame, int regnum, + struct type *type, const void *tmp) { + char to[MAX_REGISTER_SIZE]; + char *from = alloca (TYPE_LENGTH (type)); + memcpy (from, from, TYPE_LENGTH (type)); REGISTER_CONVERT_TO_RAW (type, regnum, from, to); + put_frame_register (frame, regnum, to); } Index: arch-utils.h =================================================================== RCS file: /cvs/src/src/gdb/arch-utils.h,v retrieving revision 1.46 diff -u -r1.46 arch-utils.h --- arch-utils.h 15 May 2003 22:58:36 -0000 1.46 +++ arch-utils.h 8 Jun 2003 22:02:33 -0000 @@ -165,9 +165,11 @@ (something that is discouraged); and to convert a register to the type of a corresponding variable. These legacy functions preserve that overloaded behavour in existing targets. */ -extern int legacy_convert_register_p (int regnum); -extern void legacy_register_to_value (int regnum, struct type *type, char *from, char *to); -extern void legacy_value_to_register (struct type *type, int regnum, char *from, char *to); +extern int legacy_convert_register_p (int regnum, struct type *type); +extern void legacy_register_to_value (struct frame_info *frame, int regnum, + struct type *type, void *to); +extern void legacy_value_to_register (struct frame_info *frame, int regnum, + struct type *type, const void *from); /* For compatibility with older architectures, returns (LEGACY_SIM_REGNO_IGNORE) when the register doesn't have a valid Index: findvar.c =================================================================== RCS file: /cvs/src/src/gdb/findvar.c,v retrieving revision 1.58 diff -u -r1.58 findvar.c --- findvar.c 5 Jun 2003 20:59:16 -0000 1.58 +++ findvar.c 8 Jun 2003 22:02:36 -0000 @@ -624,145 +624,75 @@ struct value * value_from_register (struct type *type, int regnum, struct frame_info *frame) { - char raw_buffer[MAX_REGISTER_SIZE]; - CORE_ADDR addr; - int optim; + struct gdbarch *gdbarch = get_frame_arch (frame); struct value *v = allocate_value (type); - char *value_bytes = 0; - int value_bytes_copied = 0; - int num_storage_locs; - enum lval_type lval; - int len; - CHECK_TYPEDEF (type); - len = TYPE_LENGTH (type); - - VALUE_REGNO (v) = regnum; - - num_storage_locs = (len > REGISTER_VIRTUAL_SIZE (regnum) ? - ((len - 1) / REGISTER_RAW_SIZE (regnum)) + 1 : - 1); - if (num_storage_locs > 1 -#if 0 - // OBSOLETE #ifdef GDB_TARGET_IS_H8500 - // OBSOLETE || TYPE_CODE (type) == TYPE_CODE_PTR - // OBSOLETE #endif -#endif - ) + if (CONVERT_REGISTER_P (regnum, type)) + { + /* The ISA/ABI need to something weird when obtaining the + specified value from this register. It might need to + re-order non-adjacent, starting with REGNUM (see MIPS and + i386). It might need to convert the [float] register into + the corresponding [integer] type (see Alpha). The assumption + is that REGISTER_TO_VALUE populates the entire value + including the location. */ + REGISTER_TO_VALUE (frame, regnum, type, VALUE_CONTENTS_RAW (v)); + VALUE_LVAL (v) = lval_reg_frame_relative; + VALUE_FRAME_ID (v) = get_frame_id (frame); + VALUE_FRAME_REGNUM (v) = regnum; + } + else { - /* Value spread across multiple storage locations. */ - int local_regnum; int mem_stor = 0, reg_stor = 0; int mem_tracking = 1; CORE_ADDR last_addr = 0; CORE_ADDR first_addr = 0; - - value_bytes = (char *) alloca (len + MAX_REGISTER_SIZE); + int first_realnum = regnum; + int len = TYPE_LENGTH (type); + int value_bytes_copied; + int optimized = 0; + char *value_bytes = (char *) alloca (len + MAX_REGISTER_SIZE); /* Copy all of the data out, whereever it may be. */ - -#if 0 - // OBSOLETE #ifdef GDB_TARGET_IS_H8500 - // OBSOLETE /* This piece of hideosity is required because the H8500 treats registers - // OBSOLETE differently depending upon whether they are used as pointers or not. As a - // OBSOLETE pointer, a register needs to have a page register tacked onto the front. - // OBSOLETE An alternate way to do this would be to have gcc output different register - // OBSOLETE numbers for the pointer & non-pointer form of the register. But, it - // OBSOLETE doesn't, so we're stuck with this. */ - // OBSOLETE - // OBSOLETE if (TYPE_CODE (type) == TYPE_CODE_PTR - // OBSOLETE && len > 2) - // OBSOLETE { - // OBSOLETE int page_regnum; - // OBSOLETE - // OBSOLETE switch (regnum) - // OBSOLETE { - // OBSOLETE case R0_REGNUM: - // OBSOLETE case R1_REGNUM: - // OBSOLETE case R2_REGNUM: - // OBSOLETE case R3_REGNUM: - // OBSOLETE page_regnum = SEG_D_REGNUM; - // OBSOLETE break; - // OBSOLETE case R4_REGNUM: - // OBSOLETE case R5_REGNUM: - // OBSOLETE page_regnum = SEG_E_REGNUM; - // OBSOLETE break; - // OBSOLETE case R6_REGNUM: - // OBSOLETE case R7_REGNUM: - // OBSOLETE page_regnum = SEG_T_REGNUM; - // OBSOLETE break; - // OBSOLETE } - // OBSOLETE - // OBSOLETE value_bytes[0] = 0; - // OBSOLETE get_saved_register (value_bytes + 1, - // OBSOLETE &optim, - // OBSOLETE &addr, - // OBSOLETE frame, - // OBSOLETE page_regnum, - // OBSOLETE &lval); - // OBSOLETE - // OBSOLETE if (register_cached (page_regnum) == -1) - // OBSOLETE return NULL; /* register value not available */ - // OBSOLETE - // OBSOLETE if (lval == lval_register) - // OBSOLETE reg_stor++; - // OBSOLETE else - // OBSOLETE mem_stor++; - // OBSOLETE first_addr = addr; - // OBSOLETE last_addr = addr; - // OBSOLETE - // OBSOLETE get_saved_register (value_bytes + 2, - // OBSOLETE &optim, - // OBSOLETE &addr, - // OBSOLETE frame, - // OBSOLETE regnum, - // OBSOLETE &lval); - // OBSOLETE - // OBSOLETE if (register_cached (regnum) == -1) - // OBSOLETE return NULL; /* register value not available */ - // OBSOLETE - // OBSOLETE if (lval == lval_register) - // OBSOLETE reg_stor++; - // OBSOLETE else - // OBSOLETE { - // OBSOLETE mem_stor++; - // OBSOLETE mem_tracking = mem_tracking && (addr == last_addr); - // OBSOLETE } - // OBSOLETE last_addr = addr; - // OBSOLETE } - // OBSOLETE else - // OBSOLETE #endif /* GDB_TARGET_IS_H8500 */ -#endif - for (local_regnum = regnum; - value_bytes_copied < len; - (value_bytes_copied += REGISTER_RAW_SIZE (local_regnum), - ++local_regnum)) - { - int realnum; - frame_register (frame, local_regnum, &optim, &lval, &addr, - &realnum, value_bytes + value_bytes_copied); - - if (register_cached (local_regnum) == -1) - return NULL; /* register value not available */ - - if (regnum == local_regnum) + for (local_regnum = regnum, value_bytes_copied = 0; + value_bytes_copied < len; + (value_bytes_copied += REGISTER_RAW_SIZE (local_regnum), + ++local_regnum)) + { + int realnum; + int optim; + enum lval_type lval; + CORE_ADDR addr; + frame_register (frame, local_regnum, &optim, &lval, &addr, + &realnum, value_bytes + value_bytes_copied); + optimized += optim; + if (register_cached (local_regnum) == -1) + return NULL; /* register value not available */ + + 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; - } - + first_realnum = realnum; + } + if (lval == lval_register) + reg_stor++; + else + { + mem_stor++; + + mem_tracking = (mem_tracking + && (regnum == local_regnum + || addr == last_addr)); + } + last_addr = addr; + } + + /* FIXME: cagney/2003-06-04: Shouldn't this always use + lval_reg_frame_relative? If it doesn't and the register's + location changes (say after a resume) then this value is + going to have wrong information. */ if ((reg_stor && mem_stor) || (mem_stor && !mem_tracking)) /* Mixed storage; all of the hassle we just went through was @@ -781,67 +711,29 @@ { VALUE_LVAL (v) = lval_register; VALUE_ADDRESS (v) = first_addr; + VALUE_REGNO (v) = first_realnum; } else internal_error (__FILE__, __LINE__, "value_from_register: Value not stored anywhere!"); - - VALUE_OPTIMIZED_OUT (v) = optim; - + + VALUE_OPTIMIZED_OUT (v) = optimized; + /* Any structure stored in more than one register will always be - an integral number of registers. Otherwise, you'd need to do + an integral number of registers. Otherwise, you need to do some fiddling with the last register copied here for little endian machines. */ - - /* Copy into the contents section of the value. */ - 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; - } - - /* Data is completely contained within a single register. Locate the - register's contents in a real register or in core; - read the data in raw format. */ - - { - int realnum; - frame_register (frame, regnum, &optim, &lval, &addr, &realnum, raw_buffer); - } - - if (register_cached (regnum) == -1) - return NULL; /* register value not available */ - - VALUE_OPTIMIZED_OUT (v) = optim; - VALUE_LVAL (v) = lval; - VALUE_ADDRESS (v) = addr; - - /* Convert the raw register to the corresponding data value's memory - format, if necessary. */ - - if (CONVERT_REGISTER_P (regnum)) - { - REGISTER_TO_VALUE (regnum, type, raw_buffer, VALUE_CONTENTS_RAW (v)); - } - else - { - /* Raw and virtual formats are the same for this register. */ - - if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG && len < REGISTER_RAW_SIZE (regnum)) - { - /* Big-endian, and we want less than full size. */ - VALUE_OFFSET (v) = REGISTER_RAW_SIZE (regnum) - len; - } - - memcpy (VALUE_CONTENTS_RAW (v), raw_buffer + VALUE_OFFSET (v), len); + if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG + && len < REGISTER_RAW_SIZE (regnum)) + /* Big-endian, and we want less than full size. */ + VALUE_OFFSET (v) = REGISTER_RAW_SIZE (regnum) - len; + else + VALUE_OFFSET (v) = 0; + memcpy (VALUE_CONTENTS_RAW (v), value_bytes + VALUE_OFFSET (v), len); } - return v; } + /* Given a struct symbol for a variable or function, and a stack frame id, Index: frame.c =================================================================== RCS file: /cvs/src/src/gdb/frame.c,v retrieving revision 1.117 retrieving revision 1.117.2.1 diff -u -r1.117 -r1.117.2.1 --- frame.c 3 Jun 2003 18:53:37 -0000 1.117 +++ frame.c 6 Jun 2003 18:02:28 -0000 1.117.2.1 @@ -674,6 +674,36 @@ } void +put_frame_register (struct frame_info *frame, int regnum, const void *buf) +{ + struct gdbarch *gdbarch = get_frame_arch (frame); + int realnum; + int optim; + enum lval_type lval; + CORE_ADDR addr; + frame_register (frame, regnum, &optim, &lval, &addr, &realnum, NULL); + if (optim) + error ("Attempt to assign to a value that was optimized out."); + switch (lval) + { + case lval_memory: + { + /* FIXME: write_memory doesn't yet take constant buffers. + Arrrg! */ + char tmp[MAX_REGISTER_SIZE]; + memcpy (tmp, buf, register_size (gdbarch, regnum)); + write_memory (addr, tmp, register_size (gdbarch, regnum)); + break; + } + case lval_register: + regcache_cooked_write (current_regcache, realnum, buf); + break; + default: + error ("Attempt to assign to an unmodifiable value."); + } +} + +void generic_unwind_get_saved_register (char *raw_buffer, int *optimizedp, CORE_ADDR *addrp, Index: frame.h =================================================================== RCS file: /cvs/src/src/gdb/frame.h,v retrieving revision 1.96 retrieving revision 1.96.2.1 diff -u -r1.96 -r1.96.2.1 --- frame.h 3 Jun 2003 18:53:37 -0000 1.96 +++ frame.h 6 Jun 2003 18:02:29 -0000 1.96.2.1 @@ -325,6 +325,12 @@ extern void frame_read_unsigned_register (struct frame_info *frame, int regnum, ULONGEST *val); +/* The reverse. Store a register value relative to the specified + frame. Note: this call makes the frame's state undefined. The + register and frame caches must be flushed. */ +extern void put_frame_register (struct frame_info *frame, int regnum, + const void *buf); + /* Map between a frame register number and its name. A frame register space is a superset of the cooked register space --- it also includes builtin registers. If NAMELEN is negative, use the NAME's Index: gdbarch.sh =================================================================== RCS file: /cvs/src/src/gdb/gdbarch.sh,v retrieving revision 1.240 diff -u -r1.240 gdbarch.sh --- gdbarch.sh 2 Jun 2003 02:54:34 -0000 1.240 +++ gdbarch.sh 8 Jun 2003 22:02:57 -0000 @@ -557,9 +557,9 @@ f:2:REGISTER_CONVERT_TO_VIRTUAL:void:register_convert_to_virtual:int regnum, struct type *type, char *from, char *to:regnum, type, from, to:::0::0 f:2:REGISTER_CONVERT_TO_RAW:void:register_convert_to_raw:struct type *type, int regnum, char *from, char *to:type, regnum, from, to:::0::0 # -f:1:CONVERT_REGISTER_P:int:convert_register_p:int regnum:regnum::0:legacy_convert_register_p::0 -f:1:REGISTER_TO_VALUE:void:register_to_value:int regnum, struct type *type, char *from, char *to:regnum, type, from, to::0:legacy_register_to_value::0 -f:1:VALUE_TO_REGISTER:void:value_to_register:struct type *type, int regnum, char *from, char *to:type, regnum, from, to::0:legacy_value_to_register::0 +f:1:CONVERT_REGISTER_P:int:convert_register_p:int regnum, struct type *type:regnum, type::0:legacy_convert_register_p::0 +f:1:REGISTER_TO_VALUE:void:register_to_value:struct frame_info *frame, int regnum, struct type *type, void *buf:frame, regnum, type, buf::0:legacy_register_to_value::0 +f:1:VALUE_TO_REGISTER:void:value_to_register:struct frame_info *frame, int regnum, struct type *type, const void *buf:frame, regnum, type, buf::0:legacy_value_to_register::0 # f:2:POINTER_TO_ADDRESS:CORE_ADDR:pointer_to_address:struct type *type, const void *buf:type, buf:::unsigned_pointer_to_address::0 f:2:ADDRESS_TO_POINTER:void:address_to_pointer:struct type *type, void *buf, CORE_ADDR addr:type, buf, addr:::unsigned_address_to_pointer::0 Index: mips-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/mips-tdep.c,v retrieving revision 1.207 diff -u -r1.207 mips-tdep.c --- mips-tdep.c 1 Jun 2003 19:02:19 -0000 1.207 +++ mips-tdep.c 8 Jun 2003 22:03:03 -0000 @@ -634,36 +634,30 @@ TYPE_LENGTH (virtual_type)); } +static int +mips_convert_register_p (int regnum, struct type *type) +{ + return (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG + && REGISTER_RAW_SIZE (regnum) == 4 + && (regnum) >= FP0_REGNUM && (regnum) < FP0_REGNUM + 32 + && TYPE_CODE(type) == TYPE_CODE_FLT + && TYPE_LENGTH(type) == 8); +} + void -mips_register_convert_to_type (int regnum, struct type *type, char *buffer) +mips_register_to_value (struct frame_info *frame, int regnum, + struct type *type, void *to) { - if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG - && REGISTER_RAW_SIZE (regnum) == 4 - && (regnum) >= FP0_REGNUM && (regnum) < FP0_REGNUM + 32 - && TYPE_CODE(type) == TYPE_CODE_FLT - && TYPE_LENGTH(type) == 8) - { - char temp[4]; - memcpy (temp, ((char *)(buffer))+4, 4); - memcpy (((char *)(buffer))+4, (buffer), 4); - memcpy (((char *)(buffer)), temp, 4); - } + frame_read_register (frame, regnum + 0, (char *) to + 4); + frame_read_register (frame, regnum + 1, (char *) to + 0); } void -mips_register_convert_from_type (int regnum, struct type *type, char *buffer) +mips_value_to_register (struct frame_info *frame, int regnum, + struct type *type, const void *from) { -if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG - && REGISTER_RAW_SIZE (regnum) == 4 - && (regnum) >= FP0_REGNUM && (regnum) < FP0_REGNUM + 32 - && TYPE_CODE(type) == TYPE_CODE_FLT - && TYPE_LENGTH(type) == 8) - { - char temp[4]; - memcpy (temp, ((char *)(buffer))+4, 4); - memcpy (((char *)(buffer))+4, (buffer), 4); - memcpy (((char *)(buffer)), temp, 4); - } + put_frame_register (frame, regnum + 0, (const char *) + 4); + put_frame_register (frame, regnum + 1, (const char *) + 0); } /* Return the GDB type object for the "standard" data type @@ -5966,6 +5960,9 @@ mips_register_convert_to_virtual); set_gdbarch_register_convert_to_raw (gdbarch, mips_register_convert_to_raw); + set_gdbarch_convert_register_p (gdbarch, mips_convert_register_p); + set_gdbarch_register_to_value (gdbarch, mips_register_to_value); + set_gdbarch_value_to_register (gdbarch, mips_value_to_register); set_gdbarch_deprecated_frame_chain (gdbarch, mips_frame_chain); set_gdbarch_frameless_function_invocation (gdbarch, Index: valops.c =================================================================== RCS file: /cvs/src/src/gdb/valops.c,v retrieving revision 1.110 diff -u -r1.110 valops.c --- valops.c 5 Jun 2003 20:59:16 -0000 1.110 +++ valops.c 8 Jun 2003 22:03:05 -0000 @@ -496,22 +496,6 @@ COERCE_ARRAY (fromval); CHECK_TYPEDEF (type); - /* If TOVAL is a special machine register requiring conversion - of program values to a special raw format, - convert FROMVAL's contents now, with result in `raw_buffer', - and set USE_BUFFER to the number of bytes to write. */ - - if (VALUE_REGNO (toval) >= 0) - { - int regno = VALUE_REGNO (toval); - if (CONVERT_REGISTER_P (regno)) - { - struct type *fromtype = check_typedef (VALUE_TYPE (fromval)); - VALUE_TO_REGISTER (fromtype, regno, VALUE_CONTENTS (fromval), raw_buffer); - use_buffer = REGISTER_RAW_SIZE (regno); - } - } - /* Since modifying a register can trash the frame chain, and modifying memory can trash the frame cache, we save the old frame and then restore the new frame afterwards. */ @@ -585,17 +569,8 @@ case lval_reg_frame_relative: case lval_register: { - /* value is stored in a series of registers in the frame - specified by the structure. Copy that value out, modify - it, and copy it back in. */ - int amount_copied; - int amount_to_copy; - char *buffer; - int value_reg; - int reg_offset; - int byte_offset; - int regno; struct frame_info *frame; + int value_reg; /* Figure out which frame this is in currently. */ if (VALUE_LVAL (toval) == lval_register) @@ -611,92 +586,78 @@ if (!frame) error ("Value being assigned to is no longer active."); - - /* Locate the first register that falls in the value that - needs to be transfered. Compute the offset of the value in - that register. */ - { - int offset; - for (reg_offset = value_reg, offset = 0; - offset + REGISTER_RAW_SIZE (reg_offset) <= VALUE_OFFSET (toval); - reg_offset++); - byte_offset = VALUE_OFFSET (toval) - offset; - } - - /* Compute the number of register aligned values that need to - be copied. */ - if (VALUE_BITSIZE (toval)) - amount_to_copy = byte_offset + 1; - else - amount_to_copy = byte_offset + TYPE_LENGTH (type); - - /* And a bounce buffer. Be slightly over generous. */ - buffer = (char *) alloca (amount_to_copy + MAX_REGISTER_SIZE); - - /* Copy it in. */ - for (regno = reg_offset, amount_copied = 0; - amount_copied < amount_to_copy; - amount_copied += REGISTER_RAW_SIZE (regno), regno++) - { - frame_register_read (frame, regno, buffer + amount_copied); - } - /* Modify what needs to be modified. */ - if (VALUE_BITSIZE (toval)) - { - modify_field (buffer + byte_offset, - value_as_long (fromval), - VALUE_BITPOS (toval), VALUE_BITSIZE (toval)); - } - else if (use_buffer) - { - memcpy (buffer + VALUE_OFFSET (toval), raw_buffer, use_buffer); + if (VALUE_LVAL (toval) == lval_reg_frame_relative + && CONVERT_REGISTER_P (VALUE_FRAME_REGNUM (toval), + VALUE_TYPE (toval))) + { + /* If TOVAL is a special machine register requiring + conversion of program values to a special raw format. */ + VALUE_TO_REGISTER (frame, VALUE_FRAME_REGNUM (toval), + VALUE_TYPE (toval), VALUE_CONTENTS (toval)); } else { - memcpy (buffer + byte_offset, VALUE_CONTENTS (fromval), - TYPE_LENGTH (type)); - /* Do any conversion necessary when storing this type to - more than one register. */ -#ifdef REGISTER_CONVERT_FROM_TYPE - REGISTER_CONVERT_FROM_TYPE (value_reg, type, - (buffer + byte_offset)); -#endif - } - - /* Copy it out. */ - for (regno = reg_offset, amount_copied = 0; - amount_copied < amount_to_copy; - amount_copied += REGISTER_RAW_SIZE (regno), regno++) - { - enum lval_type lval; - CORE_ADDR addr; - int optim; - int realnum; + /* TOVAL is stored in a series of registers in the frame + specified by the structure. Copy that value out, + modify it, and copy it back in. */ + int amount_copied; + int amount_to_copy; + char *buffer; + int reg_offset; + int byte_offset; + int regno; + + /* Locate the first register that falls in the value that + needs to be transfered. Compute the offset of the + value in that register. */ + { + int offset; + for (reg_offset = value_reg, offset = 0; + offset + REGISTER_RAW_SIZE (reg_offset) <= VALUE_OFFSET (toval); + reg_offset++); + byte_offset = VALUE_OFFSET (toval) - offset; + } + + /* Compute the number of register aligned values that need + to be copied. */ + if (VALUE_BITSIZE (toval)) + amount_to_copy = byte_offset + 1; + else + amount_to_copy = byte_offset + TYPE_LENGTH (type); - /* Just find out where to put it. */ - frame_register (frame, regno, &optim, &lval, &addr, &realnum, - NULL); + /* And a bounce buffer. Be slightly over generous. */ + buffer = (char *) alloca (amount_to_copy + MAX_REGISTER_SIZE); + + /* Copy it in. */ + for (regno = reg_offset, amount_copied = 0; + amount_copied < amount_to_copy; + amount_copied += REGISTER_RAW_SIZE (regno), regno++) + frame_register_read (frame, regno, buffer + amount_copied); - if (optim) - error ("Attempt to assign to a value that was optimized out."); - if (lval == lval_memory) - write_memory (addr, buffer + amount_copied, - REGISTER_RAW_SIZE (regno)); - else if (lval == lval_register) - regcache_cooked_write (current_regcache, realnum, - (buffer + amount_copied)); + /* Modify what needs to be modified. */ + if (VALUE_BITSIZE (toval)) + modify_field (buffer + byte_offset, + value_as_long (fromval), + VALUE_BITPOS (toval), VALUE_BITSIZE (toval)); + else if (use_buffer) + memcpy (buffer + VALUE_OFFSET (toval), raw_buffer, use_buffer); else - error ("Attempt to assign to an unmodifiable value."); - } + memcpy (buffer + byte_offset, VALUE_CONTENTS (fromval), + TYPE_LENGTH (type)); + + /* Copy it out. */ + for (regno = reg_offset, amount_copied = 0; + amount_copied < amount_to_copy; + amount_copied += REGISTER_RAW_SIZE (regno), regno++) + put_frame_register (frame, regno, buffer + amount_copied); + } if (register_changed_hook) register_changed_hook (-1); target_changed_event (); - + break; } - break; - default: error ("Left operand of assignment is not an lvalue."); --------------010205060102050805040102--