From 0d39007ace2be756a3048a9e33d94c68bcff177b Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Fri, 2 May 2025 12:29:12 -0400 Subject: libc: crt0.S -> crti.S Seems more intuitive: crti (C runtime init) Signed-off-by: Ian Moffett --- lib/libc/Makefile | 3 +++ lib/libc/src/arch/amd64/crt0.S | 45 ------------------------------------------ lib/libc/src/arch/amd64/crti.S | 45 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 45 deletions(-) delete mode 100644 lib/libc/src/arch/amd64/crt0.S create mode 100644 lib/libc/src/arch/amd64/crti.S (limited to 'lib/libc') diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 43c823e..49e7329 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -9,6 +9,9 @@ all: sys/include/machine headers $(LIBC_ASMOBJ) $(LIBC_OBJ) build/libc.a build/libc.a: build/ ar rcs build/libc.a $(LIBC_OBJ) $(LIBC_ASMOBJ) + mv $(LIBC_ASMOBJ) build/ # For initial bootstrapping + mv build/crti.S.o build/crti.o + mv build/*.o build/*.a $(ROOT)/base/usr/lib/ %.o: %.c $(CC) $(CFLAGS) -Iinclude/ $< -o $@ diff --git a/lib/libc/src/arch/amd64/crt0.S b/lib/libc/src/arch/amd64/crt0.S deleted file mode 100644 index 1a5b466..0000000 --- a/lib/libc/src/arch/amd64/crt0.S +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2023-2025 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 - -.text -.globl _start -_start: - // Mark end of callstack - xor %rbp, %rbp - - // Load context and jump to the entry - lea (%rsp), %rdi - call __libc_entry - - // Exit returning status - mov $1, %rax - int $0x80 - ud2 diff --git a/lib/libc/src/arch/amd64/crti.S b/lib/libc/src/arch/amd64/crti.S new file mode 100644 index 0000000..582fea4 --- /dev/null +++ b/lib/libc/src/arch/amd64/crti.S @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2023-2025 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 + + .section .init + .globl _start +_start: + // Mark end of callstack + xor %rbp, %rbp + + // Load context and jump to the entry + lea (%rsp), %rdi + call __libc_entry + + // Exit returning status + mov $1, %rax + int $0x80 + ud2 -- cgit v1.2.3