static int arm920t_read_cp15_physical(target_t *target,
int reg_addr, uint32_t *value)
{
- struct arm920t_common_s *arm920t = target_to_arm920(target);
- arm_jtag_t *jtag_info;
- scan_field_t fields[4];
+ struct arm920t_common *arm920t = target_to_arm920(target);
+ struct arm_jtag *jtag_info;
+ struct scan_field fields[4];
uint8_t access_type_buf = 1;
uint8_t reg_addr_buf = reg_addr & 0x3f;
uint8_t nr_w_buf = 0;
static int arm920t_write_cp15_physical(target_t *target,
int reg_addr, uint32_t value)
{
- struct arm920t_common_s *arm920t = target_to_arm920(target);
- arm_jtag_t *jtag_info;
- scan_field_t fields[4];
+ struct arm920t_common *arm920t = target_to_arm920(target);
+ struct arm_jtag *jtag_info;
+ struct scan_field fields[4];
uint8_t access_type_buf = 1;
uint8_t reg_addr_buf = reg_addr & 0x3f;
uint8_t nr_w_buf = 1;
uint32_t arm_opcode)
{
int retval;
- struct arm920t_common_s *arm920t = target_to_arm920(target);
- arm_jtag_t *jtag_info;
- scan_field_t fields[4];
+ struct arm920t_common *arm920t = target_to_arm920(target);
+ struct arm_jtag *jtag_info;
+ struct scan_field fields[4];
uint8_t access_type_buf = 0; /* interpreted access */
uint8_t reg_addr_buf = 0x0;
uint8_t nr_w_buf = 0;
void arm920t_post_debug_entry(target_t *target)
{
uint32_t cp15c15;
- struct arm920t_common_s *arm920t = target_to_arm920(target);
+ struct arm920t_common *arm920t = target_to_arm920(target);
/* examine cp15 control reg */
arm920t_read_cp15_physical(target, 0x2, &arm920t->cp15_control_reg);
void arm920t_pre_restore_context(target_t *target)
{
uint32_t cp15c15;
- struct arm920t_common_s *arm920t = target_to_arm920(target);
+ struct arm920t_common *arm920t = target_to_arm920(target);
/* restore i/d fault status and address register */
arm920t_write_cp15_interpreted(target, 0xee050f10, arm920t->d_fsr, 0x0);
static const char arm920_not[] = "target is not an ARM920";
static int arm920t_verify_pointer(struct command_context_s *cmd_ctx,
- struct arm920t_common_s *arm920t)
+ struct arm920t_common *arm920t)
{
if (arm920t->common_magic != ARM920T_COMMON_MAGIC) {
command_print(cmd_ctx, arm920_not);
"disabled", "enabled"
};
- struct arm920t_common_s *arm920t = target_to_arm920(target);
+ struct arm920t_common *arm920t = target_to_arm920(target);
struct armv4_5_common_s *armv4_5;
if (arm920t->common_magic != ARM920T_COMMON_MAGIC)
return ERROR_OK;
}
+static int arm920_mmu(struct target_s *target, int *enabled)
+{
+ if (target->state != TARGET_HALTED) {
+ LOG_ERROR("%s: target not halted", __func__);
+ return ERROR_TARGET_INVALID;
+ }
+
+ *enabled = target_to_arm920(target)->armv4_5_mmu.mmu_enabled;
+ return ERROR_OK;
+}
+
+static int arm920_virt2phys(struct target_s *target,
+ uint32_t virt, uint32_t *phys)
+{
+ /** @todo Implement this! */
+ LOG_ERROR("%s: not implemented", __func__);
+ return ERROR_FAIL;
+}
+
/** Reads a buffer, in the specified word size, with current MMU settings. */
int arm920t_read_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
{
uint32_t address, uint32_t size,
uint32_t count, uint8_t *buffer)
{
- struct arm920t_common_s *arm920t = target_to_arm920(target);
+ struct arm920t_common *arm920t = target_to_arm920(target);
return armv4_5_mmu_read_physical(target, &arm920t->armv4_5_mmu,
address, size, count, buffer);
uint32_t address, uint32_t size,
uint32_t count, uint8_t *buffer)
{
- struct arm920t_common_s *arm920t = target_to_arm920(target);
+ struct arm920t_common *arm920t = target_to_arm920(target);
return armv4_5_mmu_write_physical(target, &arm920t->armv4_5_mmu,
address, size, count, buffer);
*/
if (((size == 4) || (size == 2)) && (count == 1))
{
- struct arm920t_common_s *arm920t = target_to_arm920(target);
+ struct arm920t_common *arm920t = target_to_arm920(target);
if (arm920t->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled)
{
int arm920t_soft_reset_halt(struct target_s *target)
{
int retval = ERROR_OK;
- struct arm920t_common_s *arm920t = target_to_arm920(target);
- struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
+ struct arm920t_common *arm920t = target_to_arm920(target);
+ struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
return ERROR_OK;
}
-int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, jtag_tap_t *tap)
+int arm920t_init_arch_info(target_t *target, struct arm920t_common *arm920t, struct jtag_tap *tap)
{
- arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_common;
- arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;
+ struct arm9tdmi_common *arm9tdmi = &arm920t->arm9tdmi_common;
+ struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common;
/* initialize arm9tdmi specific info (including arm7_9 and armv4_5)
*/
static int arm920t_target_create(struct target_s *target, Jim_Interp *interp)
{
- arm920t_common_t *arm920t = calloc(1,sizeof(arm920t_common_t));
+ struct arm920t_common *arm920t = calloc(1,sizeof(struct arm920t_common));
return arm920t_init_arch_info(target, arm920t, target->tap);
}
-static int arm920t_handle_read_cache_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(arm920t_handle_read_cache_command)
{
int retval = ERROR_OK;
target_t *target = get_current_target(cmd_ctx);
- struct arm920t_common_s *arm920t = target_to_arm920(target);
- struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
+ struct arm920t_common *arm920t = target_to_arm920(target);
+ struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
uint32_t cp15c15;
uint32_t cp15_ctrl, cp15_ctrl_saved;
uint32_t C15_C_D_Ind, C15_C_I_Ind;
int i;
FILE *output;
- arm920t_cache_line_t d_cache[8][64], i_cache[8][64];
+ struct arm920t_cache_line d_cache[8][64], i_cache[8][64];
int segment, index;
retval = arm920t_verify_pointer(cmd_ctx, arm920t);
return ERROR_OK;
}
-static int arm920t_handle_read_mmu_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(arm920t_handle_read_mmu_command)
{
int retval = ERROR_OK;
target_t *target = get_current_target(cmd_ctx);
- struct arm920t_common_s *arm920t = target_to_arm920(target);
- struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
+ struct arm920t_common *arm920t = target_to_arm920(target);
+ struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common;
uint32_t cp15c15;
uint32_t cp15_ctrl, cp15_ctrl_saved;
int i;
FILE *output;
uint32_t Dlockdown, Ilockdown;
- arm920t_tlb_entry_t d_tlb[64], i_tlb[64];
+ struct arm920t_tlb_entry d_tlb[64], i_tlb[64];
int victim;
retval = arm920t_verify_pointer(cmd_ctx, arm920t);
return ERROR_OK;
}
-static int arm920t_handle_cp15_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(arm920t_handle_cp15_command)
{
int retval;
target_t *target = get_current_target(cmd_ctx);
- struct arm920t_common_s *arm920t = target_to_arm920(target);
+ struct arm920t_common *arm920t = target_to_arm920(target);
retval = arm920t_verify_pointer(cmd_ctx, arm920t);
if (retval != ERROR_OK)
if (target->state != TARGET_HALTED)
{
- command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd);
+ command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME);
return ERROR_OK;
}
return ERROR_OK;
}
-static int arm920t_handle_cp15i_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(arm920t_handle_cp15i_command)
{
int retval;
target_t *target = get_current_target(cmd_ctx);
- struct arm920t_common_s *arm920t = target_to_arm920(target);
+ struct arm920t_common *arm920t = target_to_arm920(target);
retval = arm920t_verify_pointer(cmd_ctx, arm920t);
if (retval != ERROR_OK)
if (target->state != TARGET_HALTED)
{
- command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd);
+ command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME);
return ERROR_OK;
}
return ERROR_OK;
}
-static int arm920t_handle_cache_info_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(arm920t_handle_cache_info_command)
{
int retval;
target_t *target = get_current_target(cmd_ctx);
- struct arm920t_common_s *arm920t = target_to_arm920(target);
+ struct arm920t_common *arm920t = target_to_arm920(target);
retval = arm920t_verify_pointer(cmd_ctx, arm920t);
if (retval != ERROR_OK)
.write_memory = arm920t_write_memory,
.read_phys_memory = arm920t_read_phys_memory,
.write_phys_memory = arm920t_write_phys_memory,
+ .mmu = arm920_mmu,
+ .virt2phys = arm920_virt2phys,
+
.bulk_write_memory = arm7_9_bulk_write_memory,
.checksum_memory = arm7_9_checksum_memory,
.blank_check_memory = arm7_9_blank_check_memory,