Changeset 874621f in mainline for generic/include

Timestamp:

2006-06-06T07:40:51Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

0dbc4e7

Parents:

6f9a9bc

Message:

Added kernel circular buffer klog.
Added automatic killing of tasks raising inappropriate exceptions.
TODO Fix vsnprintf return value(and behaviour according to specs) and remove workaround in klog.

Location:

generic/include

Files:

• console/klog.h (added)
• interrupt.h (modified) (2 diffs)
• ipc/irq.h (modified) (2 diffs)
• ipc/sysipc.h (modified) (1 diff)
• proc/thread.h (modified) (1 diff)
• stackarg.h (modified) (1 diff)
• stdarg.h (modified) (1 diff)

generic/include/interrupt.h

@@ -33 +33 @@
 #include <typedefs.h>
 #include <arch/types.h>
+#include <proc/task.h>
+#include <proc/thread.h>
+#include <arch.h>
+#include <console/klog.h>
+#include <ipc/irq.h>
 
 #ifndef IVT_ITEMS
@@ -42 +47 @@
 #endif
 
+#define fault_if_from_uspace(istate, cmd, ...) \
+{ \
+        if (istate_from_uspace(istate)) { \
+                klog_printf(cmd, ##__VA_ARGS__); \
+                klog_printf("Task %lld got exception at PC:%P. Task killed.", TASK->taskid, istate_get_pc(istate)); \
+                task_kill(TASK->taskid); \
+                thread_exit(); \
+        } \
+}
+
+
 extern iroutine exc_register(int n, const char *name, iroutine f);
 extern void exc_dispatch(int n, istate_t *t);

generic/include/ipc/irq.h

@@ -30 +30 @@
 #define __IRQ_H__
 
+/** Maximum length of IPC IRQ program */
 #define IRQ_MAX_PROG_SIZE 10
+
+/** Reserved 'virtual' messages for kernel notifications */
+#define IPC_IRQ_RESERVED_VIRTUAL 10
+
+#define IPC_IRQ_KLOG  (-1)
 
 typedef enum {
@@ -60 +66 @@
 #ifdef KERNEL
 
+#include <ipc/ipc.h>
+
 extern void ipc_irq_make_table(int irqcount);
 extern int ipc_irq_register(answerbox_t *box, int irq, irq_code_t *ucode);
 extern void ipc_irq_send_notif(int irq);
+extern void ipc_irq_send_msg(int irq, __native a2, __native a3);
 extern void ipc_irq_unregister(answerbox_t *box, int irq);
 extern void irq_ipc_bind_arch(__native irq);

generic/include/ipc/sysipc.h

@@ -48 +48 @@
                               __native method, __native arg1);
 __native sys_ipc_hangup(int phoneid);
-__native sys_ipc_register_irq(__native irq, irq_code_t *ucode);
-__native sys_ipc_unregister_irq(__native irq);
+__native sys_ipc_register_irq(int irq, irq_code_t *ucode);
+__native sys_ipc_unregister_irq(int irq);
 
 #endif

generic/include/proc/thread.h

@@ -151 +151 @@
 extern thread_t *thread_create(void (* func)(void *), void *arg, task_t *task, int flags, char *name);
 extern void thread_ready(thread_t *t);
-extern void thread_exit(void);
+extern void thread_exit(void) __attribute__((noreturn));
 
 #ifndef thread_create_arch

generic/include/stackarg.h

@@ -50 +50 @@
         (*((type *)((ap).last + ((ap).pos  += sizeof(type) ) - sizeof(type))))
 
+#define va_copy(dst,src)       dst=src
 #define va_end(ap)
 

generic/include/stdarg.h

@@ -41 +41 @@
 #define va_arg(ap, type)                __builtin_va_arg(ap, type)
 #define va_end(ap)                      __builtin_va_end(ap)
+#define va_copy(dst,src)                __builtin_va_copy(dst,src)
 
 #endif