Merge branch 'user' into dev

2 files changed, 111 insertions, 0 deletions

diff --git a/lib/libc/linker/entry.S b/lib/libc/linker/entry.S
new file mode 100644
index 0000000..1f982f9
--- /dev/null
+++ b/lib/libc/linker/entry.S
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team.
+ * 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 Hyra 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+ */
+
+#if !defined(__hyra__)
+#error "Hyra supported only"
+#endif
+
+#include <sys/syscall.h>
+
+.section .text, "ax", @progbits
+.globl _start
+_start:
+    // Mark end of callstack
+    xor %rbp, %rbp
+
+    // Load process context as per the sysv AMD64 ABI
+    lea (%rsp), %rdi
+    call entry
+
+    // We are done, now we exit
+    mov $SYS_exit, %rax
+    xor %rdi, %rdi
+    int $0x80
+    nop
+    ud2
diff --git a/lib/libc/linker/entry.c b/lib/libc/linker/entry.c
new file mode 100644
index 0000000..55bf312
--- /dev/null
+++ b/lib/libc/linker/entry.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team.
+ * 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 Hyra 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+ */
+
+#include <sys/syscall.h>
+#include <sys/auxv.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <elf.h>
+
+#if !defined(__hyra__)
+#error "Hyra supported only"
+#endif
+
+void
+entry(const uint64_t *ctx)
+{
+    uint64_t argc = *ctx;
+    uint64_t auxv[AT_MAX_COUNT] = {0};
+    int envc;
+
+    const char **argv = (const char **)(ctx + 1);
+    const char **envp = (const char **)(argv + argc + 1);
+    struct auxv_entry *auxvp;
+
+    /* Read-in auxiliary vector */
+    auxvp = (struct auxv_entry *)(envp + envc + 1);
+    for (; auxvp->tag != AT_NULL; ++auxvp) {
+        if (auxvp->tag < AT_MAX_COUNT) {
+            auxv[auxvp->tag] = auxvp->val;
+        }
+    }
+
+    /* TODO */
+}