Changeset b3b7e14a in mainline for kernel/generic/include

Timestamp:

2010-06-11T15:31:03Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

214ec25c

Parents:

be06914

Message:

distinguish between "hot" and "cold" exceptions
display only "hot" exceptions by default
add top to help

Location:

kernel/generic/include

Files:

• console/console.h (modified) (1 diff)
• interrupt.h (modified) (2 diffs)
• sysinfo/abi.h (modified) (1 diff)

kernel/generic/include/console/console.h

@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <print.h>
 #include <console/chardev.h>
+
+#define PAGING(counter, increment, before, after) \
+        do { \
+                (counter) += (increment); \
+                if ((counter) > 23) { \
+                        before; \
+                        printf(" -- Press any key to continue -- "); \
+                        indev_pop_character(stdin); \
+                        after; \
+                        printf("\n"); \
+                        (counter) = 0; \
+                } \
+        } while (0)
 
 extern indev_t *stdin;

kernel/generic/include/interrupt.h

@@ -44 +44 @@
 #include <stacktrace.h>
 
-typedef void (* iroutine)(int, istate_t *);
+typedef void (* iroutine_t)(int, istate_t *);
 
 typedef struct {
         const char *name;
-        iroutine f;
+        bool hot;
+        iroutine_t handler;
         uint64_t cycles;
         uint64_t count;
@@ -57 +58 @@
 
 extern void fault_if_from_uspace(istate_t *, const char *, ...);
-extern iroutine exc_register(int, const char *, iroutine);
-extern void exc_dispatch(int, istate_t *);
+extern iroutine_t exc_register(unsigned int, const char *, bool, iroutine_t);
+extern void exc_dispatch(unsigned int, istate_t *);
 extern void exc_init(void);
 

kernel/generic/include/sysinfo/abi.h

@@ -130 +130 @@
         unsigned int id;             /**< Exception ID */
         char desc[EXC_NAME_BUFLEN];  /**< Description */
+        bool hot;                    /**< Active or inactive exception */
         uint64_t cycles;             /**< Number of CPU cycles in the handler */
         uint64_t count;              /**< Number of handled exceptions */