From deacf76ca452c748fc8cf891d1fa91f76b13c8f3 Mon Sep 17 00:00:00 2001
From: Eladash <elad3356p@gmail.com>
Date: Sat, 2 Sep 2023 09:01:35 +0300
Subject: [PATCH] PPU Analyzer: Revert TRAP detection change

---
 rpcs3/Emu/Cell/PPUAnalyser.cpp | 2 +-
 rpcs3/Emu/Cell/PPUThread.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rpcs3/Emu/Cell/PPUAnalyser.cpp b/rpcs3/Emu/Cell/PPUAnalyser.cpp
index 2968190f41..074b2dd89e 100644
--- a/rpcs3/Emu/Cell/PPUAnalyser.cpp
+++ b/rpcs3/Emu/Cell/PPUAnalyser.cpp
@@ -1397,7 +1397,7 @@ bool ppu_module::analyse(u32 lib_toc, u32 entry, const u32 sec_end, const std::b
 				}
 				else if (type & ppu_itype::trap)
 				{
-					if (op.bo != 31)
+					if (op.opcode != ppu_instructions::TRAP())
 					{
 						add_block(_ptr.addr());
 					}
diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp
index 0878feb511..d9144a2d5b 100644
--- a/rpcs3/Emu/Cell/PPUThread.cpp
+++ b/rpcs3/Emu/Cell/PPUThread.cpp
@@ -3681,7 +3681,7 @@ extern void ppu_precompile(std::vector<std::string>& dir_queue, std::vector<ppu_
 			}
 
 			// Check ELF filename
-			if ((entry.name == "EBOOT.BIN" || upper.ends_with(".ELF") || upper.ends_with(".SELF")) && Emu.GetBoot() != dir_queue[i] + entry.name)
+			if ((upper.ends_with(".ELF") || upper.ends_with(".SELF")) && Emu.GetBoot() != dir_queue[i] + entry.name)
 			{
 				// Get full path
 				file_queue.emplace_back(dir_queue[i] + entry.name,  0);