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

ARMv7-A: use standard ARM core_mode symbols 

The only way ARMv7-A modes differ from ARMv4/ARMv5 flavors
is that v7-A is allowed to include "Secure monitor" support.
That's now handled by our standard top-level ARM code ... so
phase out the stuff that's specific to ARMv7-A.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell 2009-11-19 02:31:34 -08:00
parent f382ebae10
commit f320b12289
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/target/armv7a.c
View File

@ -86,7 +86,7 @@ int armv7a_arch_state(struct target *target)
state[armv7a->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled], state[armv7a->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled],
state[armv7a->armv4_5_mmu.armv4_5_cache.i_cache_enabled]); state[armv7a->armv4_5_mmu.armv4_5_cache.i_cache_enabled]);
if (armv4_5->core_mode == ARMV7A_MODE_ABT) if (armv4_5->core_mode == ARMV4_5_MODE_ABT)
armv7a_show_fault_registers(target); armv7a_show_fault_registers(target);
return ERROR_OK; return ERROR_OK;

17
src/target/armv7a.h
View File

@ -24,18 +24,6 @@
#include "armv4_5_mmu.h" #include "armv4_5_mmu.h"
#include "armv4_5_cache.h" #include "armv4_5_cache.h"
typedef enum armv7a_mode
{
ARMV7A_MODE_USR = 16,
ARMV7A_MODE_FIQ = 17,
ARMV7A_MODE_IRQ = 18,
ARMV7A_MODE_SVC = 19,
ARMV7A_MODE_ABT = 23,
ARMV7A_MODE_UND = 27,
ARMV7A_MODE_SYS = 31,
ARMV7A_MODE_MON = 22,
ARMV7A_MODE_ANY = -1
} armv7a_t;
typedef enum armv7a_state typedef enum armv7a_state
{ {
@ -78,7 +66,6 @@ struct armv7a_common
{ {
int common_magic; int common_magic;
struct reg_cache *core_cache; struct reg_cache *core_cache;
enum armv7a_mode core_mode;
enum armv7a_state core_state; enum armv7a_state core_state;
/* arm adp debug port */ /* arm adp debug port */
@ -119,14 +106,14 @@ struct armv7a_algorithm
{ {
int common_magic; int common_magic;
enum armv7a_mode core_mode; enum armv4_5_mode core_mode;
enum armv7a_state core_state; enum armv7a_state core_state;
}; };
struct armv7a_core_reg struct armv7a_core_reg
{ {
int num; int num;
enum armv7a_mode mode; enum armv4_5_mode mode;
struct target *target; struct target *target;
struct armv7a_common *armv7a_common; struct armv7a_common *armv7a_common;
}; };