summaryrefslogtreecommitdiff
path: root/src/module.c
diff options
context:
space:
mode:
authorqiuyiuestc <[email protected]>2010-04-21 16:59:06 +0000
committerqiuyiuestc <[email protected]>2010-04-21 16:59:06 +0000
commit38c432620f3c1df2e88dc892dbd24ef19a198bd2 (patch)
treefa99ba53b1b63c04aaba7d701e391bcddf88ae6b /src/module.c
parent146d88b0507c173919e1e8f8dee9f5c9157731fc (diff)
module developing
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@663 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'src/module.c')
-rw-r--r--src/module.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/module.c b/src/module.c
index 9e936713ee..af980541cb 100644
--- a/src/module.c
+++ b/src/module.c
@@ -255,9 +255,15 @@ struct rt_module* rt_module_load(void* module_ptr, const rt_uint8_t* name)
if (IS_PROG(shdr[index]) && IS_AW(shdr[index]))
{
module->module_data = (rt_uint32_t)ptr;
- rt_memset(ptr, 0, shdr[index].sh_size);
+ rt_memcpy(ptr, (rt_uint8_t*)elf_module + shdr[index].sh_offset, shdr[index].sh_size);
ptr += shdr[index].sh_size;
}
+
+ /* load bss section */
+ if (IS_NOPROG(shdr[index]) && IS_AW(shdr[index]))
+ {
+ rt_memset(ptr, 0, shdr[index].sh_size);
+ }
}
/* set module entry */
@@ -316,7 +322,7 @@ struct rt_module* rt_module_load(void* module_ptr, const rt_uint8_t* name)
{
/* relocate object in data section */
rt_module_arm_relocate(module, rel,
- (Elf32_Addr)(ptr + sym->st_value),
+ (Elf32_Addr)(module->module_data + sym->st_value),
module_addr);
}
}