Changeset 372 for trunk

Timestamp:

Aug 14, 2017, 2:40:49 PM (7 years ago)

Author:

max@…

Message:

Add a panic function.

Location:

trunk/kernel/kern

Files:

• printk.c (modified) (1 diff)
• printk.h (modified) (8 diffs)

trunk/kernel/kern/printk.c

@@ -412 +412 @@
 }
 
+/////////////////////////////////
+void _panic( char * format , ... )
+{
+    va_list       args;
+    uint32_t      save_sr;
+
+    // get pointers on TXT0 chdev
+    xptr_t    txt0_xp  = chdev_dir.txt[0];
+    cxy_t     txt0_cxy = GET_CXY( txt0_xp );
+    chdev_t * txt0_ptr = GET_PTR( txt0_xp );
+
+    // get extended pointer on remote TXT0 chdev lock
+    xptr_t  lock_xp = XPTR( txt0_cxy , &txt0_ptr->wait_lock );
+
+    // get TXT0 lock in busy waiting mode
+    remote_spinlock_lock_busy( lock_xp , &save_sr );
+
+    // call kernel_printf on TXT0, in busy waiting mode
+    va_start( args , format );
+    kernel_printf( 0 , 1 , format , &args );
+    va_end( args );
+
+    // release lock
+    remote_spinlock_unlock_busy( lock_xp , save_sr );
+
+    hal_disable_irq( NULL );
+
+    while (1)
+    {
+        hal_core_sleep();
+    }
+}
+
 ////////////////////////////////////
 void assert( bool_t       condition,

trunk/kernel/kern/printk.h

@@ -1 +1 @@
 /*
  * printk.h - Kernel Log & debug messages API definition.
- * 
+ *
  * authors  Alain Greiner (2016)
  *
@@ -24 +24 @@
 ///////////////////////////////////////////////////////////////////////////////////
 // The printk.c and printk.h files define the functions used by the kernel
-// to display messages on a text terminal. 
+// to display messages on a text terminal.
 // Two access modes are supported:
 // - The printk() function displays kernel messages on the kernel terminal TXT0,
-//   using a busy waiting policy: It calls directly the relevant TXT driver, 
+//   using a busy waiting policy: It calls directly the relevant TXT driver,
 //   after taking the TXT0 chdev lock for exclusive access to the TXT0 terminal.
 // - The user_printk() function displays messages on the calling thread private
 //   terminal, using a descheduling policy: it register the request in the selected
-//   TXT chdev waiting queue and deschedule. The calling thread is reactivated by 
-//   the IRQ signaling completion.
+//   TXT chdev waiting queue and deschedule. The calling thread is reactivated by
+//   the IRQ signalling completion.
 // Both functions use the generic TXT device to call the proper implementation
 // dependant TXT driver.
-// Finally these files define a set of conditionnal trace <***_dmsg> for debug.
+// Finally these files define a set of conditional trace <***_dmsg> for debug.
 ///////////////////////////////////////////////////////////////////////////////////
 
@@ -46 +46 @@
 
 /**********************************************************************************
- * This function build a formated string.
+ * This function build a formatted string.
  * The supported formats are defined below :
  *   %c : single character
@@ -65 +65 @@
 
 /**********************************************************************************
- * This function displays a formated string on the kernel terminal TXT0,
- * using a busy waiting policy: It calls directly the relevant TXT driver, 
+ * This function displays a formatted string on the kernel terminal TXT0,
+ * using a busy waiting policy: It calls directly the relevant TXT driver,
  * after taking the TXT0 lock.
  **********************************************************************************
- * @ format     : formated string.
+ * @ format     : formatted string.
  *********************************************************************************/
 void printk( char* format, ... );
 
 /**********************************************************************************
- * This function displays a formated string on the kernel terminal TXT0,
- * using a busy waiting policy: It calls directly the relevant TXT driver, 
+ * This function displays a formatted string on the kernel terminal TXT0,
+ * using a busy waiting policy: It calls directly the relevant TXT driver,
  * without taking the TXT0 lock.
  **********************************************************************************
- * @ format     : formated string.
+ * @ format     : formatted string.
  *********************************************************************************/
 void nolock_printk( char* format, ... );
 
 /**********************************************************************************
- * This function displays a "PANIC" message and force the calling core in
+ * This function displays a message and forces the calling core in sleeping mode.
+ **********************************************************************************
+ * @ format        : formatted string
+ *********************************************************************************/
+void _panic( char* format, ... );
+
+/**********************************************************************************
+ * This function displays a "PANIC" message and forces the calling core in
  * sleeping mode if a Boolean condition is false.
  * These functions are actually used to debug the kernel...
@@ -89 +96 @@
  * @ condition     : condition that must be true.
  * @ function_name : name of the calling function.
- * @ format        : formated string
+ * @ format        : formatted string
  *********************************************************************************/
 void assert( bool_t       condition,
@@ -95 +102 @@
              char       * format , ... );
 
+#define panic(fmt, ...)     _panic("[PANIC] %s(): " fmt, __func__, ##__VA_ARGS__)
+
 ///////////////////////////////////////////////////////////////////////////////////
-//       Conditionnal debug macros
+//       Conditional debug macros
 ///////////////////////////////////////////////////////////////////////////////////
 
@@ -250 +259 @@
 
 #if CONFIG_RPC_DEBUG
-#define rpc_dmsg(...)   if(hal_time_stamp() > CONFIG_RPC_DEBUG) printk(__VA_ARGS__) 
+#define rpc_dmsg(...)   if(hal_time_stamp() > CONFIG_RPC_DEBUG) printk(__VA_ARGS__)
 #else
 #define rpc_dmsg(...)
@@ -292 +301 @@
 
 #if CONFIG_VFS_DEBUG
-#define vfs_dmsg(...)   if(hal_time_stamp() > CONFIG_VFS_DEBUG) printk(__VA_ARGS__) 
+#define vfs_dmsg(...)   if(hal_time_stamp() > CONFIG_VFS_DEBUG) printk(__VA_ARGS__)
 #else
 #define vfs_dmsg(...)