OpenBSD: fix tests

Co-authored-by: Lorenz (xha) <[email protected]>
Signed-off-by: Sertonix <[email protected]>

Author: 2 people

configs/openbsd.mk

@@ -5,7 +5,7 @@ BINDIR = $(PREFIX)/bin
 # variables used during build
 PLATFORM = openbsd
 ARCH = x86_64
-HARECFLAGS =
+HARECFLAGS = -N "" -m .main
 QBEFLAGS =
 ASFLAGS =
 LDLINKFLAGS = -z nobtcfi
@@ -18,7 +18,7 @@ LIBS = -lm
 CC = cc
 # OpenBSD: gas is in the binutils package. as from the base system is too old.
 AS = gas
-LD = ld
+LD = cc
 QBE = qbe
 
 # build locations

makefiles/freebsd.mk

@@ -1,3 +1,10 @@
 RTSCRIPT = rt/hare.sc
 
-_rt_ha = rt/+$(PLATFORM)/syscallno.ha
+_rt_ha = \
+	rt/malloc.ha \
+	rt/+$(PLATFORM)/syscallno.ha \
+	rt/+$(PLATFORM)/segmalloc.ha
+
+_rt_s = \
+	rt/+$(PLATFORM)/start+$(ARCH).s \
+	rt/+$(PLATFORM)/syscall+$(ARCH).s

makefiles/linux.mk

@@ -1,3 +1,10 @@
 RTSCRIPT = rt/hare.sc
 
-_rt_ha = rt/+$(PLATFORM)/syscallno+$(ARCH).ha
+_rt_ha = \
+	rt/malloc.ha \
+	rt/+$(PLATFORM)/syscallno+$(ARCH).ha \
+	rt/+$(PLATFORM)/segmalloc.ha
+
+_rt_s = \
+	rt/+$(PLATFORM)/start+$(ARCH).s \
+	rt/+$(PLATFORM)/syscall+$(ARCH).s

makefiles/netbsd.mk

@@ -1,3 +1,10 @@
 RTSCRIPT = rt/hare+$(PLATFORM).sc
 
-_rt_ha = rt/+$(PLATFORM)/syscallno.ha
+_rt_ha = \
+	rt/malloc.ha \
+	rt/+$(PLATFORM)/syscallno.ha \
+	rt/+$(PLATFORM)/segmalloc.ha
+
+_rt_s = \
+	rt/+$(PLATFORM)/start+$(ARCH).s \
+	rt/+$(PLATFORM)/syscall+$(ARCH).s

makefiles/openbsd.mk

@@ -1,3 +1,7 @@
 RTSCRIPT = rt/hare+$(PLATFORM).sc
 
-_rt_ha = rt/+$(PLATFORM)/syscallno.ha
+_rt_ha = \
+	rt/malloc+libc.ha
+
+_rt_s = \
+	rt/+openbsd/platformstart.s

makefiles/tests.mk

@@ -24,23 +24,21 @@ rt_ha = \
 	rt/compile.ha \
 	rt/cstrings.ha \
 	rt/ensure.ha \
-	rt/malloc.ha \
 	rt/memcpy.ha \
 	rt/memmove.ha \
 	rt/memset.ha \
-	rt/rtmain.ha \
 	rt/strcmp.ha \
 	rt/+$(PLATFORM)/errno.ha \
-	rt/+$(PLATFORM)/segmalloc.ha \
 	rt/+$(PLATFORM)/syscalls.ha \
+	rt/+$(PLATFORM)/start.ha \
 	$(_rt_ha)
 
 $(HARECACHE)/rt.ssa: $(rt_ha)
 	@mkdir -p -- $(HARECACHE)
 	@printf 'HAREC\t%s\n' '$@'
 	@$(TDENV) $(BINOUT)/harec $(HARECFLAGS) -o $@ -t $(HARECACHE)/rt.td.tmp -N rt $(rt_ha)
 
-rt_s = $(HARECACHE)/rt.s rt/+$(PLATFORM)/start+$(ARCH).s rt/+$(PLATFORM)/syscall+$(ARCH).s
+rt_s = $(HARECACHE)/rt.s $(_rt_s)
 $(HARECACHE)/rt.o: $(rt_s)
 	@printf 'AS\t%s\n' '$@'
 	@$(AS) $(ASFLAGS) -o $@ $(rt_s)

