Revision 786c02f1 target-cris/cpu.h

b/target-cris/cpu.h
35 35
#define EXCP_MMU_READ    1
36 36
#define EXCP_MMU_WRITE   2
37 37
#define EXCP_MMU_FLUSH   3
38
#define EXCP_MMU_MISS    4
38
#define EXCP_MMU_FAULT   4
39 39
#define EXCP_BREAK      16 /* trap.  */
40 40

  
41 41
/* CPU flags.  */
......
110 110
	uint32_t btarget;
111 111
	int btaken;
112 112

  
113
	/* for traps.  */
114
	int trapnr;
115

  
116 113
	/* Condition flag tracking.  */
117 114
	uint32_t cc_op;
118 115
	uint32_t cc_mask;
......
129 126

  
130 127
	int features;
131 128

  
132
        uint64_t pending_interrupts;
133
	int interrupt_request;
134 129
	int exception_index;
130
	int interrupt_request;
131
	int interrupt_vector;
132
	int fault_vector;
133
	int trap_vector;
134

  
135 135
	int user_mode_only;
136 136
	int halted;
137 137

  
......
245 245
#define R_ACR 15
246 246

  
247 247
/* Support regs, P0 - P15  */
248
#define PR_BZ  0
249
#define PR_VR  1
248 250
#define PR_PID 2
249 251
#define PR_SRS 3
252
#define PR_WZ  4
250 253
#define PR_MOF 7
254
#define PR_DZ  8
251 255
#define PR_EBP 9
252 256
#define PR_ERP 10
253 257
#define PR_SRP 11
......
255 259

  
256 260
/* Support function regs.  */
257 261
#define SFR_RW_GC_CFG      0][0
258
#define SFR_RW_MM_CFG      1][0
259
#define SFR_RW_MM_KBASE_LO 1][1
260
#define SFR_RW_MM_KBASE_HI 1][2
261
#define SFR_R_MM_CAUSE     1][3
262
#define SFR_RW_MM_TLB_SEL  1][4
263
#define SFR_RW_MM_TLB_LO   1][5
264
#define SFR_RW_MM_TLB_HI   1][6
262
#define SFR_RW_MM_CFG      2][0
263
#define SFR_RW_MM_KBASE_LO 2][1
264
#define SFR_RW_MM_KBASE_HI 2][2
265
#define SFR_R_MM_CAUSE     2][3
266
#define SFR_RW_MM_TLB_SEL  2][4
267
#define SFR_RW_MM_TLB_LO   2][5
268
#define SFR_RW_MM_TLB_HI   2][6
265 269

  
266 270
#endif

Also available in: Unified diff