From: John Hodge <tpg@mutabah.net>
Date: Fri, 3 Aug 2012 05:40:54 +0000 (+0800)
Subject: Usermode - Added armv6 userland shims
X-Git-Tag: rel0.15~706^2~72
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=8eda591ebde3c23aaaffd7777165d33fdef6b4bc;hp=-c;p=tpg%2Facess2.git

Usermode - Added armv6 userland shims
---

8eda591ebde3c23aaaffd7777165d33fdef6b4bc
diff --git a/Usermode/Libraries/acess.ld_src/acess_armv6.ld.h b/Usermode/Libraries/acess.ld_src/acess_armv6.ld.h
new file mode 100644
index 00000000..0ea7f902
--- /dev/null
+++ b/Usermode/Libraries/acess.ld_src/acess_armv6.ld.h
@@ -0,0 +1,235 @@
+/* Script for -z combreloc: combine and sort reloc sections */
+OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
+	      "elf32-littlearm")
+OUTPUT_ARCH(arm)
+ENTRY(_start)
+SEARCH_DIR(__LIBDIR)
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  PROVIDE (__executable_start = SEGMENT_START("text-segment", 0x8000)); . = SEGMENT_START("text-segment", 0x8000);
+  .interp         : { *(.interp) }
+  .note.gnu.build-id : { *(.note.gnu.build-id) }
+  .hash           : { *(.hash) }
+  .gnu.hash       : { *(.gnu.hash) }
+  .dynsym         : { *(.dynsym) }
+  .dynstr         : { *(.dynstr) }
+  .gnu.version    : { *(.gnu.version) }
+  .gnu.version_d  : { *(.gnu.version_d) }
+  .gnu.version_r  : { *(.gnu.version_r) }
+  .rel.dyn        :
+    {
+      *(.rel.init)
+      *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
+      *(.rel.fini)
+      *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
+      *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*)
+      *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
+      *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)
+      *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)
+      *(.rel.ctors)
+      *(.rel.dtors)
+      *(.rel.got)
+      *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
+      PROVIDE_HIDDEN (__rel_iplt_start = .);
+      *(.rel.iplt)
+      PROVIDE_HIDDEN (__rel_iplt_end = .);
+      PROVIDE_HIDDEN (__rela_iplt_start = .);
+      PROVIDE_HIDDEN (__rela_iplt_end = .);
+    }
+  .rela.dyn       :
+    {
+      *(.rela.init)
+      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+      *(.rela.fini)
+      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
+      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
+      *(.rela.ctors)
+      *(.rela.dtors)
+      *(.rela.got)
+      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+      PROVIDE_HIDDEN (__rel_iplt_start = .);
+      PROVIDE_HIDDEN (__rel_iplt_end = .);
+      PROVIDE_HIDDEN (__rela_iplt_start = .);
+      *(.rela.iplt)
+      PROVIDE_HIDDEN (__rela_iplt_end = .);
+    }
+  .rel.plt        :
+    {
+      *(.rel.plt)
+    }
+  .rela.plt       :
+    {
+      *(.rela.plt)
+    }
+  .init           :
+  {
+    KEEP (*(.init))
+  } =0
+  .plt            : { *(.plt) }
+  .iplt           : { *(.iplt) }
+  .text           :
+  {
+    *(.text.unlikely .text.*_unlikely)
+    *(.text.exit .text.exit.*)
+    *(.text.startup .text.startup.*)
+    *(.text.hot .text.hot.*)
+    *(.text .stub .text.* .gnu.linkonce.t.*)
+    /* .gnu.warning sections are handled specially by elf32.em.  */
+    *(.gnu.warning)
+    *(.glue_7t) *(.glue_7) *(.vfp11_veneer) *(.v4_bx)
+  } =0
+  .fini           :
+  {
+    KEEP (*(.fini))
+  } =0
+  PROVIDE (__etext = .);
+  PROVIDE (_etext = .);
+  PROVIDE (etext = .);
+  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+  .rodata1        : { *(.rodata1) }
+  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
+   PROVIDE_HIDDEN(__exidx_start = .);
+  .ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
+   PROVIDE_HIDDEN(__exidx_end = .);
+  .eh_frame_hdr : { *(.eh_frame_hdr) }
+  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
+  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1));
+  /* Exception handling  */
+  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
+  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
+  /* Thread Local Storage sections  */
+  .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
+  .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
+  .preinit_array     :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  }
+  .init_array     :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  }
+  .fini_array     :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  }
+  .ctors          :
+  {
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+       the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+  }
+  .dtors          :
+  {
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+  }
+  .jcr            : { KEEP (*(.jcr)) }
+  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }
+  .dynamic        : { *(.dynamic) }
+  .got            : { *(.got.plt) *(.igot.plt) *(.got) *(.igot) }
+  .data           :
+  {
+    __data_start = . ;
+    *(.data .data.* .gnu.linkonce.d.*)
+    SORT(CONSTRUCTORS)
+  }
+  .data1          : { *(.data1) }
+  _edata = .; PROVIDE (edata = .);
+  __bss_start = .;
+  __bss_start__ = .;
+  .bss            :
+  {
+   *(.dynbss)
+   *(.bss .bss.* .gnu.linkonce.b.*)
+   *(COMMON)
+   /* Align here to ensure that the .bss section occupies space up to
+      _end.  Align after .bss to ensure correct alignment even if the
+      .bss section disappears because there are no input sections.
+      FIXME: Why do we need it? When there is no .bss section, we don't
+      pad the .data section.  */
+   . = ALIGN(. != 0 ? 32 / 8 : 1);
+  }
+  _bss_end__ = . ; __bss_end__ = . ;
+  . = ALIGN(32 / 8);
+  . = ALIGN(32 / 8);
+  __end__ = . ;
+  _end = .; PROVIDE (end = .);
+  /* Stabs debugging sections.  */
+  .stab          0 : { *(.stab) }
+  .stabstr       0 : { *(.stabstr) }
+  .stab.excl     0 : { *(.stab.excl) }
+  .stab.exclstr  0 : { *(.stab.exclstr) }
+  .stab.index    0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment       0 : { *(.comment) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo .zdebug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames .zdebug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges .zdebug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames .zdebug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.* .zdebug_info) }
+  .debug_abbrev   0 : { *(.debug_abbrev .zdebug_abbrev) }
+  .debug_line     0 : { *(.debug_line .zdebug_line) }
+  .debug_frame    0 : { *(.debug_frame .zdebug_frame) }
+  .debug_str      0 : { *(.debug_str .zdebug_str) }
+  .debug_loc      0 : { *(.debug_loc .zdebug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo .zdebug_macinfo) }
+  /* SGI/MIPS DWARF 2 extensions */
+  .debug_weaknames 0 : { *(.debug_weaknames .zdebug_weaknames) }
+  .debug_funcnames 0 : { *(.debug_funcnames .zdebug_funcnames) }
+  .debug_typenames 0 : { *(.debug_typenames .zdebug_typenames) }
+  .debug_varnames  0 : { *(.debug_varnames .zdebug_varnames) }
+  /* DWARF 3 */
+  .debug_pubtypes 0 : { *(.debug_pubtypes .zdebug_pubtypes) }
+  .debug_ranges   0 : { *(.debug_ranges .zdebug_ranges) }
+    .stack         0x80000 :
+  {
+    _stack = .;
+    *(.stack)
+  }
+  .ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.attributes)) }
+  .note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }
+  /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }
+}
+
+
diff --git a/Usermode/Libraries/ld-acess.so_src/arch/armv6.S.h b/Usermode/Libraries/ld-acess.so_src/arch/armv6.S.h
new file mode 100644
index 00000000..35643926
--- /dev/null
+++ b/Usermode/Libraries/ld-acess.so_src/arch/armv6.S.h
@@ -0,0 +1,137 @@
+//
+// Acess2 ARMv7 - System Calls
+//
+
+.globl _start
+.extern SoMain
+_start:
+	pop {r0}
+	ldm sp, {r1,r2,r3}
+	bl SoMain
+	
+	mov r4, r0
+
+	pop {r0,r1,r2}
+	blx r4
+	
+	b _exit
+
+@ Stupid GCC
+.globl __ucmpdi2
+__ucmpdi2:
+	cmp r0, r2
+	movmi r0, #0
+	movmi pc, lr
+	movhi r0, #2
+	movhi pc, lr
+	cmp r1, r2
+	movmi r0, #0
+	movmi pc, lr
+	movhi r0, #2
+	movhi pc, lr
+	mov r0, #1
+	mov pc, lr
+
+@ Well, can't blame it
+@ - Clear the instruction cache
+.globl __clear_cache
+__clear_cache:
+	svc #0x1001
+	mov pc, lr
+
+@ DEST
+@ SRC
+@_memcpy:
+@	push rbp
+@	mov rbp, rsp
+@	
+@	; RDI - First Param
+@	; RSI - Second Param
+@	mov rcx, rdx	; RDX - Third
+@	rep movsb
+@	
+@	pop rbp
+@	ret
+@
+.globl _errno
+_errno:	.long	0	@ Placed in .text, to allow use of relative addressing
+
+.macro syscall0 _name, _num	
+.globl \_name
+\_name:
+	push {lr}
+	svc #\_num
+	str r2, _errno
+	pop {pc}
+.endm
+
+.macro syscall5 _name, _num
+.globl \_name
+\_name:
+	push {r4, lr}
+	ldr r4, [sp,#8]
+	svc #\_num
+	str r2, _errno
+	pop {r4, pc}
+.endm
+
+.macro syscall6 _name, _num
+.globl \_name
+\_name:
+	push {r4,r5,lr}
+	ldr r4, [sp,#12]
+	ldr r5, [sp,#16]
+	svc #\_num
+	str r2, _errno
+	pop {r4,r5,pc}
+.endm
+
+#define SYSCALL0(_name,_num)	syscall0 _name, _num
+#define SYSCALL1(_name,_num)	SYSCALL0(_name, _num)
+#define SYSCALL2(_name,_num)	SYSCALL0(_name, _num)
+#define SYSCALL3(_name,_num)	SYSCALL0(_name, _num)
+#define SYSCALL4(_name,_num)	SYSCALL0(_name, _num)
+// TODO: 5/6 need special handling, because the args are on the stack
+#define SYSCALL5(_name,_num)	syscall5 _name, _num
+#define SYSCALL6(_name,_num)	syscall6 _name, _num
+
+// Override the clone syscall
+#define _exit	_exit_raw
+#define _clone	_clone_raw
+#include "syscalls.s.h"
+#undef _exit
+#undef _clone
+
+.globl _clone
+_clone:
+	push {r4}
+	mov r4, r1
+	svc #SYS_CLONE
+	str r2, _errno
+	tst r4, r4
+	beq _clone_ret
+	@ If in child, set SP
+	tst r0,r0
+	movne sp, r4
+_clone_ret:
+	pop {r4}
+	mov pc, lr
+
+.globl _exit
+_exit:
+	svc #0
+	b .
+
+.globl abort
+abort:
+	mov r0, #0
+	svc #0
+	b .
+
+.globl __exidx_start
+__exidx_start:
+	b .
+.globl __exidx_end
+__exidx_end:
+	b .
+
diff --git a/Usermode/Libraries/ld-acess.so_src/arch/armv6.ld b/Usermode/Libraries/ld-acess.so_src/arch/armv6.ld
new file mode 100644
index 00000000..7f1b3c83
--- /dev/null
+++ b/Usermode/Libraries/ld-acess.so_src/arch/armv6.ld
@@ -0,0 +1,69 @@
+ENTRY(_start)
+OUTPUT_FORMAT(elf32-littlearm)
+
+SECTIONS {
+	. = 0x6FFF0000;
+	gLinkedBase = .;
+	. += SIZEOF_HEADERS;
+	.interp		 : { *(.interp) }
+	.note.gnu.build-id : { *(.note.gnu.build-id) }
+	.hash		   : { *(.hash) }
+	.gnu.hash	   : { *(.gnu.hash) }
+	.dynsym		 : { *(.dynsym) }
+	.dynstr		 : { *(.dynstr) }
+	.gnu.version	: { *(.gnu.version) }
+	.gnu.version_d  : { *(.gnu.version_d) }
+	.gnu.version_r  : { *(.gnu.version_r) }
+	.rel.dyn		:
+	{
+		*(.rel.init)
+		*(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
+		*(.rel.fini)
+		*(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
+		*(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*)
+		*(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
+		*(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)
+		*(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)
+		*(.rel.ctors)
+		*(.rel.dtors)
+		*(.rel.got)
+		*(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
+	}
+	.rela.dyn	   :
+	{
+		*(.rela.init)
+		*(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+		*(.rela.fini)
+		*(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+		*(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+		*(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
+		*(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
+		*(.rela.ctors)
+		*(.rela.dtors)
+		*(.rela.got)
+		*(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+	}
+
+	.text : AT(ADDR(.text)) {
+		code = .;
+		*(.text)
+		*(.rodata*)
+   		PROVIDE_HIDDEN(__exidx_start = .);
+		.ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
+		PROVIDE_HIDDEN(__exidx_end = .);
+	}
+
+	.data ALIGN (0x1000) : AT(ADDR(.data)) {
+		data = .;
+		*(.data)
+	}
+
+	.bss ALIGN (0x1000) : AT(ADDR(.bss)) {
+		_sbss = .;
+		*(COMMON)
+		*(.bss)
+		_ebss = .;
+		bss = .;
+	}
+	_end = .;
+}
diff --git a/Usermode/Libraries/libc.so_src/arch/armv6.S b/Usermode/Libraries/libc.so_src/arch/armv6.S
new file mode 100644
index 00000000..be4887e8
--- /dev/null
+++ b/Usermode/Libraries/libc.so_src/arch/armv6.S
@@ -0,0 +1,24 @@
+@ 
+@ Acess2 C Library
+@ - By John Hodge (thePowersGang)
+@ 
+@ arch/armv6.S
+@ - ARMv6 specific code
+.globl setjmp
+setjmp:
+	@ RO: Buffer
+	stm r0, {r0-r14}
+	eor r0, r0
+	mov pc, lr
+
+.globl longjmp
+longjmp:
+	@ R0: Buffer
+	@ R1: Value
+	add r0, #8
+	ldm r0, {r2-r14}
+	mov r0, r1
+	tst r0, r0
+	addeq r0, #1
+	mov pc, lr	@ Will return to after setjmp
+