Changeset 357b5f5 in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2011-01-23T20:09:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (3 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -197 +197 @@
                 /* Notify the subscriber that a fault occurred. */
                 event_notify_3(EVENT_FAULT, LOWER32(TASK->taskid),
-                    UPPER32(TASK->taskid), (unative_t) THREAD);
+                    UPPER32(TASK->taskid), (sysarg_t) THREAD);
                 
 #ifdef CONFIG_UDEBUG
@@ -207 +207 @@
         task_kill(TASK->taskid);
         thread_exit();
+}
+
+/** Get istate structure of a thread.
+ *
+ * Get pointer to the istate structure at the bottom of the kernel stack.
+ *
+ * This function can be called in interrupt or user context. In interrupt
+ * context the istate structure is created by the low-level exception
+ * handler. In user context the istate structure is created by the
+ * low-level syscall handler.
+ */
+istate_t *istate_get(thread_t *thread)
+{
+        /*
+         * The istate structure should be right at the bottom of the kernel
+         * stack.
+         */
+        return (istate_t *) ((uint8_t *) thread->kstack + THREAD_STACK_SIZE -
+            sizeof(istate_t));
 }
 
@@ -263 +282 @@
                 
                 const char *symbol =
-                    symtab_fmt_name_lookup((unative_t) exc_table[i].handler);
+                    symtab_fmt_name_lookup((sysarg_t) exc_table[i].handler);
                 
 #ifdef __32_BITS__