projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#include "target.h" less wildly
[fw/openocd]
/
src
/
target
/
armv7a.c
diff --git
a/src/target/armv7a.c
b/src/target/armv7a.c
index ead5b9c21ffeeabf9d40eaa853a9cebfd32ef75d..7f2c387dfc283b37236a25d0699aad395f9da506 100644
(file)
--- a/
src/target/armv7a.c
+++ b/
src/target/armv7a.c
@@
-25,9
+25,7
@@
#include "armv7a.h"
#include "arm_disassembler.h"
#include "armv7a.h"
#include "arm_disassembler.h"
-#include "target.h"
#include "register.h"
#include "register.h"
-#include "log.h"
#include "binarybuffer.h"
#include "command.h"
#include "binarybuffer.h"
#include "command.h"
@@
-35,25
+33,6
@@
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
-struct bitfield_desc armv7a_psr_bitfield_desc[] =
-{
- {"M[4:0]", 5},
- {"T", 1},
- {"F", 1},
- {"I", 1},
- {"A", 1},
- {"E", 1},
- {"IT[7:2]", 6},
- {"GE[3:0]", 4},
- {"reserved(DNM)", 4},
- {"J", 1},
- {"IT[0:1]", 2},
- {"Q", 1},
- {"V", 1},
- {"C", 1},
- {"Z", 1},
- {"N", 1},
-};
char* armv7a_core_reg_list[] =
{
char* armv7a_core_reg_list[] =
{
@@
-165,15
+144,23
@@
int armv7a_core_reg_map[8][17] =
}
};
}
};
+/* FIXME this dummy is IDENTICAL to the armv4_5, arm11, and armv7m
+ * ones... except for naming/scoping
+ */
uint8_t armv7a_gdb_dummy_fp_value[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
struct reg armv7a_gdb_dummy_fp_reg =
{
uint8_t armv7a_gdb_dummy_fp_value[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
struct reg armv7a_gdb_dummy_fp_reg =
{
- "GDB dummy floating-point register", armv7a_gdb_dummy_fp_value,
- 0, 1, 96, NULL, 0, NULL, 0
+ .name = "GDB dummy floating-point register",
+ .value = armv7a_gdb_dummy_fp_value,
+ .dirty = 0,
+ .valid = 1,
+ .size = 96,
+ .arch_info = NULL,
+ .arch_type = 0,
};
};
-void armv7a_show_fault_registers(
target_
t *target)
+void armv7a_show_fault_registers(
struct targe
t *target)
{
uint32_t dfsr, ifsr, dfar, ifar;
struct armv7a_common *armv7a = target_to_armv7a(target);
{
uint32_t dfsr, ifsr, dfar, ifar;
struct armv7a_common *armv7a = target_to_armv7a(target);
@@
-190,7
+177,7
@@
void armv7a_show_fault_registers(target_t *target)
}
}
-int armv7a_arch_state(struct target
_s
*target)
+int armv7a_arch_state(struct target *target)
{
static const char *state[] =
{
{
static const char *state[] =
{
@@
-232,7
+219,7
@@
int armv7a_arch_state(struct target_s *target)
COMMAND_HANDLER(handle_dap_baseaddr_command)
{
COMMAND_HANDLER(handle_dap_baseaddr_command)
{
-
target_
t *target = get_current_target(cmd_ctx);
+
struct targe
t *target = get_current_target(cmd_ctx);
struct armv7a_common *armv7a = target_to_armv7a(target);
struct swjdp_common *swjdp = &armv7a->swjdp_info;
struct armv7a_common *armv7a = target_to_armv7a(target);
struct swjdp_common *swjdp = &armv7a->swjdp_info;
@@
-241,7
+228,7
@@
COMMAND_HANDLER(handle_dap_baseaddr_command)
COMMAND_HANDLER(handle_dap_memaccess_command)
{
COMMAND_HANDLER(handle_dap_memaccess_command)
{
-
target_
t *target = get_current_target(cmd_ctx);
+
struct targe
t *target = get_current_target(cmd_ctx);
struct armv7a_common *armv7a = target_to_armv7a(target);
struct swjdp_common *swjdp = &armv7a->swjdp_info;
struct armv7a_common *armv7a = target_to_armv7a(target);
struct swjdp_common *swjdp = &armv7a->swjdp_info;
@@
-250,7
+237,7
@@
COMMAND_HANDLER(handle_dap_memaccess_command)
COMMAND_HANDLER(handle_dap_apsel_command)
{
COMMAND_HANDLER(handle_dap_apsel_command)
{
-
target_
t *target = get_current_target(cmd_ctx);
+
struct targe
t *target = get_current_target(cmd_ctx);
struct armv7a_common *armv7a = target_to_armv7a(target);
struct swjdp_common *swjdp = &armv7a->swjdp_info;
struct armv7a_common *armv7a = target_to_armv7a(target);
struct swjdp_common *swjdp = &armv7a->swjdp_info;
@@
-259,7
+246,7
@@
COMMAND_HANDLER(handle_dap_apsel_command)
COMMAND_HANDLER(handle_dap_apid_command)
{
COMMAND_HANDLER(handle_dap_apid_command)
{
-
target_
t *target = get_current_target(cmd_ctx);
+
struct targe
t *target = get_current_target(cmd_ctx);
struct armv7a_common *armv7a = target_to_armv7a(target);
struct swjdp_common *swjdp = &armv7a->swjdp_info;
struct armv7a_common *armv7a = target_to_armv7a(target);
struct swjdp_common *swjdp = &armv7a->swjdp_info;
@@
-268,7
+255,7
@@
COMMAND_HANDLER(handle_dap_apid_command)
COMMAND_HANDLER(handle_dap_info_command)
{
COMMAND_HANDLER(handle_dap_info_command)
{
-
target_
t *target = get_current_target(cmd_ctx);
+
struct targe
t *target = get_current_target(cmd_ctx);
struct armv7a_common *armv7a = target_to_armv7a(target);
struct swjdp_common *swjdp = &armv7a->swjdp_info;
uint32_t apsel;
struct armv7a_common *armv7a = target_to_armv7a(target);
struct swjdp_common *swjdp = &armv7a->swjdp_info;
uint32_t apsel;
@@
-289,7
+276,7
@@
COMMAND_HANDLER(handle_dap_info_command)
COMMAND_HANDLER(handle_armv7a_disassemble_command)
{
COMMAND_HANDLER(handle_armv7a_disassemble_command)
{
-
target_
t *target = get_current_target(cmd_ctx);
+
struct targe
t *target = get_current_target(cmd_ctx);
struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
int thumb = 0;
int count = 1;
struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
int thumb = 0;
int count = 1;
@@
-361,10
+348,10
@@
usage:
return ERROR_OK;
}
return ERROR_OK;
}
-int armv7a_register_commands(struct command_context
_s
*cmd_ctx)
+int armv7a_register_commands(struct command_context *cmd_ctx)
{
{
-
command_t
*arm_adi_v5_dap_cmd;
-
command_t
*armv7a_cmd;
+
struct command
*arm_adi_v5_dap_cmd;
+
struct command
*armv7a_cmd;
arm_adi_v5_dap_cmd = register_command(cmd_ctx, NULL, "dap",
NULL, COMMAND_ANY,
arm_adi_v5_dap_cmd = register_command(cmd_ctx, NULL, "dap",
NULL, COMMAND_ANY,