This is an automated email from Gerrit. Alamy Liu ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/3303
-- gerrit commit a06a56e25c2addb8f437d52b173cab14784e200e Author: Alamy Liu <[email protected]> Date: Fri Oct 2 17:06:58 2015 -0700 dpm: use 'x0' instead of 'r0_64' Change-Id: I5431031721b861a068502fca283551388094371b Signed-off-by: Alamy Liu <[email protected]> diff --git a/src/target/aarch64.c b/src/target/aarch64.c index c1364c9..35e6304 100644 --- a/src/target/aarch64.c +++ b/src/target/aarch64.c @@ -456,7 +456,7 @@ static int aarch64_instr_write_data_r0(struct arm_dpm *dpm, return retval; } -static int aarch64_instr_write_data_r0_64(struct arm_dpm *dpm, +static int aarch64_instr_write_data_x0(struct arm_dpm *dpm, uint32_t opcode, uint64_t data) { struct aarch64_common *a8 = dpm_to_a8(dpm); @@ -556,7 +556,7 @@ static int aarch64_instr_read_data_r0(struct arm_dpm *dpm, return aarch64_read_dcc(a8, data, &dscr); } -static int aarch64_instr_read_data_r0_64(struct arm_dpm *dpm, +static int aarch64_instr_read_data_x0(struct arm_dpm *dpm, uint32_t opcode, uint64_t *data) { struct aarch64_common *a8 = dpm_to_a8(dpm); @@ -656,13 +656,13 @@ static int aarch64_dpm_setup(struct aarch64_common *a8, uint32_t debug) dpm->instr_write_data_dcc = aarch64_instr_write_data_dcc; dpm->instr_write_data_dcc_64 = aarch64_instr_write_data_dcc_64; dpm->instr_write_data_r0 = aarch64_instr_write_data_r0; - dpm->instr_write_data_r0_64 = aarch64_instr_write_data_r0_64; + dpm->instr_write_data_x0 = aarch64_instr_write_data_x0; dpm->instr_cpsr_sync = aarch64_instr_cpsr_sync; dpm->instr_read_data_dcc = aarch64_instr_read_data_dcc; dpm->instr_read_data_dcc_64 = aarch64_instr_read_data_dcc_64; dpm->instr_read_data_r0 = aarch64_instr_read_data_r0; - dpm->instr_read_data_r0_64 = aarch64_instr_read_data_r0_64; + dpm->instr_read_data_x0 = aarch64_instr_read_data_x0; dpm->bpwp_enable = aarch64_bpwp_enable; dpm->bpwp_disable = aarch64_bpwp_disable; diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c index 7c7938a..319c7e3 100644 --- a/src/target/arm_dpm.c +++ b/src/target/arm_dpm.c @@ -206,15 +206,15 @@ static int dpm_read_reg64(struct arm_dpm *dpm, struct reg *r, unsigned regnum) break; case 31: /* SP */ i = 0x910003e0; - retval = dpm->instr_read_data_r0_64(dpm, i, &value); + retval = dpm->instr_read_data_x0(dpm, i, &value); break; case 32: /* PC */ i = 0xd53b4520; - retval = dpm->instr_read_data_r0_64(dpm, i, &value); + retval = dpm->instr_read_data_x0(dpm, i, &value); break; case 33: /* CPSR */ i = 0xd53b4500; - retval = dpm->instr_read_data_r0_64(dpm, i, &value); + retval = dpm->instr_read_data_x0(dpm, i, &value); break; default: @@ -294,7 +294,7 @@ static int dpm_write_reg64(struct arm_dpm *dpm, struct reg *r, unsigned regnum) break; case 32: /* PC */ i = 0xd51b4520; - retval = dpm->instr_write_data_r0_64(dpm, i, value); + retval = dpm->instr_write_data_x0(dpm, i, value); break; default: LOG_DEBUG("register %s (%16.16llx) not defined", r->name, diff --git a/src/target/arm_dpm.h b/src/target/arm_dpm.h index 1a8d9f4..8268673 100644 --- a/src/target/arm_dpm.h +++ b/src/target/arm_dpm.h @@ -82,8 +82,8 @@ struct arm_dpm { int (*instr_write_data_r0)(struct arm_dpm *, uint32_t opcode, uint32_t data); - /** Runs one instruction, writing data to R0 before execution. */ - int (*instr_write_data_r0_64)(struct arm_dpm *, + /** Runs one instruction, writing data to X0 before execution. */ + int (*instr_write_data_x0)(struct arm_dpm *, uint32_t opcode, uint64_t data); /** Optional core-specific operation invoked after CPSR writes. */ @@ -102,7 +102,7 @@ struct arm_dpm { int (*instr_read_data_r0)(struct arm_dpm *, uint32_t opcode, uint32_t *data); - int (*instr_read_data_r0_64)(struct arm_dpm *, + int (*instr_read_data_x0)(struct arm_dpm *, uint32_t opcode, uint64_t *data); struct reg *(*arm_reg_current)(struct arm *arm, -- ------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140 _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
