Merge pull request #13766 from JosJuice/powerpc-missing-updates

PowerPC: Add missing SDRUpdated/MSRUpdated calls

Data/Sys/GameSettings/GFB.ini

@@ -1,14 +0,0 @@
-# GFBE5D - FireBlade
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Hacks]
-EFBToTextureEnable = True
-

Data/Sys/GameSettings/R6APPU.ini

@@ -0,0 +1,8 @@
+# R6APPU - Baby and Me
+
+[OnFrame]
+# The game busyloops for frame pacing but not in a way Dolphin can
+# currently optimize, so lots of CPU time is wasted.
+# This patch adds a call to VIWaitForRetrace to avoid this.
+$Performance hack
+0x80016E28:dword:0x4807BD89

Data/Sys/GameSettings/RRP.ini

@@ -13,4 +13,7 @@
 SuggestedAspectRatio = 2
 
 [Video_Hacks]
+# Avoid purple screen.
+XFBToTextureEnable = False
+# Make Wiimote pointer visible.
 ImmediateXFBEnable = False

Data/Sys/GameSettings/S7B.ini

@@ -0,0 +1,5 @@
+# S7BE69, S7BP69 - Trivial Pursuit: Bet You Know It
+
+[Video_Hacks]
+# Avoid purple flickering.
+XFBToTextureEnable = False

Data/Sys/GameSettings/SMNP01.ini

@@ -2,9 +2,6 @@
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-$Speed hack
-0x801D5B10:dword:0x60000000
-0x801D5B14:dword:0x60000000
 
 [ActionReplay]
 # Add action replay cheats here.

Source/Core/Core/PowerPC/Expression.cpp

@@ -447,9 +447,15 @@ void Expression::SynchronizeBindings(Core::System& system, SynchronizeDirection
       break;
     case VarBindingType::SPR:
       if (dir == SynchronizeDirection::From)
+      {
         v->value = static_cast<double>(ppc_state.spr[bind->index]);
+      }
       else
+      {
         ppc_state.spr[bind->index] = static_cast<u32>(static_cast<s64>(v->value));
+        if (bind->index == SPR_SDR)
+          system.GetMMU().SDRUpdated();
+      }
       break;
     case VarBindingType::PCtr:
       if (dir == SynchronizeDirection::From)
@@ -457,9 +463,14 @@ void Expression::SynchronizeBindings(Core::System& system, SynchronizeDirection
       break;
     case VarBindingType::MSR:
       if (dir == SynchronizeDirection::From)
+      {
         v->value = static_cast<double>(ppc_state.msr.Hex);
+      }
       else
+      {
         ppc_state.msr.Hex = static_cast<u32>(static_cast<s64>(v->value));
+        PowerPC::MSRUpdated(ppc_state);
+      }
       break;
     }
   }

Source/Core/Core/PowerPC/GDBStub.cpp

@@ -684,6 +684,7 @@ static void WriteRegister()
       break;
     case 104:
       ppc_state.spr[SPR_SDR] = re32hex(bufptr);
+      system.GetMMU().SDRUpdated();
       break;
     case 105:
       ppc_state.spr[SPR_ASR] = re64hex(bufptr);

Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp

@@ -102,7 +102,7 @@ void Interpreter::Trace(const UGeckoInstruction& inst)
                 "INTER PC: {:08x} SRR0: {:08x} SRR1: {:08x} CRval: {:016x} "
                 "FPSCR: {:08x} MSR: {:08x} LR: {:08x} {} {:08x} {}",
                 m_ppc_state.pc, SRR0(m_ppc_state), SRR1(m_ppc_state), m_ppc_state.cr.fields[0],
-                m_ppc_state.fpscr.Hex, m_ppc_state.msr.Hex, m_ppc_state.spr[8], regs, inst.hex,
+                m_ppc_state.fpscr.Hex, m_ppc_state.msr.Hex, m_ppc_state.spr[SPR_LR], regs, inst.hex,
                 ppc_inst);
 }
 

