Skip to content
Snippets Groups Projects
Commit f3d0eb20 authored by Anna Lyons's avatar Anna Lyons
Browse files

Update seL4_FaultType to 4 

With the increased faults on various configurations (hyp, mcs) we need
more bits to identify faults.
parent 1f84a048
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 117 additions and 117 deletions
include/arch/arm/arch/32/mode/object/structures.bf
+ 7
− 7
View file @ f3d0eb20
......@@ -187,14 +187,14 @@ block VMFault {
field address 32
#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
field FSR 26
padding 2
padding 1
field instructionFault 1
#else
field FSR 14
field instructionFault 1
padding 14
padding 13
#endif
field seL4_FaultType 3
field seL4_FaultType 4
}
#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
......@@ -202,14 +202,14 @@ block VGICMaintenance {
field idx 6
field idxValid 1
padding 25
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block VCPUFault {
field hsr 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
#endif
......
include/arch/arm/arch/64/mode/object/structures.bf
+ 6
− 6
View file @ f3d0eb20
......@@ -145,8 +145,8 @@ block VMFault {
field address 64
field FSR 32
field instructionFault 1
padding 28
field seL4_FaultType 3
padding 27
field seL4_FaultType 4
}
#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
......@@ -156,15 +156,15 @@ block VGICMaintenance {
field idx 6
field idxValid 1
padding 25
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block VCPUFault {
padding 64
field hsr 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
#endif
......
include/arch/riscv/arch/32/mode/object/structures.bf
+ 2
− 2
View file @ f3d0eb20
......@@ -102,8 +102,8 @@ block VMFault {
field FSR 5
padding 7
field instructionFault 1
padding 16
field seL4_FaultType 3
padding 15
field seL4_FaultType 4
}
-- VM attributes
......
include/arch/riscv/arch/64/mode/object/structures.bf
+ 2
− 2
View file @ f3d0eb20
......@@ -105,8 +105,8 @@ block VMFault {
field FSR 5
padding 7
field instructionFault 1
padding 16
field seL4_FaultType 3
padding 15
field seL4_FaultType 4
}
-- VM attributes
......
include/arch/x86/arch/32/mode/object/structures.bf
+ 2
− 2
View file @ f3d0eb20
......@@ -243,8 +243,8 @@ block VMFault {
field FSR 5
padding 7
field instructionFault 1
padding 16
field seL4_FaultType 3
padding 15
field seL4_FaultType 4
}
-- VM attributes
......
include/arch/x86/arch/64/mode/object/structures.bf
+ 2
− 2
View file @ f3d0eb20
......@@ -266,8 +266,8 @@ block VMFault {
field FSR 5
padding 7
field instructionFault 1
padding 16
field seL4_FaultType 3
padding 15
field seL4_FaultType 4
}
-- VM attributes
......
include/object/structures_32.bf
+ 10
− 10
View file @ f3d0eb20
......@@ -234,41 +234,41 @@ tagged_union lookup_fault lufType {
-- Fault: size = 8 bytes
block NullFault {
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block CapFault {
field address 32
field inReceivePhase 1
padding 28
field seL4_FaultType 3
padding 27
field seL4_FaultType 4
}
block UnknownSyscall {
field syscallNumber 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block UserException {
field number 32
field code 29
field seL4_FaultType 3
field code 28
field seL4_FaultType 4
}
#ifdef CONFIG_HARDWARE_DEBUG_API
block DebugException {
field breakpointAddress 32
padding 21
padding 20
-- 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 3
field seL4_FaultType 4
}
#endif
......
include/object/structures_64.bf
+ 10
− 10
View file @ f3d0eb20
......@@ -316,45 +316,45 @@ tagged_union lookup_fault lufType {
block NullFault {
padding 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block CapFault {
field address 64
field inReceivePhase 1
padding 60
field seL4_FaultType 3
padding 59
field seL4_FaultType 4
}
block UnknownSyscall {
field syscallNumber 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block UserException {
padding 64
field number 32
field code 29
field seL4_FaultType 3
field code 28
field seL4_FaultType 4
}
#ifdef CONFIG_HARDWARE_DEBUG_API
block DebugException {
field breakpointAddress 64
padding 53
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 3
field seL4_FaultType 4
}
#endif
......
libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.bf
+ 16
− 16
View file @ f3d0eb20
......@@ -20,14 +20,14 @@ block VMFault {
field Addr 32
field PrefetchFault 32
field FSR 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block NullFault {
padding 416
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block CapFault {
......@@ -40,8 +40,8 @@ block CapFault {
field MR4 32
field MR5 32
field MR6 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block UnknownSyscall {
......@@ -58,8 +58,8 @@ block UnknownSyscall {
field LR 32
field CPSR 32
field Syscall 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block UserException {
......@@ -69,23 +69,23 @@ block UserException {
field CPSR 32
field Number 32
field Code 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
block VGICMaintenance {
padding 384
field IDX 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block VCPUFault {
padding 384
field HSR 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
#endif
......@@ -96,8 +96,8 @@ block DebugException {
field ExceptionReason 32
field TriggerAddress 32
field BreakpointNumber 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
#endif
......
libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/types.bf
+ 16
− 16
View file @ f3d0eb20
......@@ -20,14 +20,14 @@ block VMFault {
field Addr 64
field PrefetchFault 64
field FSR 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block NullFault {
padding 832
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block CapFault {
......@@ -40,8 +40,8 @@ block CapFault {
field MR4 64
field MR5 64
field MR6 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block UnknownSyscall {
......@@ -58,8 +58,8 @@ block UnknownSyscall {
field LR 64
field SPSR 64
field Syscall 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block UserException {
......@@ -69,24 +69,24 @@ block UserException {
field SPSR 64
field Number 64
field Code 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
block VGICMaintenance {
padding 768
field IDX 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block VCPUFault {
padding 768
padding 32
field HSR 32
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
#endif
......@@ -97,8 +97,8 @@ block DebugException {
field ExceptionReason 64
field TriggerAddress 64
field BreakpointNumber 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
#endif
......
libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.bf
+ 12
− 12
View file @ f3d0eb20
......@@ -20,14 +20,14 @@ block VMFault {
field Addr 32
field PrefetchFault 32
field FSR 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block NullFault {
padding 352
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block CapFault {
......@@ -40,8 +40,8 @@ block CapFault {
field MR4 32
field MR5 32
field MR6 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block UnknownSyscall {
......@@ -56,8 +56,8 @@ block UnknownSyscall {
field ESP 32
field EFLAGS 32
field Syscall 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block UserException {
......@@ -67,8 +67,8 @@ block UserException {
field EFLAGS 32
field Number 32
field Code 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
#ifdef CONFIG_HARDWARE_DEBUG_API
......@@ -78,8 +78,8 @@ block DebugException {
field ExceptionReason 32
field TriggerAddress 32
field BreakpointNumber 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
#endif
......
libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/types.bf
+ 10
− 10
View file @ f3d0eb20
......@@ -27,8 +27,8 @@ block VMFault {
field PrefetchFault 32
field FSR 5
padding 8
padding 16
field seL4_FaultType 3
padding 15
field seL4_FaultType 4
}
-- VM attributes
......@@ -39,8 +39,8 @@ block vm_attributes {
block NullFault {
padding 352
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block CapFault {
......@@ -53,8 +53,8 @@ block CapFault {
field MR4 32
field MR5 32
field MR6 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block UnknownSyscall {
......@@ -69,8 +69,8 @@ block UnknownSyscall {
field A5 32
field A6 32
field Syscall 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
block UserException {
......@@ -80,8 +80,8 @@ block UserException {
field FLAGS 32
field Number 32
field Code 32
padding 29
field seL4_FaultType 3
padding 28
field seL4_FaultType 4
}
#include <sel4/arch/shared_types.bf>
libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.bf
+ 10
− 10
View file @ f3d0eb20
......@@ -28,8 +28,8 @@ block VMFault {
padding 32
field FSR 5
padding 8
padding 16
field seL4_FaultType 3
padding 15
field seL4_FaultType 4
}
-- VM attributes
......@@ -41,8 +41,8 @@ block vm_attributes {
block NullFault {
padding 704
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block CapFault {
......@@ -55,8 +55,8 @@ block CapFault {
field MR4 64
field MR5 64
field MR6 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block UnknownSyscall {
......@@ -71,8 +71,8 @@ block UnknownSyscall {
field A5 64
field A6 64
field Syscall 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block UserException {
......@@ -82,8 +82,8 @@ block UserException {
field FLAGS 64
field Number 64
field Code 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
#include <sel4/arch/shared_types.bf>
libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.bf
+ 12
− 12
View file @ f3d0eb20
......@@ -20,14 +20,14 @@ block VMFault {
field Addr 64
field PrefetchFault 64
field FSR 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block NullFault {
padding 1216
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block CapFault {
......@@ -40,8 +40,8 @@ block CapFault {
field MR4 64
field MR5 64
field MR6 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block UnknownSyscall {
......@@ -64,8 +64,8 @@ block UnknownSyscall {
field RSP 64
field FLAGS 64
field Syscall 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
block UserException {
......@@ -75,8 +75,8 @@ block UserException {
field FLAGS 64
field Number 64
field Code 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
#ifdef CONFIG_HARDWARE_DEBUG_API
......@@ -86,8 +86,8 @@ block DebugException {
field ExceptionReason 64
field TriggerAddress 64
field BreakpointNumber 64
padding 61
field seL4_FaultType 3
padding 60
field seL4_FaultType 4
}
#endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment