From: John Hodge (sonata) <tpg@mutabah.net>
Date: Tue, 6 Nov 2012 05:11:30 +0000 (+0800)
Subject: ld-acess/libc - Implimenting functions required by ARM eabi
X-Git-Tag: rel0.15~668
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=1409c5235c5228061ba6605fc1f41302f4f3fe78;p=tpg%2Facess2.git

ld-acess/libc - Implimenting functions required by ARM eabi
---

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index e252210d..bf2e9320 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -38,7 +38,7 @@ $(_BIN): $(OBJ) $(_LIBS)
 	@mkdir -p $(dir $(_BIN))
 	@echo [LD] -o $(BIN) $(OBJ)
 	@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ) $(shell $(CC) -print-libgcc-file-name)
-	@$(DISASM) -S $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
+	@$(DISASM) -D -S $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
 
 $(_OBJPREFIX)%.o: %.c
 	@echo [CC] -o $@
diff --git a/Usermode/Libraries/ld-acess.so_src/arch/armv7.S.h b/Usermode/Libraries/ld-acess.so_src/arch/armv7.S.h
index 46128b21..2c85b14e 100644
--- a/Usermode/Libraries/ld-acess.so_src/arch/armv7.S.h
+++ b/Usermode/Libraries/ld-acess.so_src/arch/armv7.S.h
@@ -39,6 +39,16 @@ __clear_cache:
 	svc #0x1001
 	mov pc, lr
 
+
+@ >r0: PC
+@ >r1: Pointer to item count
+@ <r0: Address
+@ STUBBED
+__gnu_Unwind_Find_exidx:
+	mov r0, #0
+	str r0, [r1]
+	mov pc, lr
+
 .section .data
 .globl _errno
 _errno:	.long	0	@ Placed in .text, to allow use of relative addressing
