Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a66af298 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: merge the non-mmu and mmu versions of module.c 



The non-mmu and mmu versions of the module loader module.c are
nearly identical. Merge them back to a single module.c. There is
a little bit of re-ordering of the struct and enum definitions in
module.h to keep the ifdefery to a minimum.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 6617eaf3

arch/m68k/include/asm/module.h

+13 −18
Original line number Original line Diff line number Diff line 
#ifndef _ASM_M68K_MODULE_H

#ifndef _ASM_M68K_MODULE_H

#define _ASM_M68K_MODULE_H

#define _ASM_M68K_MODULE_H





#ifdef CONFIG_MMU

enum m68k_fixup_type {

	m68k_fixup_memoffset,

	m68k_fixup_vnode_shift,

};



struct m68k_fixup_info {

	enum m68k_fixup_type type;

	void *addr;

};





struct mod_arch_specific {

struct mod_arch_specific {

	struct m68k_fixup_info *fixup_start, *fixup_end;

	struct m68k_fixup_info *fixup_start, *fixup_end;

};

};





#ifdef CONFIG_MMU



#define MODULE_ARCH_INIT {				\

#define MODULE_ARCH_INIT {				\

	.fixup_start		= __start_fixup,	\

	.fixup_start		= __start_fixup,	\

	.fixup_end		= __stop_fixup,		\

	.fixup_end		= __stop_fixup,		\

}

}









enum m68k_fixup_type {

	m68k_fixup_memoffset,

	m68k_fixup_vnode_shift,

};



struct m68k_fixup_info {

	enum m68k_fixup_type type;

	void *addr;

};



#define m68k_fixup(type, addr)			\

#define m68k_fixup(type, addr)			\

	"	.section \".m68k_fixup\",\"aw\"\n"	\

	"	.section \".m68k_fixup\",\"aw\"\n"	\

	"	.long " #type "," #addr "\n"	\

	"	.long " #type "," #addr "\n"	\

	"	.previous\n"

	"	.previous\n"





#endif /* CONFIG_MMU */



extern struct m68k_fixup_info __start_fixup[], __stop_fixup[];

extern struct m68k_fixup_info __start_fixup[], __stop_fixup[];





struct module;

struct module;

extern void module_fixup(struct module *mod, struct m68k_fixup_info *start,

extern void module_fixup(struct module *mod, struct m68k_fixup_info *start,

			 struct m68k_fixup_info *end);

			 struct m68k_fixup_info *end);





#else



struct mod_arch_specific {

};



#endif /* CONFIG_MMU */



#define Elf_Shdr Elf32_Shdr

#define Elf_Shdr Elf32_Shdr

#define Elf_Sym Elf32_Sym

#define Elf_Sym Elf32_Sym

#define Elf_Ehdr Elf32_Ehdr

#define Elf_Ehdr Elf32_Ehdr

arch/m68k/kernel/module.c

+127 −3
Original line number Original line Diff line number Diff line 
#ifdef CONFIG_MMU

/*

#include "module_mm.c"

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file COPYING in the main directory of this archive

 * for more details.

 */



#include <linux/moduleloader.h>

#include <linux/elf.h>

#include <linux/vmalloc.h>

#include <linux/fs.h>

#include <linux/string.h>

#include <linux/kernel.h>



#if 0

#define DEBUGP printk

#else

#else

#include "module_no.c"

#define DEBUGP(fmt...)

#endif



#ifdef CONFIG_MODULES



int apply_relocate(Elf32_Shdr *sechdrs,

		   const char *strtab,

		   unsigned int symindex,

		   unsigned int relsec,

		   struct module *me)

{

	unsigned int i;

	Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;

	Elf32_Sym *sym;

	uint32_t *location;



	DEBUGP("Applying relocate section %u to %u\n", relsec,

	       sechdrs[relsec].sh_info);

	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {

		/* This is where to make the change */

		location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr

			+ rel[i].r_offset;

		/* This is the symbol it is referring to.  Note that all

		   undefined symbols have been resolved.  */

		sym = (Elf32_Sym *)sechdrs[symindex].sh_addr

			+ ELF32_R_SYM(rel[i].r_info);



		switch (ELF32_R_TYPE(rel[i].r_info)) {

		case R_68K_32:

			/* We add the value into the location given */

			*location += sym->st_value;

			break;

		case R_68K_PC32:

			/* Add the value, subtract its postition */

			*location += sym->st_value - (uint32_t)location;

			break;

		default:

			printk(KERN_ERR "module %s: Unknown relocation: %u\n",

			       me->name, ELF32_R_TYPE(rel[i].r_info));

			return -ENOEXEC;

		}

	}

