diff --git a/makefile b/makefile index 7b34306e082..7bae8d1fb5b 100644 --- a/makefile +++ b/makefile @@ -1416,13 +1416,18 @@ macosx_x86: generate $(PROJECTDIR)/$(MAKETYPE)-osx/Makefile #------------------------------------------------- $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile: makefile $(SCRIPTS) $(GENIE) - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=osx-clang --gcc_version=$(CLANG_VERSION) $(MAKETYPE) + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=osx-clang --gcc_version=$(CLANG_VERSION) --PLATFORM=arm64 --NOASM=1 --FORCE_DRC_C_BACKEND=1 $(MAKETYPE) .PHONY: macosx_x64_clang macosx_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)64 precompile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)64 +.PHONY: macosx_arm64_clang +macosx_arm64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile + $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)64 precompile + $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)64 + .PHONY: macosx_x86_clang macosx_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)32 precompile diff --git a/scripts/genie.lua b/scripts/genie.lua index 5310e003ed8..f714e8dc159 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -679,12 +679,21 @@ else } if _OPTIONS["targetos"]=="macosx" then configuration { "x64" } + if (_OPTIONS["PLATFORM"]=="arm64") then + buildoptions { + "-arch arm64", + } + linkoptions { + "-arch arm64", + } + else buildoptions { "-arch x86_64", } linkoptions { "-arch x86_64", } + end configuration { "x32" } buildoptions { "-arch i386", diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 3eb2acf0e0b..65c00510d2d 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -1068,7 +1068,7 @@ function toolchain(_buildDir, _subDir) configuration { "osx*", "x64" } objdir (_buildDir .. "osx_clang" .. "/obj") buildoptions { - "-m64", "-DHAVE_IMMINTRIN_H=1", + "-m64", "-DHAVE_IMMINTRIN_H=0", "-DSDL_DISABLE_IMMINTRIN_H=1", "-DHAVE_SSE=0" } configuration { "osx*", "x64", "Release" } diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index dc0d8a940a4..56c24f7eae1 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -161,7 +161,7 @@ static const int ch_int_levels[8] = { - 12 ^ 7, 8 ^ 7, 13 ^ 7, 9 ^ 7, 14 ^ 7, 10 ^ 7, 15 ^ 7, 11 ^ 7 + 12 ^ 7, 8 ^ 7, 13 ^ 7, 9 xor 7, 14 ^ 7, 10 xor 7, 15 ^ 7, 11 ^ 7 }; #define IRQ_PERRINT_LEVEL (0 ^ 7) diff --git a/src/mame/drivers/spg2xx_pdc.cpp b/src/mame/drivers/spg2xx_pdc.cpp index 431a4dd9deb..b34cfcb3137 100644 --- a/src/mame/drivers/spg2xx_pdc.cpp +++ b/src/mame/drivers/spg2xx_pdc.cpp @@ -240,7 +240,7 @@ void spg2xx_pdc_game_state::init_pdc150t() for (int i = 0; i < len/2; i++) { - 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 ); + 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 ); } #if 0