WIP: Fix int intrinsics

Author: antoyo

build_sysroot/build_sysroot.sh

@@ -23,7 +23,7 @@ if [[ "$1" == "--release" ]]; then
 else
     sysroot_channel='debug'
     # TODO: add flags to simplify the case for cross-compilation.
-    AR="m68k-unknown-linux-gnu-ar" CC="m68k-unknown-linux-gnu-gcc" cargo build --target $TARGET_TRIPLE --features compiler_builtins/c
+    AR="m68k-unknown-linux-gnu-ar" CC="m68k-unknown-linux-gnu-gcc" cargo build --target $TARGET_TRIPLE
 fi
 
 # Copy files to sysroot

build_system/src/prepare.rs

@@ -4,7 +4,7 @@ use crate::utils::{cargo_install, git_clone, run_command, run_command_with_outpu
 use std::fs;
 use std::path::Path;
 
-fn prepare_libcore(sysroot_path: &Path) -> Result<(), String> {
+fn prepare_libcore(sysroot_path: &Path, cross_compile: bool) -> Result<(), String> {
     let rustc_path = match get_rustc_path() {
         Some(path) => path,
         None => return Err("`rustc` path not found".to_string()),
@@ -87,6 +87,12 @@ fn prepare_libcore(sysroot_path: &Path) -> Result<(), String> {
             Ok(())
         },
     )?;
+    if cross_compile {
+        walk_dir("cross_patches", |_| Ok(()), |file_path: &Path| {
+            patches.push(file_path.to_path_buf());
+            Ok(())
+        })?;
+    }
     patches.sort();
     for file_path in patches {
         println!("[GIT] apply `{}`", file_path.display());
@@ -156,24 +162,30 @@ where
 }
 
 struct PrepareArg {
+    cross_compile: bool,
     only_libcore: bool,
 }
 
 impl PrepareArg {
     fn new() -> Result<Option<Self>, String> {
         let mut only_libcore = false;
+        let mut cross_compile = false;
 
         for arg in std::env::args().skip(2) {
             match arg.as_str() {
                 "--only-libcore" => only_libcore = true,
+                "--cross" => cross_compile = true,
                 "--help" => {
                     Self::usage();
                     return Ok(None);
                 }
                 a => return Err(format!("Unknown argument `{a}`")),
             }
         }
-        Ok(Some(Self { only_libcore }))
+        Ok(Some(Self {
+            cross_compile,
+            only_libcore,
+        }))
     }
 
     fn usage() {
@@ -194,7 +206,7 @@ pub fn run() -> Result<(), String> {
         None => return Ok(()),
     };
     let sysroot_path = Path::new("build_sysroot");
-    prepare_libcore(sysroot_path)?;
+    prepare_libcore(sysroot_path, args.cross_compile)?;
 
     if !args.only_libcore {
         cargo_install("hyperfine")?;

tests/lang_tests_common.rs

@@ -73,22 +73,25 @@ pub fn main_inner(profile: Profile) {
                 }
             }
             // Test command 2: run `tempdir/x`.
-            let vm_parent_dir = "..";
-            let vm_dir = "vm";
+            let vm_parent_dir = "/home/bouanto/Ordinateur/VirtualMachines";
+            let vm_dir = "debian-m68k-root-img/";
             let exe_filename = exe.file_name().unwrap();
             let vm_exe_path = PathBuf::from(vm_parent_dir).join(vm_dir).join("home").join(exe_filename);
             // FIXME: panicking here makes the test pass.
             let inside_vm_exe_path = PathBuf::from("/home").join(&exe_filename);
             let mut copy = Command::new("sudo");
             copy.arg("cp");
             copy.args(&[&exe, &vm_exe_path]);
-            copy.status().expect("copy executable inside VM");
 
             let mut runtime = Command::new("sudo");
             runtime.args(&["chroot", vm_dir, "qemu-m68k-static"]);
             runtime.arg(inside_vm_exe_path);
             runtime.current_dir(vm_parent_dir);
-            vec![("Compiler", compiler), ("Run-time", runtime)]
+            vec![
+                ("Compiler", compiler),
+                ("Copy", copy),
+                ("Run-time", runtime),
+            ]
         })
         .run();
 }