Changeset 70259a55 in mainline for kernel/arch/ia64/src

Timestamp:

2018-09-11T21:01:08Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e38ff16

Parents:

d2c91ab

Message:

ia64: Use appropriate imm21 operand with BREAK

This commit changes the imm21 used with the BREAK instruction to conform
to the IA-64 Software Conventions and Runtime Architecture Guide. This
is necessary to be able to distinguish syscalls from compiler-generated
calls to architected software interrupts (e.g. integer divide by zero).

In order to be able to test the used immediate in break_instruction(),
we extend istate_t to hold the CR.IIM register.

Location:

kernel/arch/ia64/src

Files:

• interrupt.c (modified) (1 diff)
• ivt.S (modified) (3 diffs)

kernel/arch/ia64/src/interrupt.c

@@ -195 +195 @@
 }
 
+
+#define BREAK_IMM_SYSCALL       0x40000U
+
 /** Handle syscall. */
 sysarg_t break_instruction(unsigned int n, istate_t *istate)
 {
         sysarg_t ret;
+
+        if (istate->cr_iim != BREAK_IMM_SYSCALL) {
+                fault_if_from_uspace(istate, "Unknown software interrupt: %x",
+                    (uint32_t) istate->cr_iim);
+                panic_badtrap(istate, n, "Interruption: %#hx (%s).",
+                    (uint16_t) n, vector_to_string(n));
+        }
 
         /*

kernel/arch/ia64/src/ivt.S

@@ -186 +186 @@
         st8 [r31] = r29, -STACK_ITEM_SIZE ;;    /* save predicate registers */
 
+        mov r29 = cr.iim ;;
+        st8 [r31] = r29, -STACK_ITEM_SIZE ;;    /* save cr.iim */
+
         st8 [r31] = r24, -STACK_ITEM_SIZE ;;    /* save cr.iip */
         st8 [r31] = r25, -STACK_ITEM_SIZE ;;    /* save cr.ipsr */
@@ -274 +277 @@
         ld8 r25 = [r31], +STACK_ITEM_SIZE ;;    /* load cr.ipsr */
         ld8 r24 = [r31], +STACK_ITEM_SIZE ;;    /* load cr.iip */
+        ld8 r29 = [r31], +STACK_ITEM_SIZE ;;    /* load cr.iim */
 
         mov cr.iip = r24;;
@@ -279 +283 @@
         mov cr.isr = r27
         mov cr.ifa = r28
+        mov cr.iim = r29
 
         /* Set up FPU as in exception. */