Source/Core/DolphinQt/Debugger/ThreadWidget.cpp

@@ -137,8 +137,7 @@ QLineEdit* ThreadWidget::CreateLineEdit() const
 {
   QLineEdit* line_edit = new QLineEdit(QStringLiteral("00000000"));
   line_edit->setReadOnly(true);
-  line_edit->setFixedWidth(
-      line_edit->fontMetrics().boundingRect(QStringLiteral(" 00000000 ")).width());
+  line_edit->setAlignment(Qt::AlignVCenter | Qt::AlignRight);
   return line_edit;
 }
 
@@ -146,6 +145,8 @@ QGroupBox* ThreadWidget::CreateContextGroup()
 {
   QGroupBox* context_group = new QGroupBox(tr("Thread context"));
   QGridLayout* context_layout = new QGridLayout;
+  context_layout->setColumnStretch(0, 1);
+  context_layout->setColumnStretch(1, 1);
   context_group->setLayout(context_layout);
   context_layout->addWidget(new QLabel(tr("Current context")), 0, 0);
   m_current_context = CreateLineEdit();
@@ -164,6 +165,8 @@ QGroupBox* ThreadWidget::CreateActiveThreadQueueGroup()
 {
   QGroupBox* thread_queue_group = new QGroupBox(tr("Active thread queue"));
   auto* thread_queue_layout = new QGridLayout;
+  thread_queue_layout->setColumnStretch(0, 1);
+  thread_queue_layout->setColumnStretch(1, 1);
   thread_queue_group->setLayout(thread_queue_layout);
   thread_queue_layout->addWidget(new QLabel(tr("Head")), 0, 0);
   m_queue_head = CreateLineEdit();

Source/Core/DolphinQt/GameList/GameList.cpp

@@ -66,6 +66,7 @@
 #include "DolphinQt/QtUtils/DolphinFileDialog.h"
 #include "DolphinQt/QtUtils/DoubleClickEventFilter.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
+#include "DolphinQt/QtUtils/NonAutodismissibleMenu.h"
 #include "DolphinQt/QtUtils/ParallelProgressDialog.h"
 #include "DolphinQt/Resources.h"
 #include "DolphinQt/Settings.h"
@@ -519,7 +520,8 @@ void GameList::ShowContextMenu(const QPoint&)
 
     menu->addSeparator();
 
-    auto* tags_menu = menu->addMenu(tr("Tags"));
+    auto* const tags_menu{new QtUtils::NonAutodismissibleMenu(tr("Tags"), menu)};
+    menu->addMenu(tags_menu);
 
     auto path = game->GetFilePath();
     auto game_tags = m_model.GetGameTags(path);

Source/Core/DolphinQt/GameList/GameListModel.cpp

@@ -470,6 +470,13 @@ void GameListModel::AddGameTag(const std::string& path, const QString& name)
 
   m_game_tags[QString::fromStdString(path)] = tags;
   Settings::GetQSettings().setValue(QStringLiteral("gamelist/game_tags"), m_game_tags);
+
+  const int row = FindGameIndex(path);
+  if (row >= 0)
+  {
+    const QModelIndex index = createIndex(row, static_cast<int>(Column::Tags));
+    emit dataChanged(index, index);
+  }
 }
 
 void GameListModel::RemoveGameTag(const std::string& path, const QString& name)
@@ -481,6 +488,13 @@ void GameListModel::RemoveGameTag(const std::string& path, const QString& name)
   m_game_tags[QString::fromStdString(path)] = tags;
 
   Settings::GetQSettings().setValue(QStringLiteral("gamelist/game_tags"), m_game_tags);
+
+  const int row = FindGameIndex(path);
+  if (row >= 0)
+  {
+    const QModelIndex index = createIndex(row, static_cast<int>(Column::Tags));
+    emit dataChanged(index, index);
+  }
 }
 
 void GameListModel::NewTag(const QString& name)

