From 5d3baef0d2517214b51f4abff5be931408805efa Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Mon, 18 Dec 2006 11:45:47 +0000 Subject: [PATCH] Removed old elfloader.c and replaced with the current code (previously in elfloader-tmp.c) --- core/loader/elfloader-tmp.c | 493 ------------------------------------ cpu/msp430/Makefile.msp430 | 4 +- 2 files changed, 2 insertions(+), 495 deletions(-) delete mode 100644 core/loader/elfloader-tmp.c diff --git a/core/loader/elfloader-tmp.c b/core/loader/elfloader-tmp.c deleted file mode 100644 index 47fa195f2..000000000 --- a/core/loader/elfloader-tmp.c +++ /dev/null @@ -1,493 +0,0 @@ -/* - * Copyright (c) 2005, Swedish Institute of Computer Science - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``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 INSTITUTE OR CONTRIBUTORS 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. - * - * This file is part of the Contiki operating system. - * - * @(#)$Id: elfloader-tmp.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $ - */ - -#include "contiki.h" - -#include "loader/elfloader-tmp.h" -#include "loader/elfloader-arch.h" - -#include "cfs/cfs.h" -#include "loader/symtab.h" - -#include -#include -#include - -#if 0 -#include -#define PRINTF(...) printf(__VA_ARGS__) -#else -#define PRINTF(...) do {} while (0) -#endif - -#define EI_NIDENT 16 - - -struct elf32_ehdr { - unsigned char e_ident[EI_NIDENT]; /* ident bytes */ - elf32_half e_type; /* file type */ - elf32_half e_machine; /* target machine */ - elf32_word e_version; /* file version */ - elf32_addr e_entry; /* start address */ - elf32_off e_phoff; /* phdr file offset */ - elf32_off e_shoff; /* shdr file offset */ - elf32_word e_flags; /* file flags */ - elf32_half e_ehsize; /* sizeof ehdr */ - elf32_half e_phentsize; /* sizeof phdr */ - elf32_half e_phnum; /* number phdrs */ - elf32_half e_shentsize; /* sizeof shdr */ - elf32_half e_shnum; /* number shdrs */ - elf32_half e_shstrndx; /* shdr string index */ -}; - -/* Values for e_type. */ -#define ET_NONE 0 /* Unknown type. */ -#define ET_REL 1 /* Relocatable. */ -#define ET_EXEC 2 /* Executable. */ -#define ET_DYN 3 /* Shared object. */ -#define ET_CORE 4 /* Core file. */ - -struct elf32_shdr { - elf32_word sh_name; /* section name */ - elf32_word sh_type; /* SHT_... */ - elf32_word sh_flags; /* SHF_... */ - elf32_addr sh_addr; /* virtual address */ - elf32_off sh_offset; /* file offset */ - elf32_word sh_size; /* section size */ - elf32_word sh_link; /* misc info */ - elf32_word sh_info; /* misc info */ - elf32_word sh_addralign; /* memory alignment */ - elf32_word sh_entsize; /* entry size if table */ -}; - -/* sh_type */ -#define SHT_NULL 0 /* inactive */ -#define SHT_PROGBITS 1 /* program defined information */ -#define SHT_SYMTAB 2 /* symbol table section */ -#define SHT_STRTAB 3 /* string table section */ -#define SHT_RELA 4 /* relocation section with addends*/ -#define SHT_HASH 5 /* symbol hash table section */ -#define SHT_DYNAMIC 6 /* dynamic section */ -#define SHT_NOTE 7 /* note section */ -#define SHT_NOBITS 8 /* no space section */ -#define SHT_REL 9 /* relation section without addends */ -#define SHT_SHLIB 10 /* reserved - purpose unknown */ -#define SHT_DYNSYM 11 /* dynamic symbol table section */ -#define SHT_LOPROC 0x70000000 /* reserved range for processor */ -#define SHT_HIPROC 0x7fffffff /* specific section header types */ -#define SHT_LOUSER 0x80000000 /* reserved range for application */ -#define SHT_HIUSER 0xffffffff /* specific indexes */ - -struct elf32_rel { - elf32_addr r_offset; /* Location to be relocated. */ - elf32_word r_info; /* Relocation type and symbol index. */ -}; - -struct elf32_sym { - elf32_word st_name; /* String table index of name. */ - elf32_addr st_value; /* Symbol value. */ - elf32_word st_size; /* Size of associated object. */ - unsigned char st_info; /* Type and binding information. */ - unsigned char st_other; /* Reserved (not used). */ - elf32_half st_shndx; /* Section index of symbol. */ -}; - -#define ELF32_R_SYM(info) ((info) >> 8) -#define ELF32_R_TYPE(info) ((unsigned char)(info)) - -struct relevant_section { - unsigned char number; - unsigned int offset; - char *address; -}; - -char elfloader_unknown[30]; /* Name that caused link error. */ - -struct process **elfloader_autostart_processes; - -static struct relevant_section bss, data, text; - -const static unsigned char elf_magic_header[] = - {0x7f, 0x45, 0x4c, 0x46, /* 0x7f, 'E', 'L', 'F' */ - 0x01, /* Only 32-bit objects. */ - 0x01, /* Only LSB data. */ - 0x01, /* Only ELF version 1. */ - }; - -/*---------------------------------------------------------------------------*/ -static void -seek_read(int fd, unsigned int offset, char *buf, int len) -{ - cfs_seek(fd, offset); - cfs_read(fd, buf, len); -} -/*---------------------------------------------------------------------------*/ -/* -static void -seek_write(int fd, unsigned int offset, char *buf, int len) -{ - cfs_seek(fd, offset); - cfs_write(fd, buf, len); -} -*/ -/*---------------------------------------------------------------------------*/ -static void * -find_local_symbol(int fd, const char *symbol, - unsigned int symtab, unsigned short symtabsize, - unsigned int strtab) -{ - struct elf32_sym s; - unsigned int a; - char name[30]; - struct relevant_section *sect; - - for(a = symtab; a < symtab + symtabsize; a += sizeof(s)) { - seek_read(fd, a, (char *)&s, sizeof(s)); - - if(s.st_name != 0) { - seek_read(fd, strtab + s.st_name, name, sizeof(name)); - if(strcmp(name, symbol) == 0) { - if(s.st_shndx == bss.number) { - sect = &bss; - } else if(s.st_shndx == data.number) { - sect = &data; - } else if(s.st_shndx == text.number) { - sect = &text; - } else { - return NULL; - } - return &(sect->address[s.st_value]); - } - } - } - return NULL; -} -/*---------------------------------------------------------------------------*/ -static int -relocate_section(int fd, - unsigned int section, unsigned short size, - unsigned int sectionaddr, - unsigned int strs, - unsigned int strtab, - unsigned int symtab, unsigned short symtabsize) -{ - struct elf32_rela rela; - struct elf32_sym s; - unsigned int a; - char name[30]; - char *addr; - struct relevant_section *sect; - - for(a = section; a < section + size; a += sizeof(struct elf32_rela)) { - seek_read(fd, a, (char *)&rela, sizeof(rela)); - seek_read(fd, - symtab + sizeof(struct elf32_sym) * ELF32_R_SYM(rela.r_info), - (char *)&s, sizeof(s)); - if(s.st_name != 0) { - seek_read(fd, strtab + s.st_name, name, sizeof(name)); - PRINTF("name: %s\n", name); - addr = (char *)symtab_lookup(name); - /* ADDED */ - if(addr == NULL) { - PRINTF("name not found in global: %s\n", name); - addr = find_local_symbol(fd, name, symtab, symtabsize, strtab); - PRINTF("found address %p\n", addr); - } - if(addr == NULL) { - if(s.st_shndx == bss.number) { - sect = &bss; - } else if(s.st_shndx == data.number) { - sect = &data; - } else if(s.st_shndx == text.number) { - sect = &text; - } else { - PRINTF("elfloader unknown name: '%30s'\n", name); - memcpy(elfloader_unknown, name, sizeof(elfloader_unknown)); - elfloader_unknown[sizeof(elfloader_unknown) - 1] = 0; - return ELFLOADER_SYMBOL_NOT_FOUND; - } - addr = sect->address; - } - } else { - if(s.st_shndx == bss.number) { - sect = &bss; - } else if(s.st_shndx == data.number) { - sect = &data; - } else if(s.st_shndx == text.number) { - sect = &text; - } else { - return ELFLOADER_SEGMENT_NOT_FOUND; - } - - addr = sect->address; - } - - elfloader_arch_relocate(fd, sectionaddr, &rela, addr); - - } - return ELFLOADER_OK; -} -/*---------------------------------------------------------------------------*/ -static void * -find_program_processes(int fd, - unsigned int symtab, unsigned short size, - unsigned int strtab) -{ - struct elf32_sym s; - unsigned int a; - char name[30]; - - for(a = symtab; a < symtab + size; a += sizeof(s)) { - seek_read(fd, a, (char *)&s, sizeof(s)); - - if(s.st_name != 0) { - seek_read(fd, strtab + s.st_name, name, sizeof(name)); - if(strcmp(name, "autostart_processes") == 0) { - return &data.address[s.st_value]; - } - } - } - return NULL; -/* return find_local_symbol(fd, "autostart_processes", symtab, size, strtab); */ -} -/*---------------------------------------------------------------------------*/ -void -elfloader_init(void) -{ - elfloader_autostart_processes = NULL; -} -/*---------------------------------------------------------------------------*/ -#if 0 -static void -print_chars(unsigned char *ptr, int num) -{ - int i; - for(i = 0; i < num; ++i) { - PRINTF("%d", ptr[i]); - if(i == num - 1) { - PRINTF("\n"); - } else { - PRINTF(", "); - } - } -} -#endif /* 0 */ -/*---------------------------------------------------------------------------*/ -int -elfloader_load(int fd) -{ - struct elf32_ehdr ehdr; - struct elf32_shdr shdr; - struct elf32_shdr strtable; - unsigned int strs; - unsigned int shdrptr; - unsigned int nameptr; - char name[12]; - - int i; - unsigned short shdrnum, shdrsize; - - unsigned short textoff = 0, textsize, textrelaoff = 0, textrelasize; - unsigned short dataoff = 0, datasize, datarelaoff = 0, datarelasize; - unsigned short symtaboff = 0, symtabsize; - unsigned short strtaboff = 0, strtabsize; - unsigned short bsssize = 0; - - struct process **process; - int ret; - - elfloader_unknown[0] = 0; - - /* The ELF header is located at the start of the buffer. */ - seek_read(fd, 0, (char *)&ehdr, sizeof(ehdr)); - - /* print_chars(ehdr.e_ident, sizeof(elf_magic_header)); - print_chars(elf_magic_header, sizeof(elf_magic_header));*/ - /* Make sure that we have a correct and compatible ELF header. */ - if(memcmp(ehdr.e_ident, elf_magic_header, sizeof(elf_magic_header)) != 0) { - PRINTF("ELF header problems\n"); - return ELFLOADER_BAD_ELF_HEADER; - } - - /* Grab the section header. */ - shdrptr = ehdr.e_shoff; - seek_read(fd, shdrptr, (char *)&shdr, sizeof(shdr)); - - /* Get the size and number of entries of the section header. */ - shdrsize = ehdr.e_shentsize; - shdrnum = ehdr.e_shnum; - - /* The string table section: holds the names of the sections. */ - seek_read(fd, ehdr.e_shoff + shdrsize * ehdr.e_shstrndx, - (char *)&strtable, sizeof(strtable)); - - /* Get a pointer to the actual table of strings. This table holds - the names of the sections, not the names of other symbols in the - file (these are in the sybtam section). */ - strs = strtable.sh_offset; - - /* Go through all sections and pick out the relevant ones. The - ".text" segment holds the actual code from the ELF file, the - ".data" segment contains initialized data, the ".bss" segment - holds the size of the unitialized data segment. The ".rela.text" - and ".rela.data" segments contains relocation information for the - contents of the ".text" and ".data" segments, respectively. The - ".symtab" segment contains the symbol table for this file. The - ".strtab" segment points to the actual string names used by the - symbol table. - - In addition to grabbing pointers to the relevant sections, we - also save the section number for resolving addresses in the - relocator code. - */ - - - /* Initialize the segment sizes to zero so that we can check if - their sections was found in the file or not. */ - textsize = textrelasize = datasize = datarelasize = - symtabsize = strtabsize = 0; - - bss.number = data.number = text.number = 0; - - shdrptr = ehdr.e_shoff; - for(i = 0; i < shdrnum; ++i) { - - seek_read(fd, shdrptr, (char *)&shdr, sizeof(shdr)); - - /* The name of the section is contained in the strings table. */ - nameptr = strs + shdr.sh_name; - seek_read(fd, nameptr, name, sizeof(name)); - - /* Match the name of the section with a predefined set of names - (.text, .data, .bss, .rela.text, .rela.data, .symtab, and - .strtab). */ - - if(strncmp(name, ".text", 5) == 0) { - textoff = shdr.sh_offset; - textsize = shdr.sh_size; - text.number = i; - text.offset = textoff; - } else if(strncmp(name, ".rela.text", 10) == 0) { - textrelaoff = shdr.sh_offset; - textrelasize = shdr.sh_size; - } else if(strncmp(name, ".data", 5) == 0) { - dataoff = shdr.sh_offset; - datasize = shdr.sh_size; - data.number = i; - data.offset = dataoff; - } else if(strncmp(name, ".rela.data", 10) == 0) { - datarelaoff = shdr.sh_offset; - datarelasize = shdr.sh_size; - } else if(strncmp(name, ".symtab", 7) == 0) { - symtaboff = shdr.sh_offset; - symtabsize = shdr.sh_size; - } else if(strncmp(name, ".strtab", 7) == 0) { - strtaboff = shdr.sh_offset; - strtabsize = shdr.sh_size; - } else if(strncmp(name, ".bss", 4) == 0) { - bsssize = shdr.sh_size; - bss.number = i; - bss.offset = 0; - } - - /* Move on to the next section header. */ - shdrptr += shdrsize; - } - - if(symtabsize == 0) { - return ELFLOADER_NO_SYMTAB; - } - if(strtabsize == 0) { - return ELFLOADER_NO_STRTAB; - } - if(textsize == 0) { - return ELFLOADER_NO_TEXT; - } - - bss.address = (char *)elfloader_arch_allocate_ram(bsssize + datasize); - data.address = (char *)bss.address + bsssize; - text.address = (char *)elfloader_arch_allocate_rom(textsize); - - - /* If we have text segment relocations, we process them. */ - PRINTF("elfloader: relocate text\n"); - if(textrelasize > 0) { - ret = relocate_section(fd, - textrelaoff, textrelasize, - textoff, - strs, - strtaboff, - symtaboff, symtabsize); - if(ret != ELFLOADER_OK) { - return ret; - } - } - - /* If we have any data segment relocations, we process them too. */ - PRINTF("elfloader: relocate data\n"); - if(datarelasize > 0) { - ret = relocate_section(fd, - datarelaoff, datarelasize, - dataoff, - strs, - strtaboff, - symtaboff, symtabsize); - if(ret != ELFLOADER_OK) { - PRINTF("elfloader: data failed\n"); - return ret; - } - } - - /* Write text segment into flash and data segment into RAM. */ - cfs_seek(fd, textoff); - elfloader_arch_write_text(fd, textsize, text.address); - - memset(bss.address, 0, bsssize); - seek_read(fd, dataoff, data.address, datasize); - - PRINTF("elfloader: autostart search\n"); - process = find_local_symbol(fd, "autostart_processes", symtaboff, symtabsize, strtaboff); - if(process != NULL) { - PRINTF("elfloader: autostart found\n"); - elfloader_autostart_processes = process; - return ELFLOADER_OK; - } else { - PRINTF("elfloader: no autostart\n"); - process = find_program_processes(fd, symtaboff, symtabsize, strtaboff); - if(process != NULL) { - PRINTF("elfloader: FOUND PRG\n"); - } - return ELFLOADER_NO_STARTPOINT; - } -} -/*---------------------------------------------------------------------------*/ diff --git a/cpu/msp430/Makefile.msp430 b/cpu/msp430/Makefile.msp430 index 23717b77a..5ca539e2d 100644 --- a/cpu/msp430/Makefile.msp430 +++ b/cpu/msp430/Makefile.msp430 @@ -1,4 +1,4 @@ -# $Id: Makefile.msp430,v 1.7 2006/10/09 09:15:48 adamdunkels Exp $ +# $Id: Makefile.msp430,v 1.8 2006/12/18 11:48:18 adamdunkels Exp $ ### Check if we are running under Windows @@ -27,7 +27,7 @@ UIPDRIVERS = me.c me_tabs.c slip.c crc16.c #UIPDRIVERS = me.c me_tabs.c crc16.c ppp/ahdlc.c ppp/ipcp.c ppp/lcp.c ppp/pap.c ppp/ppp.c ppp/ppp_process.c SYSAPPS = codeprop-tmp.c APPDIRS += $(CONTIKI)/apps/codeprop -#ELFLOADER = loader-arch.c elfloader-tmp.c elfloader-msp430.c symtab.c +#ELFLOADER = loader-arch.c elfloader.c elfloader-msp430.c symtab.c ELFLOADER = elfloader-tmp.c elfloader-msp430.c symtab.c TARGETLIBS = random.c serial.c