29c29
< * $FreeBSD: head/sys/sparc64/include/tte.h 182767 2008-09-04 19:43:14Z marius $
---
> * $FreeBSD: head/sys/sparc64/include/tte.h 205258 2010-03-17 20:23:14Z marius $
38a39,40
> #define TD_RSVD2_SHIFT (49)
> #define TD_SIZE2_SHIFT (48)
40a43,45
> #define TD_RSVD_OC_SHIFT (47)
> #define TD_RSVD_PT_SHIFT TD_RSVD_CH_SHIFT
> #define TD_RSVD_VE_SHIFT (41)
46,49c51,60
< #define TD_DIAG_SF_BITS (9)
< #define TD_RSVD_CH_BITS (7)
< #define TD_PA_CH_BITS (30)
< #define TD_PA_SF_BITS (28)
---
> #define TD_RSVD2_BITS (1) /* US-IV+, SPARC64 VI, VII, VIIIfx */
> #define TD_SIZE2_BITS (1) /* US-IV+, SPARC64 VI, VII, VIIIfx */
> #define TD_DIAG_SF_BITS (9) /* US-I, II{,e,i} */
> #define TD_RSVD_CH_BITS (7) /* US-III{,i,+}, US-IV, SPARC64 V */
> #define TD_RSVD_OC_BITS (1) /* SPARC64 VI, VII */
> #define TD_RSVD_PT_BITS (5) /* US-IV+, SPARC64 VI, VII */
> #define TD_RSVD_VE_BITS (7) /* SPARC64 VIIIfx */
> #define TD_PA_CH_BITS (30) /* US-III{,i,+}, US-IV{,+}, SPARC64 V */
> #define TD_PA_OC_BITS (34) /* SPARC64 VI, VII */
> #define TD_PA_SF_BITS (28) /* US-I, II{,e,i}, SPARC64 VIIIfx */
54a66,67
> #define TD_RSVD2_MASK ((1UL << TD_RSVD2_BITS) - 1)
> #define TD_SIZE2_MASK ((1UL << TD_SIZE2_BITS) - 1)
56a70,72
> #define TD_RSVD_OC_MASK ((1UL << TD_RSVD_OC_BITS) - 1)
> #define TD_RSVD_PT_MASK ((1UL << TD_RSVD_PT_BITS) - 1)
> #define TD_RSVD_VE_MASK ((1UL << TD_RSVD_VE_BITS) - 1)
57a74
> #define TD_PA_OC_MASK ((1UL << TD_PA_OC_BITS) - 1)
65a83,85
> #define TS_32M (4UL) /* US-IV+, SPARC64 VI, VII only */
> #define TS_256M (5UL) /* US-IV+, SPARC64 VI, VII only */
> #define TS_2G (6UL) /* SPARC64 VIIIfx only */
74a95,103
> #define TD_32M \
> (((TS_32M & TD_SIZE_MASK) << TD_SIZE_SHIFT) | \
> (TD_SIZE2_MASK << TD_SIZE2_SHIFT))
> #define TD_256M \
> (((TS_256M & TD_SIZE_MASK) << TD_SIZE_SHIFT) | \
> (TD_SIZE2_MASK << TD_SIZE2_SHIFT))
> #define TD_2G \
> (((TS_2G & TD_SIZE_MASK) << TD_SIZE_SHIFT) | \
> (TD_SIZE2_MASK << TD_SIZE2_SHIFT))
97c126
< #define TTE_PAGE_SHIFT(sz) \
---
> #define TTE_PAGE_SHIFT(sz) \
100c129
< #define TTE_GET_SIZE(tp) \
---
> #define TTE_GET_SIZE(tp) \
102c131
< #define TTE_GET_PAGE_SHIFT(tp) \
---
> #define TTE_GET_PAGE_SHIFT(tp) \
104c133
< #define TTE_GET_PAGE_SIZE(tp) \
---
> #define TTE_GET_PAGE_SIZE(tp) \
106c135
< #define TTE_GET_PAGE_MASK(tp) \
---
> #define TTE_GET_PAGE_MASK(tp) \
109c138
< #define TTE_GET_PA(tp) \
---
> #define TTE_GET_PA(tp) \
111c140
< #define TTE_GET_VPN(tp) \
---
> #define TTE_GET_VPN(tp) \
113c142
< #define TTE_GET_VA(tp) \
---
> #define TTE_GET_VA(tp) \
115,119c144,147
< #define TTE_GET_PMAP(tp) \
< (((tp)->tte_data & TD_P) != 0 ? \
< (kernel_pmap) : \
< (PHYS_TO_VM_PAGE(pmap_kextract((vm_offset_t)(tp)))->md.pmap))
< #define TTE_ZERO(tp) \
---
> #define TTE_GET_PMAP(tp) \
> (((tp)->tte_data & TD_P) != 0 ? (kernel_pmap) : \
> (PHYS_TO_VM_PAGE(pmap_kextract((vm_offset_t)(tp)))->md.pmap))
> #define TTE_ZERO(tp) \
132a161
>