Source/Core/DolphinQt/MainWindow.cpp

@@ -1849,6 +1849,14 @@ void MainWindow::OnImportNANDBackup()
 
 void MainWindow::OnPlayRecording()
 {
+  if (AchievementManager::GetInstance().IsHardcoreModeActive())
+  {
+    ModalMessageBox::critical(
+        this, tr("Error"),
+        tr("Playback of input recordings is disabled in RetroAchievements hardcore mode."));
+    return;
+  }
+
   QString dtm_file = DolphinFileDialog::getOpenFileName(
       this, tr("Select the Recording File to Play"), QString(), tr("Dolphin TAS Movies (*.dtm)"));
 

Source/Core/DolphinQt/MenuBar.cpp

@@ -352,22 +352,23 @@ void MenuBar::AddToolsMenu()
   m_export_wii_saves =
       tools_menu->addAction(tr("Export All Wii Saves"), this, &MenuBar::ExportWiiSaves);
 
-  QMenu* menu = new QMenu(tr("Connect Wii Remotes"), tools_menu);
+  auto* const connect_wii_remotes_menu{
+      new QtUtils::NonAutodismissibleMenu(tr("Connect Wii Remotes"), tools_menu)};
 
   tools_menu->addSeparator();
-  tools_menu->addMenu(menu);
+  tools_menu->addMenu(connect_wii_remotes_menu);
 
   for (int i = 0; i < 4; i++)
   {
-    m_wii_remotes[i] = menu->addAction(tr("Connect Wii Remote %1").arg(i + 1), this,
-                                       [this, i] { emit ConnectWiiRemote(i); });
+    m_wii_remotes[i] = connect_wii_remotes_menu->addAction(
+        tr("Connect Wii Remote %1").arg(i + 1), this, [this, i] { emit ConnectWiiRemote(i); });
     m_wii_remotes[i]->setCheckable(true);
   }
 
-  menu->addSeparator();
+  connect_wii_remotes_menu->addSeparator();
 
-  m_wii_remotes[4] =
-      menu->addAction(tr("Connect Balance Board"), this, [this] { emit ConnectWiiRemote(4); });
+  m_wii_remotes[4] = connect_wii_remotes_menu->addAction(tr("Connect Balance Board"), this,
+                                                         [this] { emit ConnectWiiRemote(4); });
   m_wii_remotes[4]->setCheckable(true);
 }
 
@@ -601,7 +602,8 @@ void MenuBar::AddViewMenu()
 
 void MenuBar::AddOptionsMenu()
 {
-  QMenu* options_menu = addMenu(tr("&Options"));
+  auto* const options_menu{new QtUtils::NonAutodismissibleMenu(tr("&Options"), this)};
+  addMenu(options_menu);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
   options_menu->addAction(tr("Co&nfiguration"), QKeySequence::Preferences, this,
                           &MenuBar::Configure);
@@ -892,7 +894,8 @@ void MenuBar::AddMovieMenu()
 
 void MenuBar::AddJITMenu()
 {
-  m_jit = addMenu(tr("JIT"));
+  m_jit = new QtUtils::NonAutodismissibleMenu(tr("JIT"), this);
+  addMenu(m_jit);
 
   m_jit_interpreter_core = m_jit->addAction(tr("Interpreter Core"));
   m_jit_interpreter_core->setCheckable(true);

Source/Core/VideoCommon/CommandProcessor.h

@@ -200,12 +200,6 @@ private:
   u16 m_perf_select = 0;
   u16 m_unk_0a_reg = 0;
 
-  u16 m_bbox_left = 0;
-  u16 m_bbox_top = 0;
-  u16 m_bbox_right = 0;
-  u16 m_bbox_bottom = 0;
-  u16 m_token_reg = 0;
-
   Common::Flag m_interrupt_set;
   Common::Flag m_interrupt_waiting;