WebSVN – HelenOS – Diff – /branches/dynload/uspace/lib/rtld/arch/ppc32/src/reloc.c


/*
 * Copyright (c) 2008 Jiri Svoboda
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * - Redistributions of source code must retain the above copyright
 *   notice, this list of conditions and the following disclaimer.
 * - Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 * - The name of the author may not be used to endorse or promote products
 *   derived from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
/** @addtogroup rtld rtld
 * @brief
 * @{
 */
/**
 * @file
 */
 
#include <stdio.h>
 
#include <arch.h>
#include <elf_dyn.h>
#include <symbol.h>
#include <rtld.h>
#include <smc.h>
 
#define __L(ptr) ((uint32_t)(ptr) & 0x0000ffff)
#define __HA(ptr) ((uint32_t)(ptr) >> 16)
 
// ldis r11, .PLTtable@ha
static inline uint32_t _ldis(unsigned rD, uint16_t imm16)
{
    /* Special case of addis: ldis rD,SIMM == addis rD,0,SIMM */
    return 0x3C000000 | (rD << 21) | imm16;
}
 
static inline uint32_t _lwz(unsigned rD, uint16_t disp16, unsigned rA)
{
    return 0x80000000 | (rD << 21) | (rA << 16) | disp16;
}
 
static inline uint32_t _mtctr(unsigned rS)
{
    /* mtctr rD == mtspr 9, rD */
    return 0x7c0003a6 | (rS << 21) | (9/*CTR*/ << 16);
}
 
static inline uint32_t _bctr()
{
    /* bcctr 0x1f, 0 */
    return 0x4c000420 | (0x1f/*always*/ << 21);
}
 
/* branch */
static inline uint32_t _b(uint32_t *addr, uint32_t *location)
{
    uint32_t raddr = ((uint32_t)addr - (uint32_t)location) & 0x03fffffc;
    return 0x48000000 | raddr;
}
 
 
/*
 * Fill in PLT
 */
void module_process_pre_arch(module_t *m)
{
    uint32_t *plt;
    uint32_t *_plt_ent;
 
    plt = m->dyn.plt_got;
    if (!plt) {
        /* Module has no PLT */
        return;
    }
 
    // PLT entries start here. However, each occupies 2 words
    _plt_ent = plt + 18;
 
    // By definition of the ppc ABI, there's 1:1 correspondence
    // between JMPREL entries and PLT entries
    unsigned plt_n = m->dyn.plt_rel_sz / sizeof(elf_rela_t);
 
    uint32_t *_plt_table;
    uint32_t *_plt_call;
    uint32_t *_plt_resolve;
 
    _plt_resolve = plt;
    _plt_call = plt + 6;
    _plt_table = plt + 18 + plt_n;
 
/* .PLTcall: */
    plt[6] = _ldis(11, __HA(_plt_table));   // ldis r11, .PLTtable@ha
    plt[7] = _lwz(11, __L(_plt_table), 11); // lwz r11, .PLTtable@l(r11)
    plt[8] = _mtctr(11);            // mtctr r11
    plt[9] = _bctr();
 
/* .PLTi, i = 0..N-1 */
//  kputint(-4);
/*  for (i = 0; i < plt_n; ++i) {
        //_plt_table[i] == function address;
        plt[18+i] = _b(_plt_call, &plt[18+i]);  // b .PLTcall
    }*/
}
 
void rel_table_process(module_t *m, elf_rel_t *rt, size_t rt_size)
{
    /* Unused */
    (void)m; (void)rt; (void)rt_size;
}
 
/**
 * Process (fixup) all relocations in a relocation table.
 */
