deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* Add cle_info argument to cle_write_reloc.

Browse source
This commit is contained in:
bg- 2007-06-04 17:47:56 +00:00
parent c22b261b12
commit 0f3f14f159
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/loader/cle.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)$Id: cle.c,v 1.6 2007/04/26 13:37:28 bg- Exp $ * @(#)$Id: cle.c,v 1.7 2007/06/04 17:48:19 bg- Exp $
*/ */
/* /*
@ -260,7 +260,7 @@ cle_relocate(struct cle_info *info,
addr += rela.r_addend; addr += rela.r_addend;
ret = cle_write_reloc(segmem + rela.r_offset, &rela, addr); ret = cle_write_reloc(segmem + rela.r_offset, &rela, addr, info);
if(ret != CLE_OK) { if(ret != CLE_OK) {
return ret; return ret;
} }

7
core/loader/cle.h
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)$Id: cle.h,v 1.6 2007/05/15 10:28:03 bg- Exp $ * @(#)$Id: cle.h,v 1.7 2007/06/04 17:47:56 bg- Exp $
*/ */
#ifndef CLE_H #ifndef CLE_H
@ -92,7 +92,10 @@ cle_lookup(struct cle_info *info,
struct elf32_rela; /* Struct forward decl. */ struct elf32_rela; /* Struct forward decl. */
int cle_write_reloc(unsigned char *, const struct elf32_rela *, cle_addr); int cle_write_reloc(void *,
const struct elf32_rela *,
cle_addr,
const struct cle_info *);
/* /*
* Error codes that apply in general to linking and loading. * Error codes that apply in general to linking and loading.

7
core/loader/cle_msp430.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)$Id: cle_msp430.c,v 1.1 2007/04/26 13:38:00 bg- Exp $ * @(#)$Id: cle_msp430.c,v 1.2 2007/06/04 17:48:32 bg- Exp $
*/ */
/* /*
@ -54,9 +54,10 @@
* specific! * specific!
*/ */
int int
cle_write_reloc(unsigned char *pos, cle_write_reloc(void *pos,
const struct elf32_rela *rela, const struct elf32_rela *rela,
cle_addr addr) cle_addr addr,
const struct cle_info *info)
{ {
memcpy(pos, &addr, 2); /* Write reloc */ memcpy(pos, &addr, 2); /* Write reloc */
return CLE_OK; return CLE_OK;