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

arm: Use different enum for core_type and core_mode 

The fields core_type and core_mode use the same enum arm_mode
but encode different information, making the code less immediate
to read.

Use a different enum arm_core_type for the field core_type.
The code behavior is not changed.

Change-Id: I60f2095ea6801dfe22f6da81ec295ca71ef90466
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5258
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2019-06-24 17:15:33 +02:00
parent f447c31b30
commit fba438fde7
7 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/target/arm.h
View File

@ -40,6 +40,22 @@
* support has not yet been integrated, affecting Cortex-M parts. * support has not yet been integrated, affecting Cortex-M parts.
*/ */
/**
* Indicates what registers are in the ARM state core register set.
*
* - ARM_CORE_TYPE_STD indicates the standard set of 37 registers, seen
* on for example ARM7TDMI cores.
* - ARM_CORE_TYPE_SEC_EXT indicates core has security extensions, thus
* three more registers are shadowed for "Secure Monitor" mode.
* - ARM_CORE_TYPE_M_PROFILE indicates a microcontroller profile core,
* which only shadows SP.
*/
enum arm_core_type {
ARM_CORE_TYPE_STD = -1,
ARM_CORE_TYPE_SEC_EXT = 1,
ARM_CORE_TYPE_M_PROFILE,
};
/** /**
* Represent state of an ARM core. * Represent state of an ARM core.
* *
@ -161,15 +177,8 @@ struct arm {
/** Support for arm_reg_current() */ /** Support for arm_reg_current() */
const int *map; const int *map;
/** /** Indicates what registers are in the ARM state core register set. */
* Indicates what registers are in the ARM state core register set. enum arm_core_type core_type;
* ARM_MODE_ANY indicates the standard set of 37 registers,
* seen on for example ARM7TDMI cores. ARM_MODE_MON indicates three
* more registers are shadowed, for "Secure Monitor" mode.
* ARM_MODE_THREAD indicates a microcontroller profile core,
* which only shadows SP.
*/
enum arm_mode core_type;
/** Record the current core mode: SVC, USR, or some other mode. */ /** Record the current core mode: SVC, USR, or some other mode. */
enum arm_mode core_mode; enum arm_mode core_mode;

4
src/target/arm11.c
View File

@ -1109,7 +1109,7 @@ static int arm11_target_create(struct target *target, Jim_Interp *interp)
if (!arm11) if (!arm11)
return ERROR_FAIL; return ERROR_FAIL;
arm11->arm.core_type = ARM_MODE_ANY; arm11->arm.core_type = ARM_CORE_TYPE_STD;
arm_init_arch_info(target, &arm11->arm); arm_init_arch_info(target, &arm11->arm);
arm11->jtag_info.tap = target->tap; arm11->jtag_info.tap = target->tap;
@ -1180,7 +1180,7 @@ static int arm11_examine(struct target *target)
type = "ARM1156"; type = "ARM1156";
break; break;
case 0x7B76: case 0x7B76:
arm11->arm.core_type = ARM_MODE_MON; arm11->arm.core_type = ARM_CORE_TYPE_SEC_EXT;
/* NOTE: could default arm11->hardware_step to true */ /* NOTE: could default arm11->hardware_step to true */
type = "ARM1176"; type = "ARM1176";
break; break;

2
src/target/arm7_9_common.c
View File

@ -2848,7 +2848,7 @@ int arm7_9_init_arch_info(struct target *target, struct arm7_9_common *arm7_9)
arm7_9->dcc_downloads = false; arm7_9->dcc_downloads = false;
arm->arch_info = arm7_9; arm->arch_info = arm7_9;
arm->core_type = ARM_MODE_ANY; arm->core_type = ARM_CORE_TYPE_STD;
arm->read_core_reg = arm7_9_read_core_reg; arm->read_core_reg = arm7_9_read_core_reg;
arm->write_core_reg = arm7_9_write_core_reg; arm->write_core_reg = arm7_9_write_core_reg;
arm->full_context = arm7_9_full_context; arm->full_context = arm7_9_full_context;

18
src/target/armv4_5.c
View File