void rela_table_process(module_t *m, elf_rela_t *rt, size_t rt_size)
{
    int i;
 
    size_t rt_entries;
    size_t r_offset;
    elf_word r_info;
    unsigned rel_type;
    elf_word sym_idx;
    uintptr_t sym_addr;
    uintptr_t r_addend;
   
    elf_symbol_t *sym_table;
    elf_symbol_t *sym;
    uint32_t *r_ptr;
    uint16_t *r_ptr16;
    char *str_tab;
   
    elf_symbol_t *sym_def;
    module_t *dest;
 
    uint32_t *plt;
    uint32_t *_plt_table;
    uint32_t *_plt_ent;
    uint32_t plt_n;
    uint32_t pidx;
    uint32_t t_addr;
    uint32_t sym_size;
 
    plt = m->dyn.plt_got;
    plt_n = m->dyn.plt_rel_sz / sizeof(elf_rela_t);
    _plt_ent = plt+ 18;
    _plt_table = plt + 18 + plt_n;
 
    DPRINTF("parse relocation table\n");
 
    sym_table = m->dyn.sym_tab;
    rt_entries = rt_size / sizeof(elf_rela_t);
    str_tab = m->dyn.str_tab;
 
    DPRINTF("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
   
    for (i = 0; i < rt_entries; ++i) {
        DPRINTF("symbol %d: ", i);
        r_offset = rt[i].r_offset;
        r_info = rt[i].r_info;
        r_addend = rt[i].r_addend;
 
        sym_idx = ELF32_R_SYM(r_info);
        sym = &sym_table[sym_idx];
 
        DPRINTF("name '%s', value 0x%x, size 0x%x\n",
            str_tab + sym->st_name,
            sym->st_value,
            sym->st_size);
 
        rel_type = ELF32_R_TYPE(r_info);
        r_ptr = (uint32_t *)(r_offset + m->bias);
        r_ptr16 = (uint16_t *)(r_offset + m->bias);
 
        if (sym->st_name != 0) {
            DPRINTF("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);
            sym_def = symbol_def_find(str_tab + sym->st_name,
                m, &dest);
            DPRINTF("dest name: '%s'\n", dest->dyn.soname);
            DPRINTF("dest bias: 0x%x\n", dest->bias);
            if (sym_def) {
                sym_addr = symbol_get_addr(sym_def, dest);
                DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
            } else {
                DPRINTF("symbol definition not found\n");
                continue;
            }
        }
 
        switch (rel_type) {
        case R_PPC_ADDR16_LO:
            DPRINTF("fixup R_PPC_ADDR16_LO (#lo(s+a))\n");
            *r_ptr16 = (sym_addr + r_addend) & 0xffff;
            break;
 
        case R_PPC_ADDR16_HI:
            DPRINTF("fixup R_PPC_ADDR16_HI (#hi(s+a))\n");
            *r_ptr16 = (sym_addr + r_addend) >> 16;
            break;
 
        case R_PPC_ADDR16_HA:
            DPRINTF("fixup R_PPC_ADDR16_HA (#ha(s+a))\n");
            t_addr = sym_addr + r_addend;
            *r_ptr16 = (t_addr >> 16) + ((t_addr & 0x8000) ? 1 : 0);
            break;
 
        case R_PPC_JMP_SLOT:
            DPRINTF("fixup R_PPC_JMP_SLOT (b+v)\n");
            pidx = (r_ptr - _plt_ent) / 2;
            if (pidx >= plt_n) {
                DPRINTF("error: proc index out of range\n");
                //kputint(0xee00ee0ee00);
                while(1);
            }
            //_plt_table[pidx] = sym_addr;
            plt[18+2*pidx] = _b((void *)sym_addr, &plt[18+2*pidx]);
            break;
 
        case R_PPC_ADDR32:
            DPRINTF("fixup R_PPC_ADDR32 (b+v+a)\n");
            *r_ptr = r_addend + sym_addr;
            break;
 
        case R_PPC_COPY:
            /*
             * Copy symbol data from shared object to specified
             * location.
             */
            DPRINTF("fixup R_PPC_COPY (s)\n");
            sym_size = sym->st_size;
            if (sym_size != sym_def->st_size) {
                printf("warning: mismatched symbol sizes\n");
                /* Take the lower value. */
                if (sym_size > sym_def->st_size)
                    sym_size = sym_def->st_size;
            }
            memcpy(r_ptr, (const void *)sym_addr, sym_size);
            break;
           
        case R_PPC_RELATIVE:
            DPRINTF("fixup R_PPC_RELATIVE (b+a)\n");
            *r_ptr = r_addend + m->bias;
            break;
        case R_PPC_REL24:
//          printf("ignore R_PPC_REL24 at 0x%04x\n", (uintptr_t) r_ptr);
            *r_ptr = (sym_addr + r_addend - (uint32_t)r_ptr) >> 2;
            DPRINTF("fixup R_PPC_REL24 (s+a-p)>>2\n");
            /*TODO*/
            break;
        default:
            printf("unknown relocation type %d\n", rel_type);
            break;
        }
    }
 
    /*
     * Synchronize the used portion of PLT. This is necessary since
     * we are writing instructions.
     */
    smc_coherence(&plt[18], plt_n * 2 * sizeof(uint32_t));
}
 
/** @}
 */
 

Rev 3663	Rev 3681
1	/*	1	/*
2	* Copyright (c) 2008 Jiri Svoboda	2	* Copyright (c) 2008 Jiri Svoboda
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions	6	* modification, are permitted provided that the following conditions
7	* are met:	7	* are met:
8	*	8	*
9	* - Redistributions of source code must retain the above copyright	9	* - Redistributions of source code must retain the above copyright
10	* notice, this list of conditions and the following disclaimer.	10	* notice, this list of conditions and the following disclaimer.
11	* - Redistributions in binary form must reproduce the above copyright	11	* - Redistributions in binary form must reproduce the above copyright
12	* notice, this list of conditions and the following disclaimer in the	12	* notice, this list of conditions and the following disclaimer in the
13	* documentation and/or other materials provided with the distribution.	13	* documentation and/or other materials provided with the distribution.
14	* - The name of the author may not be used to endorse or promote products	14	* - The name of the author may not be used to endorse or promote products
15	* derived from this software without specific prior written permission.	15	* derived from this software without specific prior written permission.
16	*	16	*
17	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR	17	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
18	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES	18	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.	19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
20	* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,	20	* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21	* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT	21	* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,	22	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY	23	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	24	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	25	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	26	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27	*/	27	*/
28		28
29	/** @addtogroup rtld rtld	29	/** @addtogroup rtld rtld
30	* @brief	30	* @brief
31	* @{	31	* @{
32	*/	32	*/
33	/**	33	/**
34	* @file	34	* @file
35	*/	35	*/
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 <symbol.h>
42	#include <rtld.h>	42	#include <rtld.h>
43	#include <smc.h>	43	#include <smc.h>
44		44
45	#define __L(ptr) ((uint32_t)(ptr) & 0x0000ffff)	45	#define __L(ptr) ((uint32_t)(ptr) & 0x0000ffff)
46	#define __HA(ptr) ((uint32_t)(ptr) >> 16)	46	#define __HA(ptr) ((uint32_t)(ptr) >> 16)
47		47
48	// ldis r11, .PLTtable@ha	48	// ldis r11, .PLTtable@ha
49	static inline uint32_t _ldis(unsigned rD, uint16_t imm16)	49	static inline uint32_t _ldis(unsigned rD, uint16_t imm16)
50	{	50	{
51	/* Special case of addis: ldis rD,SIMM == addis rD,0,SIMM */	51	/* Special case of addis: ldis rD,SIMM == addis rD,0,SIMM */
52	return 0x3C000000 \| (rD << 21) \| imm16;	52	return 0x3C000000 \| (rD << 21) \| imm16;
53	}	53	}
54		54
55	static inline uint32_t _lwz(unsigned rD, uint16_t disp16, unsigned rA)	55	static inline uint32_t _lwz(unsigned rD, uint16_t disp16, unsigned rA)
56	{	56	{
57	return 0x80000000 \| (rD << 21) \| (rA << 16) \| disp16;	57	return 0x80000000 \| (rD << 21) \| (rA << 16) \| disp16;
58	}	58	}
59		59
60	static inline uint32_t _mtctr(unsigned rS)	60	static inline uint32_t _mtctr(unsigned rS)
61	{	61	{
62	/* mtctr rD == mtspr 9, rD */	62	/* mtctr rD == mtspr 9, rD */
63	return 0x7c0003a6 \| (rS << 21) \| (9/CTR/ << 16);	63	return 0x7c0003a6 \| (rS << 21) \| (9/CTR/ << 16);
64	}	64	}
65		65
66	static inline uint32_t _bctr()	66	static inline uint32_t _bctr()
67	{	67	{
68	/* bcctr 0x1f, 0 */	68	/* bcctr 0x1f, 0 */
69	return 0x4c000420 \| (0x1f/always/ << 21);	69	return 0x4c000420 \| (0x1f/always/ << 21);
70	}	70	}
71		71
72	/* branch */	72	/* branch */
73	static inline uint32_t _b(uint32_t addr, uint32_t location)	73	static inline uint32_t _b(uint32_t addr, uint32_t location)
74	{	74	{
75	uint32_t raddr = ((uint32_t)addr - (uint32_t)location) & 0x03fffffc;	75	uint32_t raddr = ((uint32_t)addr - (uint32_t)location) & 0x03fffffc;
76	return 0x48000000 \| raddr;	76	return 0x48000000 \| raddr;
77	}	77	}
78		78
79		79
80	/*	80	/*
81	* Fill in PLT	81	* Fill in PLT
82	*/	82	*/
83	void module_process_pre_arch(module_t *m)	83	void module_process_pre_arch(module_t *m)
84	{	84	{
85	uint32_t *plt;	85	uint32_t *plt;
86	uint32_t *_plt_ent;	86	uint32_t *_plt_ent;
87		87
88	plt = m->dyn.plt_got;	88	plt = m->dyn.plt_got;
89	if (!plt) {	89	if (!plt) {
90	/* Module has no PLT */	90	/* Module has no PLT */
91	return;	91	return;
92	}	92	}
93		93
94	// PLT entries start here. However, each occupies 2 words	94	// PLT entries start here. However, each occupies 2 words
95	_plt_ent = plt + 18;	95	_plt_ent = plt + 18;
96		96
97	// By definition of the ppc ABI, there's 1:1 correspondence	97	// By definition of the ppc ABI, there's 1:1 correspondence
98	// between JMPREL entries and PLT entries	98	// between JMPREL entries and PLT entries
99	unsigned plt_n = m->dyn.plt_rel_sz / sizeof(elf_rela_t);	99	unsigned plt_n = m->dyn.plt_rel_sz / sizeof(elf_rela_t);
100		100
101	uint32_t *_plt_table;	101	uint32_t *_plt_table;
102	uint32_t *_plt_call;	102	uint32_t *_plt_call;
103	uint32_t *_plt_resolve;	103	uint32_t *_plt_resolve;
104		104
105	_plt_resolve = plt;	105	_plt_resolve = plt;
106	_plt_call = plt + 6;	106	_plt_call = plt + 6;
107	_plt_table = plt + 18 + plt_n;	107	_plt_table = plt + 18 + plt_n;
108		108
109	/* .PLTcall: */	109	/* .PLTcall: */
110	plt[6] = _ldis(11, __HA(_plt_table)); // ldis r11, .PLTtable@ha	110	plt[6] = _ldis(11, __HA(_plt_table)); // ldis r11, .PLTtable@ha
111	plt[7] = _lwz(11, __L(_plt_table), 11); // lwz r11, .PLTtable@l(r11)	111	plt[7] = _lwz(11, __L(_plt_table), 11); // lwz r11, .PLTtable@l(r11)
112	plt[8] = _mtctr(11); // mtctr r11	112	plt[8] = _mtctr(11); // mtctr r11
113	plt[9] = _bctr();	113	plt[9] = _bctr();
114		114
115	/* .PLTi, i = 0..N-1 */	115	/* .PLTi, i = 0..N-1 */
116	// kputint(-4);	116	// kputint(-4);
117	/* for (i = 0; i < plt_n; ++i) {	117	/* for (i = 0; i < plt_n; ++i) {
118	//_plt_table[i] == function address;	118	//_plt_table[i] == function address;
119	plt[18+i] = _b(_plt_call, &plt[18+i]); // b .PLTcall	119	plt[18+i] = _b(_plt_call, &plt[18+i]); // b .PLTcall
120	}*/	120	}*/
121	}	121	}
122		122
123	void rel_table_process(module_t m, elf_rel_t rt, size_t rt_size)	123	void rel_table_process(module_t m, elf_rel_t rt, size_t rt_size)
124	{	124	{
125	/* Unused */	125	/* Unused */
126	(void)m; (void)rt; (void)rt_size;	126	(void)m; (void)rt; (void)rt_size;
127	}	127	}
128		128
129	/**	129	/**
130	* Process (fixup) all relocations in a relocation table.	130	* Process (fixup) all relocations in a relocation table.
131	*/	131	*/
132	void rela_table_process(module_t m, elf_rela_t rt, size_t rt_size)	132	void rela_table_process(module_t m, elf_rela_t rt, size_t rt_size)
133	{	133	{
134	int i;	134	int i;
135		135
136	size_t rt_entries;	136	size_t rt_entries;
137	size_t r_offset;	137	size_t r_offset;
138	elf_word r_info;	138	elf_word r_info;
139	unsigned rel_type;	139	unsigned rel_type;
140	elf_word sym_idx;	140	elf_word sym_idx;
141	uintptr_t sym_addr;	141	uintptr_t sym_addr;
142	uintptr_t r_addend;	142	uintptr_t r_addend;
143		143
144	elf_symbol_t *sym_table;	144	elf_symbol_t *sym_table;
145	elf_symbol_t *sym;	145	elf_symbol_t *sym;
146	uint32_t *r_ptr;	146	uint32_t *r_ptr;
-		147	uint16_t *r_ptr16;
147	char *str_tab;	148	char *str_tab;
148		149
149	elf_symbol_t *sym_def;	150	elf_symbol_t *sym_def;
150	module_t *dest;	151	module_t *dest;
151		152
152	uint32_t *plt;	153	uint32_t *plt;
153	uint32_t *_plt_table;	154	uint32_t *_plt_table;
154	uint32_t *_plt_ent;	155	uint32_t *_plt_ent;
155	uint32_t plt_n;	156	uint32_t plt_n;
156	uint32_t pidx;	157	uint32_t pidx;
-		158	uint32_t t_addr;
-		159	uint32_t sym_size;
157		160
158	plt = m->dyn.plt_got;	161	plt = m->dyn.plt_got;
159	plt_n = m->dyn.plt_rel_sz / sizeof(elf_rela_t);	162	plt_n = m->dyn.plt_rel_sz / sizeof(elf_rela_t);
160	_plt_ent = plt+ 18;	163	_plt_ent = plt+ 18;
161	_plt_table = plt + 18 + plt_n;	164	_plt_table = plt + 18 + plt_n;
162		165
163	DPRINTF("parse relocation table\n");	166	DPRINTF("parse relocation table\n");
164		167
165	sym_table = m->dyn.sym_tab;	168	sym_table = m->dyn.sym_tab;
166	rt_entries = rt_size / sizeof(elf_rela_t);	169	rt_entries = rt_size / sizeof(elf_rela_t);
167	str_tab = m->dyn.str_tab;	170	str_tab = m->dyn.str_tab;
168		171
169	DPRINTF("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);	172	DPRINTF("address: 0x%x, entries: %d\n", (uintptr_t)rt, rt_entries);
170		173
171	for (i = 0; i < rt_entries; ++i) {	174	for (i = 0; i < rt_entries; ++i) {
172	DPRINTF("symbol %d: ", i);	175	DPRINTF("symbol %d: ", i);
173	r_offset = rt[i].r_offset;	176	r_offset = rt[i].r_offset;
174	r_info = rt[i].r_info;	177	r_info = rt[i].r_info;
175	r_addend = rt[i].r_addend;	178	r_addend = rt[i].r_addend;
176		179
177	sym_idx = ELF32_R_SYM(r_info);	180	sym_idx = ELF32_R_SYM(r_info);
178	sym = &sym_table[sym_idx];	181	sym = &sym_table[sym_idx];
179		182
180	DPRINTF("name '%s', value 0x%x, size 0x%x\n",	183	DPRINTF("name '%s', value 0x%x, size 0x%x\n",
181	str_tab + sym->st_name,	184	str_tab + sym->st_name,
182	sym->st_value,	185	sym->st_value,
183	sym->st_size);	186	sym->st_size);
184		187
185	rel_type = ELF32_R_TYPE(r_info);	188	rel_type = ELF32_R_TYPE(r_info);
186	r_ptr = (uint32_t *)(r_offset + m->bias);	189	r_ptr = (uint32_t *)(r_offset + m->bias);
-		190	r_ptr16 = (uint16_t *)(r_offset + m->bias);
187		191
188	if (sym->st_name != 0) {	192	if (sym->st_name != 0) {
189	DPRINTF("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);	193	DPRINTF("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);
190	sym_def = symbol_def_find(str_tab + sym->st_name,	194	sym_def = symbol_def_find(str_tab + sym->st_name,
191	m, &dest);	195	m, &dest);
192	DPRINTF("dest name: '%s'\n", dest->dyn.soname);	196	DPRINTF("dest name: '%s'\n", dest->dyn.soname);
193	DPRINTF("dest bias: 0x%x\n", dest->bias);	197	DPRINTF("dest bias: 0x%x\n", dest->bias);
194	if (sym_def) {	198	if (sym_def) {
195	sym_addr = symbol_get_addr(sym_def, dest);	199	sym_addr = symbol_get_addr(sym_def, dest);
196	DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);	200	DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
197	} else {	201	} else {
198	DPRINTF("symbol definition not found\n");	202	DPRINTF("symbol definition not found\n");
199	continue;	203	continue;
200	}	204	}
201	}	205	}
202		206
203	switch (rel_type) {	207	switch (rel_type) {
-		208	case R_PPC_ADDR16_LO:
-		209	DPRINTF("fixup R_PPC_ADDR16_LO (#lo(s+a))\n");
-		210	*r_ptr16 = (sym_addr + r_addend) & 0xffff;
-		211	break;
-		212
-		213	case R_PPC_ADDR16_HI:
-		214	DPRINTF("fixup R_PPC_ADDR16_HI (#hi(s+a))\n");
-		215	*r_ptr16 = (sym_addr + r_addend) >> 16;
-		216	break;
-		217
-		218	case R_PPC_ADDR16_HA:
-		219	DPRINTF("fixup R_PPC_ADDR16_HA (#ha(s+a))\n");
-		220	t_addr = sym_addr + r_addend;
-		221	*r_ptr16 = (t_addr >> 16) + ((t_addr & 0x8000) ? 1 : 0);
-		222	break;
-		223
204	case R_PPC_JMP_SLOT:	224	case R_PPC_JMP_SLOT:
205	DPRINTF("fixup R_PPC_JMP_SLOT (b+v)\n");	225	DPRINTF("fixup R_PPC_JMP_SLOT (b+v)\n");
206	pidx = (r_ptr - _plt_ent) / 2;	226	pidx = (r_ptr - _plt_ent) / 2;
207	if (pidx >= plt_n) {	227	if (pidx >= plt_n) {
208	DPRINTF("error: proc index out of range\n");	228	DPRINTF("error: proc index out of range\n");
209	//kputint(0xee00ee0ee00);	229	//kputint(0xee00ee0ee00);
210	while(1);	230	while(1);
211	}	231	}
212	//_plt_table[pidx] = sym_addr;	232	//_plt_table[pidx] = sym_addr;
213	plt[18+2pidx] = _b((void )sym_addr, &plt[18+2*pidx]);	233	plt[18+2pidx] = _b((void )sym_addr, &plt[18+2*pidx]);
214	break;	234	break;
215		235
216	case R_PPC_ADDR32:	236	case R_PPC_ADDR32:
217	DPRINTF("fixup R_PPC_ADDR32 (b+v+a)\n");	237	DPRINTF("fixup R_PPC_ADDR32 (b+v+a)\n");
218	*r_ptr = r_addend + sym_addr;	238	*r_ptr = r_addend + sym_addr;
219	break;	239	break;
-		240
-		241	case R_PPC_COPY:
-		242	/*
-		243	* Copy symbol data from shared object to specified
-		244	* location.
-		245	*/
-		246	DPRINTF("fixup R_PPC_COPY (s)\n");
-		247	sym_size = sym->st_size;
-		248	if (sym_size != sym_def->st_size) {
-		249	printf("warning: mismatched symbol sizes\n");
-		250	/* Take the lower value. */
-		251	if (sym_size > sym_def->st_size)
-		252	sym_size = sym_def->st_size;
-		253	}
-		254	memcpy(r_ptr, (const void *)sym_addr, sym_size);
-		255	break;
220		256
221	case R_PPC_RELATIVE:	257	case R_PPC_RELATIVE:
222	DPRINTF("fixup R_PPC_RELATIVE (b+a)\n");	258	DPRINTF("fixup R_PPC_RELATIVE (b+a)\n");
223	*r_ptr = r_addend + m->bias;	259	*r_ptr = r_addend + m->bias;
224	break;	260	break;
225	case R_PPC_REL24:	261	case R_PPC_REL24:
226	// printf("ignore R_PPC_REL24 at 0x%04x\n", (uintptr_t) r_ptr);	262	// printf("ignore R_PPC_REL24 at 0x%04x\n", (uintptr_t) r_ptr);
227	*r_ptr = (sym_addr + r_addend - (uint32_t)r_ptr) >> 2;	263	*r_ptr = (sym_addr + r_addend - (uint32_t)r_ptr) >> 2;
228	DPRINTF("fixup R_PPC_REL24 (s+a-p)>>2\n");	264	DPRINTF("fixup R_PPC_REL24 (s+a-p)>>2\n");
229	/TODO/	265	/TODO/
230	break;	266	break;
231	default:	267	default:
232	printf("unknown relocation type\n");	268	printf("unknown relocation type %d\n", rel_type);
233	break;	269	break;
234	}	270	}
235	}	271	}
236		272
237	/*	273	/*
238	* Synchronize the used portion of PLT. This is necessary since	274	* Synchronize the used portion of PLT. This is necessary since
239	* we are writing instructions.	275	* we are writing instructions.
240	*/	276	*/
241	smc_coherence(&plt[18], plt_n * 2 * sizeof(uint32_t));	277	smc_coherence(&plt[18], plt_n * 2 * sizeof(uint32_t));
242	}	278	}
243		279
244	/** @}	280	/** @}
245	*/	281	*/
246		282

Subversion Repositories HelenOS

(root)/branches/dynload/uspace/lib/rtld/arch/ppc32/src/reloc.c – Rev 3663 → 3681