diff --git a/Usermode/Libraries/ld-acess.so_src/elf.c b/Usermode/Libraries/ld-acess.so_src/elf.c
index 9a2668a7..0b3656b2 100644
--- a/Usermode/Libraries/ld-acess.so_src/elf.c
+++ b/Usermode/Libraries/ld-acess.so_src/elf.c
@@ -260,7 +260,7 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename)
 	// - Will be reversed at the end of the function
 	for( i = 0; i < iSegmentCount; i ++ )
 	{
-		if(phtab[i].Type == PT_LOAD && phtab[i].Flags & PF_R ) {
+		if(phtab[i].Type == PT_LOAD && !(phtab[i].Flags & PF_W) ) {
 			uintptr_t	addr = phtab[i].VAddr + iBaseDiff;
 			uintptr_t	end = addr + phtab[i].MemSize;
 			for( ; addr < end; addr += PAGE_SIZE )
@@ -447,7 +447,8 @@ void *Elf32Relocate(void *Base, char **envp, const char *Filename)
 	// Re-set readonly
 	for( i = 0; i < iSegmentCount; i ++ )
 	{
-		if(phtab[i].Type == PT_LOAD && phtab[i].Flags & PF_R ) {
+		// If load and not writable
+		if(phtab[i].Type == PT_LOAD && !(phtab[i].Flags & PF_W) ) {
 			uintptr_t	addr = phtab[i].VAddr + iBaseDiff;
 			uintptr_t	end = addr + phtab[i].MemSize;
 			for( ; addr < end; addr += PAGE_SIZE )
@@ -705,12 +706,14 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename)
 	}
 
 	// Relocation function
+	auto int _Elf64DoReloc(Elf64_Xword r_info, void *ptr, Elf64_Sxword addend);
 	int _Elf64DoReloc(Elf64_Xword r_info, void *ptr, Elf64_Sxword addend)
 	{
 		 int	sym = ELF64_R_SYM(r_info);
 		 int	type = ELF64_R_TYPE(r_info);
 		const char	*symname = strtab + symtab[sym].st_name;
 		void	*symval;
+		//DEBUGS("_Elf64DoReloc: %s", symname);
 		switch( type )
 		{
 		case R_X86_64_NONE:
@@ -739,6 +742,7 @@ void *Elf64Relocate(void *Base, char **envp, const char *Filename)
 			SysDebug("ld-acess - _Elf64DoReloc: Unknown relocation type %i", type);
 			return 2;
 		}
+		//DEBUGS("_Elf64DoReloc: - Good");
 		return 0;
 	}
 
diff --git a/Usermode/Libraries/ld-acess.so_src/export.c b/Usermode/Libraries/ld-acess.so_src/export.c
index 1cec11ef..586078a0 100644
--- a/Usermode/Libraries/ld-acess.so_src/export.c
+++ b/Usermode/Libraries/ld-acess.so_src/export.c
@@ -11,7 +11,6 @@ extern int32_t	__modsi3(int32_t Num, int32_t Den);
 extern uint32_t	__udivsi3(uint32_t Num, uint32_t Den);
 extern uint32_t	__umodsi3(uint32_t Num, uint32_t Den);
 
-
 #define _STR(x)	#x
 #define STR(x)	_STR(x)
 #define EXP(sym)	{&sym, STR(sym)}
@@ -35,6 +34,13 @@ const struct {
 	#define __ASSEMBLER__
 	#include "arch/syscalls.s.h"
 	#undef __ASSEMBLER__
+	
+	#ifdef ARCHDIR_is_armv7
+	{0, "__gnu_Unwind_Find_exidx"},
+	{0, "__cxa_call_unexpected"},
+	{0, "__cxa_type_match"},
+	{0, "__cxa_begin_cleanup"},
+	#endif
 #if 0
 	EXP(__umoddi3),
 	EXP(__udivdi3),
diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index fb3225bc..d2c3190a 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -11,7 +11,7 @@ LDFLAGS  += -soname libc.so -Map map.txt
 INCFILES := stdio.h stdlib.h
 
 OBJ  = stub.o heap.o stdlib.o env.o fileIO.o string.o select.o rand.o
-OBJ += perror.o scanf.o
+OBJ += perror.o scanf.o signals.o
 OBJ += arch/$(ARCHDIR).ao
 # signals.o
 DEPFILES := $(OBJ:%.o=%.d)
diff --git a/Usermode/Libraries/libc.so_src/include_exp/signal.h b/Usermode/Libraries/libc.so_src/include_exp/signal.h
index cc72b00b..bf03c7f1 100644
--- a/Usermode/Libraries/libc.so_src/include_exp/signal.h
+++ b/Usermode/Libraries/libc.so_src/include_exp/signal.h
@@ -8,6 +8,8 @@
 #ifndef _SIGNAL_H_
 #define _SIGNAL_H_
 
+typedef void (*sighandler_t)(int);
+
 #define SIG_DFL	((void*)0)
 #define SIG_ERR	((void*)-1)
 
@@ -16,5 +18,7 @@
 #define SIGPIPE	1001
 #define SIGCHLD	1002
 
+extern int	raise(int sig);
+
 #endif
 
diff --git a/Usermode/Libraries/libc.so_src/include_exp/stdlib.h b/Usermode/Libraries/libc.so_src/include_exp/stdlib.h
index 8acfb8bc..dbe557f7 100644
--- a/Usermode/Libraries/libc.so_src/include_exp/stdlib.h
+++ b/Usermode/Libraries/libc.so_src/include_exp/stdlib.h
@@ -24,6 +24,7 @@ extern long long	strtoll(const char *ptr, char **end, int base);
 extern long	strtol(const char *ptr, char **end, int base);
 extern int	atoi(const char *ptr);
 extern void	exit(int status) __attribute__((noreturn));
+extern void	abort(void);
 extern void	atexit(void (*__func)(void));
 extern void	qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *));
 extern int	abs(int j);
diff --git a/Usermode/Libraries/libc.so_src/signals.c b/Usermode/Libraries/libc.so_src/signals.c
index ddaf5448..f8b71d34 100644
--- a/Usermode/Libraries/libc.so_src/signals.c
+++ b/Usermode/Libraries/libc.so_src/signals.c
@@ -2,7 +2,7 @@
  * AcessOS Basic C Library
  * signals.c
 */
-#include <syscalls.h>
+//#include <acess/sys.h>
 #include <stdlib.h>
 #include <signal.h>
 #include "lib.h"
@@ -22,3 +22,22 @@ sighandler_t signal(int num, sighandler_t handler)
 	sighandlers[num] = handler;
 	return prev;
 }
+
+int raise(int signal)
+{
+	if( signal < 0 || signal > NUM_SIGNALS )
+		return 1;
+	switch(signal)
+	{
+	case SIGABRT:
+		abort();
+		break;
+	}
+	return 0;
+}
+
+void abort(void)
+{
+	// raise(SIGABRT);
+	_exit(-1);
+}