@ -658,7 +658,7 @@ struct reg_cache *arm_build_reg_cache(struct target *target, struct arm *arm)
for (i = 0; i < num_core_regs; i++) { for (i = 0; i < num_core_regs; i++) {
/* Skip registers this core doesn't expose */ /* Skip registers this core doesn't expose */
if (arm_core_regs[i].mode == ARM_MODE_MON if (arm_core_regs[i].mode == ARM_MODE_MON
&& arm->core_type != ARM_MODE_MON) && arm->core_type != ARM_CORE_TYPE_SEC_EXT)
continue; continue;
/* REVISIT handle Cortex-M, which only shadows R13/SP */ /* REVISIT handle Cortex-M, which only shadows R13/SP */
@ -787,7 +787,7 @@ COMMAND_HANDLER(handle_armv4_5_reg_command)
return ERROR_FAIL; return ERROR_FAIL;
} }
if (arm->core_type != ARM_MODE_ANY) { if (arm->core_type != ARM_CORE_TYPE_STD) {
command_print(CMD, command_print(CMD,
"Microcontroller Profile not supported - use standard reg cmd"); "Microcontroller Profile not supported - use standard reg cmd");
return ERROR_OK; return ERROR_OK;
@ -820,7 +820,7 @@ COMMAND_HANDLER(handle_armv4_5_reg_command)
sep = ""; sep = "";
break; break;
case ARM_MODE_MON: case ARM_MODE_MON:
if (arm->core_type != ARM_MODE_MON) if (arm->core_type != ARM_CORE_TYPE_SEC_EXT)
continue; continue;
/* FALLTHROUGH */ /* FALLTHROUGH */
default: default:
@ -872,7 +872,7 @@ COMMAND_HANDLER(handle_armv4_5_core_state_command)
return ERROR_FAIL; return ERROR_FAIL;
} }
if (arm->core_type == ARM_MODE_THREAD) { if (arm->core_type == ARM_CORE_TYPE_M_PROFILE) {
/* armv7m not supported */ /* armv7m not supported */
command_print(CMD, "Unsupported Command"); command_print(CMD, "Unsupported Command");
return ERROR_OK; return ERROR_OK;
@ -910,7 +910,7 @@ COMMAND_HANDLER(handle_arm_disassemble_command)
return ERROR_FAIL; return ERROR_FAIL;
} }
if (arm->core_type == ARM_MODE_THREAD) { if (arm->core_type == ARM_CORE_TYPE_M_PROFILE) {
/* armv7m is always thumb mode */ /* armv7m is always thumb mode */
thumb = 1; thumb = 1;
} }
@ -1197,7 +1197,7 @@ int arm_get_gdb_reg_list(struct target *target,
break; break;
case REG_CLASS_ALL: case REG_CLASS_ALL:
*reg_list_size = (arm->core_type != ARM_MODE_MON ? 48 : 51); *reg_list_size = (arm->core_type != ARM_CORE_TYPE_SEC_EXT ? 48 : 51);
unsigned int list_size_core = *reg_list_size; unsigned int list_size_core = *reg_list_size;
if (arm->arm_vfp_version == ARM_VFP_V3) if (arm->arm_vfp_version == ARM_VFP_V3)
*reg_list_size += 33; *reg_list_size += 33;
@ -1210,7 +1210,7 @@ int arm_get_gdb_reg_list(struct target *target,
for (i = 13; i < ARRAY_SIZE(arm_core_regs); i++) { for (i = 13; i < ARRAY_SIZE(arm_core_regs); i++) {
int reg_index = arm->core_cache->reg_list[i].number; int reg_index = arm->core_cache->reg_list[i].number;
if (!(arm_core_regs[i].mode == ARM_MODE_MON if (!(arm_core_regs[i].mode == ARM_MODE_MON
&& arm->core_type != ARM_MODE_MON)) && arm->core_type != ARM_CORE_TYPE_SEC_EXT))
(*reg_list)[reg_index] = &(arm->core_cache->reg_list[i]); (*reg_list)[reg_index] = &(arm->core_cache->reg_list[i]);
} }
@ -1673,8 +1673,8 @@ int arm_init_arch_info(struct target *target, struct arm *arm)
arm->common_magic = ARM_COMMON_MAGIC; arm->common_magic = ARM_COMMON_MAGIC;
/* core_type may be overridden by subtype logic */ /* core_type may be overridden by subtype logic */
if (arm->core_type != ARM_MODE_THREAD) { if (arm->core_type != ARM_CORE_TYPE_M_PROFILE) {
arm->core_type = ARM_MODE_ANY; arm->core_type = ARM_CORE_TYPE_STD;
arm_set_cpsr(arm, ARM_MODE_USR); arm_set_cpsr(arm, ARM_MODE_USR);
} }

2
src/target/armv7m.c
View File

@ -695,7 +695,7 @@ int armv7m_init_arch_info(struct target *target, struct armv7m_common *armv7m)
/* Enable stimulus port #0 by default */ /* Enable stimulus port #0 by default */
armv7m->trace_config.itm_ter[0] = 1; armv7m->trace_config.itm_ter[0] = 1;
arm->core_type = ARM_MODE_THREAD; arm->core_type = ARM_CORE_TYPE_M_PROFILE;
arm->arch_info = armv7m; arm->arch_info = armv7m;
arm->setup_semihosting = armv7m_setup_semihosting; arm->setup_semihosting = armv7m_setup_semihosting;

2
src/target/cortex_a.c
View File

@ -2787,7 +2787,7 @@ static int cortex_a_examine_first(struct target *target)
} }
} }
armv7a->arm.core_type = ARM_MODE_MON; armv7a->arm.core_type = ARM_CORE_TYPE_SEC_EXT;
/* Avoid recreating the registers cache */ /* Avoid recreating the registers cache */
if (!target_was_examined(target)) { if (!target_was_examined(target)) {

2
src/target/xscale.c
View File

@ -2981,7 +2981,7 @@ static int xscale_init_arch_info(struct target *target,
/* prepare ARMv4/5 specific information */ /* prepare ARMv4/5 specific information */
arm->arch_info = xscale; arm->arch_info = xscale;
arm->core_type = ARM_MODE_ANY; arm->core_type = ARM_CORE_TYPE_STD;
arm->read_core_reg = xscale_read_core_reg; arm->read_core_reg = xscale_read_core_reg;
arm->write_core_reg = xscale_write_core_reg; arm->write_core_reg = xscale_write_core_reg;
arm->full_context = xscale_full_context; arm->full_context = xscale_full_context;