Re: [PATCH v4 3/6] Refactor arm_software_single_step to use regcache.

Yao Qi
2015-12-03T10:28:50Z

Antoine Tremblay <antoine.tremblay@ericsson.com> writes:

Hi Antoine,

> * common/common-regcache.h (register_status) New enum.
> (regcache_raw_read_unsigned): New declaration.
> * regcache.h (enum register_status): Move to common-regcache.h.
> (regcache_raw_read_unsigned): Likewise.
>
> gdb/gdbserver/ChangeLog:
>
> * regcache.c (regcache_raw_read_unsigned): New function.
> * regcache.h (REG_UNAVAILABLE, REG_VALID): Replaced by shared
> register_status enum.
> (init_register_cache): Initialize cache to REG_UNAVAILABLE.

Adding regcache_raw_read_unsigned in GDBserver looks unrelated to this
patch. I know patch #4 will use regcache_raw_read_unsigned in
GDBserver, so this change can be patch 3.5.

> another breakpoint by our caller. */
>
> static CORE_ADDR
> -thumb_get_next_pc_raw (struct frame_info *frame, CORE_ADDR pc)
> +thumb_get_next_pc_raw (struct regcache *regcache, struct frame_info *frame,
> + CORE_ADDR pc)

Do we still need frame? it should be removed.

> @@ -4746,20 +4775,22 @@ thumb_get_next_pc_raw (struct frame_info *frame, CORE_ADDR pc)
> address. */
>
> static CORE_ADDR
> -arm_get_next_pc_raw (struct frame_info *frame, CORE_ADDR pc)
> +arm_get_next_pc_raw (struct regcache *regcache, struct frame_info *frame,
> + CORE_ADDR pc)

Likewise.

> @@ -5019,14 +5057,15 @@ arm_get_next_pc_raw (struct frame_info *frame, CORE_ADDR pc)
> loop is detected. */
>
> CORE_ADDR
> -arm_get_next_pc (struct frame_info *frame, CORE_ADDR pc)
> +arm_get_next_pc (struct regcache *regcache, struct frame_info *frame,
> + CORE_ADDR pc)
> {

Likewise.

> diff --git a/gdb/gdbserver/regcache.c b/gdb/gdbserver/regcache.c
> index b9311fe..c608bf3 100644
> --- a/gdb/gdbserver/regcache.c
> +++ b/gdb/gdbserver/regcache.c
> @@ -145,8 +145,9 @@ init_register_cache (struct regcache *regcache,
> = (unsigned char *) xcalloc (1, tdesc->registers_size);
> regcache->registers_owned = 1;
> regcache->register_status
> - = (unsigned char *) xcalloc (1, tdesc->num_registers);
> - gdb_assert (REG_UNAVAILABLE == 0);
> + = (unsigned char *) xmalloc (tdesc->num_registers);
> + memset ((void *) regcache->register_status, REG_UNAVAILABLE,
> + tdesc->num_registers);

Odd indentation.

> #else
> gdb_assert_not_reached ("can't allocate memory from the heap");
> #endif
> @@ -435,6 +436,27 @@ collect_register (struct regcache *regcache, int n, void *buf)
> register_size (regcache->tdesc, n));
> }
>
> +enum register_status
> +regcache_raw_read_unsigned (struct regcache *regcache, int regnum,
> + ULONGEST *val)

Odd indentation.

--
Yao (齐尧)