Merge branch 'master' into jit-rs

.github/workflows/build.yml

@@ -100,7 +100,12 @@ jobs:
           path: upload
 
   build-nix:
-    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        os:
+          - ubuntu-22.04
+          - macos-14
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main

CMakeLists.txt

@@ -87,10 +87,16 @@ else()
     endif()
 endif()
 
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
+    set (X86 TRUE)
+else ()
+    set (X86 FALSE)
+endif ()
+
 check_c_compiler_flag("-mssse3" HAS_SSSE3)
 check_c_compiler_flag("-msse4.1" HAS_SSE4_1)
 
-if (HAS_SSSE3 AND HAS_SSE4_1)
+if (HAS_SSSE3 AND HAS_SSE4_1 AND X86)
     set(DEFAULT_C_COMP_OPTIONS ${DEFAULT_C_COMP_OPTIONS} -mssse3 -msse4.1)
     ADD_COMPILE_DEFINITIONS(N64_HAVE_SSE)
 endif()

flake.nix

@@ -39,10 +39,15 @@
         pkgs.capstone
         pkgs.dbus
         pkgs.bzip2
+      ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
+        pkgs.darwin.apple_sdk.frameworks.Cocoa
       ];
+      stdenv = if pkgs.stdenv.isLinux then pkgs.stdenv
+                else if pkgs.stdenv.isDarwin then pkgs.clang18Stdenv
+                else throw "Unsupported platform";
     in
     {
-      packages.default = pkgs.stdenv.mkDerivation
+      packages.default = stdenv.mkDerivation
         {
           cargoDeps = pkgs.rustPlatform.importCargoLock {
             lockFile = ./src/jit/Cargo.lock;
@@ -66,20 +71,28 @@
             (pkgs.lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
           ];
           passthru.exePath = "/bin/n64";
-          postInstall = ''
-            wrapProgram $out/bin/n64 --set LD_LIBRARY_PATH ${pkgs.vulkan-loader}/lib
-          '';
+          postInstall =
+            if pkgs.stdenv.isLinux then ''
+              wrapProgram $out/bin/n64 --set LD_LIBRARY_PATH ${pkgs.vulkan-loader}/lib
+            '' else if pkgs.stdenv.isDarwin then ''
+              wrapProgram $out/bin/n64 --set DYLD_FALLBACK_LIBRARY_PATH ${pkgs.darwin.moltenvk}/lib
+            '' else throw "Unsupported platform";
+
         };
 
       apps.default = {
         type = "app";
         program = "${self.packages.${system}.default}/bin/n64";
       };
 
-      devShells.default = pkgs.mkShell
+      devShells.default = pkgs.mkShell.override { stdenv = stdenv; }
         {
           buildInputs = devShellTools ++ tools ++ libs;
-          LD_LIBRARY_PATH = "${pkgs.vulkan-loader}/lib";
+          shellHook = if stdenv.isLinux then ''
+            export LD_LIBRARY_PATH="${pkgs.vulkan-loader}/lib";
+          '' else if stdenv.isDarwin then ''
+            export DYLD_FALLBACK_LIBRARY_PATH="${pkgs.darwin.moltenvk}/lib";
+          '' else throw "Unsupported platform";
         };
     }
   );

src/common/util.h

@@ -48,11 +48,11 @@ typedef __m128i s128;
 #define ASSERTDWORD(type) _Static_assert(sizeof(type) == 8, #type " must be 64 bits")
 #endif
 
-#ifndef N64_WIN
+#if defined(N64_WIN) || defined(N64_MACOS)
+#define PATH_MAX 0x1000
+#else
 #include <unistd.h>
 #include <linux/limits.h>
-#else
-#define PATH_MAX 0x1000
 #endif
 
 
