Page MenuHomeFreeBSD
Files F153180711

D13146.diff
No OneTemporary
Actions

D13146.diff
View Options

Index: head/sys/arm64/arm64/exception.S
===================================================================
--- head/sys/arm64/arm64/exception.S
+++ head/sys/arm64/arm64/exception.S
@@ -219,8 +219,8 @@
vempty /* FIQ 64-bit EL0 */
vector el0_error /* Error 64-bit EL0 */
- vempty /* Synchronous 32-bit EL0 */
- vempty /* IRQ 32-bit EL0 */
+ vector el0_sync /* Synchronous 32-bit EL0 */
+ vector el0_irq /* IRQ 32-bit EL0 */
vempty /* FIQ 32-bit EL0 */
- vempty /* Error 32-bit EL0 */
+ vector el0_error /* Error 32-bit EL0 */
Index: head/sys/arm64/arm64/trap.c
===================================================================
--- head/sys/arm64/arm64/trap.c
+++ head/sys/arm64/arm64/trap.c
@@ -381,7 +381,8 @@
panic("VFP exception in userland");
#endif
break;
- case EXCP_SVC:
+ case EXCP_SVC32:
+ case EXCP_SVC64:
svc_handler(td, frame);
break;
case EXCP_INSN_ABORT_L:
Index: head/sys/arm64/include/armreg.h
===================================================================
--- head/sys/arm64/include/armreg.h
+++ head/sys/arm64/include/armreg.h
@@ -123,7 +123,8 @@
#define EXCP_UNKNOWN 0x00 /* Unkwn exception */
#define EXCP_FP_SIMD 0x07 /* VFP/SIMD trap */
#define EXCP_ILL_STATE 0x0e /* Illegal execution state */
-#define EXCP_SVC 0x15 /* SVC trap */
+#define EXCP_SVC32 0x11 /* SVC trap for AArch32 */
+#define EXCP_SVC64 0x15 /* SVC trap for AArch64 */
#define EXCP_MSR 0x18 /* MSR/MRS trap */
#define EXCP_INSN_ABORT_L 0x20 /* Instruction abort, from lower EL */
#define EXCP_INSN_ABORT 0x21 /* Instruction abort, from same EL */

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 3:48 PM (16 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31849115
Default Alt Text
D13146.diff (1 KB)

Event Timeline