trivial: align for better readability
White space change only: - left-align sizes within each block declaration - min 2 spaces to separate field name from size Signed-off-by: Gerwin Klein <gerwin.klein@proofcraft.systems>
This commit is contained in:
Gerwin Klein
parent
c9f3c64162
commit
d648c5dd53
1 changed files with 129 additions and 129 deletions
|
|
@ -5,135 +5,135 @@
|
|||
--
|
||||
|
||||
block null_cap {
|
||||
padding 64
|
||||
padding 64
|
||||
|
||||
field capType 5
|
||||
padding word_size - 5
|
||||
field capType 5
|
||||
padding word_size - 5
|
||||
}
|
||||
|
||||
block untyped_cap {
|
||||
field capFreeIndex canonical_size
|
||||
padding word_size - canonical_size - 1 - 6
|
||||
field capIsDevice 1
|
||||
field capBlockSize 6
|
||||
field capFreeIndex canonical_size
|
||||
padding word_size - canonical_size - 1 - 6
|
||||
field capIsDevice 1
|
||||
field capBlockSize 6
|
||||
|
||||
field capType 5
|
||||
field_ptr capPtr word_size - 5
|
||||
field capType 5
|
||||
field_ptr capPtr word_size - 5
|
||||
}
|
||||
|
||||
block endpoint_cap(capEPBadge, capCanGrantReply, capCanGrant, capCanSend,
|
||||
capCanReceive, capEPPtr, capType) {
|
||||
field capEPBadge 64
|
||||
field capEPBadge 64
|
||||
|
||||
field capType 5
|
||||
field capType 5
|
||||
field capCanGrantReply 1
|
||||
field capCanGrant 1
|
||||
field capCanReceive 1
|
||||
field capCanSend 1
|
||||
field_ptr capEPPtr word_size - 5 - 4
|
||||
field capCanGrant 1
|
||||
field capCanReceive 1
|
||||
field capCanSend 1
|
||||
field_ptr capEPPtr word_size - 5 - 4
|
||||
}
|
||||
|
||||
block notification_cap {
|
||||
field capNtfnBadge 64
|
||||
field capNtfnBadge 64
|
||||
|
||||
field capType 5
|
||||
field capNtfnCanReceive 1
|
||||
field capNtfnCanSend 1
|
||||
field_ptr capNtfnPtr word_size - 5 - 2
|
||||
field capType 5
|
||||
field capNtfnCanReceive 1
|
||||
field capNtfnCanSend 1
|
||||
field_ptr capNtfnPtr word_size - 5 - 2
|
||||
}
|
||||
|
||||
#ifdef CONFIG_KERNEL_MCS
|
||||
block reply_cap {
|
||||
field capReplyPtr 64
|
||||
field capReplyPtr 64
|
||||
|
||||
field capType 5
|
||||
field capReplyCanGrant 1
|
||||
padding word_size - 5 - 1
|
||||
field capType 5
|
||||
field capReplyCanGrant 1
|
||||
padding word_size - 5 - 1
|
||||
}
|
||||
|
||||
block call_stack(callStackPtr, isHead) {
|
||||
padding word_size - 1 - 48
|
||||
field isHead 1
|
||||
field_ptr callStackPtr 48
|
||||
padding word_size - 1 - 48
|
||||
field isHead 1
|
||||
field_ptr callStackPtr 48
|
||||
}
|
||||
#else
|
||||
block reply_cap(capReplyCanGrant, capReplyMaster, capTCBPtr, capType) {
|
||||
field capTCBPtr 64
|
||||
field capTCBPtr 64
|
||||
|
||||
field capType 5
|
||||
padding word_size - 5 - 2
|
||||
field capReplyCanGrant 1
|
||||
field capReplyMaster 1
|
||||
field capType 5
|
||||
padding word_size - 5 - 2
|
||||
field capReplyCanGrant 1
|
||||
field capReplyMaster 1
|
||||
}
|
||||
#endif
|
||||
|
||||
-- The user-visible format of the data word is defined by cnode_capdata, below.
|
||||
block cnode_cap(capCNodeRadix, capCNodeGuardSize, capCNodeGuard,
|
||||
capCNodePtr, capType) {
|
||||
field capCNodeGuard 64
|
||||
field capCNodeGuard 64
|
||||
|
||||
field capType 5
|
||||
field capCNodeGuardSize 6
|
||||
field capCNodeRadix 6
|
||||
field_ptr(1) capCNodePtr 47
|
||||
field capType 5
|
||||
field capCNodeGuardSize 6
|
||||
field capCNodeRadix 6
|
||||
field_ptr(1) capCNodePtr 47
|
||||
}
|
||||
|
||||
block thread_cap {
|
||||
padding 64
|
||||
padding 64
|
||||
|
||||
field capType 5
|
||||
field_ptr capTCBPtr word_size - 5
|
||||
field capType 5
|
||||
field_ptr capTCBPtr word_size - 5
|
||||
}
|
||||
|
||||
block irq_control_cap {
|
||||
padding 64
|
||||
padding 64
|
||||
|
||||
field capType 5
|
||||
padding word_size - 5
|
||||
padding word_size - 5
|
||||
}
|
||||
|
||||
block irq_handler_cap {
|
||||
#ifdef ENABLE_SMP_SUPPORT
|
||||
field capIRQ 64
|
||||
field capIRQ 64
|
||||
#else
|
||||
padding word_size - 12
|
||||
field capIRQ 12
|
||||
padding word_size - 12
|
||||
field capIRQ 12
|
||||
#endif
|
||||
|
||||
field capType 5
|
||||
padding word_size - 5
|
||||
padding word_size - 5
|
||||
}
|
||||
|
||||
block zombie_cap {
|
||||
field capZombieID 64
|
||||
field capZombieID 64
|
||||
|
||||
field capType 5
|
||||
padding word_size - 5 - 7
|
||||
field capZombieType 7
|
||||
field capType 5
|
||||
padding word_size - 5 - 7
|
||||
field capZombieType 7
|
||||
}
|
||||
|
||||
block domain_cap {
|
||||
padding 64
|
||||
padding 64
|
||||
|
||||
field capType 5
|
||||
padding word_size - 5
|
||||
field capType 5
|
||||
padding word_size - 5
|
||||
}
|
||||
|
||||
#ifdef CONFIG_KERNEL_MCS
|
||||
block sched_context_cap {
|
||||
field_ptr capSCPtr 48
|
||||
field capSCSizeBits 6
|
||||
padding 10
|
||||
field_ptr capSCPtr 48
|
||||
field capSCSizeBits 6
|
||||
padding 10
|
||||
|
||||
field capType 5
|
||||
padding 59
|
||||
field capType 5
|
||||
padding 59
|
||||
}
|
||||
|
||||
block sched_control_cap {
|
||||
field core 64
|
||||
field core 64
|
||||
|
||||
field capType 5
|
||||
padding 59
|
||||
field capType 5
|
||||
padding 59
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -141,36 +141,36 @@ block sched_control_cap {
|
|||
|
||||
-- Endpoint: size = 16 bytes
|
||||
block endpoint {
|
||||
field epQueue_head 64
|
||||
field_ptr(2) epQueue_tail word_size - 2
|
||||
field state 2
|
||||
field epQueue_head 64
|
||||
field_ptr(2) epQueue_tail word_size - 2
|
||||
field state 2
|
||||
}
|
||||
|
||||
-- Async endpoint: size = 32 bytes (64 bytes on mcs)
|
||||
block notification {
|
||||
#ifdef CONFIG_KERNEL_MCS
|
||||
padding 3 * word_size
|
||||
field_ptr ntfnSchedContext word_size
|
||||
padding 3 * word_size
|
||||
field_ptr ntfnSchedContext word_size
|
||||
#endif
|
||||
|
||||
field_ptr ntfnBoundTCB word_size
|
||||
field_ptr ntfnBoundTCB word_size
|
||||
|
||||
field ntfnMsgIdentifier word_size
|
||||
field ntfnMsgIdentifier word_size
|
||||
|
||||
field_ptr ntfnQueue_head word_size
|
||||
field_ptr ntfnQueue_head word_size
|
||||
|
||||
field_high ntfnQueue_tail canonical_size
|
||||
padding word_size - canonical_size - 2
|
||||
field state 2
|
||||
field_high ntfnQueue_tail canonical_size
|
||||
padding word_size - canonical_size - 2
|
||||
field state 2
|
||||
}
|
||||
|
||||
-- Mapping database (MDB) node: size = 16 bytes
|
||||
block mdb_node {
|
||||
field_ptr(2) mdbNext word_size - 2
|
||||
field mdbRevocable 1
|
||||
field mdbFirstBadged 1
|
||||
field_ptr(2) mdbNext word_size - 2
|
||||
field mdbRevocable 1
|
||||
field mdbFirstBadged 1
|
||||
|
||||
field mdbPrev word_size
|
||||
field mdbPrev word_size
|
||||
}
|
||||
|
||||
-- Thread state data
|
||||
|
|
@ -223,96 +223,96 @@ block mdb_node {
|
|||
|
||||
-- Lookup fault: size = 16 bytes
|
||||
block invalid_root {
|
||||
padding 64
|
||||
padding 64
|
||||
|
||||
padding 62
|
||||
field lufType 2
|
||||
padding 62
|
||||
field lufType 2
|
||||
}
|
||||
|
||||
block missing_capability {
|
||||
padding 64
|
||||
padding 64
|
||||
|
||||
padding 55
|
||||
field bitsLeft 7
|
||||
field lufType 2
|
||||
padding 55
|
||||
field bitsLeft 7
|
||||
field lufType 2
|
||||
}
|
||||
|
||||
block depth_mismatch {
|
||||
padding 64
|
||||
padding 64
|
||||
|
||||
padding 48
|
||||
field bitsFound 7
|
||||
field bitsLeft 7
|
||||
field lufType 2
|
||||
padding 48
|
||||
field bitsFound 7
|
||||
field bitsLeft 7
|
||||
field lufType 2
|
||||
}
|
||||
|
||||
block guard_mismatch {
|
||||
field guardFound 64
|
||||
field guardFound 64
|
||||
|
||||
padding 48
|
||||
field bitsLeft 7
|
||||
field bitsFound 7
|
||||
field lufType 2
|
||||
padding 48
|
||||
field bitsLeft 7
|
||||
field bitsFound 7
|
||||
field lufType 2
|
||||
}
|
||||
|
||||
tagged_union lookup_fault lufType {
|
||||
tag invalid_root 0
|
||||
tag missing_capability 1
|
||||
tag depth_mismatch 2
|
||||
tag guard_mismatch 3
|
||||
tag invalid_root 0
|
||||
tag missing_capability 1
|
||||
tag depth_mismatch 2
|
||||
tag guard_mismatch 3
|
||||
}
|
||||
|
||||
-- Fault: size = 16 bytes
|
||||
block NullFault {
|
||||
padding 64
|
||||
padding 64
|
||||
|
||||
padding 60
|
||||
field seL4_FaultType 4
|
||||
padding 60
|
||||
field seL4_FaultType 4
|
||||
}
|
||||
|
||||
block CapFault {
|
||||
field address 64
|
||||
field address 64
|
||||
|
||||
field inReceivePhase 1
|
||||
padding 59
|
||||
field seL4_FaultType 4
|
||||
field inReceivePhase 1
|
||||
padding 59
|
||||
field seL4_FaultType 4
|
||||
}
|
||||
|
||||
block UnknownSyscall {
|
||||
field syscallNumber 64
|
||||
field syscallNumber 64
|
||||
|
||||
padding 60
|
||||
field seL4_FaultType 4
|
||||
padding 60
|
||||
field seL4_FaultType 4
|
||||
}
|
||||
|
||||
block UserException {
|
||||
padding 64
|
||||
padding 64
|
||||
|
||||
field number 32
|
||||
field code 28
|
||||
field seL4_FaultType 4
|
||||
field number 32
|
||||
field code 28
|
||||
field seL4_FaultType 4
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HARDWARE_DEBUG_API
|
||||
block DebugException {
|
||||
field breakpointAddress 64
|
||||
field breakpointAddress 64
|
||||
|
||||
padding 52
|
||||
padding 52
|
||||
-- X86 has 4 breakpoints (DR0-3).
|
||||
-- ARM has between 2 and 16 breakpoints
|
||||
-- ( ARM Ref manual, C3.3).
|
||||
-- So we just use 4 bits to cater for both.
|
||||
field breakpointNumber 4
|
||||
field exceptionReason 4
|
||||
field seL4_FaultType 4
|
||||
field breakpointNumber 4
|
||||
field exceptionReason 4
|
||||
field seL4_FaultType 4
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_KERNEL_MCS
|
||||
block Timeout {
|
||||
field badge 64
|
||||
padding 60
|
||||
field seL4_FaultType 4
|
||||
field badge 64
|
||||
padding 60
|
||||
field seL4_FaultType 4
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -326,21 +326,21 @@ block thread_state(blockingIPCBadge, blockingIPCCanGrant,
|
|||
tcbQueued, blockingObject,
|
||||
tsType) {
|
||||
#endif
|
||||
field blockingIPCBadge 64
|
||||
field blockingIPCBadge 64
|
||||
|
||||
#ifdef CONFIG_KERNEL_MCS
|
||||
field_ptr(4) replyObject 59
|
||||
field_ptr(4) replyObject 59
|
||||
#else
|
||||
padding 60
|
||||
padding 60
|
||||
#endif
|
||||
field blockingIPCCanGrant 1
|
||||
field blockingIPCCanGrantReply 1
|
||||
field blockingIPCIsCall 1
|
||||
field tcbQueued 1
|
||||
field blockingIPCCanGrant 1
|
||||
field blockingIPCCanGrantReply 1
|
||||
field blockingIPCIsCall 1
|
||||
field tcbQueued 1
|
||||
#ifdef CONFIG_KERNEL_MCS
|
||||
field tcbInReleaseQueue 1
|
||||
field tcbInReleaseQueue 1
|
||||
#endif
|
||||
|
||||
field_ptr(4) blockingObject word_size - 4
|
||||
field tsType 4
|
||||
field_ptr(4) blockingObject word_size - 4
|
||||
field tsType 4
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue