interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

aarch64: clean up struct aarch64_common 

remove some rarely or completely unused components.

Change-Id: Id285bb7075901016297fa173a874db7f11a840d7
Signed-off-by: Matthias Welwarsky <matthias.welwarsky@sysgo.com>
Reviewed-on: http://openocd.zylin.com/3992
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
This commit is contained in:
Matthias Welwarsky 2017-02-17 13:57:08 +01:00 committed by Paul Fertser
parent 257c434d3f
commit e513fe949b
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/target/aarch64.c
View File

@ -331,7 +331,6 @@ static int aarch64_poll(struct target *target)
armv8->debug_base + CPUV8_DBG_DSCR, &dscr); armv8->debug_base + CPUV8_DBG_DSCR, &dscr);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
aarch64->cpudbg_dscr = dscr;
if (DSCR_RUN_MODE(dscr) == 0x3) { if (DSCR_RUN_MODE(dscr) == 0x3) {
if (prev_target_state != TARGET_HALTED) { if (prev_target_state != TARGET_HALTED) {
@ -601,21 +600,27 @@ static int aarch64_resume(struct target *target, int current,
static int aarch64_debug_entry(struct target *target) static int aarch64_debug_entry(struct target *target)
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
struct aarch64_common *aarch64 = target_to_aarch64(target);
struct armv8_common *armv8 = target_to_armv8(target); struct armv8_common *armv8 = target_to_armv8(target);
struct arm_dpm *dpm = &armv8->dpm; struct arm_dpm *dpm = &armv8->dpm;
enum arm_state core_state; enum arm_state core_state;
uint32_t dscr;
LOG_DEBUG("%s dscr = 0x%08" PRIx32, target_name(target), aarch64->cpudbg_dscr);
dpm->dscr = aarch64->cpudbg_dscr;
core_state = armv8_dpm_get_core_state(dpm);
armv8_select_opcodes(armv8, core_state == ARM_STATE_AARCH64);
armv8_select_reg_access(armv8, core_state == ARM_STATE_AARCH64);
/* make sure to clear all sticky errors */ /* make sure to clear all sticky errors */
retval = mem_ap_write_atomic_u32(armv8->debug_ap, retval = mem_ap_write_atomic_u32(armv8->debug_ap,
armv8->debug_base + CPUV8_DBG_DRCR, DRCR_CSE); armv8->debug_base + CPUV8_DBG_DRCR, DRCR_CSE);
if (retval == ERROR_OK)
retval = mem_ap_read_atomic_u32(armv8->debug_ap,
armv8->debug_base + CPUV8_DBG_DSCR, &dscr);
if (retval != ERROR_OK)
return retval;
LOG_DEBUG("%s dscr = 0x%08" PRIx32, target_name(target), dscr);
dpm->dscr = dscr;
core_state = armv8_dpm_get_core_state(dpm);
armv8_select_opcodes(armv8, core_state == ARM_STATE_AARCH64);
armv8_select_reg_access(armv8, core_state == ARM_STATE_AARCH64);
/* discard async exceptions */ /* discard async exceptions */
if (retval == ERROR_OK) if (retval == ERROR_OK)
@ -625,7 +630,7 @@ static int aarch64_debug_entry(struct target *target)
return retval; return retval;
/* Examine debug reason */ /* Examine debug reason */
armv8_dpm_report_dscr(dpm, aarch64->cpudbg_dscr); armv8_dpm_report_dscr(dpm, dscr);
/* save address of instruction that triggered the watchpoint? */ /* save address of instruction that triggered the watchpoint? */
if (target->debug_reason == DBG_REASON_WATCHPOINT) { if (target->debug_reason == DBG_REASON_WATCHPOINT) {
@ -717,7 +722,6 @@ static int aarch64_post_debug_entry(struct target *target)
(aarch64->system_control_reg & 0x4U) ? 1 : 0; (aarch64->system_control_reg & 0x4U) ? 1 : 0;
armv8->armv8_mmu.armv8_cache.i_cache_enabled = armv8->armv8_mmu.armv8_cache.i_cache_enabled =
(aarch64->system_control_reg & 0x1000U) ? 1 : 0; (aarch64->system_control_reg & 0x1000U) ? 1 : 0;
aarch64->curr_mode = armv8->arm.core_mode;
return ERROR_OK; return ERROR_OK;
} }
@ -1893,8 +1897,6 @@ static int aarch64_init_arch_info(struct target *target,
armv8->arm.dap = tap->dap; armv8->arm.dap = tap->dap;
aarch64->fast_reg_read = 0;
/* register arch-specific functions */ /* register arch-specific functions */
armv8->examine_debug_reason = NULL; armv8->examine_debug_reason = NULL;

9
src/target/aarch64.h
View File

@ -48,25 +48,16 @@ struct aarch64_common {
int common_magic; int common_magic;
/* Context information */ /* Context information */
uint32_t cpudbg_dscr;
uint32_t system_control_reg; uint32_t system_control_reg;
uint32_t system_control_reg_curr; uint32_t system_control_reg_curr;
enum arm_mode curr_mode;
/* Breakpoint register pairs */ /* Breakpoint register pairs */
int brp_num_context; int brp_num_context;
int brp_num; int brp_num;
int brp_num_available; int brp_num_available;
struct aarch64_brp *brp_list; struct aarch64_brp *brp_list;
/* Use aarch64_read_regs_through_mem for fast register reads */
int fast_reg_read;
struct armv8_common armv8_common; struct armv8_common armv8_common;
}; };
static inline struct aarch64_common * static inline struct aarch64_common *