Merge pull request #658 from jphickey/fix-651-vxworks-stackcalc

Fix #651, use unsigned types in VxWorks stack calculation
nasa · Dec 1, 2020 · d54e3b5 · d54e3b5
2 parents a8f0695 + 66ad32e
commit d54e3b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/os/vxworks/inc/os-impl-tasks.h b/src/os/vxworks/inc/os-impl-tasks.h
@@ -37,7 +37,7 @@ typedef struct
     WIND_TCB tcb; /* Must be first */
     TASK_ID  vxid;
     void *   heap_block; /* set non-null if the stack was obtained with malloc() */
-    long     heap_block_size;
+    size_t   heap_block_size;
 } OS_impl_task_internal_record_t;
 
 /* Tables where the OS object information is stored */

diff --git a/src/os/vxworks/src/os-impl-tasks.c b/src/os/vxworks/src/os-impl-tasks.c
@@ -51,7 +51,7 @@
 #if defined(_STACK_ALIGN_SIZE)
 #define VX_IMPL_STACK_ALIGN_SIZE _STACK_ALIGN_SIZE
 #else
-#define VX_IMPL_STACK_ALIGN_SIZE 16
+#define VX_IMPL_STACK_ALIGN_SIZE ((size_t)16)
 #endif
 
 #if defined(STACK_ROUND_DOWN)
@@ -122,9 +122,9 @@ int32 OS_TaskCreate_Impl(osal_index_t task_id, uint32 flags)
     STATUS                          status;
     int                             vxflags;
     int                             vxpri;
-    long                            actualsz;
-    long                            userstackbase;
-    long                            actualstackbase;
+    size_t                          actualsz;
+    unsigned long                   userstackbase;
+    unsigned long                   actualstackbase;
     OS_impl_task_internal_record_t *lrec;
     VxWorks_ID_Buffer_t             id;
 
@@ -147,7 +147,7 @@ int32 OS_TaskCreate_Impl(osal_index_t task_id, uint32 flags)
      */
     vxpri         = OS_task_table[task_id].priority;
     actualsz      = OS_task_table[task_id].stack_size;
-    userstackbase = (long)OS_task_table[task_id].stack_pointer;
+    userstackbase = (unsigned long)OS_task_table[task_id].stack_pointer;
 
     /*
      * NOTE: Using taskInit() here rather than taskSpawn() allows us
@@ -213,7 +213,7 @@ int32 OS_TaskCreate_Impl(osal_index_t task_id, uint32 flags)
             }
         }
 
-        userstackbase = (long)lrec->heap_block;
+        userstackbase = (unsigned long)lrec->heap_block;
     }
 
     if (userstackbase == 0)