dominus

Untitled

Sep 29th, 2020
865
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/makefile b/makefile
  2. index 7b34306e082..7bae8d1fb5b 100644
  3. --- a/makefile
  4. +++ b/makefile
  5. @@ -1416,13 +1416,18 @@ macosx_x86: generate $(PROJECTDIR)/$(MAKETYPE)-osx/Makefile
  6.  #-------------------------------------------------
  7.  
  8.  $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
  9. -   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=osx-clang --gcc_version=$(CLANG_VERSION) $(MAKETYPE)
  10. +   $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=osx-clang --gcc_version=$(CLANG_VERSION) --PLATFORM=arm64 --NOASM=1 --FORCE_DRC_C_BACKEND=1 $(MAKETYPE)
  11.  
  12.  .PHONY: macosx_x64_clang
  13.  macosx_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile
  14.     $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)64 precompile
  15.     $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)64
  16.  
  17. +.PHONY: macosx_arm64_clang
  18. +macosx_arm64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile
  19. +   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)64 precompile
  20. +   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)64
  21. +
  22.  .PHONY: macosx_x86_clang
  23.  macosx_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile
  24.     $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)32 precompile
  25. diff --git a/scripts/genie.lua b/scripts/genie.lua
  26. index 5310e003ed8..f714e8dc159 100644
  27. --- a/scripts/genie.lua
  28. +++ b/scripts/genie.lua
  29. @@ -679,12 +679,21 @@ else
  30.     }
  31.     if _OPTIONS["targetos"]=="macosx" then
  32.         configuration { "x64" }
  33. +       if (_OPTIONS["PLATFORM"]=="arm64") then
  34. +           buildoptions {
  35. +               "-arch arm64",
  36. +           }
  37. +           linkoptions {
  38. +               "-arch arm64",
  39. +           }
  40. +       else
  41.             buildoptions {
  42.                 "-arch x86_64",
  43.             }
  44.             linkoptions {
  45.                 "-arch x86_64",
  46.             }
  47. +       end
  48.         configuration { "x32" }
  49.             buildoptions {
  50.                 "-arch i386",
  51. diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
  52. index 3eb2acf0e0b..65c00510d2d 100644
  53. --- a/scripts/toolchain.lua
  54. +++ b/scripts/toolchain.lua
  55. @@ -1068,7 +1068,7 @@ function toolchain(_buildDir, _subDir)
  56.     configuration { "osx*", "x64" }
  57.         objdir (_buildDir .. "osx_clang" .. "/obj")
  58.         buildoptions {
  59. -           "-m64", "-DHAVE_IMMINTRIN_H=1",
  60. +           "-m64", "-DHAVE_IMMINTRIN_H=0", "-DSDL_DISABLE_IMMINTRIN_H=1", "-DHAVE_SSE=0"
  61.         }
  62.  
  63.     configuration { "osx*", "x64", "Release" }
  64. diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp
  65. index dc0d8a940a4..56c24f7eae1 100644
  66. --- a/src/mame/drivers/cmi.cpp
  67. +++ b/src/mame/drivers/cmi.cpp
  68. @@ -161,7 +161,7 @@
  69.  
  70.  static const int ch_int_levels[8] =
  71.  {
  72. -   12 ^ 7, 8 ^ 7, 13 ^ 7, 9 ^ 7, 14 ^ 7, 10 ^ 7, 15 ^ 7, 11  ^ 7
  73. +   12 ^ 7, 8 ^ 7, 13 ^ 7, 9 xor 7, 14 ^ 7, 10 xor 7, 15 ^ 7, 11  ^ 7
  74.  };
  75.  
  76.  #define IRQ_PERRINT_LEVEL       (0 ^ 7)
  77. diff --git a/src/mame/drivers/spg2xx_pdc.cpp b/src/mame/drivers/spg2xx_pdc.cpp
  78. index 431a4dd9deb..b34cfcb3137 100644
  79. --- a/src/mame/drivers/spg2xx_pdc.cpp
  80. +++ b/src/mame/drivers/spg2xx_pdc.cpp
  81. @@ -240,7 +240,7 @@ void spg2xx_pdc_game_state::init_pdc150t()
  82.  
  83.     for (int i = 0; i < len/2; i++)
  84.     {
  85. -       src[i] = bitswap<16>(src[i], 3^8,11^8,2^8,10^8,1^8,9^8,0^8,8^8, 12^8,4^8,13^8,5^8,14^8,6^8,15^8,7^8 );
  86. +       src[i] = bitswap<16>(src[i], 3^8,11^8,2 xor 8,10 xor 8,1^8,9^8,0^8,8^8, 12^8,4^8,13^8,5^8,14^8,6^8,15^8,7^8 );
  87.     }
  88.  
  89.  #if 0
  90.  
RAW Paste Data