From: Brian Cain <bc...@quicinc.com> Signed-off-by: Brian Cain <brian.c...@oss.qualcomm.com> --- target/hexagon/cpu.h | 10 ++++++- target/hexagon/cpu_bits.h | 55 ++++++++++++++++++++++++++++----------- 2 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index 7e2ea838c5..dabee310c5 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -67,6 +67,15 @@ typedef struct CPUHexagonTLBContext CPUHexagonTLBContext; #define MMU_GUEST_IDX 1 #define MMU_KERNEL_IDX 2 +#define HEXAGON_CPU_IRQ_0 0 +#define HEXAGON_CPU_IRQ_1 1 +#define HEXAGON_CPU_IRQ_2 2 +#define HEXAGON_CPU_IRQ_3 3 +#define HEXAGON_CPU_IRQ_4 4 +#define HEXAGON_CPU_IRQ_5 5 +#define HEXAGON_CPU_IRQ_6 6 +#define HEXAGON_CPU_IRQ_7 7 + typedef enum { HEX_LOCK_UNLOCKED = 0, HEX_LOCK_WAITING = 1, @@ -75,7 +84,6 @@ typedef enum { } hex_lock_state_t; #endif - #define CPU_RESOLVING_TYPE TYPE_HEXAGON_CPU typedef struct { diff --git a/target/hexagon/cpu_bits.h b/target/hexagon/cpu_bits.h index 610094a759..c7cc426ec8 100644 --- a/target/hexagon/cpu_bits.h +++ b/target/hexagon/cpu_bits.h @@ -24,14 +24,16 @@ #define PCALIGN_MASK (PCALIGN - 1) enum hex_event { - HEX_EVENT_NONE = -1, - HEX_EVENT_TRAP0 = 0x008, - HEX_EVENT_FETCH_NO_UPAGE = 0x012, - HEX_EVENT_INVALID_PACKET = 0x015, - HEX_EVENT_INVALID_OPCODE = 0x015, - HEX_EVENT_PC_NOT_ALIGNED = 0x01e, - HEX_EVENT_PRIV_NO_UREAD = 0x024, - HEX_EVENT_PRIV_NO_UWRITE = 0x025, + HEX_EVENT_NONE = -1, + HEX_EVENT_RESET = 0x0, + HEX_EVENT_IMPRECISE = 0x1, + HEX_EVENT_PRECISE = 0x2, + HEX_EVENT_TLB_MISS_X = 0x4, + HEX_EVENT_TLB_MISS_RW = 0x6, + HEX_EVENT_TRAP0 = 0x8, + HEX_EVENT_TRAP1 = 0x9, + HEX_EVENT_FPTRAP = 0xb, + HEX_EVENT_DEBUG = 0xc, HEX_EVENT_INT0 = 0x10, HEX_EVENT_INT1 = 0x11, HEX_EVENT_INT2 = 0x12, @@ -53,15 +55,38 @@ enum hex_event { enum hex_cause { HEX_CAUSE_NONE = -1, HEX_CAUSE_RESET = 0x000, - HEX_CAUSE_TRAP0 = 0x172, - HEX_CAUSE_FETCH_NO_UPAGE = 0x012, - HEX_CAUSE_INVALID_PACKET = 0x015, - HEX_CAUSE_INVALID_OPCODE = 0x015, - HEX_CAUSE_PC_NOT_ALIGNED = 0x01e, - HEX_CAUSE_PRIV_NO_UREAD = 0x024, - HEX_CAUSE_PRIV_NO_UWRITE = 0x025, + HEX_CAUSE_BIU_PRECISE = 0x001, + HEX_CAUSE_UNSUPORTED_HVX_64B = 0x002, /* QEMU-specific */ + HEX_CAUSE_DOUBLE_EXCEPT = 0x003, + HEX_CAUSE_TRAP0 = 0x008, + HEX_CAUSE_TRAP1 = 0x009, + HEX_CAUSE_FETCH_NO_XPAGE = 0x011, + HEX_CAUSE_FETCH_NO_UPAGE = 0x012, + HEX_CAUSE_INVALID_PACKET = 0x015, + HEX_CAUSE_INVALID_OPCODE = 0x015, + HEX_CAUSE_NO_COPROC_ENABLE = 0x016, + HEX_CAUSE_NO_COPROC2_ENABLE = 0x018, HEX_CAUSE_PRIV_USER_NO_GINSN = 0x01a, HEX_CAUSE_PRIV_USER_NO_SINSN = 0x01b, + HEX_CAUSE_REG_WRITE_CONFLICT = 0x01d, + HEX_CAUSE_PC_NOT_ALIGNED = 0x01e, + HEX_CAUSE_MISALIGNED_LOAD = 0x020, + HEX_CAUSE_MISALIGNED_STORE = 0x021, + HEX_CAUSE_PRIV_NO_READ = 0x022, + HEX_CAUSE_PRIV_NO_WRITE = 0x023, + HEX_CAUSE_PRIV_NO_UREAD = 0x024, + HEX_CAUSE_PRIV_NO_UWRITE = 0x025, + HEX_CAUSE_COPROC_LDST = 0x026, + HEX_CAUSE_STACK_LIMIT = 0x027, + HEX_CAUSE_VWCTRL_WINDOW_MISS = 0x029, + HEX_CAUSE_IMPRECISE_NMI = 0x043, + HEX_CAUSE_IMPRECISE_MULTI_TLB_MATCH = 0x044, + HEX_CAUSE_TLBMISSX_CAUSE_NORMAL = 0x060, + HEX_CAUSE_TLBMISSX_CAUSE_NEXTPAGE = 0x061, + HEX_CAUSE_TLBMISSRW_CAUSE_READ = 0x070, + HEX_CAUSE_TLBMISSRW_CAUSE_WRITE = 0x071, + HEX_CAUSE_DEBUG_SINGLESTEP = 0x80, + HEX_CAUSE_FPTRAP_CAUSE_BADFLOAT = 0x0bf, HEX_CAUSE_INT0 = 0x0c0, HEX_CAUSE_INT1 = 0x0c1, HEX_CAUSE_INT2 = 0x0c2, -- 2.34.1