yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!52 heap初始化做address以及size的对齐检查 

Merge pull request !52 from 金永生/los_heap
This commit is contained in:
openharmony_ci 2021-04-10 09:03:51 +08:00 committed by Gitee
parent 63d340305c 9af0cd4891
commit 45a8a3812c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/src/mm/los_memory.c
View File

@ -893,7 +893,13 @@ UINT32 LOS_MemInit(VOID *pool, UINT32 size)
return OS_ERROR; return OS_ERROR;
} }
size = OS_MEM_ALIGN(size, OS_MEM_ALIGN_SIZE); if (((UINTPTR)pool & (OS_MEM_ALIGN_SIZE - 1)) || \
(size & (OS_MEM_ALIGN_SIZE - 1))) {
PRINT_ERR("LiteOS heap memory address or size configured not aligned:address:0x%x,size:0x%x, alignsize:%d\n", \
(UINTPTR)pool, size, OS_MEM_ALIGN_SIZE);
return OS_ERROR;
}
if (OsMemPoolInit(pool, size)) { if (OsMemPoolInit(pool, size)) {
return OS_ERROR; return OS_ERROR;
} }
@ -2025,11 +2031,6 @@ UINT32 OsMemSystemInit(VOID)
m_aucSysMem0 = LOSCFG_SYS_HEAP_ADDR; m_aucSysMem0 = LOSCFG_SYS_HEAP_ADDR;
#endif #endif
if ((UINTPTR)m_aucSysMem0 & (OS_MEM_ALIGN_SIZE - 1)) {
m_aucSysMem0 = (UINT8 *)(((UINTPTR)m_aucSysMem0 + (OS_MEM_ALIGN_SIZE - 1)) &
~(OS_MEM_ALIGN_SIZE - 1));
}
ret = LOS_MemInit(m_aucSysMem0, LOSCFG_SYS_HEAP_SIZE); ret = LOS_MemInit(m_aucSysMem0, LOSCFG_SYS_HEAP_SIZE);
PRINT_INFO("LiteOS heap memory address:0x%x,size:0x%x\n", m_aucSysMem0, LOSCFG_SYS_HEAP_SIZE); PRINT_INFO("LiteOS heap memory address:0x%x,size:0x%x\n", m_aucSysMem0, LOSCFG_SYS_HEAP_SIZE);
return ret; return ret;