	return 0;

}



int apply_relocate_add(Elf32_Shdr *sechdrs,

		       const char *strtab,

		       unsigned int symindex,

		       unsigned int relsec,

		       struct module *me)

{

	unsigned int i;

	Elf32_Rela *rel = (void *)sechdrs[relsec].sh_addr;

	Elf32_Sym *sym;

	uint32_t *location;



	DEBUGP("Applying relocate_add section %u to %u\n", relsec,

	       sechdrs[relsec].sh_info);

	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {

		/* This is where to make the change */

		location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr

			+ rel[i].r_offset;

		/* This is the symbol it is referring to.  Note that all

		   undefined symbols have been resolved.  */

		sym = (Elf32_Sym *)sechdrs[symindex].sh_addr

			+ ELF32_R_SYM(rel[i].r_info);



		switch (ELF32_R_TYPE(rel[i].r_info)) {

		case R_68K_32:

			/* We add the value into the location given */

			*location = rel[i].r_addend + sym->st_value;

			break;

		case R_68K_PC32:

			/* Add the value, subtract its postition */

			*location = rel[i].r_addend + sym->st_value - (uint32_t)location;

			break;

		default:

			printk(KERN_ERR "module %s: Unknown relocation: %u\n",

			       me->name, ELF32_R_TYPE(rel[i].r_info));

			return -ENOEXEC;

		}

	}

	return 0;

}



int module_finalize(const Elf_Ehdr *hdr,

		    const Elf_Shdr *sechdrs,

		    struct module *mod)

{

	module_fixup(mod, mod->arch.fixup_start, mod->arch.fixup_end);

	return 0;

}



#endif /* CONFIG_MODULES */



void module_fixup(struct module *mod, struct m68k_fixup_info *start,

		  struct m68k_fixup_info *end)

{

#ifdef CONFIG_MMU

	struct m68k_fixup_info *fixup;



	for (fixup = start; fixup < end; fixup++) {

		switch (fixup->type) {

		case m68k_fixup_memoffset:

			*(u32 *)fixup->addr = m68k_memoffset;

			break;

		case m68k_fixup_vnode_shift:

			*(u16 *)fixup->addr += m68k_virt_to_node_shift;

			break;

		}

	}

#endif

#endif

}

arch/m68k/kernel/module_mm.c

deleted100644 → 0
+0 −128
Original line number Original line Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file COPYING in the main directory of this archive

 * for more details.

 */



#include <linux/moduleloader.h>

#include <linux/elf.h>

#include <linux/vmalloc.h>

#include <linux/fs.h>

#include <linux/string.h>

#include <linux/kernel.h>



#if 0

#define DEBUGP printk

#else

#define DEBUGP(fmt...)

#endif



#ifdef CONFIG_MODULES



int apply_relocate(Elf32_Shdr *sechdrs,

		   const char *strtab,

		   unsigned int symindex,

		   unsigned int relsec,

		   struct module *me)

{

	unsigned int i;

	Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;

	Elf32_Sym *sym;

	uint32_t *location;



	DEBUGP("Applying relocate section %u to %u\n", relsec,

	       sechdrs[relsec].sh_info);

	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {

		/* This is where to make the change */

		location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr

			+ rel[i].r_offset;

		/* This is the symbol it is referring to.  Note that all

		   undefined symbols have been resolved.  */

		sym = (Elf32_Sym *)sechdrs[symindex].sh_addr

			+ ELF32_R_SYM(rel[i].r_info);



		switch (ELF32_R_TYPE(rel[i].r_info)) {

		case R_68K_32:

			/* We add the value into the location given */

			*location += sym->st_value;

			break;

		case R_68K_PC32:

			/* Add the value, subtract its postition */

			*location += sym->st_value - (uint32_t)location;

			break;

		default:

			printk(KERN_ERR "module %s: Unknown relocation: %u\n",

			       me->name, ELF32_R_TYPE(rel[i].r_info));

			return -ENOEXEC;

		}

	}

	return 0;

}



int apply_relocate_add(Elf32_Shdr *sechdrs,

		       const char *strtab,

		       unsigned int symindex,

		       unsigned int relsec,

		       struct module *me)

{

	unsigned int i;

	Elf32_Rela *rel = (void *)sechdrs[relsec].sh_addr;

	Elf32_Sym *sym;

	uint32_t *location;