rt/rtmain.ha rt/+freebsd/start.ha

@@ -0,0 +1,34 @@
+@symbol("main") fn main() void;
+
+const @symbol("__init_array_start") init_start: [*]*fn() void;
+const @symbol("__init_array_end") init_end: [*]*fn() void;
+const @symbol("__fini_array_start") fini_start: [*]*fn() void;
+const @symbol("__fini_array_end") fini_end: [*]*fn() void;
+
+let argc: size = 0;
+let argv: *[*]*const u8 = null: *[*]*const u8;
+let envp: *[*]nullable *const u8 = null: *[*]nullable *const u8;
+
+export let status = 0;
+
+export fn start_ha(iv: *[*]uintptr) never = {
+	const ninit = (&init_end: uintptr - &init_start: uintptr): size
+		/ size(*fn() void);
+	for (let i = 0z; i < ninit; i += 1) {
+		init_start[i]();
+	};
+
+	argc = iv[0]: size;
+	argv = &iv[1]: *[*]*const u8;
+	envp = &argv[argc + 1]: *[*]nullable *const u8;
+
+	main();
+
+	const nfini = (&fini_end: uintptr - &fini_start: uintptr): size
+		/ size(*fn() void);
+	for (let i = 0z; i < nfini; i += 1) {
+		fini_start[i]();
+	};
+
+	exit(status);
+};

rt/+linux/start.ha

@@ -0,0 +1,34 @@
+@symbol("main") fn main() void;
+
+const @symbol("__init_array_start") init_start: [*]*fn() void;
+const @symbol("__init_array_end") init_end: [*]*fn() void;
+const @symbol("__fini_array_start") fini_start: [*]*fn() void;
+const @symbol("__fini_array_end") fini_end: [*]*fn() void;
+
+let argc: size = 0;
+let argv: *[*]*const u8 = null: *[*]*const u8;
+let envp: *[*]nullable *const u8 = null: *[*]nullable *const u8;
+
+export let status = 0;
+
+export fn start_ha(iv: *[*]uintptr) never = {
+	const ninit = (&init_end: uintptr - &init_start: uintptr): size
+		/ size(*fn() void);
+	for (let i = 0z; i < ninit; i += 1) {
+		init_start[i]();
+	};
+
+	argc = iv[0]: size;
+	argv = &iv[1]: *[*]*const u8;
+	envp = &argv[argc + 1]: *[*]nullable *const u8;
+
+	main();
+
+	const nfini = (&fini_end: uintptr - &fini_start: uintptr): size
+		/ size(*fn() void);
+	for (let i = 0z; i < nfini; i += 1) {
+		fini_start[i]();
+	};
+
+	exit(status);
+};

rt/+netbsd/start.ha

@@ -0,0 +1,4 @@
+.section ".preinit_array"
+.balign 8
+.init.initfunc.0:
+        .quad preinit_hare+0

rt/+openbsd/platformstart.s

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: MPL-2.0
+// (c) Hare authors <https://harelang.org>
+
+let argc: size = 0;
+let argv: *[*]*const u8 = null: *[*]*const u8;
+let envp: *[*]nullable *const u8 = null: *[*]nullable *const u8;
+
+export let status = 0;
+
+// The real main function.
+@symbol(".main") fn main() void;
+
+// The setup of envp and args is done here. This is called by crt0 before
+// normal init functions are called.
+export @symbol("preinit_hare") fn preinit_hare(
+	c_argc: int,
+	c_argv: *[*]*const u8,
+	c_envp: *[*]nullable *const u8
+) void = {
+	argc = c_argc: size;
+	argv = c_argv;
+	envp = c_envp;
+};
+
+// The purpose of this "fake" main function is to make sure we exit with the
+// correct exit code in the case that rt::exit() is not called from within the
+// program. The intilization and finilization functions are not run from here,
+// they are ran by crt0.
+export @symbol("main") fn _main() void = {
+	main();
+	exit(status);
+};