From 03f50fc878f75fcdebf0e3273f201fb4b62b0bae Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Mon, 22 Jan 2018 11:02:49 +0000 Subject: Replace regcache_raw_read with regcache->raw_read The patch later in this series will move regcache's raw_read and cooked_read methods to a new class regcache_read, and regcache is dervied from it. Also pass regcache_read instead of regcache to gdbarch methods pseudo_register_read and pseudo_register_read_value. In order to prepare for this change, this patch changes regcache_raw_read to regcache->raw_read. On the other hand, since we are in C++, I prefer using class method (regcache->raw_read). gdb: 2018-01-22 Yao Qi * aarch64-tdep.c (aarch64_pseudo_read_value): Call regcache method raw_read instead of regcache_raw_read. * amd64-tdep.c (amd64_pseudo_register_read_value): Likewise. * arm-tdep.c (arm_neon_quad_read): Likewise. * avr-tdep.c (avr_pseudo_register_read): Likewise. * bfin-tdep.c (bfin_pseudo_register_read): Likewise. * frv-tdep.c (frv_pseudo_register_read): Likewise. * h8300-tdep.c (h8300_pseudo_register_read): Likewise. * i386-tdep.c (i386_mmx_regnum_to_fp_regnum): Likewise. (i386_pseudo_register_read_into_value): Likewise. * mep-tdep.c (mep_pseudo_cr32_read): Likewise. * msp430-tdep.c (msp430_pseudo_register_read): Likewise. * nds32-tdep.c (nds32_pseudo_register_read): Likewise. * rl78-tdep.c (rl78_pseudo_register_read): Likewise. * s390-linux-tdep.c (s390_pseudo_register_read): Likewise. * sparc-tdep.c (sparc32_pseudo_register_read): Likewise. * sparc64-tdep.c (sparc64_pseudo_register_read): Likewise. * spu-tdep.c (spu_pseudo_register_read_spu): Likewise. * xtensa-tdep.c (xtensa_pseudo_register_read): Likewise. --- gdb/rl78-tdep.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'gdb/rl78-tdep.c') diff --git a/gdb/rl78-tdep.c b/gdb/rl78-tdep.c index 3db72a1..55653db 100644 --- a/gdb/rl78-tdep.c +++ b/gdb/rl78-tdep.c @@ -650,68 +650,67 @@ rl78_pseudo_register_read (struct gdbarch *gdbarch, int raw_regnum = RL78_RAW_BANK0_R0_REGNUM + (reg - RL78_BANK0_R0_REGNUM); - status = regcache_raw_read (regcache, raw_regnum, buffer); + status = regcache->raw_read (raw_regnum, buffer); } else if (RL78_BANK0_RP0_REGNUM <= reg && reg <= RL78_BANK3_RP3_REGNUM) { int raw_regnum = 2 * (reg - RL78_BANK0_RP0_REGNUM) + RL78_RAW_BANK0_R0_REGNUM; - status = regcache_raw_read (regcache, raw_regnum, buffer); + status = regcache->raw_read (raw_regnum, buffer); if (status == REG_VALID) - status = regcache_raw_read (regcache, raw_regnum + 1, buffer + 1); + status = regcache->raw_read (raw_regnum + 1, buffer + 1); } else if (RL78_BANK0_RP0_PTR_REGNUM <= reg && reg <= RL78_BANK3_RP3_PTR_REGNUM) { int raw_regnum = 2 * (reg - RL78_BANK0_RP0_PTR_REGNUM) + RL78_RAW_BANK0_R0_REGNUM; - status = regcache_raw_read (regcache, raw_regnum, buffer); + status = regcache->raw_read (raw_regnum, buffer); if (status == REG_VALID) - status = regcache_raw_read (regcache, raw_regnum + 1, buffer + 1); + status = regcache->raw_read (raw_regnum + 1, buffer + 1); } else if (reg == RL78_SP_REGNUM) { - status = regcache_raw_read (regcache, RL78_SPL_REGNUM, buffer); + status = regcache->raw_read (RL78_SPL_REGNUM, buffer); if (status == REG_VALID) - status = regcache_raw_read (regcache, RL78_SPH_REGNUM, buffer + 1); + status = regcache->raw_read (RL78_SPH_REGNUM, buffer + 1); } else if (reg == RL78_PC_REGNUM) { gdb_byte rawbuf[4]; - status = regcache_raw_read (regcache, RL78_RAW_PC_REGNUM, rawbuf); + status = regcache->raw_read (RL78_RAW_PC_REGNUM, rawbuf); memcpy (buffer, rawbuf, 3); } else if (RL78_X_REGNUM <= reg && reg <= RL78_H_REGNUM) { ULONGEST psw; - status = regcache_raw_read_unsigned (regcache, RL78_PSW_REGNUM, &psw); + status = regcache->raw_read (RL78_PSW_REGNUM, &psw); if (status == REG_VALID) { /* RSB0 is at bit 3; RSBS1 is at bit 5. */ int bank = ((psw >> 3) & 1) | ((psw >> 4) & 1); int raw_regnum = RL78_RAW_BANK0_R0_REGNUM + bank * RL78_REGS_PER_BANK + (reg - RL78_X_REGNUM); - status = regcache_raw_read (regcache, raw_regnum, buffer); + status = regcache->raw_read (raw_regnum, buffer); } } else if (RL78_AX_REGNUM <= reg && reg <= RL78_HL_REGNUM) { ULONGEST psw; - status = regcache_raw_read_unsigned (regcache, RL78_PSW_REGNUM, &psw); + status = regcache->raw_read (RL78_PSW_REGNUM, &psw); if (status == REG_VALID) { /* RSB0 is at bit 3; RSBS1 is at bit 5. */ int bank = ((psw >> 3) & 1) | ((psw >> 4) & 1); int raw_regnum = RL78_RAW_BANK0_R0_REGNUM + bank * RL78_REGS_PER_BANK + 2 * (reg - RL78_AX_REGNUM); - status = regcache_raw_read (regcache, raw_regnum, buffer); + status = regcache->raw_read (raw_regnum, buffer); if (status == REG_VALID) - status = regcache_raw_read (regcache, raw_regnum + 1, - buffer + 1); + status = regcache->raw_read (raw_regnum + 1, buffer + 1); } } else -- cgit v1.1