Changeset 93b84b3 in mainline for generic/src

Timestamp:

2005-12-12T16:30:07Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

ebbdb8f

Parents:

af9a7c5

Message:

Fixed weird simics panic.
Run kconsole, if we panic. This currently works in gxemul,
simics. In mips we need to modify the simulator.
On ia32 we need a function, that would speak directly to the chip
and fetch the character using polling.

Location:

generic/src

Files:

• console/console.c (modified) (3 diffs)
• console/kconsole.c (modified) (6 diffs)
• lib/func.c (modified) (2 diffs)

generic/src/console/console.c

@@ -35 +35 @@
 #include <typedefs.h>
 #include <arch.h>
+#include <func.h>
+#include <print.h>
 
 /** Standard input character device. */
@@ -50 +52 @@
         __u8 ch;
         ipl_t ipl;
+
+        if (haltstate) {
+                /* If we are here, we are hopefully on the processor, that 
+                 * issued the 'halt' command, so proceed to read the character
+                 * directly from input
+                 */
+                if (chardev->op->read)
+                        return chardev->op->read(chardev);
+                /* no other way of interacting with user, halt */
+                printf("cpu: halted - no kconsole\n");
+                cpu_halt();
+        }
 
         waitq_sleep(&chardev->wq);
@@ -115 +129 @@
 void putchar(char c)
 {
-        stdout->op->write(stdout, c);
+        if (stdout->op->write)
+                stdout->op->write(stdout, c);
 }

generic/src/console/kconsole.c

@@ -248 +248 @@
                         putchar(c);
                         break;
-                } if (c == '\b') {
+                } if (c == '\b') { /* Backspace */
                         if (position == 0)
                                 continue;
@@ -262 +262 @@
                         continue;
                 }
-                if (c == '\t') {
+                if (c == '\t') { /* Tabulator */
                         int found;
 
@@ -310 +310 @@
                         continue;
                 }
-                if (c == 0x1b) {
+                if (c == 0x1b) { /* Special command */
                         mod = _getc(input);
                         c = _getc(input);
@@ -318 +318 @@
 
                         if (c == 0x33 && _getc(input) == 0x7e) {
+                                /* Delete */
                                 if (position == curlen)
                                         continue;
@@ -332 +333 @@
                                 position = 0;
                         } 
-                        else if (c == 0x46) {
+                        else if (c == 0x46) {  /* End */
                                 for (i=position;i<curlen;i++)
                                         putchar(current[i]);
@@ -356 +357 @@
                                 rdln_print_c(' ',curlen);
                                 rdln_print_c('\b',curlen);
-                                if (c == 0x41)
+                                if (c == 0x41) /* Up */
                                         histposition--;
                                 else

generic/src/lib/func.c

@@ -33 +33 @@
 #include <arch.h>
 #include <typedefs.h>
+#include <console/kconsole.h>
 
 __u32   haltstate = 0; /**< Halt flag */
@@ -46 +47 @@
         haltstate = 1;
         interrupts_disable();
+#ifdef CONFIG_DEBUG
+        printf("\n");
+        kconsole(NULL); /* Run kconsole as a last resort to user */
+#endif      
+
         if (CPU)
                 printf("cpu%d: halted\n", CPU->id);