Rev 2973 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2973 | Rev 2978 | ||
---|---|---|---|
Line 36... | Line 36... | ||
36 | 36 | ||
37 | #include <stdio.h> |
37 | #include <stdio.h> |
38 | 38 | ||
39 | #include <arch.h> |
39 | #include <arch.h> |
40 | #include <elf_dyn.h> |
40 | #include <elf_dyn.h> |
- | 41 | #include <symbol.h> |
|
41 | #include <rtld.h> |
42 | #include <rtld.h> |
42 | 43 | ||
43 | /** |
44 | /** |
44 | * Process (fixup) all relocations in a relocation table. |
45 | * Process (fixup) all relocations in a relocation table. |
45 | */ |
46 | */ |
46 | void rel_table_process(module_t *m, elf_rel_t *rt, size_t rt_size) |
47 | void rel_table_process(module_t *m, elf_rel_t *rt, size_t rt_size, |
- | 48 | module_t *dest) |
|
47 | { |
49 | { |
48 | unsigned bias; |
- | |
49 | int i; |
50 | int i; |
50 | 51 | ||
51 | size_t rt_entries; |
52 | size_t rt_entries; |
52 | size_t r_offset; |
53 | size_t r_offset; |
53 | elf_word r_info; |
54 | elf_word r_info; |
54 | unsigned rel_type; |
55 | unsigned rel_type; |
55 | elf_word sym_idx; |
56 | elf_word sym_idx; |
56 | // uintptr_t sym_addr; |
57 | uintptr_t sym_addr; |
57 | 58 | ||
58 | elf_symbol_t *sym_table; |
59 | elf_symbol_t *sym_table; |
59 | elf_symbol_t *sym; |
60 | elf_symbol_t *sym; |
60 | uint32_t *r_ptr; |
61 | uint32_t *r_ptr; |
61 | char *str_tab; |
62 | char *str_tab; |
- | 63 | ||
- | 64 | elf_symbol_t *sym_def; |
|
62 | 65 | ||
63 | printf("parse relocation table\n"); |
66 | printf("parse relocation table\n"); |
64 | 67 | ||
65 | sym_table = m->dyn.sym_tab; |
68 | sym_table = m->dyn.sym_tab; |
66 | bias = m->bias; |
- | |
67 | rt_entries = rt_size / sizeof(elf_rel_t); |
69 | rt_entries = rt_size / sizeof(elf_rel_t); |
68 | str_tab = m->dyn.str_tab; |
70 | str_tab = m->dyn.str_tab; |
69 | 71 | ||
70 | printf("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries); |
72 | printf("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries); |
71 | 73 | ||
Line 81... | Line 83... | ||
81 | str_tab + sym->st_name, |
83 | str_tab + sym->st_name, |
82 | sym->st_value, |
84 | sym->st_value, |
83 | sym->st_size); |
85 | sym->st_size); |
84 | 86 | ||
85 | rel_type = ELF32_R_TYPE(r_info); |
87 | rel_type = ELF32_R_TYPE(r_info); |
86 | r_ptr = (uint32_t *)(r_offset + bias); |
88 | r_ptr = (uint32_t *)(r_offset + m->bias); |
87 | 89 | ||
88 | printf("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset); |
90 | printf("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset); |
- | 91 | sym_def = symbol_def_find(dest, str_tab + sym->st_name); |
|
- | 92 | if (sym_def) { |
|
- | 93 | sym_addr = sym_def->st_value + dest->bias; |
|
- | 94 | printf("symbol definition found, addr=0x%x\n", sym_addr); |
|
- | 95 | } else { |
|
- | 96 | printf("symbol definition not found\n"); |
|
- | 97 | continue; |
|
- | 98 | } |
|
89 | /* |
99 | |
90 | switch (rel_type) { |
100 | switch (rel_type) { |
91 | case R_386_GLOB_DAT: |
101 | case R_386_GLOB_DAT: |
92 | case R_386_JUMP_SLOT: |
102 | case R_386_JUMP_SLOT: |
93 | sym_addr = sym_table[sym_idx].st_value + bias; |
103 | printf("fixup R_386_GLOB_DAT/JUMP_SLOT (b+v)\n"); |
94 | kputint(sym_idx); |
- | |
95 | kputint(sym_addr); |
- | |
96 | - | ||
97 | *r_ptr = sym_addr; |
104 | *r_ptr = sym_addr; |
98 | break; |
105 | break; |
99 | 106 | ||
100 | case R_386_32: |
107 | case R_386_32: |
101 | sym_addr = sym_table[sym_idx].st_value + bias; |
- | |
102 | kputint(sym_idx); |
- | |
103 | kputint(sym_addr); |
108 | printf("fixup R_386_32 (b+v+a)\n"); |
104 | - | ||
105 | *r_ptr += sym_addr; |
109 | *r_ptr += sym_addr; |
106 | break; |
110 | break; |
107 | |
111 | |
108 | case R_386_RELATIVE: |
112 | case R_386_RELATIVE: |
- | 113 | printf("fixup R_386_RELATIVE (b+a)\n"); |
|
109 | *r_ptr += bias; |
114 | *r_ptr += dest->bias; |
110 | break; |
115 | break; |
111 | }*/ |
116 | } |
112 | } |
117 | } |
113 | 118 | ||
114 | } |
119 | } |
115 | 120 | ||
116 | /** @} |
121 | /** @} |