@@ -69,7 +69,7 @@ INLINE u32 npow2(u32 x) {
 }
 
 INLINE bool file_exists(const char* path) {
-#ifndef N64_WIN
+#if !defined(N64_WIN) && !defined(N64_MACOS)
     return access(path, F_OK) == 0;
 #else
     FILE* f = fopen(path, "r");

src/cpu/fpu_instructions.c

@@ -266,7 +266,7 @@ void set_cause_cvt_l_d(double d) {
 #define check_nans_f(fs, ft) do { assert_is_float(fs); assert_is_float(ft); if (is_nan_f(fs) || is_nan_f(ft)) { set_cause_invalid_operation(); check_fpu_exception(); } } while (0)
 #define check_nans_d(fs, ft) do { assert_is_double(fs); assert_is_double(ft); if (is_nan_d(fs) || is_nan_d(ft)) { set_cause_invalid_operation(); check_fpu_exception(); } } while (0)
 
-#ifdef N64_WIN
+#if defined(N64_WIN) || defined(N64_MACOS)
 #define unordered_s(a, b) (isnan(a) || isnan(b))
 #define unordered_d(a, b) (isnan(a) || isnan(b))
 #else

src/system/mprotect_utils.c

@@ -45,6 +45,8 @@ void mprotect_rwx(u8* cache, size_t size, const char* cache_name) {
     if (!VirtualProtect(cache, size, PAGE_EXECUTE_READWRITE, &oldProtect)) {
         mprotect_error(cache_name);
     }
+#elif defined(N64_MACOS)
+    // no-op
 #else
     if (mprotect(cache, size, PROT_READ | PROT_WRITE | PROT_EXEC) != 0) {
         mprotect_error(cache_name);

tests/test_dynarec_v2.c

@@ -38,7 +38,7 @@ void test_branch_likely(bool jit) {
     n64_system_step(false, 1);
 
     assert_reg_value((u64)0, MIPS_REG_T0);
-    assert_eq_u64("pc", 0xFFFFFFFF80000008, N64CPU.pc);
+    assert_eq_u64("pc", 0xFFFFFFFF80000008ULL, N64CPU.pc);
 
     if (jit) {
         n64_system_step(true, -1);
@@ -48,7 +48,7 @@ void test_branch_likely(bool jit) {
     }
 
     // Branch was NOT taken.
-    assert_eq_u64("pc", 0xFFFFFFFF80000014, N64CPU.pc);
+    assert_eq_u64("pc", 0xFFFFFFFF80000014ULL, N64CPU.pc);
 
     // Delay slot was skipped.
     // 0: register is not getting written back at all

tests/test_rom.c

@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #define LOG_ENABLED
 #include <log.h>
+#include <inttypes.h>
 #include <system/n64system.h>
 #include <cpu/mips_instructions.h>
 #include <cpu/r4300i_register_access.h>
@@ -15,7 +16,7 @@ bool test_complete() {
     s64 test_failed = get_register(TEST_FAILED_REGISTER);
     if (test_failed != 0) {
         if (test_failed != -1) {
-            logfatal("Test #%ld failed.", test_failed);
+            logfatal("Test #%" PRId64 " failed.", test_failed);
         }
 
         return true;

tests/unit.h

@@ -1,6 +1,7 @@
 #ifndef N64_UNIT_H
 #define N64_UNIT_H
 #include <cpu/r4300i_register_access.h>
+#include <inttypes.h>
 
 static int tests_failed = 0;
 
@@ -62,9 +63,9 @@ void test_instr_1_1_imm(case_instr_1_1_imm test_case, mipsinstr_handler_t instr,
     u64 actual = get_register(routput);
 
     if (actual != test_case.output) {
-        failed("%s: r%d, (r%d)%ld, %d | Expected: %ld but got %ld", instr_name, routput, rinput, test_case.input, test_case.immediate, test_case.output, actual)
+        failed("%s: r%d, (r%d)%" PRId64 ", %d | Expected: %" PRId64 " but got %" PRId64, instr_name, routput, rinput, test_case.input, test_case.immediate, test_case.output, actual)
     } else if (SHOULD_LOG_PASSED_TESTS) {
-        passed("%s: r%d, (r%d)%ld, %d | Expected: %ld and got %ld", instr_name, routput, rinput, test_case.input, test_case.immediate, test_case.output, actual)
+        passed("%s: r%d, (r%d)%" PRId64 ", %d | Expected: %" PRId64 " and got %" PRId64, instr_name, routput, rinput, test_case.input, test_case.immediate, test_case.output, actual)
     }
 }
 
@@ -88,9 +89,9 @@ void test_instr_2_1(case_instr_2_1 test_case, mipsinstr_handler_t instr, const c
     u64 actual = get_register(routput);
 
     if (actual != test_case.output) {
-        failed("%s: r%d, (r%d)%ld, (r%d)%ld | Expected: %ld but got %ld", instr_name, routput, rinput1, test_case.r1, rinput2, test_case.r2, test_case.output, actual)
+        failed("%s: r%d, (r%d)%" PRId64 ", (r%d)%" PRId64 " | Expected: %" PRId64 " but got %" PRId64, instr_name, routput, rinput1, test_case.r1, rinput2, test_case.r2, test_case.output, actual)
     } else if (SHOULD_LOG_PASSED_TESTS) {
-        passed("%s: r%d, (r%d)%ld, (r%d)%ld | Expected: %ld and got %ld", instr_name, routput, rinput1, test_case.r1, rinput2, test_case.r2, test_case.output, actual)
+        passed("%s: r%d, (r%d)%" PRId64 ", (r%d)%" PRId64 " | Expected: %" PRId64 " and got %" PRId64, instr_name, routput, rinput1, test_case.r1, rinput2, test_case.r2, test_case.output, actual)
     }
 }