Changeset 473 for trunk/kernel/libk

Timestamp:

Aug 21, 2018, 6:01:01 PM (6 years ago)

Author:

alain

Message:

Fix several GCC warning related to the -Wextra compilation option.

Location:

trunk/kernel/libk

Files:

• bits.c (modified) (2 diffs)
• grdxt.c (modified) (3 diffs)
• spinlock.c (modified) (2 diffs)

trunk/kernel/libk/bits.c

@@ -81 +81 @@
                 if((len + bit) >= 32)
                 {
-                        val = (bit == 0) ? 0xFFFFFFFF : (1 << (32 - bit)) - 1;
+            if( bit == 0 ) val = 0xFFFFFFFF;
+            else           val = (uint32_t)((1 << (32 - bit)) - 1);
+
                         bitmap[word] |= (val << bit);
                         word++;
@@ -108 +110 @@
                 if((len + bit) >= 32)
                 {
-                        val = (bit == 0) ? 0xFFFFFFFF : (1 << (32 - bit)) - 1;
+            if( bit == 0 ) val = 0xFFFFFFFF;
+            else           val = (uint32_t)((1 << (32 - bit)) - 1);
+
                         bitmap[word] &= ~(val << bit);
                         word++;

trunk/kernel/libk/grdxt.c

@@ -73 +73 @@
         req.type = KMEM_GENERIC;
 
-        for( ix1=0 ; ix1 < (1 << w1) ; ix1++ )
+        for( ix1=0 ; ix1 < (uint32_t)(1 << w1) ; ix1++ )
         {
         ptr2 = ptr1[ix1];
@@ -79 +79 @@
                 if( ptr2 == NULL ) continue;
 
-        for( ix2=0 ; ix2 < (1 << w2) ; ix2++ )
+        for( ix2=0 ; ix2 < (uint32_t)(1 << w2) ; ix2++ )
         {
             ptr3 = ptr2[ix2];
@@ -129 +129 @@
            name, 1<<w1 , 1<<w2 , 1<<w3 );
 
-        for( ix1=0 ; ix1 < (1<<w1) ; ix1++ )
+        for( ix1=0 ; ix1 < (uint32_t)(1<<w1) ; ix1++ )
         {
         ptr2 = ptr1[ix1];
         if( ptr2 == NULL )  continue;
     
-        for( ix2=0 ; ix2 < (1<<w2) ; ix2++ )
+        for( ix2=0 ; ix2 < (uint32_t)(1<<w2) ; ix2++ )
         {
             ptr3 = ptr2[ix2];
             if( ptr3 == NULL ) continue;
 
-            for( ix3=0 ; ix3 < (1<<w3) ; ix3++ )
+            for( ix3=0 ; ix3 < (uint32_t)(1<<w3) ; ix3++ )
             {
                 value = (intptr_t)ptr3[ix3];

trunk/kernel/libk/spinlock.c

@@ -47 +47 @@
 ///////////////////////////////////////////
 void spinlock_lock_busy( spinlock_t * lock,
-                         uint32_t   * irq_state )
+                         reg_t      * irq_state )
 {
     reg_t               mode;
@@ -82 +82 @@
 //////////////////////////////////////////////
 void spinlock_unlock_busy( spinlock_t * lock,
-                           uint32_t     irq_state )
+                           reg_t        irq_state )
 {
     thread_t * this = CURRENT_THREAD;