Seperate out the startup stuff from the non-startup stuff.

Begin converting some big ugly macros to inline functions
instead

1 files changed, 83 insertions, 0 deletions

diff --git a/ldso/ldso/mips/dl-startup.h b/ldso/ldso/mips/dl-startup.h
index 886f8b8b8..21c9074e1 100644
--- a/ldso/ldso/mips/dl-startup.h
+++ b/ldso/ldso/mips/dl-startup.h
@@ -35,3 +35,86 @@ asm("" \
 );
 
 #define DL_BOOT(X)   static void __attribute__ ((unused)) _dl_boot2 (X)
+
+/*
+ * Get a pointer to the argv array.  On many platforms this can be just
+ * the address if the first argument, on other platforms we need to
+ * do something a little more subtle here.
+ */
+#define GET_ARGV(ARGVP, ARGS) ARGVP = ((unsigned long *) ARGS)
+
+
+/*
+ * Here is a macro to perform the GOT relocation. This is only
+ * used when bootstrapping the dynamic loader.
+ */
+#define PERFORM_BOOTSTRAP_GOT(got)						\
+do {										\
+	Elf32_Sym *sym;								\
+	unsigned long i;							\
+										\
+	/* Add load address displacement to all local GOT entries */		\
+	i = 2;									\
+	while (i < tpnt->mips_local_gotno)					\
+		got[i++] += load_addr;						\
+										\
+	/* Handle global GOT entries */						\
+	got += tpnt->mips_local_gotno;						\
+	sym = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] +			\
+		 load_addr) + tpnt->mips_gotsym;				\
+	i = tpnt->mips_symtabno - tpnt->mips_gotsym;				\
+										\
+	while (i--) {								\
+		if (sym->st_shndx == SHN_UNDEF ||				\
+			sym->st_shndx == SHN_COMMON)				\
+			*got = load_addr + sym->st_value;			\
+		else if (ELF32_ST_TYPE(sym->st_info) == STT_FUNC &&		\
+			*got != sym->st_value)					\
+			*got += load_addr;					\
+		else if (ELF32_ST_TYPE(sym->st_info) == STT_SECTION) {		\
+			if (sym->st_other == 0)					\
+				*got += load_addr;				\
+		}								\
+		else								\
+			*got = load_addr + sym->st_value;			\
+										\
+		got++;								\
+		sym++;								\
+	}									\
+} while (0)
+
+
+/*
+ * Here is a macro to perform a relocation.  This is only used when
+ * bootstrapping the dynamic loader.
+ */
+#define PERFORM_BOOTSTRAP_RELOC(RELP,REL,SYMBOL,LOAD,SYMTAB)			\
+	switch(ELF32_R_TYPE((RELP)->r_info)) {					\
+	case R_MIPS_REL32:							\
+		if (symtab_index) {						\
+			if (symtab_index < tpnt->mips_gotsym)			\
+				*REL += SYMBOL;					\
+		}								\
+		else {								\
+			*REL += LOAD;						\
+		}								\
+		break;								\
+	case R_MIPS_NONE:							\
+		break;								\
+	default:								\
+		SEND_STDERR("Aiieeee!");					\
+		_dl_exit(1);							\
+	}
+
+
+/*
+ * Transfer control to the user's application, once the dynamic loader
+ * is done.  This routine has to exit the current function, then
+ * call the _dl_elf_main function. For MIPS, we do it in assembly
+ * because the stack doesn't get properly restored otherwise. Got look
+ * at boot1_arch.h
+ */
+#define START()
+
+
+