working aarch64

Author: m-hilgendorf

packages/std/packages/std/manifest.rs

@@ -305,9 +305,17 @@ impl Manifest {
 			.as_ref()
 			.ok_or_else(|| tg::error!("expected a wrap binary"))?;
 
-		tg::cache::cache(tg, tg::cache::Arg {
-			artifacts: vec![file.id().into(), stub_bin.id().into(), stub_elf.id().into(), wrap.id().into()]
-		})
+		tg::cache::cache(
+			tg,
+			tg::cache::Arg {
+				artifacts: vec![
+					file.id().into(),
+					stub_bin.id().into(),
+					stub_elf.id().into(),
+					wrap.id().into(),
+				],
+			},
+		)
 		.await
 		.map_err(|source| tg::error!(!source, "failed to cache artifacts"))?;
 
@@ -317,9 +325,10 @@ impl Manifest {
 		let stub_bin = path.join(stub_bin.id().to_string());
 		let stub_elf = path.join(stub_elf.id().to_string());
 		let wrap = path.join(wrap.id().to_string());
-		
+
 		// Create a temp file for the manifest.
-		let mut manifest = tempfile::NamedTempFile::new().map_err(|source| tg::error!(!source, "failed to get temp file"))?;
+		let mut manifest = tempfile::NamedTempFile::new()
+			.map_err(|source| tg::error!(!source, "failed to get temp file"))?;
 
 		// Create a random output name.
 		let tempfile = tempfile::NamedTempFile::new()
@@ -329,7 +338,10 @@ impl Manifest {
 		// Create the manifest file. TODO: asyncify.
 		let contents = serde_json::to_vec(self)
 			.map_err(|source| tg::error!(!source, "failed to serialize manifest"))?;
-		manifest.as_file_mut().write_all(&contents).map_err(|source| tg::error!(!source, "failed to write manifest"))?;
+		manifest
+			.as_file_mut()
+			.write_all(&contents)
+			.map_err(|source| tg::error!(!source, "failed to write manifest"))?;
 
 		// Run the command.
 		let success = std::process::Command::new(wrap)
@@ -348,10 +360,14 @@ impl Manifest {
 			return Err(tg::error!("failed to run the command"));
 		}
 
-		let bytes = std::fs::read(output).map_err(|source| tg::error!(!source, "failed to read the output"))?;
-		std::fs::remove_file(output).map_err(|source| tg::error!(!source, "failed to remove output file"))?;
+		let bytes = std::fs::read(output)
+			.map_err(|source| tg::error!(!source, "failed to read the output"))?;
+		std::fs::remove_file(output)
+			.map_err(|source| tg::error!(!source, "failed to remove output file"))?;
 		let cursor = std::io::Cursor::new(bytes);
-		let blob = tg::Blob::with_reader(tg, cursor).await.map_err(|source| tg::error!(!source, "failed to create blob"))?;
+		let blob = tg::Blob::with_reader(tg, cursor)
+			.await
+			.map_err(|source| tg::error!(!source, "failed to create blob"))?;
 
 		// Obtain the dependencies from the manifest to add to the file.
 		// NOTE: We know the wrapper file has no dependencies, so there is no need to merge.
@@ -637,7 +653,6 @@ static TANGRAM_WRAPPER: LazyLock<tg::File> = LazyLock::new(|| {
 	tg::File::with_id(id)
 });
 
-
 static TANGRAM_STUB_BIN: LazyLock<Option<tg::File>> = LazyLock::new(|| {
 	std::env::var("TANGRAM_STUB_BIN_ID").ok().map(|id| {
 		let id = id.parse().expect("TANGRAM_STUB_BIN_ID is not a valid ID");

packages/std/packages/stub/src/util.c

@@ -0,0 +1,69 @@
+/*
+	gcc appears to have an issue with some functions (memset and memcpy) on some architectures (aarch64) which forbids overriding them in a static function declaration within a single header file. In addition, conversion
+	of long doubles to doubles is a built-in provided by lib-gcc on aarch64. 
+
+	We don't care about any of that, so this source file works around it.
+*/
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __x86_64__
+__attribute__((naked))
+static void* memcpy (
+	void*		dst, 
+	const void*	src, 
+	size_t		len
+) {
+	asm volatile (
+		"rep rex.w movsb;"
+		"ret;" 
+		: "+D"(dst), "+S"(src), "+c"(len) 
+		:
+		: "memory", "cc"
+	);
+}
+
+__attribute__((naked))
+void* memset (
+	void* dst,
+	int c, 
+	size_t n
+) {
+	asm volatile (
+		"rep rex.w stosb;"
+		"ret;" 
+		: "+D"(dst), "+c"(n) 
+		: "a"(c) 
+		: "memory", "cc"
+	);
+}
+#endif
+
+#ifdef __aarch64__
+#include "syscall.h"
+double __trunctfdf2 (long double ld) {
+	exit(111);
+	return 0.0;
+}
+
+void* memcpy (
+	void*		dst, 
+	const void*	src, 
+	size_t		len
+) {
+	for (size_t i = 0; i < len; i++) {
+		((uint8_t*)dst)[i] = ((const uint8_t*)src)[i];
+	}
+}
+
+void* memset (
+	void* dst,
+	int c, 
+	size_t n
+) {
+	for (size_t i = 0; i < n; i++) {
+		((uint8_t*)dst)[i] = (uint8_t)(c);
+	}
+	return dst;
+}
+#endif

packages/std/packages/stub/src/wrap.c

@@ -112,7 +112,7 @@ void file_concat (File* dst, File src) {
 		bytes_read += n;
 		ssize_t offset = 0;
 		while (offset < n) {
-			ssize_t m = write(dst->fd, buf + offset, sizeof(buf) - offset);
+			ssize_t m = write(dst->fd, buf + offset, n - offset);
 			ABORT_IF(m < 0, "failed to write to %s", dst->path);
 			offset += m;
 		}