Changeset 242 for trunk

Timestamp:

Jul 20, 2017, 10:29:05 AM (7 years ago)

Author:

max@…

Message:

add a dumb lock for the console

Location:

trunk/hal/x86_64/core

Files:

• hal_exception.c (modified) (2 diffs)
• hal_internal.h (modified) (1 diff)
• x86_printf.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_exception.c

@@ -69 +69 @@
         }
 
+        x86_lock();
         x86_printf("\n****** EXCEPTION OCCURRED ******\n");
         x86_printf("%s\n", (char *)buf);
@@ -77 +78 @@
                 x86_printf("-> va  = %Z\n", rcr2());
         x86_printf("****** EXCEPTION OCCURRED ******\n\n");
+        x86_unlock();
 
         while (1);

trunk/hal/x86_64/core/hal_internal.h

@@ -79 +79 @@
 
 /* x86_printf.c */
+void x86_lock();
+void x86_unlock();
+
 void x86_panic(char *msg);
 void x86_putc(char c);

trunk/hal/x86_64/core/x86_printf.c

@@ -42 +42 @@
 size_t cons_ptr __in_kdata = 0;
 
+/* -------------------------------------------------------------------------- */
+
+static uint32_t x86_lock_val __in_kdata = 0;
+
+void x86_lock()
+{
+        while (!hal_atomic_cas(&x86_lock_val, 0, 1)) {
+                /* wait */
+        }
+}
+
+void x86_unlock()
+{
+        while (!hal_atomic_cas(&x86_lock_val, 1, 0)) {
+                /* wait */
+        }
+}
+
+/* -------------------------------------------------------------------------- */
+
 void x86_panic(char *msg)
 {
+        x86_lock();
         x86_printf("!!!!! PANIC !!!!!\n");
         x86_printf("-> %s\n", msg);
         x86_printf("!!!!!!!!!!!!!!!!!\n");
+        x86_unlock();
         while (1);
 }