Skip to content

Manic EMU is an all-in-one retro game emulator for iOS. It packs powerful features while keeping a clean, sleek UI and delivering buttery-smooth gameplay.

Swift

Adapting JIT for iOS 26 across multiple cores

Daiuno49ba8003e59b
diff --git a/.gitignore b/.gitignore
index 85461334..e416b804 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,6 +98,12 @@ Cores/libretro-azahar
Cores/J2meJS
Cores/freej2me-web
Cores/melonDS
+Cores/flycast
+Cores/beetle-psx-libretro
+Cores/dosbox-pure
+Cores/mupen64plus
+Cores/libretro-common
+StikDebug
i18n/
#claude code
diff --git a/Cores/Azahar b/Cores/Azahar
index 9e6ae5a3..61df83e3 160000
--- a/Cores/Azahar
+++ b/Cores/Azahar
@@ -1 +1 @@
-Subproject commit 9e6ae5a3fc4b87510e3fe7986b55d51942b0edf2
+Subproject commit 61df83e35fdd0e28de19a884c4961bee19d5dc4d
diff --git a/Cores/Libretro/ui/drivers/LibretroCore.m b/Cores/Libretro/ui/drivers/LibretroCore.m
index c2bc8f34..1a865519 100644
--- a/Cores/Libretro/ui/drivers/LibretroCore.m
+++ b/Cores/Libretro/ui/drivers/LibretroCore.m
@@ -544,6 +544,9 @@ NSString * const MAMEGameFileMissingNotification = @"MAMEGameFileMissingNotifica
}
+ (BOOL)JITAvailable {
+ if (LibretroCore.sharedInstance.forbitJIT) {
+ return false;
+ }
return jit_available();
}
diff --git a/Cores/Libretro/ui/drivers/cocoa/LibretroCore.h b/Cores/Libretro/ui/drivers/cocoa/LibretroCore.h
index dd5b4664..541ed232 100644
--- a/Cores/Libretro/ui/drivers/cocoa/LibretroCore.h
+++ b/Cores/Libretro/ui/drivers/cocoa/LibretroCore.h
@@ -42,6 +42,7 @@ extern NSString * const RetroAchievementsNotification;
@property(nonatomic, strong) id retroArch_iOS;
@property (nonatomic, copy, nullable) NSString *workspace;
+@property (assign) BOOL forbitJIT;
+ (instancetype)sharedInstance;
diff --git a/Cores/Libretro/verbosity.c b/Cores/Libretro/verbosity.c
index 5f469678..3ed1683b 100644
--- a/Cores/Libretro/verbosity.c
+++ b/Cores/Libretro/verbosity.c
@@ -294,7 +294,7 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
int sz = vsnprintf(NULL, 0, fmt, ap) + 1;
char buffer[sz]; /* TODO/FIXME - VLA - C89 backwards compatibility */
vsnprintf(buffer, sz, fmt, ap);
- os_log(OS_LOG_DEFAULT, "%s %s", tag_v, buffer);
+ os_log(OS_LOG_DEFAULT, "%{public}s %{public}s", tag_v, buffer);
#else
static aslclient asl_client;
static int asl_initialized = 0;
diff --git a/Cores/dosbox.pure.libretro.framework/Info.plist b/Cores/dosbox.pure.libretro.framework/Info.plist
index 271d4071..917de113 100644
--- a/Cores/dosbox.pure.libretro.framework/Info.plist
+++ b/Cores/dosbox.pure.libretro.framework/Info.plist
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bc543310c0d359fb56f7cf305489d4efb08c9cc784ab0cda9f0cff64e3eaf72d
-size 730
+oid sha256:01e15b7f69ee6e261d0cdad27f78eec709a272931ffd0630396fc0bd36e5d0c7
+size 1014
diff --git a/Cores/dosbox.pure.libretro.framework/_CodeSignature/CodeResources b/Cores/dosbox.pure.libretro.framework/_CodeSignature/CodeResources
index ea939467..ef5905b5 100644
--- a/Cores/dosbox.pure.libretro.framework/_CodeSignature/CodeResources
+++ b/Cores/dosbox.pure.libretro.framework/_CodeSignature/CodeResources
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e7bd2ed2a5d90646a3e4db07c3024ce4f2f52a461e58dab27b74fc0d437ceb75
+oid sha256:6301344718e9f47d8fe596b4e61ed7d9f976359694454a9aeffdfb3a9912b2cc
size 1798
diff --git a/Cores/dosbox.pure.libretro.framework/dosbox.pure.libretro b/Cores/dosbox.pure.libretro.framework/dosbox.pure.libretro
index e9f3d009..7edacd6d 100755
--- a/Cores/dosbox.pure.libretro.framework/dosbox.pure.libretro
+++ b/Cores/dosbox.pure.libretro.framework/dosbox.pure.libretro
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0f4a41c46135f9febe6d014a7fb3f31d5f3dc9b15134828557e4d8cef8ba3eab
-size 2377200
+oid sha256:c90c02bed984de41c6eb3300cdfd9cf16b3b7b13e53da7d65fcbe726adb58fa7
+size 2562480
diff --git a/Cores/flycast.libretro.framework/Info.plist b/Cores/flycast.libretro.framework/Info.plist
index 9b98ef5b..6e8cc3b1 100644
--- a/Cores/flycast.libretro.framework/Info.plist
+++ b/Cores/flycast.libretro.framework/Info.plist
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e739889febf1ca5b51c15e0816aaeb199e034d7acd10e602312cb569195f9594
-size 718
+oid sha256:9301a5da422021873aeccfb77664c8f495b0aaf226dc568f492ee71aa65b5a36
+size 1010
diff --git a/Cores/flycast.libretro.framework/_CodeSignature/CodeResources b/Cores/flycast.libretro.framework/_CodeSignature/CodeResources
index dd61de53..47d7d4b2 100644
--- a/Cores/flycast.libretro.framework/_CodeSignature/CodeResources
+++ b/Cores/flycast.libretro.framework/_CodeSignature/CodeResources
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:57e437b2871417e40fc973c5f6b65371f7aa9b37c31c5d4acf7329ea43bdd2ac
+oid sha256:26cc9235fc04e6b7cc971b3cb94e058f230f20715300dd473184d6c0c4bb0ea0
size 1798
diff --git a/Cores/flycast.libretro.framework/flycast.libretro b/Cores/flycast.libretro.framework/flycast.libretro
index b88f0b34..c89f6c25 100755
--- a/Cores/flycast.libretro.framework/flycast.libretro
+++ b/Cores/flycast.libretro.framework/flycast.libretro
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2c052e9f1a6fa904cb54f25d1d0762059fb732f3bc18fef74b3629993176c7ba
-size 17057584
+oid sha256:6120adfad190032e84b686c6bf2f337c1f29771360aff37aa69e7f459a30bfb1
+size 18082496
diff --git a/Cores/mednafen.psx.hw.libretro.framework/Info.plist b/Cores/mednafen.psx.hw.libretro.framework/Info.plist
index 8f43c32f..4aa6c20d 100644
--- a/Cores/mednafen.psx.hw.libretro.framework/Info.plist
+++ b/Cores/mednafen.psx.hw.libretro.framework/Info.plist
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c1846430df88f9f456803e95da9efb26a0b31a1ac4e9885386bbf5b75f56794b
-size 742
+oid sha256:d97defdad7108eaffe106c6d7e4ae0b52bb5432b6e12c751b5ee9da14b87c666
+size 1026
diff --git a/Cores/mednafen.psx.hw.libretro.framework/_CodeSignature/CodeResources b/Cores/mednafen.psx.hw.libretro.framework/_CodeSignature/CodeResources
index 88337c50..79ff1b28 100644
--- a/Cores/mednafen.psx.hw.libretro.framework/_CodeSignature/CodeResources
+++ b/Cores/mednafen.psx.hw.libretro.framework/_CodeSignature/CodeResources
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:71f897ba95538d95b45564721271cdfa8a486eb19653138842b5604790be16d3
+oid sha256:f56c759b0edc061eb07ef6ea8dfe7eeebd42cc11c459705acd736fe44f4f56fd
size 1798
diff --git a/Cores/mednafen.psx.hw.libretro.framework/mednafen.psx.hw.libretro b/Cores/mednafen.psx.hw.libretro.framework/mednafen.psx.hw.libretro
index fb22ee9a..818de248 100755
--- a/Cores/mednafen.psx.hw.libretro.framework/mednafen.psx.hw.libretro
+++ b/Cores/mednafen.psx.hw.libretro.framework/mednafen.psx.hw.libretro
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fe74b508ff821cbec830801396f9676a12329ba2263e44de9e25f0f652395f32
-size 11494240
+oid sha256:ad784d653a96e8519c6abae60157e42d0e916e11d24f489a024aebe8ad89ef37
+size 12762736
diff --git a/Cores/melondsds.libretro.framework/melondsds.libretro b/Cores/melondsds.libretro.framework/melondsds.libretro
index 741c4f69..da190af3 100755
--- a/Cores/melondsds.libretro.framework/melondsds.libretro
+++ b/Cores/melondsds.libretro.framework/melondsds.libretro
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a8c6b65c6c706a8739505406d5c5adc8daee4446f114d11db5461e66f3e491cf
-size 4603296
+oid sha256:2cedc9333806dd53aee0466a0ba623dbebe8bab6a22268c4cbc9c67b462b08e7
+size 4748304
diff --git a/Cores/mupen64plus.next.jit.libretro.framework/Info.plist b/Cores/mupen64plus.next.jit.libretro.framework/Info.plist
new file mode 100644
index 00000000..be6f7708
--- /dev/null
+++ b/Cores/mupen64plus.next.jit.libretro.framework/Info.plist
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c729bae93e2e0cdae88dd4976bf1110e8005fc6a3e5fd9ba1658bd5249bcd143
+size 758
diff --git a/Cores/mupen64plus.next.jit.libretro.framework/mupen64plus.next.jit.libretro b/Cores/mupen64plus.next.jit.libretro.framework/mupen64plus.next.jit.libretro
new file mode 100644
index 00000000..5df6f2e4
--- /dev/null
+++ b/Cores/mupen64plus.next.jit.libretro.framework/mupen64plus.next.jit.libretro
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:222772c956f00cfe0275b9a12206c52c1c028c3f9041131c4f59207a5d93c189
+size 4094080
diff --git a/Cores/ppsspp.libretro.framework/Info.plist b/Cores/ppsspp.libretro.framework/Info.plist
index 89a03a2d..a1269f39 100644
--- a/Cores/ppsspp.libretro.framework/Info.plist
+++ b/Cores/ppsspp.libretro.framework/Info.plist
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7ded6bf441be9963d18d3f38183c360bc17bd536c698a30e4a4588f2176de6f6
+oid sha256:3a6565afb47c3569da7e7647fd544cae8af8826756e4ff975d8c68e33613d5fc
size 1006
diff --git a/Cores/ppsspp.libretro.framework/_CodeSignature/CodeResources b/Cores/ppsspp.libretro.framework/_CodeSignature/CodeResources
index c4f9366d..5fc18706 100644
--- a/Cores/ppsspp.libretro.framework/_CodeSignature/CodeResources
+++ b/Cores/ppsspp.libretro.framework/_CodeSignature/CodeResources
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6a5868bebad75e501bec283e87f8d060957e04992aaca5b23e6683307b138669
+oid sha256:641d39d361353179d7a4beddd60dc99732fb708b63103892911f30018daa982b
size 1798
diff --git a/Cores/ppsspp.libretro.framework/ppsspp.libretro b/Cores/ppsspp.libretro.framework/ppsspp.libretro
index 4b6973c3..568e368e 100755
--- a/Cores/ppsspp.libretro.framework/ppsspp.libretro
+++ b/Cores/ppsspp.libretro.framework/ppsspp.libretro
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a6823d30ff396e3d1fa44ddf233e198f3f2e055f11e78f0cb9395be4b84f7917
-size 16933008
+oid sha256:f7e0b75d23a80d58ead1329f4c90123b713d46f2403eb0fa26c16b25e93c22ab
+size 16457552
diff --git a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj b/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
index ef1ae39f..df6f4607 100644
--- a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
+++ b/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
@@ -656,6 +656,7 @@
57913B492D5ED7D7004D51AA /* SaveItemCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57913B482D5ED7D7004D51AA /* SaveItemCollectionViewCell.swift */; };
57913B532D5EF725004D51AA /* DateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57913B522D5EF71D004D51AA /* DateExtension.swift */; };
579213532D95314800E88819 /* BaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 579213522D95313800E88819 /* BaseNavigationController.swift */; };
+ 5792E7312F83B2650015CE0E /* mupen64plus.next.jit.libretro.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5792E7302F83B2560015CE0E /* mupen64plus.next.jit.libretro.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
579C114B2D1D0B1900CFD1F5 /* ApplicationSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 579C114A2D1D0B1900CFD1F5 /* ApplicationSceneDelegate.swift */; };
579C114D2D1D0E0A00CFD1F5 /* UIWindowExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 579C114C2D1D0E0A00CFD1F5 /* UIWindowExtensions.swift */; };
57A480CC2E733B83001D4598 /* flycast-jitless.libretro.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 57A480CB2E733B77001D4598 /* flycast-jitless.libretro.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -1229,6 +1230,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
+ 5792E7312F83B2650015CE0E /* mupen64plus.next.jit.libretro.framework in Embed Frameworks */,
578F24032F7A75AC00C8D834 /* azahar.libretro.framework/azahar.libretro in Embed Frameworks */,
578452C02F6A7F500020A88F /* dosbox.pure.libretro.framework in Embed Frameworks */,
D90358FF409D7405F5E406CC /* prboom.libretro.framework in Embed Frameworks */,
@@ -2112,6 +2114,7 @@
57913B482D5ED7D7004D51AA /* SaveItemCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SaveItemCollectionViewCell.swift; sourceTree = "<group>"; };
57913B522D5EF71D004D51AA /* DateExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateExtension.swift; sourceTree = "<group>"; };
579213522D95313800E88819 /* BaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseNavigationController.swift; sourceTree = "<group>"; };
+ 5792E7302F83B2560015CE0E /* mupen64plus.next.jit.libretro.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mupen64plus.next.jit.libretro.framework; path = ../Cores/mupen64plus.next.jit.libretro.framework; sourceTree = SOURCE_ROOT; };
579AB9D52E6C1118000868CB /* Config-SideloadDebug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Config-SideloadDebug.xcconfig"; sourceTree = "<group>"; };
579C114A2D1D0B1900CFD1F5 /* ApplicationSceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationSceneDelegate.swift; sourceTree = "<group>"; };
579C114C2D1D0E0A00CFD1F5 /* UIWindowExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIWindowExtensions.swift; sourceTree = "<group>"; };
@@ -4468,6 +4471,7 @@
5744C71B2E375EFF0088081A /* pokemini.libretro.framework */,
5754D8C22E27A562001EA5ED /* mednafen.vb.libretro.framework */,
57D0BC0D2E1AD31A008C3049 /* mupen64plus.next.libretro.framework */,
+ 5792E7302F83B2560015CE0E /* mupen64plus.next.jit.libretro.framework */,
57DCE8522E0F97780079E3AA /* yabause.libretro.framework */,
57DCE79D2E0C43310079E3AA /* mednafen.saturn.libretro.framework */,
57655C1E2DF6B94C003E4A6E /* picodrive.libretro.framework */,
diff --git a/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings
index a8aec8fb..bf646437 100644
--- a/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings
@@ -917,3 +917,7 @@ Press the controller button to complete mapping...";
"FirstAnniversary" = "THANKS FOR BEING HERE,\nWE WROTE YOU SOMETHING";
"ApirlFoolsDayTitle" = "Uh-oh, is Manic EMU broken?";
"ApirlFoolsDayDetail" = "Don't worry!\nJust kidding—happy April Fools' Day!\n\nEverything will be back to normal once you close this.";
+
+"JITType" = "JIT Type";
+"JITTypeDesc" = "JIT is the fastest, while IR JIT is moderately fast.";
+
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Models/ExtraKey.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Models/ExtraKey.swift
index abfa6fe3..baa4c61b 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Models/ExtraKey.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Models/ExtraKey.swift
@@ -54,4 +54,6 @@ enum ExtraKey: String {
case j2meScreenRotate
case coreConfigs
case skinSoundEffects
+ case jitType
+ case biosName
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoDetailReusableView.swift b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoDetailReusableView.swift
index f638e74d..fcfc3372 100644
--- a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoDetailReusableView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoDetailReusableView.swift
@@ -269,7 +269,7 @@ class GameInfoDetailReusableView: UICollectionReusableView {
actions.append((UIAction(title: R.string.localizable.on()) { [weak self] _ in
guard let self = self else { return }
self.jitButton.titleLabel.text = "JIT \(R.string.localizable.on())"
- if let game {
+ if let game = self.game {
Game.change { _ in
game.jit = true
}
@@ -278,7 +278,7 @@ class GameInfoDetailReusableView: UICollectionReusableView {
actions.append(UIAction(title: R.string.localizable.off()) { [weak self] _ in
guard let self = self else { return }
self.jitButton.titleLabel.text = "JIT \(R.string.localizable.off())"
- if let game {
+ if let game = self.game {
Game.change { _ in
game.jit = false
}
@@ -317,6 +317,83 @@ class GameInfoDetailReusableView: UICollectionReusableView {
return view
}()
+ private lazy var jitTypeContextMenuButton: ContextMenuButton = {
+ var actions: [UIMenuElement] = []
+ actions.append((UIAction(title: "JIT") { [weak self] _ in
+ guard let self = self else { return }
+ self.jitTypeButton.titleLabel.text = "\(R.string.localizable.jitType())\nJIT"
+ self.game?.updateExtra(key: ExtraKey.jitType.rawValue, value: 0)
+ }))
+ actions.append(UIAction(title: "IR JIT") { [weak self] _ in
+ guard let self = self else { return }
+ self.jitTypeButton.titleLabel.text = "\(R.string.localizable.jitType())\nIR JIT"
+ self.game?.updateExtra(key: ExtraKey.jitType.rawValue, value: 1)
+ })
+ let view = ContextMenuButton(image: nil, menu: UIMenu(title: R.string.localizable.jitTypeDesc(), children: actions))
+ return view
+ }()
+
+ private lazy var jitTypeButton: SymbolButton = {
+ let title: String
+ let jitAvailable = LibretroCore.jitAvailable()
+ if jitAvailable {
+ let jitType = ((game?.getExtraInt(key: ExtraKey.jitType.rawValue) ?? 0) == 0) ? "JIT" : "IR JIT"
+ title = "\(R.string.localizable.jitType())\n\(jitType)"
+ } else {
+ title = R.string.localizable.jitNotAllow()
+ }
+ let view = SymbolButton(symbol: .boltFill, title: title, horizontalContian: true)
+ view.titleLabel.numberOfLines = 0
+ view.addTapGesture { [weak self] gesture in
+ guard let self = self else { return }
+ if jitAvailable {
+ self.jitTypeContextMenuButton.triggerTapGesture()
+ } else {
+ UIView.makeToast(message: R.string.localizable.jitNoSupportDesc())
+ }
+ }
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
+ return view
+ }()
+
+ private lazy var biosSelectionContextMenuButton: ContextMenuButton = {
+ let ps1Bios = game?.ps1ImportedBios ?? []
+ var actions: [UIMenuElement] = ps1Bios.map({ bios in
+ UIAction(title: bios.fileName, subtitle: bios.desc) { [weak self] _ in
+ guard let self = self else { return }
+ self.biosSelectionButton.titleLabel.text = "BIOS\n" + bios.fileName.deletingPathExtension
+ self.game?.updateExtra(key: ExtraKey.biosName.rawValue, value: bios.fileName)
+ }
+ })
+ actions.append(UIAction(title: "OpenBIOS") { [weak self] _ in
+ guard let self = self else { return }
+ self.biosSelectionButton.titleLabel.text = "BIOS\nOpenBIOS"
+ self.game?.updateExtra(key: ExtraKey.biosName.rawValue, value: nil)
+ })
+ let view = ContextMenuButton(image: nil, menu: UIMenu(title: "BIOS", children: actions))
+ return view
+ }()
+
+ private lazy var biosSelectionButton: SymbolButton = {
+ let title = "BIOS\n" + (game?.getExtraString(key: ExtraKey.biosName.rawValue) ?? "OpenBIOS").deletingPathExtension
+ let view = SymbolButton(symbol: .cpu, title: title, horizontalContian: true)
+ view.titleLabel.numberOfLines = 0
+ view.addTapGesture { [weak self] gesture in
+ guard let self, let game = self.game else { return }
+ if game.ps1ImportedBios.count > 0 {
+ self.biosSelectionContextMenuButton.triggerTapGesture()
+ } else {
+ UIView.makeToast(message: R.string.localizable.saturnBiosAlertTitle())
+ }
+ }
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
+ return view
+ }()
+
private lazy var shaderContextMenuButton: ContextMenuButton = {
var actions: [UIMenuElement] = []
actions.append((UIAction(title: R.string.localizable.on()) { [weak self] _ in
@@ -1497,6 +1574,10 @@ class GameInfoDetailReusableView: UICollectionReusableView {
pspRendererButton.removeFromSuperview()
pspTextureContextMenuButton.removeFromSuperview()
pspTextureButton.removeFromSuperview()
+ jitContextMenuButton.removeFromSuperview()
+ jitButton.removeFromSuperview()
+ jitTypeContextMenuButton.removeFromSuperview()
+ jitTypeButton.removeFromSuperview()
if let lastView = functionButtonContainerView.subviews.last {
//语言选择按钮
@@ -1528,11 +1609,36 @@ class GameInfoDetailReusableView: UICollectionReusableView {
make.leading.equalTo(pspRendererButton.snp.trailing).offset(Constants.Size.ContentSpaceMin)
make.centerY.equalToSuperview()
make.size.equalTo(Constants.Size.IconSizeHuge)
- make.trailing.equalToSuperview()
}
pspTextureContextMenuButton.snp.makeConstraints { make in
make.edges.equalTo(pspTextureButton)
}
+
+ //jit
+ functionButtonContainerView.addSubview(jitContextMenuButton)
+ functionButtonContainerView.addSubview(jitButton)
+ jitButton.snp.makeConstraints { make in
+ make.leading.equalTo(pspTextureButton.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.centerY.equalToSuperview()
+ make.size.equalTo(Constants.Size.IconSizeHuge)
+ }
+ jitContextMenuButton.snp.makeConstraints { make in
+ make.edges.equalTo(jitButton)
+ }
+
+ //jitType
+ functionButtonContainerView.addSubview(jitTypeContextMenuButton)
+ functionButtonContainerView.addSubview(jitTypeButton)
+ jitTypeButton.snp.makeConstraints { make in
+ make.leading.equalTo(jitButton.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.centerY.equalToSuperview()
+ make.size.equalTo(Constants.Size.IconSizeHuge)
+ make.trailing.equalToSuperview()
+ }
+ jitTypeContextMenuButton.snp.makeConstraints { make in
+ make.edges.equalTo(jitTypeButton)
+ }
+
}
}
@@ -1570,6 +1676,8 @@ class GameInfoDetailReusableView: UICollectionReusableView {
ndsSystemTypeButton.removeFromSuperview()
gbaSlotContextMenuButton.removeFromSuperview()
gbaSlotButton.removeFromSuperview()
+ jitContextMenuButton.removeFromSuperview()
+ jitButton.removeFromSuperview()
let isMelonDS = (game?.defaultCore ?? 0) == 0
if let lastView = functionButtonContainerView.subviews.last {
//语言选择按钮
@@ -1625,12 +1733,24 @@ class GameInfoDetailReusableView: UICollectionReusableView {
make.leading.equalTo(ndsSystemTypeButton.snp.trailing).offset(Constants.Size.ContentSpaceMin)
make.centerY.equalToSuperview()
make.size.equalTo(Constants.Size.IconSizeHuge)
- make.trailing.equalToSuperview()
}
gbaSlotContextMenuButton.snp.makeConstraints { make in
make.edges.equalTo(gbaSlotButton)
}
}
+
+ //jit
+ functionButtonContainerView.addSubview(jitContextMenuButton)
+ functionButtonContainerView.addSubview(jitButton)
+ jitButton.snp.makeConstraints { make in
+ make.leading.equalTo((enableGBASlot ? gbaSlotButton : ndsSystemTypeButton).snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.centerY.equalToSuperview()
+ make.size.equalTo(Constants.Size.IconSizeHuge)
+ make.trailing.equalToSuperview()
+ }
+ jitContextMenuButton.snp.makeConstraints { make in
+ make.edges.equalTo(jitButton)
+ }
}
}
}
@@ -1641,6 +1761,8 @@ class GameInfoDetailReusableView: UICollectionReusableView {
transferPakButton.removeFromSuperview()
rdpPluginContextMenuButton.removeFromSuperview()
rdpPluginButton.removeFromSuperview()
+ jitContextMenuButton.removeFromSuperview()
+ jitButton.removeFromSuperview()
if let lastView = functionButtonContainerView.subviews.last {
//transferPak
functionButtonContainerView.addSubview(transferPakContextMenuButton)
@@ -1661,11 +1783,23 @@ class GameInfoDetailReusableView: UICollectionReusableView {
make.leading.equalTo(transferPakButton.snp.trailing).offset(Constants.Size.ContentSpaceMin)
make.centerY.equalToSuperview()
make.size.equalTo(Constants.Size.IconSizeHuge)
- make.trailing.equalToSuperview()
}
rdpPluginContextMenuButton.snp.makeConstraints { make in
make.edges.equalTo(rdpPluginButton)
}
+
+ //jit
+ functionButtonContainerView.addSubview(jitContextMenuButton)
+ functionButtonContainerView.addSubview(jitButton)
+ jitButton.snp.makeConstraints { make in
+ make.leading.equalTo(rdpPluginButton.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.centerY.equalToSuperview()
+ make.size.equalTo(Constants.Size.IconSizeHuge)
+ make.trailing.equalToSuperview()
+ }
+ jitContextMenuButton.snp.makeConstraints { make in
+ make.edges.equalTo(jitButton)
+ }
}
}
@@ -1676,6 +1810,10 @@ class GameInfoDetailReusableView: UICollectionReusableView {
psxModeButton.removeFromSuperview()
psxRendererContextMenuButton.removeFromSuperview()
psxRendererButton.removeFromSuperview()
+ jitContextMenuButton.removeFromSuperview()
+ jitButton.removeFromSuperview()
+ biosSelectionContextMenuButton.removeFromSuperview()
+ biosSelectionButton.removeFromSuperview()
if let lastView = functionButtonContainerView.subviews.last {
//导入sbi文件
@@ -1705,12 +1843,36 @@ class GameInfoDetailReusableView: UICollectionReusableView {
make.leading.equalTo(psxModeButton.snp.trailing).offset(Constants.Size.ContentSpaceMin)
make.centerY.equalToSuperview()
make.size.equalTo(Constants.Size.IconSizeHuge)
- make.trailing.equalToSuperview()
}
psxRendererContextMenuButton.snp.makeConstraints { make in
make.edges.equalTo(psxRendererButton)
}
+ //jit
+ functionButtonContainerView.addSubview(jitContextMenuButton)
+ functionButtonContainerView.addSubview(jitButton)
+ jitButton.snp.makeConstraints { make in
+ make.leading.equalTo(psxRendererButton.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.centerY.equalToSuperview()
+ make.size.equalTo(Constants.Size.IconSizeHuge)
+ }
+ jitContextMenuButton.snp.makeConstraints { make in
+ make.edges.equalTo(jitButton)
+ }
+
+ //bios
+ functionButtonContainerView.addSubview(biosSelectionContextMenuButton)
+ functionButtonContainerView.addSubview(biosSelectionButton)
+ biosSelectionButton.snp.makeConstraints { make in
+ make.leading.equalTo(psxRendererButton.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.centerY.equalToSuperview()
+ make.size.equalTo(Constants.Size.IconSizeHuge)
+ make.trailing.equalToSuperview()
+ }
+ biosSelectionContextMenuButton.snp.makeConstraints { make in
+ make.edges.equalTo(biosSelectionButton)
+ }
+
}
}
@@ -1825,6 +1987,8 @@ class GameInfoDetailReusableView: UICollectionReusableView {
private func updateDOSFunctionButton() {
hideDefaultFunctionButtons([retroButton, cheatCodeButton])
dosSettingButton.removeFromSuperview()
+ jitContextMenuButton.removeFromSuperview()
+ jitButton.removeFromSuperview()
if let lastView = functionButtonContainerView.subviews.last {
functionButtonContainerView.addSubview(dosSettingButton)
@@ -1832,9 +1996,21 @@ class GameInfoDetailReusableView: UICollectionReusableView {
make.leading.equalTo(lastView.snp.trailing).offset(Constants.Size.ContentSpaceMin)
make.centerY.equalToSuperview()
make.size.equalTo(Constants.Size.IconSizeHuge)
- make.trailing.equalToSuperview()
}
}
+
+ //jit
+ functionButtonContainerView.addSubview(jitContextMenuButton)
+ functionButtonContainerView.addSubview(jitButton)
+ jitButton.snp.makeConstraints { make in
+ make.leading.equalTo(dosSettingButton.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.centerY.equalToSuperview()
+ make.size.equalTo(Constants.Size.IconSizeHuge)
+ make.trailing.equalToSuperview()
+ }
+ jitContextMenuButton.snp.makeConstraints { make in
+ make.edges.equalTo(jitButton)
+ }
}
private func hideDefaultFunctionButtons(_ buttons: [UIView]) {
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift
index 7270b5de..0f33e714 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift
@@ -270,23 +270,6 @@ class Game: Object, ObjectUpdatable {
}
} else if gameType == .ds {
requireBIOS = Constants.BIOS.DSBios.filter({ required ? $0.required : true })
- } else if gameType == .ps1 {
- //PS1的BIOS必须确保至少拥有一个
- var isPS1BIOSMissing = true
- let fileManager = FileManager.default
- for bios in Constants.BIOS.PS1Bios {
- let biosInLib = Constants.Path.System.appendingPathComponent(bios.fileName)
- let biosInDoc = Constants.Path.BIOS.appendingPathComponent(bios.fileName)
- if fileManager.fileExists(atPath: biosInLib) {
- isPS1BIOSMissing = false
- break
- } else if fileManager.fileExists(atPath: biosInDoc) {
- try? FileManager.safeCopyItem(at: URL(fileURLWithPath: biosInDoc), to: URL(fileURLWithPath: biosInLib))
- isPS1BIOSMissing = false
- break
- }
- }
- return isPS1BIOSMissing
} else if gameType == .fds {
requireBIOS = Constants.BIOS.FDSBios
} else {
@@ -311,20 +294,34 @@ class Game: Object, ObjectUpdatable {
return false
}
- var ps1OverrideBIOSConfig: String {
- let regionFreeBios = ["ps1_rom.bin", "PSXONPSP660.bin"]
+ var ps1ImportedBios: [BIOSItem] {
+ let ps1Bios = Constants.BIOS.PS1Bios
let fileManager = FileManager.default
- for (index, bios) in regionFreeBios.enumerated() {
- let biosInLib = Constants.Path.System.appendingPathComponent(bios)
- let biosInDoc = Constants.Path.BIOS.appendingPathComponent(bios)
+ var result = [BIOSItem]()
+ for bios in ps1Bios {
+ let biosInLib = Constants.Path.System.appendingPathComponent(bios.fileName)
+ let biosInDoc = Constants.Path.BIOS.appendingPathComponent(bios.fileName)
if fileManager.fileExists(atPath: biosInLib) {
- return index == 0 ? "ps1_rom" : "psxonpsp"
+ result.append(bios)
} else if fileManager.fileExists(atPath: biosInDoc) {
try? FileManager.safeCopyItem(at: URL(fileURLWithPath: biosInDoc), to: URL(fileURLWithPath: biosInLib))
- return index == 0 ? "ps1_rom" : "psxonpsp"
+ result.append(bios)
}
}
- return "disabled"
+ return result
+ }
+
+ var ps1OverrideBios: String {
+ if let biosConfig = getExtraString(key: ExtraKey.biosName.rawValue) {
+ if biosConfig == "ps1_rom.bin" {
+ return "ps1_rom"
+ } else if biosConfig == "PSXONPSP660.bin" {
+ return "psxonpsp"
+ } else {
+ return "disabled"
+ }
+ }
+ return "openbios"
}
var libretroCorePath: String? {
@@ -351,7 +348,11 @@ class Game: Object, ObjectUpdatable {
return Bundle.main.path(forResource: "mednafen.saturn.libretro", ofType: "framework", inDirectory: "Frameworks")
}
} else if gameType == .n64 {
- return Bundle.main.path(forResource: "mupen64plus.next.libretro", ofType: "framework", inDirectory: "Frameworks")
+ if LibretroCore.jitAvailable(), jit {
+ return Bundle.main.path(forResource: "mupen64plus.next.jit.libretro", ofType: "framework", inDirectory: "Frameworks")
+ } else {
+ return Bundle.main.path(forResource: "mupen64plus.next.libretro", ofType: "framework", inDirectory: "Frameworks")
+ }
} else if gameType == .vb {
return Bundle.main.path(forResource: "mednafen.vb.libretro", ofType: "framework", inDirectory: "Frameworks")
} else if gameType == .pm {
@@ -373,7 +374,7 @@ class Game: Object, ObjectUpdatable {
return Bundle.main.path(forResource: "vbam.libretro", ofType: "framework", inDirectory: "Frameworks")
}
} else if gameType == .dc {
- if jit {
+ if LibretroCore.jitAvailable(), jit {
return Bundle.main.path(forResource: "flycast.libretro", ofType: "framework", inDirectory: "Frameworks")
} else {
if defaultCore == 0 {
@@ -502,6 +503,9 @@ class Game: Object, ObjectUpdatable {
}
var isN64ParaLLEl: Bool {
+ if LibretroCore.jitAvailable(), jit {
+ return false
+ }
return gameType == .n64 && !(getExtraBool(key: ExtraKey.rdpPlugin.rawValue) ?? true)
}
@@ -776,11 +780,16 @@ class Game: Object, ObjectUpdatable {
return nil
}
- func getStoreCoreConfigsString() -> String? {
- if let coreConfigs = getStoreCoreConfigs() {
+ func getStoreCoreConfigsString(enableJIT: Bool = false) -> String? {
+ if var coreConfigs = getStoreCoreConfigs() {
+ coreConfigs["dosbox_pure_cpu_core"] = "normal"
var result = ""
for (key, value) in coreConfigs {
- result += "\(key) = \"\(value)\"\n"
+ if key == "dosbox_pure_cpu_core" {
+ result += "\(key) = \"\(enableJIT ? "dynamic" : "normal")\"\n"
+ } else {
+ result += "\(key) = \"\(value)\"\n"
+ }
}
return result
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift
index df90829d..03f6c5e3 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift
@@ -753,6 +753,7 @@ class PlayViewController: GameViewController {
//设置外设控制器
updateExternalGameController()
//如果需要加载默认配置
+ LibretroCore.sharedInstance().forbitJIT = manicGame.safeMode
if manicGame.safeMode {
loadMinimalConfig()
} else {
@@ -2546,11 +2547,19 @@ extension PlayViewController {
//禁用网络
networkingConfigs += ["ppsspp_enable_wlan": "disabled"]
}
+
+ //jit
+ let enableJIT = LibretroCore.jitAvailable() && manicGame.jit
+ if enableJIT {
+ setupUniversalScript(gameType: .psp)
+ }
+ let jitValue = ((manicGame.getExtraInt(key: ExtraKey.jitType.rawValue) ?? 0) == 0) ? "JIT" : "IR JIT"
LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.PPSSPP.name, configs: [
"ppsspp_cheats": "enabled",
"ppsspp_language": languages[manicGame.region],
"ppsspp_backend": backend,
- "ppsspp_texture_replacement": (manicGame.getExtraBool(key: ExtraKey.pspTexture.rawValue) ?? false) ? "enabled" : "disabled"
+ "ppsspp_texture_replacement": (manicGame.getExtraBool(key: ExtraKey.pspTexture.rawValue) ?? false) ? "enabled" : "disabled",
+ "ppsspp_cpu_core" : enableJIT ? jitValue : "Interpreter"
] + networkingConfigs, reload: false)
updatePSPResolution(manicGame.resolution, reload: false)
} else if manicGame.gameType == .nes || manicGame.gameType == .fds {
@@ -2601,6 +2610,12 @@ extension PlayViewController {
//麦克风
let microphone = manicGame.getExtraBool(key: ExtraKey.microphone.rawValue) ?? false
+ //jit
+ let enableJIT = LibretroCore.jitAvailable() && manicGame.jit
+ if enableJIT {
+ setupUniversalScript(gameType: .ds)
+ }
+
//设置配置
LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.melonDSDS.name,
configs: ["melonds_firmware_language": dsLanguageOption,
@@ -2609,7 +2624,8 @@ extension PlayViewController {
"melonds_mic_input_active": "always",
"melonds_number_of_screen_layouts": "1",
"melonds_screen_layout1": "custom",
- "melonds_show_cursor": "disabled"],
+ "melonds_show_cursor": "disabled",
+ "melonds_jit_enable": enableJIT ? "enabled" : "disabled"],
reload: false)
//wfc
LibretroCore.sharedInstance().setNDSWFCDNS( WFC.currentDNS());
@@ -2666,15 +2682,28 @@ extension PlayViewController {
"vbam_palettes": manicGame.pallete.optionForVBAM], reload: false)
}
} else if manicGame.gameType == .n64 {
- LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.Mupen64PlushNext.name, key: "mupen64plus-rdp-plugin", value: manicGame.isN64ParaLLEl ? "parallel" : "gliden64", reload: false)
+
+ let enableJIT = LibretroCore.jitAvailable() && manicGame.jit
+ if enableJIT {
+ setupUniversalScript(gameType: .n64)
+ }
+ LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.Mupen64PlushNext.name, configs: [
+ "mupen64plus-cpucore": (enableJIT ? "dynamic_recompiler" : "cached_interpreter"),
+ "mupen64plus-rdp-plugin": ((manicGame.isN64ParaLLEl && !enableJIT) ? "parallel" : "gliden64"),
+ "mupen64plus-pak1": manicGame.hasTransferPak ? "transfer" : "memory"
+ ], reload: false)
updateN64Resolution(manicGame.resolution, reload: false)
- LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.Mupen64PlushNext.name, key: "mupen64plus-pak1", value: manicGame.hasTransferPak ? "transfer" : "memory", reload: false)
} else if manicGame.gameType == .vb {
LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.BeetleVB.name, key: "vb_color_mode", value: manicGame.pallete.paletteTitleForVB, reload: false)
} else if manicGame.gameType == .pm {
LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.PokeMini.name, key: "pokemini_palette", value: manicGame.pallete.paletteTitleForPM, reload: false)
} else if manicGame.gameType == .ps1 {
+ let enableJIT = LibretroCore.jitAvailable() && manicGame.jit
+ if enableJIT {
+ setupUniversalScript(gameType: .ps1)
+ }
let isHardwareRenderer = manicGame.getExtraBool(key: ExtraKey.psxRenderer.rawValue) ?? true
+
LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.BeetlePSXHW.name,
configs: [
//video
@@ -2691,12 +2720,17 @@ extension PlayViewController {
"beetle_psx_hw_pgxp_texture": "enabled",
//hacks
"beetle_psx_hw_gte_overclock": "enabled",
- "beetle_psx_hw_override_bios": manicGame.ps1OverrideBIOSConfig,
+ "beetle_psx_hw_override_bios": manicGame.ps1OverrideBios,
//common
"beetle_psx_hw_renderer": isHardwareRenderer ? "hardware_vk" : "software",
+ //jit
+ "beetle_psx_hw_cpu_dynarec": enableJIT ? "execute" : "disabled",
],
reload: false)
} else if manicGame.gameType == .dc {
+ if LibretroCore.jitAvailable(), manicGame.jit {
+ setupUniversalScript(gameType: .dc)
+ }
updateDCResolution(manicGame.resolution, reload: false)
LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.Flycast.name,
configs: ["reicast_renderer": "Vulkan",
@@ -2769,7 +2803,12 @@ extension PlayViewController {
"prboom-rumble": "enabled"],
reload: false)
} else if manicGame.gameType == .dos {
- LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.DOSBoxPure.name, content: manicGame.getStoreCoreConfigsString(), reload: false)
+ //jit
+ let enableJIT = LibretroCore.jitAvailable() && manicGame.jit
+ if enableJIT {
+ setupUniversalScript(gameType: .dos)
+ }
+ LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.DOSBoxPure.name, content: manicGame.getStoreCoreConfigsString(enableJIT: enableJIT), reload: false)
}
//配置静音模式
@@ -2792,12 +2831,12 @@ extension PlayViewController {
//Libretro配置
if manicGame.isLibretroType {
- var enableLibretroLog = "false"
- var libretroLogLevel = "1"
-#if DEBUG
- enableLibretroLog = "true"
- libretroLogLevel = "0"
-#endif
+// var enableLibretroLog = "false"
+// var libretroLogLevel = "1"
+//#if DEBUG
+ let enableLibretroLog = "true"
+ let libretroLogLevel = "0"
+//#endif
let enableMircophone = (manicGame.gameType == .ds && (manicGame.getExtraBool(key: ExtraKey.microphone.rawValue) ?? false)) || manicGame.isAzahar3DS
LibretroCore.sharedInstance().updateLibretroConfigs([
"fastforward_frameskip": "false",
@@ -2896,7 +2935,8 @@ extension PlayViewController {
"ppsspp_backend": "auto",
"ppsspp_texture_replacement": "disabled",
"ppsspp_enable_wlan": "disabled",
- "ppsspp_internal_resolution": "480x272"
+ "ppsspp_internal_resolution": "480x272",
+ "ppsspp_cpu_core": "Interpreter"
], reload: false)
} else if manicGame.gameType == .nes || manicGame.gameType == .fds {
LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.Nestopia.name, configs: [
@@ -2939,7 +2979,8 @@ extension PlayViewController {
"melonds_mic_input_active": "always",
"melonds_number_of_screen_layouts": "1",
"melonds_screen_layout1": "custom",
- "melonds_show_cursor": "disabled"],
+ "melonds_show_cursor": "disabled",
+ "melonds_jit_enable": "disabled"],
reload: false)
//wfc
LibretroCore.sharedInstance().setNDSWFCDNS( WFC.currentDNS());
@@ -2989,7 +3030,8 @@ extension PlayViewController {
}
} else if manicGame.gameType == .n64 {
LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.Mupen64PlushNext.name, configs:
- ["mupen64plus-43screensize": "640x480",
+ ["mupen64plus-cpucore": "cached_interpreter",
+ "mupen64plus-43screensize": "640x480",
"mupen64plus-rdp-plugin": "gliden64",
"mupen64plus-pak1": "memory"],
reload: false)
@@ -3014,9 +3056,11 @@ extension PlayViewController {
"beetle_psx_hw_pgxp_texture": "enabled",
//hacks
"beetle_psx_hw_gte_overclock": "enabled",
- "beetle_psx_hw_override_bios": manicGame.ps1OverrideBIOSConfig,
+ "beetle_psx_hw_override_bios": "disabled",
//common
"beetle_psx_hw_renderer": "hardware_vk",
+ //jit
+ "beetle_psx_hw_cpu_dynarec": "disabled",
],
reload: false)
} else if manicGame.gameType == .dc {
@@ -4671,7 +4715,7 @@ extension PlayViewController {
static var isGaming: Bool { currentPlayViewController != nil }
static var enableAirplay: Bool {
- if let currentPlayViewController {
+ if let _ = currentPlayViewController {
return true
}
return false
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSSelectionView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSSelectionView.swift
index 2eea08bb..2fa4a7b9 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSSelectionView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSSelectionView.swift
@@ -272,9 +272,6 @@ extension BIOSSelectionView: UICollectionViewDataSource {
let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: BackgroundColorHaderReusableView.self, for: indexPath)
let section = datas[indexPath.section]
let matt = NSMutableAttributedString(string: section.title, attributes: [.font: Constants.Font.body(size: .s, weight: .semibold), .foregroundColor: Constants.Color.LabelSecondary])
- if section == .ps1 {
- matt.append(NSAttributedString(string: " (\(R.string.localizable.chooseOne()))", attributes: [.font: Constants.Font.caption(size: .m), .foregroundColor: Constants.Color.LabelTertiary]))
- }
header.titleLabel.attributedText = matt
return header
}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/UniversalScript.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/UniversalScript.swift
index 374b5fde..553c50e7 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/UniversalScript.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/UniversalScript.swift
@@ -57,6 +57,22 @@ func setupUniversalScript(gameType: GameType) {
legacyCommands[0x70] = function(b) {};
legacyCommands[0x71] = function(b) {};
"""
+ case .n64:
+ script = """
+ legacyCommands[0x70] = function(b) {};
+ legacyCommands[0x71] = function(b) {};
+ legacyCommands[0x69] = manicN64Breakpoint;
+ continuesWithSignal = true;
+ var n64JitRequests = 0;
+ function manicN64Breakpoint(brkResponse) {
+ n64JitRequests++;
+ var jitAddr = x0;
+ var size = x1 > 0n ? x1 : 0x10000n;
+ log('[N64] JIT Request #' + n64JitRequests + ' addr=0x' + jitAddr.toString(16) + ' size=0x' + size.toString(16));
+ var result = prepare_memory_region(Number(jitAddr), Number(size));
+ log('[N64] prepare_memory_region result: ' + result);
+ }
+ """
default: return
}