Revision 83469015 target-sparc/cpu.h

b/target-sparc/cpu.h
6 6
#if !defined(TARGET_SPARC64)
7 7
#define TARGET_LONG_BITS 32
8 8
#define TARGET_FPREGS 32
9
#define TARGET_PAGE_BITS 12 /* 4k */
9 10
#else
10 11
#define TARGET_LONG_BITS 64
11 12
#define TARGET_FPREGS 64
13
#define TARGET_PAGE_BITS 12 /* XXX */
12 14
#endif
13 15
#define TARGET_FPREG_T float
14 16

  
......
35 37
#define TT_TRAP     0x80
36 38
#else
37 39
#define TT_TFAULT   0x08
40
#define TT_TMISS    0x09
38 41
#define TT_ILL_INSN 0x10
39 42
#define TT_PRIV_INSN 0x11
40 43
#define TT_NFPU_INSN 0x20
......
42 45
#define TT_CLRWIN   0x24
43 46
#define TT_DIV_ZERO 0x28
44 47
#define TT_DFAULT   0x30
48
#define TT_DMISS    0x31
49
#define TT_DPROT    0x32
50
#define TT_PRIV_ACT 0x37
45 51
#define TT_EXTINT   0x40
46 52
#define TT_SPILL    0x80
47 53
#define TT_FILL     0xc0
......
65 71
#define TBR_BASE_MASK 0xfffff000
66 72

  
67 73
#if defined(TARGET_SPARC64)
74
#define PS_IG    (1<<11)
75
#define PS_MG    (1<<10)
76
#define PS_RED   (1<<5)
68 77
#define PS_PEF   (1<<4)
69 78
#define PS_AM    (1<<3)
70 79
#define PS_PRIV  (1<<2)
71 80
#define PS_IE    (1<<1)
81
#define PS_AG    (1<<0)
72 82
#endif
73 83

  
74 84
/* Fcc */
......
166 176
       context) */
167 177
    unsigned long mem_write_pc; /* host pc at which the memory was
168 178
                                   written */
169
    unsigned long mem_write_vaddr; /* target virtual addr at which the
179
    target_ulong mem_write_vaddr; /* target virtual addr at which the
170 180
                                      memory was written */
171 181
    /* 0 = kernel, 1 = user (may have 2 = kernel code, 3 = user code ?) */
172 182
    CPUTLBEntry tlb_read[2][CPU_TLB_SIZE];
......
201 211
    uint32_t pstate;
202 212
    uint32_t tl;
203 213
    uint32_t cansave, canrestore, otherwin, wstate, cleanwin;
204
    target_ulong agregs[8]; /* alternate general registers */
205
    target_ulong igregs[8]; /* interrupt general registers */
206
    target_ulong mgregs[8]; /* mmu general registers */
214
    uint64_t agregs[8]; /* alternate general registers */
215
    uint64_t bgregs[8]; /* backup for normal global registers */
216
    uint64_t igregs[8]; /* interrupt general registers */
217
    uint64_t mgregs[8]; /* mmu general registers */
207 218
    uint64_t version;
208 219
    uint64_t fprs;
220
    uint64_t tick_cmpr, stick_cmpr;
209 221
#endif
210 222
#if !defined(TARGET_SPARC64) && !defined(reg_T2)
211 223
    target_ulong t2;
......
275 287
struct siginfo;
276 288
int cpu_sparc_signal_handler(int hostsignum, struct siginfo *info, void *puc);
277 289

  
278
#define TARGET_PAGE_BITS 12 /* 4k */
279 290
#include "cpu-all.h"
280 291

  
281 292
#endif

Also available in: Unified diff