Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-26 18:48:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_Linux: Thread: fix alignment warning

Browse Source 
../../libraries/AP_HAL_Linux/Thread.cpp: In member function ‘void Linux::Thread::_poison_stack()’:
../../libraries/AP_HAL_Linux/Thread.cpp:87:31: warning: cast from ‘uint8_t* {aka unsigned char*}’ to ‘uint32_t* {aka unsigned int*}’ increases required alignment of target type [-Wcast-align]
         for (p = (uint32_t *) end; p > curr; p--) {
                               ^
../../libraries/AP_HAL_Linux/Thread.cpp:93:31: warning: cast from ‘uint8_t* {aka unsigned char*}’ to ‘uint32_t* {aka unsigned int*}’ increases required alignment of target type [-Wcast-align]
         for (p = (uint32_t *) end; p < curr; p++) {
                               ^
../../libraries/AP_HAL_Linux/Thread.cpp:98:39: warning: cast from ‘uint8_t* {aka unsigned char*}’ to ‘uint32_t* {aka unsigned int*}’ increases required alignment of target type [-Wcast-align]
     _stack_debug.start = (uint32_t *) begin;
                                       ^
../../libraries/AP_HAL_Linux/Thread.cpp:99:37: warning: cast from ‘uint8_t* {aka unsigned char*}’ to ‘uint32_t* {aka unsigned int*}’ increases required alignment of target type [-Wcast-align]
     _stack_debug.end = (uint32_t *) end;
                                     ^
This commit is contained in:
Lucas De Marchi 2016-05-19 12:18:28 -03:00
parent 18af4da690
commit 7e49d0c53f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/AP_HAL_Linux/Thread.cpp
View File

@ -60,8 +60,7 @@ void Thread::_poison_stack()
pthread_attr_t attr;
size_t stack_size, guard_size;
void *stackp;
uint8_t *end, *begin, *curr;
uint32_t *p;
uint32_t *p, *curr, *begin, *end;
if (pthread_getattr_np(_ctx, &attr) != 0 ||
pthread_attr_getstack(&attr, &stackp, &stack_size) != 0 ||
@ -69,11 +68,14 @@ void Thread::_poison_stack()
return;
}
stack_size /= sizeof(uint32_t);
guard_size /= sizeof(uint32_t);
/* The stack either grows upward or downard. The guard part always
* protects the end */
end = (uint8_t *) stackp;
end = (uint32_t *)stackp;
begin = end + stack_size;
curr = (uint8_t *) alloca(sizeof(uint32_t));
curr = (uint32_t *)alloca(sizeof(uint32_t));
/* if curr is closer to @end, the stack actually grows from low to high
* virtual address: this is because this function should be executing very
@ -84,19 +86,19 @@ void Thread::_poison_stack()
std::swap(end, begin);
end -= guard_size;
for (p = (uint32_t *) end; p > (uint32_t *) curr; p--) {
for (p = end; p > curr; p--) {
*p = STACK_POISON;
}
} else {
end += guard_size;
for (p = (uint32_t *) end; p < (uint32_t *) curr; p++) {
for (p = end; p < curr; p++) {
*p = STACK_POISON;
}
}
_stack_debug.start = (uint32_t *) begin;
_stack_debug.end = (uint32_t *) end;
_stack_debug.start = begin;
_stack_debug.end = end;
}
size_t Thread::get_stack_usage()