From cf16ee5eb5966dfe52d3e7246341b453fe10092c Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Tue, 6 Aug 2019 21:52:12 +0300
Subject: [PATCH] Implement lib_loading_type::liblv2list

---
 rpcs3/Emu/Cell/PPUModule.cpp      |  3 ++-
 rpcs3/Emu/Cell/lv2/sys_prx.cpp    | 14 +++++++++++++-
 rpcs3/Emu/System.h                |  1 +
 rpcs3/Json/tooltips.json          |  1 +
 rpcs3/rpcs3qt/settings_dialog.cpp |  4 +++-
 rpcs3/rpcs3qt/settings_dialog.ui  | 13 +++++++++++++
 6 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp
index 7e885d9de9..0e2319bbaa 100644
--- a/rpcs3/Emu/Cell/PPUModule.cpp
+++ b/rpcs3/Emu/Cell/PPUModule.cpp
@@ -50,6 +50,7 @@ void fmt_class_string<lib_loading_type>::format(std::string& out, u64 arg)
 		case lib_loading_type::both: return "Load automatic and manual selection";
 		case lib_loading_type::liblv2only: return "Load liblv2.sprx only";
 		case lib_loading_type::liblv2both: return "Load liblv2.sprx and manual selection";
+		case lib_loading_type::liblv2list: return "Load liblv2.sprx and strict selection";
 		}
 
 		return unknown;
@@ -1282,7 +1283,7 @@ void ppu_load_exec(const ppu_exec_object& elf)
 		// Load required set of modules (lib_loading_type::both processed in sys_prx.cpp)
 		load_libs = g_cfg.core.load_libraries.get_set();
 	}
-	else if (g_cfg.core.lib_loading == lib_loading_type::liblv2only || g_cfg.core.lib_loading == lib_loading_type::liblv2both)
+	else if (g_cfg.core.lib_loading >= lib_loading_type::liblv2only && g_cfg.core.lib_loading <= lib_loading_type::liblv2list)
 	{
 		// Load only liblv2.sprx
 		load_libs.emplace("liblv2.sprx");
diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.cpp b/rpcs3/Emu/Cell/lv2/sys_prx.cpp
index fdec09bdf5..c643d32266 100644
--- a/rpcs3/Emu/Cell/lv2/sys_prx.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_prx.cpp
@@ -117,7 +117,19 @@ static error_code prx_load_module(const std::string& vpath, u64 flags, vm::ptr<s
 		return CELL_PRX_ERROR_LIBRARY_FOUND;
 	}
 
-	bool ignore = s_prx_ignore.count(vpath) != 0;
+	bool ignore = false;
+
+	if (g_cfg.core.lib_loading == lib_loading_type::liblv2list)
+	{
+		if (vpath.compare(0, 24, "/dev_flash/sys/external/") == 0 && vpath != "/dev_flash/sys/external/libsysmodule.sprx"sv)
+		{
+			ignore = g_cfg.core.load_libraries.get_set().count(name) == 0;
+		}
+	}
+	else
+	{
+		ignore = s_prx_ignore.count(vpath) != 0;
+	}
 
 	if (ignore && (g_cfg.core.lib_loading == lib_loading_type::both || g_cfg.core.lib_loading == lib_loading_type::liblv2both))
 	{
diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h
index b913ec9a76..28ba51b8af 100644
--- a/rpcs3/Emu/System.h
+++ b/rpcs3/Emu/System.h
@@ -47,6 +47,7 @@ enum class lib_loading_type
 	both,
 	liblv2only,
 	liblv2both,
+	liblv2list,
 };
 
 enum sleep_timers_accuracy_level : u32
diff --git a/rpcs3/Json/tooltips.json b/rpcs3/Json/tooltips.json
index b243fa0d47..6da7630b9d 100644
--- a/rpcs3/Json/tooltips.json
+++ b/rpcs3/Json/tooltips.json
@@ -29,6 +29,7 @@
 			"manual": "Allows the user to manually choose the LLE libraries to load.\nIf unsure, don't use this option. Nothing will work if you use this.",
 			"both": "Automatically selects the LLE libraries to load and allows the user to choose additional libraries manually.\nIf unsure, don't use this option.",
 			"liblv2both": "Loads liblv2.sprx and chosen list of libraries.\nIf unsure, don't use this option.",
+			"liblv2list": "Loads liblv2.sprx and nothing but selected libraries.\nDon't use this option.",
 			"liblv2": "This closely emulates how games can load and unload system module files on a real PlayStation 3.\nSome games require this.\nThis is the preferred option."
 		},
 		"checkboxes": {
diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp
index 71d6974e77..3fe4ef1a88 100644
--- a/rpcs3/rpcs3qt/settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/settings_dialog.cpp
@@ -310,6 +310,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
 	SubscribeTooltip(ui->lib_both, json_cpu_lib["both"].toString());
 	SubscribeTooltip(ui->lib_lv2,  json_cpu_lib["liblv2"].toString());
 	SubscribeTooltip(ui->lib_lv2b, json_cpu_lib["liblv2both"].toString());
+	SubscribeTooltip(ui->lib_lv2l, json_cpu_lib["liblv2list"].toString());
 
 	// creating this in ui file keeps scrambling the order...
 	QButtonGroup *libModeBG = new QButtonGroup(this);
@@ -318,6 +319,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
 	libModeBG->addButton(ui->lib_both, (int)lib_loading_type::both);
 	libModeBG->addButton(ui->lib_lv2,  (int)lib_loading_type::liblv2only);
 	libModeBG->addButton(ui->lib_lv2b, (int)lib_loading_type::liblv2both);
+	libModeBG->addButton(ui->lib_lv2l, (int)lib_loading_type::liblv2list);
 
 	{// Handle lib loading options
 		QString selectedLib = qstr(xemu_settings->GetSetting(emu_settings::LibLoadOptions));
@@ -389,7 +391,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
 
 	auto l_OnLibButtonClicked = [=](int ind)
 	{
-		if (ind == (int)lib_loading_type::manual || ind == (int)lib_loading_type::both || ind == (int)lib_loading_type::liblv2both)
+		if (ind == (int)lib_loading_type::manual || ind == (int)lib_loading_type::both || ind == (int)lib_loading_type::liblv2both || ind == (int)lib_loading_type::liblv2list)
 		{
 			ui->searchBox->setEnabled(true);
 			ui->lleList->setEnabled(true);
diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui
index d007f9a835..2ad0e0f522 100644
--- a/rpcs3/rpcs3qt/settings_dialog.ui
+++ b/rpcs3/rpcs3qt/settings_dialog.ui
@@ -213,6 +213,19 @@
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QRadioButton" name="lib_lv2l">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Load liblv2.sprx and strict selection</string>
+                </property>
+               </widget>
+              </item>
              </layout>
             </widget>
            </item>