Skip to content

Xtensa: fix the coproc_area incorrect issue #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lundinc2 merged 4 commits into from
Oct 26, 2020
Merged

Xtensa: fix the coproc_area incorrect issue #117

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2e9e7c
Xtensa: fix the coproc_area incorrect issue
magicse7en Aug 12, 2020
55aae61
Merge branch 'master' into fix_coproc_area
lundinc2 Oct 26, 2020
0142598
Update port.c
lundinc2 Oct 26, 2020
5e23b17
Merge branch 'master' into fix_coproc_area
lundinc2 Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions portable/ThirdParty/XCC/Xtensa/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,16 +212,19 @@ BaseType_t xPortSysTickHandler( void )
* Used to set coprocessor area in stack. Current hack is to reuse MPU pointer for coprocessor area.
*/
#if portUSING_MPU_WRAPPERS
void vPortStoreTaskMPUSettings( xMPU_SETTINGS *xMPUSettings, const struct xMEMORY_REGION * const xRegions, StackType_t *pxBottomOfStack, uint32_t ulStackDepth )
void vPortStoreTaskMPUSettings( xMPU_SETTINGS * xMPUSettings,
const struct xMEMORY_REGION * const xRegions,
StackType_t * pxBottomOfStack,
uint32_t ulStackDepth )
{
#if XCHAL_CP_NUM > 0
xMPUSettings->coproc_area = (StackType_t*)((((uint32_t)(pxBottomOfStack + ulStackDepth - 1)) - XT_CP_SIZE ) & ~0xf);

#if XCHAL_CP_NUM > 0
xMPUSettings->coproc_area = ( StackType_t * ) ( ( uint32_t ) ( pxBottomOfStack + ulStackDepth - 1 ));
xMPUSettings->coproc_area = ( StackType_t * ) ( ( ( portPOINTER_SIZE_TYPE ) xMPUSettings->coproc_area ) & ( ~( ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) ) );
xMPUSettings->coproc_area = ( Stacktype_t * ) ( ( ( uint32_t ) xMPUSettings->coproc_area - XT_CP_SIZE ) & ~0xf );

/* NOTE: we cannot initialize the coprocessor save area here because FreeRTOS is going to
/* NOTE: we cannot initialize the coprocessor save area here because FreeRTOS is going to
* clear the stack area after we return. This is done in pxPortInitialiseStack().
*/
#endif
*/
#endif
}
#endif

#endif /* if portUSING_MPU_WRAPPERS */