chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apply kuronca patch for heap initialization check. 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@811 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2010-07-22 02:54:19 +00:00
parent f834265044
commit 0a64bac9d9
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clock.c
View File

@ -96,7 +96,7 @@ void rt_tick_increase()
rt_tick_t rt_tick_from_millisecond(rt_uint32_t ms) rt_tick_t rt_tick_from_millisecond(rt_uint32_t ms)
{ {
/* return the calculated tick */ /* return the calculated tick */
return (RT_TICK_PER_SECOND * ms) / 1000 + (RT_TICK_PER_SECOND * ms) % 1000 ? 1:0; return (RT_TICK_PER_SECOND * ms+999) / 1000;
} }
/*@}*/ /*@}*/

15
src/mem.c
View File

@ -166,15 +166,22 @@ static void plug_holes(struct heap_mem *mem)
void rt_system_heap_init(void* begin_addr, void* end_addr) void rt_system_heap_init(void* begin_addr, void* end_addr)
{ {
struct heap_mem *mem; struct heap_mem *mem;
rt_uint32_t begin_align = RT_ALIGN((rt_uint32_t)begin_addr, RT_ALIGN_SIZE);
rt_uint32_t end_align = RT_ALIGN_DOWN((rt_uint32_t)end_addr, RT_ALIGN_SIZE);
/* alignment addr */ /* alignment addr */
begin_addr = (void*)RT_ALIGN((rt_uint32_t)begin_addr, RT_ALIGN_SIZE); if((end_align > (2 * SIZEOF_STRUCT_MEM) ) &&
((end_align - 2 * SIZEOF_STRUCT_MEM) >= begin_align )) {
/* calculate the aligned memory size */ /* calculate the aligned memory size */
mem_size_aligned = RT_ALIGN_DOWN((rt_uint32_t)end_addr - (rt_uint32_t)begin_addr, RT_ALIGN_SIZE) - 2 * SIZEOF_STRUCT_MEM; mem_size_aligned = end_align - begin_align - 2 * SIZEOF_STRUCT_MEM;
}
else {
rt_kprintf("mem init, error begin address 0x%x, and end address 0x%x\n", (rt_uint32_t)begin_addr, (rt_uint32_t)end_addr);
return;
}
/* point to begin address of heap */ /* point to begin address of heap */
heap_ptr = begin_addr; heap_ptr = (rt_uint8_t *)begin_align;
#ifdef RT_MEM_DEBUG #ifdef RT_MEM_DEBUG
rt_kprintf("mem init, heap begin address 0x%x, size %d\n", (rt_uint32_t)heap_ptr, mem_size_aligned); rt_kprintf("mem init, heap begin address 0x%x, size %d\n", (rt_uint32_t)heap_ptr, mem_size_aligned);

5
src/slab.c
View File

@ -329,6 +329,11 @@ void rt_system_heap_init(void *begin_addr, void* end_addr)
heap_start = RT_ALIGN((rt_uint32_t)begin_addr, RT_MM_PAGE_SIZE); heap_start = RT_ALIGN((rt_uint32_t)begin_addr, RT_MM_PAGE_SIZE);
heap_end = RT_ALIGN_DOWN((rt_uint32_t)end_addr, RT_MM_PAGE_SIZE); heap_end = RT_ALIGN_DOWN((rt_uint32_t)end_addr, RT_MM_PAGE_SIZE);
if(heap_start >= heap_end) {
rt_kprintf("rt_system_heap_init, error begin address 0x%x, and end address 0x%x\n", (rt_uint32_t)begin_addr, (rt_uint32_t)end_addr);
return;
}
limsize = heap_end - heap_start; limsize = heap_end - heap_start;
npages = limsize / RT_MM_PAGE_SIZE; npages = limsize / RT_MM_PAGE_SIZE;