Changeset 279 for trunk/hal/tsar_mips32/core/hal_irqmask.c

Timestamp:

Jul 27, 2017, 12:23:29 AM (7 years ago)

Author:

alain

Message:

1) Introduce independant command fields for the various devices in the thread descriptor.
2) Introduce a new dev_pic_enable_ipi() function in the generic PIC device
3) Fix two bugs identified by Maxime in the scheduler initialisation, and in the sched_select().
4) fix several bugs in the TSAR hal_kentry.S.
5) Introduce a third kgiet segment (besides kdata and kcode) in the TSAR bootloader.

File:

• trunk/hal/tsar_mips32/core/hal_irqmask.c (modified) (3 diffs)

trunk/hal/tsar_mips32/core/hal_irqmask.c

@@ -28 +28 @@
 inline void hal_disable_irq( uint32_t * old )
 {
-        register unsigned int sr;
+        register uint32_t sr;
         
         __asm__ volatile 
                 (".set noat                          \n"
-                 ".set noreorder                     \n"
-                 "mfc0   $1,     $12                 \n"
-                 "nop                                \n"
-                 ".set reorder                       \n"
+         "mfc0   $1,     $12                 \n"
                  "or     %0,     $0,     $1          \n"
                  "srl    $1,     $1,     1           \n"
                  "sll    $1,     $1,     1           \n"
                  "mtc0   $1,     $12                 \n"
-                 ".set at                            \n"
-                 : "=&r" (sr));
+         ".set at                            \n"
+                 : "=&r" (sr) );
 
         if( old ) *old = sr;
@@ -49 +46 @@
 inline void hal_enable_irq( uint32_t * old )
 {
-        register unsigned int sr;
+        register uint32_t sr;
  
         __asm__ volatile 
                 (".set noat                          \n"
-                 ".set noreorder                     \n"
                  "mfc0   $1,     $12                 \n"
-                 "nop                                \n"
                  "or     %0,     $0,     $1          \n"
-                 "ori    $1,     $1,     0x1         \n"
+                 "ori    $1,     $1,     0xFF01      \n"
                  "mtc0   $1,     $12                 \n"
-                 "nop                                \n"
-                 ".set reorder                       \n"
-                 ".set at                            \n"
-                 : "=&r" (sr));
+         ".set at                            \n"
+                 : "=&r" (sr) );
   
         if( old ) *old = sr;
@@ -71 +64 @@
 {
         __asm__ volatile 
-                (".set noat                          \n"
-                 ".set noreorder                     \n"
-                 "mfc0    $1,    $12                 \n"
-                 "ori     $2,    $0,      0xFF       \n"
-                 "and     $2,    $2,      %0         \n"
-                 "or      $1,    $1,      $2         \n"
-                 "mtc0    $1,    $12                 \n"
-                 ".set reorder                       \n" 
-                 ".set at                            \n"
-                 : : "r" (old) : "$2");
+                ( "mtc0    %0,    $12" : : "r" (old) );
 }
 
+