From d04739312c850eb65e06ce3d34b52e7affb1c6c8 Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Sat, 19 Dec 2020 23:17:51 +0200 Subject: [PATCH] Move caps fields around for more logical arrangement And allowing easier bitmatch-ing for Type. --- nucleus/src/arch/aarch64/caps/asid_control_cap.rs | 2 +- nucleus/src/arch/aarch64/caps/asid_pool_cap.rs | 6 +++--- nucleus/src/arch/aarch64/caps/frame.rs | 14 +++++++------- .../src/arch/aarch64/caps/page_directory_cap.rs | 10 +++++----- .../arch/aarch64/caps/page_global_directory_cap.rs | 8 ++++---- nucleus/src/arch/aarch64/caps/page_table_cap.rs | 10 +++++----- .../arch/aarch64/caps/page_upper_directory_cap.rs | 10 +++++----- nucleus/src/caps/capnode_cap.rs | 10 +++++----- nucleus/src/caps/domain_cap.rs | 2 +- nucleus/src/caps/endpoint_cap.rs | 5 +++-- nucleus/src/caps/irq_control_cap.rs | 2 +- nucleus/src/caps/irq_handler_cap.rs | 6 +++--- nucleus/src/caps/notification_cap.rs | 4 ++-- nucleus/src/caps/null_cap.rs | 2 +- nucleus/src/caps/reply_cap.rs | 8 ++++---- nucleus/src/caps/resume_cap.rs | 2 +- nucleus/src/caps/thread_cap.rs | 4 ++-- nucleus/src/caps/untyped_cap.rs | 6 +++--- nucleus/src/caps/zombie_cap.rs | 6 +++--- 19 files changed, 59 insertions(+), 58 deletions(-) diff --git a/nucleus/src/arch/aarch64/caps/asid_control_cap.rs b/nucleus/src/arch/aarch64/caps/asid_control_cap.rs index 0b37de3..514d034 100644 --- a/nucleus/src/arch/aarch64/caps/asid_control_cap.rs +++ b/nucleus/src/arch/aarch64/caps/asid_control_cap.rs @@ -19,7 +19,7 @@ use { register_bitfields! { u128, AsidControlCap [ - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 11 ] ] diff --git a/nucleus/src/arch/aarch64/caps/asid_pool_cap.rs b/nucleus/src/arch/aarch64/caps/asid_pool_cap.rs index 1b1a553..2e77133 100644 --- a/nucleus/src/arch/aarch64/caps/asid_pool_cap.rs +++ b/nucleus/src/arch/aarch64/caps/asid_pool_cap.rs @@ -19,11 +19,11 @@ use { register_bitfields! { u128, AsidPoolCap [ - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 13 ], - ASIDBase OFFSET(69) NUMBITS(16) [], - ASIDPool OFFSET(91) NUMBITS(37) [] + ASIDBase OFFSET(64) NUMBITS(16) [], + ASIDPool OFFSET(80) NUMBITS(37) [], ] } diff --git a/nucleus/src/arch/aarch64/caps/frame.rs b/nucleus/src/arch/aarch64/caps/frame.rs index 552e4b5..5d5f90e 100644 --- a/nucleus/src/arch/aarch64/caps/frame.rs +++ b/nucleus/src/arch/aarch64/caps/frame.rs @@ -19,15 +19,15 @@ use { register_bitfields! { u128, FrameCap [ - MappedASID OFFSET(0) NUMBITS(16) [], - BasePtr OFFSET(16) NUMBITS(48) [], // PhysAddr - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 1 ], - Size OFFSET(69) NUMBITS(2) [], - VMRights OFFSET(71) NUMBITS(2) [], - IsDevice OFFSET(73) NUMBITS(1) [], - MappedAddress OFFSET(80) NUMBITS(48) [] // VirtAddr + Size OFFSET(6) NUMBITS(2) [], + VMRights OFFSET(8) NUMBITS(2) [], + IsDevice OFFSET(10) NUMBITS(1) [], + BasePtr OFFSET(16) NUMBITS(48) [], // PhysAddr + MappedAddress OFFSET(64) NUMBITS(48) [], // VirtAddr + MappedASID OFFSET(112) NUMBITS(16) [], ] } diff --git a/nucleus/src/arch/aarch64/caps/page_directory_cap.rs b/nucleus/src/arch/aarch64/caps/page_directory_cap.rs index 01aaab4..3566407 100644 --- a/nucleus/src/arch/aarch64/caps/page_directory_cap.rs +++ b/nucleus/src/arch/aarch64/caps/page_directory_cap.rs @@ -19,13 +19,13 @@ use { register_bitfields! { u128, PageDirectoryCap [ - MappedASID OFFSET(0) NUMBITS(16) [], - BasePtr OFFSET(16) NUMBITS(48) [], // PhysAddr - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 5 ], - IsMapped OFFSET(79) NUMBITS(1) [], - MappedAddress OFFSET(80) NUMBITS(19) [] // VirtAddr + IsMapped OFFSET(6) NUMBITS(1) [], + BasePtr OFFSET(16) NUMBITS(48) [], // PhysAddr + MappedAddress OFFSET(64) NUMBITS(48) [], // VirtAddr + MappedASID OFFSET(112) NUMBITS(16) [], ] } diff --git a/nucleus/src/arch/aarch64/caps/page_global_directory_cap.rs b/nucleus/src/arch/aarch64/caps/page_global_directory_cap.rs index 4e56492..60cca3c 100644 --- a/nucleus/src/arch/aarch64/caps/page_global_directory_cap.rs +++ b/nucleus/src/arch/aarch64/caps/page_global_directory_cap.rs @@ -19,12 +19,12 @@ use { register_bitfields! { u128, PageGlobalDirectoryCap [ - MappedASID OFFSET(0) NUMBITS(16) [], - BasePtr OFFSET(16) NUMBITS(48) [], // PhysAddr - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 9 ], - IsMapped OFFSET(79) NUMBITS(1) [] + IsMapped OFFSET(6) NUMBITS(1) [], + BasePtr OFFSET(16) NUMBITS(48) [], // PhysAddr + MappedASID OFFSET(112) NUMBITS(16) [], ] } diff --git a/nucleus/src/arch/aarch64/caps/page_table_cap.rs b/nucleus/src/arch/aarch64/caps/page_table_cap.rs index 1a3a868..ae93090 100644 --- a/nucleus/src/arch/aarch64/caps/page_table_cap.rs +++ b/nucleus/src/arch/aarch64/caps/page_table_cap.rs @@ -19,13 +19,13 @@ use { register_bitfields! { u128, PageTableCap [ - MappedASID OFFSET(0) NUMBITS(16) [], - BasePtr OFFSET(16) NUMBITS(48) [], // PhysAddr - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 3 ], - IsMapped OFFSET(79) NUMBITS(1) [], - MappedAddress OFFSET(80) NUMBITS(28) [] // VirtAddr + IsMapped OFFSET(6) NUMBITS(1) [], + BasePtr OFFSET(16) NUMBITS(48) [], // PhysAddr + MappedAddress OFFSET(64) NUMBITS(48) [], // VirtAddr + MappedASID OFFSET(112) NUMBITS(16) [], ], } diff --git a/nucleus/src/arch/aarch64/caps/page_upper_directory_cap.rs b/nucleus/src/arch/aarch64/caps/page_upper_directory_cap.rs index cf8787e..b4f2cca 100644 --- a/nucleus/src/arch/aarch64/caps/page_upper_directory_cap.rs +++ b/nucleus/src/arch/aarch64/caps/page_upper_directory_cap.rs @@ -19,13 +19,13 @@ use { register_bitfields! { u128, PageUpperDirectoryCap [ - MappedASID OFFSET(0) NUMBITS(16) [], - BasePtr OFFSET(16) NUMBITS(48) [], // PhysAddr - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 7 ], - IsMapped OFFSET(79) NUMBITS(1) [], - MappedAddress OFFSET(80) NUMBITS(10) [] // VirtAddr + IsMapped OFFSET(6) NUMBITS(1) [], + BasePtr OFFSET(16) NUMBITS(48) [], // PhysAddr + MappedAddress OFFSET(64) NUMBITS(48) [], // VirtAddr + MappedASID OFFSET(112) NUMBITS(16) [], ] } diff --git a/nucleus/src/caps/capnode_cap.rs b/nucleus/src/caps/capnode_cap.rs index 95dd759..fb89877 100644 --- a/nucleus/src/caps/capnode_cap.rs +++ b/nucleus/src/caps/capnode_cap.rs @@ -18,13 +18,13 @@ use { register_bitfields! { u128, CapNodeCap [ - Guard OFFSET(0) NUMBITS(64) [], - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 10 ], - GuardSize OFFSET(69) NUMBITS(6) [], - Radix OFFSET(75) NUMBITS(6) [], - Ptr OFFSET(81) NUMBITS(47) [], + GuardSize OFFSET(6) NUMBITS(6) [], + Radix OFFSET(12) NUMBITS(6) [], + Ptr OFFSET(16) NUMBITS(48) [], + Guard OFFSET(64) NUMBITS(64) [], ] } diff --git a/nucleus/src/caps/domain_cap.rs b/nucleus/src/caps/domain_cap.rs index 8da0473..0eb5025 100644 --- a/nucleus/src/caps/domain_cap.rs +++ b/nucleus/src/caps/domain_cap.rs @@ -16,7 +16,7 @@ use { register_bitfields! { u128, DomainCap [ - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 20 ] ], diff --git a/nucleus/src/caps/endpoint_cap.rs b/nucleus/src/caps/endpoint_cap.rs index c1bfe93..3335a8e 100644 --- a/nucleus/src/caps/endpoint_cap.rs +++ b/nucleus/src/caps/endpoint_cap.rs @@ -16,10 +16,11 @@ use { register_bitfields! { u128, EndpointCap [ - Badge OFFSET(0) NUMBITS(64) [], - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 4 ], + // @todo Badge has 4 lower bits all-zero - why? + Badge OFFSET(0) NUMBITS(64) [], CanGrantReply OFFSET(69) NUMBITS(1) [], CanGrant OFFSET(70) NUMBITS(1) [], CanReceive OFFSET(71) NUMBITS(1) [], diff --git a/nucleus/src/caps/irq_control_cap.rs b/nucleus/src/caps/irq_control_cap.rs index 76328e4..3f71a3b 100644 --- a/nucleus/src/caps/irq_control_cap.rs +++ b/nucleus/src/caps/irq_control_cap.rs @@ -16,7 +16,7 @@ use { register_bitfields! { u128, IrqControlCap [ - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 14 ] ] diff --git a/nucleus/src/caps/irq_handler_cap.rs b/nucleus/src/caps/irq_handler_cap.rs index f52bd1d..b267289 100644 --- a/nucleus/src/caps/irq_handler_cap.rs +++ b/nucleus/src/caps/irq_handler_cap.rs @@ -16,10 +16,10 @@ use { register_bitfields! { u128, IrqHandlerCap [ - Irq OFFSET(52) NUMBITS(12) [], - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 16 - ] + ], + Irq OFFSET(52) NUMBITS(12) [], ] } diff --git a/nucleus/src/caps/notification_cap.rs b/nucleus/src/caps/notification_cap.rs index 183ff2c..ce4cacc 100644 --- a/nucleus/src/caps/notification_cap.rs +++ b/nucleus/src/caps/notification_cap.rs @@ -18,10 +18,10 @@ use { register_bitfields! { u128, NotificationCap [ - Badge OFFSET(0) NUMBITS(64) [], - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 6 ], + Badge OFFSET(0) NUMBITS(64) [], CanReceive OFFSET(69) NUMBITS(1) [], CanSend OFFSET(70) NUMBITS(1) [], Ptr OFFSET(80) NUMBITS(48) [], diff --git a/nucleus/src/caps/null_cap.rs b/nucleus/src/caps/null_cap.rs index 259376a..77b52e1 100644 --- a/nucleus/src/caps/null_cap.rs +++ b/nucleus/src/caps/null_cap.rs @@ -16,7 +16,7 @@ use { register_bitfields! { u128, NullCap [ - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 0 ] ] diff --git a/nucleus/src/caps/reply_cap.rs b/nucleus/src/caps/reply_cap.rs index 57156b2..4524ecc 100644 --- a/nucleus/src/caps/reply_cap.rs +++ b/nucleus/src/caps/reply_cap.rs @@ -16,12 +16,12 @@ use { register_bitfields! { u128, ReplyCap [ - TCBPtr OFFSET(0) NUMBITS(64) [], - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 8 ], - ReplyCanGrant OFFSET(126) NUMBITS(1) [], - ReplyMaster OFFSET(127) NUMBITS(1) [], + ReplyCanGrant OFFSET(62) NUMBITS(1) [], + ReplyMaster OFFSET(63) NUMBITS(1) [], + TCBPtr OFFSET(64) NUMBITS(64) [], ] } diff --git a/nucleus/src/caps/resume_cap.rs b/nucleus/src/caps/resume_cap.rs index b831166..13d937e 100644 --- a/nucleus/src/caps/resume_cap.rs +++ b/nucleus/src/caps/resume_cap.rs @@ -36,7 +36,7 @@ register_bitfields! { // the need for the extra system calls. ResumeCap [ - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 22 ] ] diff --git a/nucleus/src/caps/thread_cap.rs b/nucleus/src/caps/thread_cap.rs index 8512340..991acee 100644 --- a/nucleus/src/caps/thread_cap.rs +++ b/nucleus/src/caps/thread_cap.rs @@ -16,10 +16,10 @@ use { register_bitfields! { u128, ThreadCap [ - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 12 ], - TCBPtr OFFSET(80) NUMBITS(48) [], + TCBPtr OFFSET(64) NUMBITS(48) [], ] } diff --git a/nucleus/src/caps/untyped_cap.rs b/nucleus/src/caps/untyped_cap.rs index 8e470e6..033cfe9 100644 --- a/nucleus/src/caps/untyped_cap.rs +++ b/nucleus/src/caps/untyped_cap.rs @@ -72,6 +72,9 @@ register_bitfields! { // -- https://github.com/seL4/seL4/blob/master/src/object/untyped.c#L196 UntypedCap [ + Type OFFSET(0) NUMBITS(6) [ + value = 2 + ], /// Index of the first unoccupied byte within this Untyped. /// This index is limited between MIN_UNTYPED_BITS and max bits number in BlockSizePower. /// To occupy less bits, the free index is shifted right by MIN_UNTYPED_BITS. @@ -85,9 +88,6 @@ register_bitfields! { IsDevice OFFSET(57) NUMBITS(1) [], /// Untyped is 2**BlockSizePower bytes in size BlockSizePower OFFSET(58) NUMBITS(6) [], - Type OFFSET(64) NUMBITS(5) [ - value = 2 - ], /// Physical address of untyped. Ptr OFFSET(80) NUMBITS(48) [], ] diff --git a/nucleus/src/caps/zombie_cap.rs b/nucleus/src/caps/zombie_cap.rs index 9cda200..a62b214 100644 --- a/nucleus/src/caps/zombie_cap.rs +++ b/nucleus/src/caps/zombie_cap.rs @@ -16,11 +16,11 @@ use { register_bitfields! { u128, ZombieCap [ - ZombieID OFFSET(0) NUMBITS(64) [], - Type OFFSET(64) NUMBITS(5) [ + Type OFFSET(0) NUMBITS(6) [ value = 18 ], - ZombieType OFFSET(121) NUMBITS(7) [] + ZombieType OFFSET(58) NUMBITS(6) [], + ZombieID OFFSET(64) NUMBITS(64) [], ] }