	DEBUGP("Applying relocate_add section %u to %u\n", relsec,

	       sechdrs[relsec].sh_info);

	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {

		/* This is where to make the change */

		location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr

			+ rel[i].r_offset;

		/* This is the symbol it is referring to.  Note that all

		   undefined symbols have been resolved.  */

		sym = (Elf32_Sym *)sechdrs[symindex].sh_addr

			+ ELF32_R_SYM(rel[i].r_info);



		switch (ELF32_R_TYPE(rel[i].r_info)) {

		case R_68K_32:

			/* We add the value into the location given */

			*location = rel[i].r_addend + sym->st_value;

			break;

		case R_68K_PC32:

			/* Add the value, subtract its postition */

			*location = rel[i].r_addend + sym->st_value - (uint32_t)location;

			break;

		default:

			printk(KERN_ERR "module %s: Unknown relocation: %u\n",

			       me->name, ELF32_R_TYPE(rel[i].r_info));

			return -ENOEXEC;

		}

	}

	return 0;

}



int module_finalize(const Elf_Ehdr *hdr,

		    const Elf_Shdr *sechdrs,

		    struct module *mod)

{

	module_fixup(mod, mod->arch.fixup_start, mod->arch.fixup_end);



	return 0;

}



#endif /* CONFIG_MODULES */



void module_fixup(struct module *mod, struct m68k_fixup_info *start,

		  struct m68k_fixup_info *end)

{

	struct m68k_fixup_info *fixup;



	for (fixup = start; fixup < end; fixup++) {

		switch (fixup->type) {

		case m68k_fixup_memoffset:

			*(u32 *)fixup->addr = m68k_memoffset;

			break;

		case m68k_fixup_vnode_shift:

			*(u16 *)fixup->addr += m68k_virt_to_node_shift;

			break;

		}

	}

}

arch/m68k/kernel/module_no.c

deleted100644 → 0
+0 −92
Original line number Original line Diff line number Diff line 
#include <linux/moduleloader.h>

#include <linux/elf.h>

#include <linux/vmalloc.h>

#include <linux/fs.h>

#include <linux/string.h>

#include <linux/kernel.h>



#if 0

#define DEBUGP printk

#else

#define DEBUGP(fmt...)

#endif



int apply_relocate(Elf32_Shdr *sechdrs,

		   const char *strtab,

		   unsigned int symindex,

		   unsigned int relsec,

		   struct module *me)

{

	unsigned int i;

	Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;

	Elf32_Sym *sym;

	uint32_t *location;



	DEBUGP("Applying relocate section %u to %u\n", relsec,

	       sechdrs[relsec].sh_info);

	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {

		/* This is where to make the change */

		location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr

			+ rel[i].r_offset;

		/* This is the symbol it is referring to.  Note that all

		   undefined symbols have been resolved.  */

		sym = (Elf32_Sym *)sechdrs[symindex].sh_addr

			+ ELF32_R_SYM(rel[i].r_info);



		switch (ELF32_R_TYPE(rel[i].r_info)) {

		case R_68K_32:

			/* We add the value into the location given */

			*location += sym->st_value;

			break;

		case R_68K_PC32:

			/* Add the value, subtract its postition */

			*location += sym->st_value - (uint32_t)location;

			break;

		default:

			printk(KERN_ERR "module %s: Unknown relocation: %u\n",

			       me->name, ELF32_R_TYPE(rel[i].r_info));

			return -ENOEXEC;

		}

	}

	return 0;

}



int apply_relocate_add(Elf32_Shdr *sechdrs,

		       const char *strtab,

		       unsigned int symindex,

		       unsigned int relsec,

		       struct module *me)

{

	unsigned int i;

	Elf32_Rela *rel = (void *)sechdrs[relsec].sh_addr;

	Elf32_Sym *sym;

	uint32_t *location;



	DEBUGP("Applying relocate_add section %u to %u\n", relsec,

	       sechdrs[relsec].sh_info);

	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {

		/* This is where to make the change */

		location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr

			+ rel[i].r_offset;

		/* This is the symbol it is referring to.  Note that all

		   undefined symbols have been resolved.  */

		sym = (Elf32_Sym *)sechdrs[symindex].sh_addr

			+ ELF32_R_SYM(rel[i].r_info);



		switch (ELF32_R_TYPE(rel[i].r_info)) {

		case R_68K_32:

			/* We add the value into the location given */

			*location = rel[i].r_addend + sym->st_value;

			break;

		case R_68K_PC32:

			/* Add the value, subtract its postition */

			*location = rel[i].r_addend + sym->st_value - (uint32_t)location;

			break;

		default:

			printk(KERN_ERR "module %s: Unknown relocation: %u\n",

			       me->name, ELF32_R_TYPE(rel[i].r_info));

			return -ENOEXEC;

		}

	}

	return 0;

}