christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

openocd: refactored register access

Browse Source 
Change-Id: I396bd8a89e85d806183106c41070c58e2a37a377
This commit is contained in:
Lars Rademacher
2013-10-22 00:33:14 +02:00
parent 0d2a5175cf
commit 5638a7473e
1 changed files with 32 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
debuggers/openocd/openocd_wrapper.cc
View File

@ -98,6 +98,7 @@ static void update_timers();
static struct watchpoint *getHaltingWatchpoint(); static struct watchpoint *getHaltingWatchpoint();
static void getCurrentMemAccesses(struct halt_condition *accesses); static void getCurrentMemAccesses(struct halt_condition *accesses);
static uint32_t getCurrentPC(); static uint32_t getCurrentPC();
static struct reg *get_reg_by_number(unsigned int num);
/* /*
* Main entry and main loop. * Main entry and main loop.
@ -551,67 +552,50 @@ void oocdw_reboot()
} }
} }
/*
* Register access as in target.c: COMMAND_HANDLER(handle_reg_command)
*/
static struct reg *get_reg_by_number(unsigned int num)
{
struct reg *reg = NULL;
struct reg_cache *cache = target_a9->reg_cache;
unsigned int count = 0;
while (cache) {
unsigned i;
for (i = 0; i < cache->num_regs; i++) {
if (count++ == num) {
reg = &cache->reg_list[i];
break;
}
}
if (reg)
break;
cache = cache->next;
}
return reg;
}
void oocdw_read_reg(uint32_t reg_num, enum arm_reg_group rg, uint32_t *data) void oocdw_read_reg(uint32_t reg_num, enum arm_reg_group rg, uint32_t *data)
{ {
assert((target_a9->state == TARGET_HALTED) && "Target not halted"); assert((target_a9->state == TARGET_HALTED) && "Target not halted");
struct arm *arm = (struct arm*)(target_a9->arch_info); struct reg *reg = get_reg_by_number(reg_num);
if (rg == ARM_REGS_CORE) {
struct reg *reg = arm->core_cache->reg_list + reg_num;
// Core registers if (reg->valid == 0)
if (arm->read_core_reg(target_a9, reg, reg_num, arm->core_mode)) { reg->type->get(reg);
LOG << "FATAL ERROR: Could not read register " << reg_num << endl;
exit(-1);
}
*data = *((uint32_t*)(reg->value)); *data = *((uint32_t*)(reg->value));
} else {
// ToDo:
// coprocessor registers
/*
* struct target *target, int cpnum,
uint32_t op1, uint32_t op2,
uint32_t CRn, uint32_t CRm,
uint32_t *value
*/
/*if (arm->mrc(...)) {
}*/
LOG << "FATAL ERROR: Accessing coprocessor registers not implemented yet." << endl;
exit(-1);
}
} }
void oocdw_write_reg(uint32_t reg_num, enum arm_reg_group rg, uint32_t data) void oocdw_write_reg(uint32_t reg_num, enum arm_reg_group rg, uint32_t data)
{ {
assert((target_a9->state == TARGET_HALTED) && "Target not halted"); assert((target_a9->state == TARGET_HALTED) && "Target not halted");
struct arm *arm = (struct arm*)(target_a9->arch_info); struct reg *reg = get_reg_by_number(reg_num);
if (rg == ARM_REGS_CORE) {
struct reg *reg = arm->core_cache->reg_list + reg_num;
// Core registers reg->type->set(reg, (uint8_t*)(&data));
if (arm->write_core_reg(target_a9, reg, reg_num, arm->core_mode, data)) {
LOG << "FATAL ERROR: Could not write register " << reg_num << endl;
exit(-1);
}
} else {
// ToDo:
// coprocessor registers
/*
* struct target *target, int cpnum,
uint32_t op1, uint32_t op2,
uint32_t CRn, uint32_t CRm,
uint32_t value
*/
/*if (arm->mcr(...)) {
}*/
LOG << "FATAL ERROR: Accessing coprocessor registers not implemented yet." << endl;
exit(-1);
}
} }
void oocdw_finish() void oocdw_finish()