BranchWatchDialog: A Total Replacement for CodeDiffDialog

With a purpose-built Branch Watch feature built into the emulated system: BranchWatchDialog, replacing CodeDiffDialog, is now better than ever!

Source/Core/Common/CommonPaths.h

@@ -75,6 +75,8 @@
 #define DUMP_AUDIO_DIR "Audio"
 #define DUMP_DSP_DIR "DSP"
 #define DUMP_SSL_DIR "SSL"
+#define DUMP_DEBUG_DIR "Debug"
+#define DUMP_DEBUG_BRANCHWATCH_DIR "BranchWatch"
 #define LOGS_DIR "Logs"
 #define MAIL_LOGS_DIR "Mail"
 #define SHADERS_DIR "Shaders"

Source/Core/Common/FileUtil.cpp

@@ -856,6 +856,9 @@ static void RebuildUserDirectories(unsigned int dir_index)
     s_user_paths[D_DUMPTEXTURES_IDX] = s_user_paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
     s_user_paths[D_DUMPDSP_IDX] = s_user_paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
     s_user_paths[D_DUMPSSL_IDX] = s_user_paths[D_DUMP_IDX] + DUMP_SSL_DIR DIR_SEP;
+    s_user_paths[D_DUMPDEBUG_IDX] = s_user_paths[D_DUMP_IDX] + DUMP_DEBUG_DIR DIR_SEP;
+    s_user_paths[D_DUMPDEBUG_BRANCHWATCH_IDX] =
+        s_user_paths[D_DUMPDEBUG_IDX] + DUMP_DEBUG_BRANCHWATCH_DIR DIR_SEP;
     s_user_paths[D_LOGS_IDX] = s_user_paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
     s_user_paths[D_MAILLOGS_IDX] = s_user_paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
     s_user_paths[D_THEMES_IDX] = s_user_paths[D_USER_IDX] + THEMES_DIR DIR_SEP;
@@ -932,6 +935,9 @@ static void RebuildUserDirectories(unsigned int dir_index)
     s_user_paths[D_DUMPTEXTURES_IDX] = s_user_paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
     s_user_paths[D_DUMPDSP_IDX] = s_user_paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
     s_user_paths[D_DUMPSSL_IDX] = s_user_paths[D_DUMP_IDX] + DUMP_SSL_DIR DIR_SEP;
+    s_user_paths[D_DUMPDEBUG_IDX] = s_user_paths[D_DUMP_IDX] + DUMP_DEBUG_DIR DIR_SEP;
+    s_user_paths[D_DUMPDEBUG_BRANCHWATCH_IDX] =
+        s_user_paths[D_DUMP_IDX] + DUMP_DEBUG_BRANCHWATCH_DIR DIR_SEP;
     s_user_paths[F_MEM1DUMP_IDX] = s_user_paths[D_DUMP_IDX] + MEM1_DUMP;
     s_user_paths[F_MEM2DUMP_IDX] = s_user_paths[D_DUMP_IDX] + MEM2_DUMP;
     s_user_paths[F_ARAMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + ARAM_DUMP;

Source/Core/Common/FileUtil.h

@@ -52,6 +52,8 @@ enum
   D_DUMPTEXTURES_IDX,
   D_DUMPDSP_IDX,
   D_DUMPSSL_IDX,
+  D_DUMPDEBUG_IDX,
+  D_DUMPDEBUG_BRANCHWATCH_IDX,
   D_LOAD_IDX,
   D_LOGS_IDX,
   D_MAILLOGS_IDX,

Source/Core/Core/Boot/Boot_BS2Emu.cpp

@@ -19,6 +19,7 @@
 #include "Core/Config/MainSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
+#include "Core/Debugger/BranchWatch.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HW/DVD/DVDInterface.h"
 #include "Core/HW/EXI/EXI_DeviceIPL.h"
@@ -158,6 +159,11 @@ bool CBoot::RunApploader(Core::System& system, const Core::CPUThreadGuard& guard
 
   auto& ppc_state = system.GetPPCState();
   auto& mmu = system.GetMMU();
+  auto& branch_watch = system.GetPowerPC().GetBranchWatch();
+
+  const bool resume_branch_watch = branch_watch.GetRecordingActive();
+  if (system.IsBranchWatchIgnoreApploader())
+    branch_watch.Pause();
 
   // Call iAppLoaderEntry.
   DEBUG_LOG_FMT(BOOT, "Call iAppLoaderEntry");
@@ -220,6 +226,8 @@ bool CBoot::RunApploader(Core::System& system, const Core::CPUThreadGuard& guard
   // return
   ppc_state.pc = ppc_state.gpr[3];
 
+  branch_watch.SetRecordingActive(resume_branch_watch);
+
   return true;
 }
 

Source/Core/Core/System.h

@@ -141,9 +141,11 @@ public:
   bool IsPauseOnPanicMode() const { return m_pause_on_panic_enabled; }
   bool IsMIOS() const { return m_is_mios; }
   bool IsWii() const { return m_is_wii; }
+  bool IsBranchWatchIgnoreApploader() { return m_branch_watch_ignore_apploader; }
 
   void SetIsMIOS(bool is_mios) { m_is_mios = is_mios; }
   void SetIsWii(bool is_wii) { m_is_wii = is_wii; }
+  void SetIsBranchWatchIgnoreApploader(bool enable) { m_branch_watch_ignore_apploader = enable; }
 
   SoundStream* GetSoundStream() const;
   void SetSoundStream(std::unique_ptr<SoundStream> sound_stream);
@@ -202,5 +204,6 @@ private:
   bool m_pause_on_panic_enabled = false;
   bool m_is_mios = false;
   bool m_is_wii = false;
+  bool m_branch_watch_ignore_apploader = false;
 };
 }  // namespace Core

Source/Core/DolphinQt/CMakeLists.txt

@@ -206,12 +206,14 @@ add_executable(dolphin-emu
   Debugger/AssemblerWidget.h
   Debugger/AssemblyEditor.cpp
   Debugger/AssemblyEditor.h
+  Debugger/BranchWatchDialog.cpp
+  Debugger/BranchWatchDialog.h
+  Debugger/BranchWatchTableModel.cpp
+  Debugger/BranchWatchTableModel.h
   Debugger/BreakpointDialog.cpp
   Debugger/BreakpointDialog.h
   Debugger/BreakpointWidget.cpp
   Debugger/BreakpointWidget.h
-  Debugger/CodeDiffDialog.cpp
-  Debugger/CodeDiffDialog.h
   Debugger/CodeViewWidget.cpp
   Debugger/CodeViewWidget.h
   Debugger/CodeWidget.cpp

Source/Core/DolphinQt/Debugger/BranchWatchDialog.h

@@ -0,0 +1,114 @@
+// Copyright 2024 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <optional>
+#include <string>
+
+#include <QDialog>
+#include <QModelIndexList>
+
+#include "Core/Core.h"
+
+namespace Core
+{
+class BranchWatch;
+class CPUThreadGuard;
+class System;
+}  // namespace Core
+class BranchWatchProxyModel;
+class BranchWatchTableModel;
+class CodeWidget;
+class QAction;
+class QMenu;
+class QPoint;
+class QPushButton;
+class QStatusBar;
+class QTableView;
+class QTimer;
+class QToolBar;
+class QWidget;
+
+namespace BranchWatchTableModelColumn
+{
+enum EnumType : int;
+}
+namespace BranchWatchTableModelUserRole
+{
+enum EnumType : int;
+}
+
+class BranchWatchDialog : public QDialog
+{
+  Q_OBJECT
+
+  using Column = BranchWatchTableModelColumn::EnumType;
+  using UserRole = BranchWatchTableModelUserRole::EnumType;
+
+public:
+  explicit BranchWatchDialog(Core::System& system, Core::BranchWatch& branch_watch,
+                             CodeWidget* code_widget, QWidget* parent = nullptr);
+  void done(int r) override;
+  int exec() override;
+  void open() override;
+
+private:
+  void OnStartPause(bool checked);
+  void OnClearBranchWatch();
+  void OnSave();
+  void OnSaveAs();
+  void OnLoad();
+  void OnLoadFrom();
+  void OnCodePathWasTaken();
+  void OnCodePathNotTaken();
+  void OnBranchWasOverwritten();
+  void OnBranchNotOverwritten();
+  void OnWipeRecentHits();
+  void OnWipeInspection();
+  void OnTimeout();
+  void OnEmulationStateChanged(Core::State new_state);
+  void OnHelp();
+  void OnToggleAutoSave(bool checked);
+  void OnHideShowControls(bool checked);
+  void OnToggleIgnoreApploader(bool checked);
+
+  void OnTableClicked(const QModelIndex& index);
+  void OnTableContextMenu(const QPoint& pos);
+  void OnTableHeaderContextMenu(const QPoint& pos);
+  void OnTableDelete(QModelIndexList index_list);
+  void OnTableDeleteKeypress();
+  void OnTableSetBLR(QModelIndexList index_list);
+  void OnTableSetNOP(QModelIndexList index_list);
+  void OnTableCopyAddress(QModelIndexList index_list);
+
+public:
+  // TODO: Step doesn't cause EmulationStateChanged to be emitted, so it has to call this manually.
+  void Update();
+  // TODO: There seems to be a lack of a ubiquitous signal for when symbols change.
+  void UpdateSymbols();
+
+private:
+  void UpdateStatus();
+  void Save(const Core::CPUThreadGuard& guard, const std::string& filepath);
+  void Load(const Core::CPUThreadGuard& guard, const std::string& filepath);
+  void AutoSave(const Core::CPUThreadGuard& guard);
+
+  Core::System& m_system;
+  Core::BranchWatch& m_branch_watch;
+  CodeWidget* m_code_widget;
+
+  QPushButton *m_btn_start_pause, *m_btn_clear_watch, *m_btn_path_was_taken, *m_btn_path_not_taken,
+      *m_btn_was_overwritten, *m_btn_not_overwritten, *m_btn_wipe_recent_hits;
+  QAction* m_act_autosave;
+  QMenu* m_mnu_column_visibility;
+
+  QToolBar* m_control_toolbar;
+  QTableView* m_table_view;
+  BranchWatchProxyModel* m_table_proxy;
+  BranchWatchTableModel* m_table_model;
+  QStatusBar* m_status_bar;
+  QTimer* m_timer;
+
+  std::optional<std::string> m_autosave_filepath;
+};

Source/Core/DolphinQt/Debugger/BranchWatchTableModel.h

@@ -0,0 +1,119 @@
+// Copyright 2024 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <cstdio>
+
+#include <QAbstractTableModel>
+#include <QFont>
+#include <QList>
+#include <QVariant>
+
+#include "Common/SymbolDB.h"
+
+namespace Core
+{
+class BranchWatch;
+class CPUThreadGuard;
+class System;
+}  // namespace Core
+
+namespace BranchWatchTableModelColumn
+{
+enum EnumType : int
+{
+  Instruction = 0,
+  Condition,
+  Origin,
+  Destination,
+  RecentHits,
+  TotalHits,
+  OriginSymbol,
+  DestinSymbol,
+  NumberOfColumns,
+};
+}
+
+namespace BranchWatchTableModelUserRole
+{
+enum EnumType : int
+{
+  ClickRole = Qt::UserRole,
+  SortRole,
+};
+}
+
+struct BranchWatchTableModelSymbolListValueType
+{
+  explicit BranchWatchTableModelSymbolListValueType(const Common::Symbol* const origin_symbol,
+                                                    const Common::Symbol* const destin_symbol)
+      : origin_name(origin_symbol ? QString::fromStdString(origin_symbol->name) : QVariant{}),
+        origin_addr(origin_symbol ? origin_symbol->address : QVariant{}),
+        destin_name(destin_symbol ? QString::fromStdString(destin_symbol->name) : QVariant{}),
+        destin_addr(destin_symbol ? destin_symbol->address : QVariant{})
+  {
+  }
+  QVariant origin_name, origin_addr;
+  QVariant destin_name, destin_addr;
+};
+
+class BranchWatchTableModel final : public QAbstractTableModel
+{
+  Q_OBJECT
+
+public:
+  using Column = BranchWatchTableModelColumn::EnumType;
+  using UserRole = BranchWatchTableModelUserRole::EnumType;
+  using SymbolListValueType = BranchWatchTableModelSymbolListValueType;
+  using SymbolList = QList<SymbolListValueType>;
+
+  explicit BranchWatchTableModel(Core::System& system, Core::BranchWatch& branch_watch,
+                                 QObject* parent = nullptr)
+      : QAbstractTableModel(parent), m_system(system), m_branch_watch(branch_watch)
+  {
+  }
+  QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+  QVariant headerData(int section, Qt::Orientation orientation,
+                      int role = Qt::DisplayRole) const override;
+  int rowCount(const QModelIndex& parent = QModelIndex{}) const override;
+  int columnCount(const QModelIndex& parent = QModelIndex{}) const override;
+  bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex{}) override;
+  void setFont(const QFont& font) { m_font = font; }
+
+  void OnClearBranchWatch(const Core::CPUThreadGuard& guard);
+  void OnCodePathWasTaken(const Core::CPUThreadGuard& guard);
+  void OnCodePathNotTaken(const Core::CPUThreadGuard& guard);
+  void OnBranchWasOverwritten(const Core::CPUThreadGuard& guard);
+  void OnBranchNotOverwritten(const Core::CPUThreadGuard& guard);
+  void OnWipeRecentHits();
+  void OnWipeInspection();
+  void OnDelete(QModelIndexList index_list);
+
+  void Save(const Core::CPUThreadGuard& guard, std::FILE* file) const;
+  void Load(const Core::CPUThreadGuard& guard, std::FILE* file);
+  void UpdateSymbols();
+  void UpdateHits();
+  void SetInspected(const QModelIndex& index);
+
+  const SymbolList& GetSymbolList() const { return m_symbol_list; }
+
+private:
+  void SetOriginInspected(u32 origin_addr);
+  void SetDestinInspected(u32 destin_addr, bool nested);
+  void SetSymbolInspected(u32 symbol_addr, bool nested);
+  void PrefetchSymbols();
+
+  [[nodiscard]] QVariant DisplayRoleData(const QModelIndex& index) const;
+  [[nodiscard]] QVariant FontRoleData(const QModelIndex& index) const;
+  [[nodiscard]] QVariant TextAlignmentRoleData(const QModelIndex& index) const;
+  [[nodiscard]] QVariant ForegroundRoleData(const QModelIndex& index) const;
+  [[nodiscard]] QVariant ClickRoleData(const QModelIndex& index) const;
+  [[nodiscard]] QVariant SortRoleData(const QModelIndex& index) const;
+
+  Core::System& m_system;
+  Core::BranchWatch& m_branch_watch;
+
+  SymbolList m_symbol_list;
+  mutable QFont m_font;
+};

Source/Core/DolphinQt/Debugger/CodeDiffDialog.h

@@ -1,86 +0,0 @@
-// Copyright 2022 Dolphin Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <QDialog>
-#include <string>
-#include <vector>
-#include "Common/CommonTypes.h"
-
-class CodeWidget;
-class QLabel;
-class QPushButton;
-class QCheckBox;
-class QTableWidget;
-
-struct Diff
-{
-  u32 addr = 0;
-  std::string symbol;
-  u32 hits = 0;
-  u32 total_hits = 0;
-
-  bool operator<(const std::string& val) const { return symbol < val; }
-};
-
-class CodeDiffDialog : public QDialog
-{
-  Q_OBJECT
-
-public:
-  explicit CodeDiffDialog(CodeWidget* parent);
-  void reject() override;
-
-private:
-  enum class UpdateType
-  {
-    Include,
-    Exclude,
-    Backup
-  };
-
-  void CreateWidgets();
-  void ConnectWidgets();
-  void SaveDataBackup();
-  void LoadDataBackup();
-  void ClearData();
-  void ClearBlockCache();
-  void OnClickItem();
-  void OnRecord(bool enabled);
-  std::vector<Diff> CalculateSymbolsFromProfile() const;
-  void OnInclude();
-  void OnExclude();
-  void RemoveMissingSymbolsFromIncludes(const std::vector<Diff>& symbol_diff);
-  void RemoveMatchingSymbolsFromIncludes(const std::vector<Diff>& symbol_list);
-  void Update(UpdateType type);
-  void InfoDisp();
-
-  void OnContextMenu();
-
-  void OnGoTop();
-  void OnDelete();
-  void OnSetBLR();
-
-  void MarkRowBLR(int row);
-  void UpdateItem();
-  void UpdateButtons(bool running);
-
-  QTableWidget* m_matching_results_table;
-  QCheckBox* m_autosave_check;
-  QLabel* m_exclude_size_label;
-  QLabel* m_include_size_label;
-  QPushButton* m_exclude_btn;
-  QPushButton* m_include_btn;
-  QPushButton* m_record_btn;
-  QPushButton* m_reset_btn;
-  QPushButton* m_save_btn;
-  QPushButton* m_load_btn;
-  QPushButton* m_help_btn;
-  CodeWidget* m_code_widget;
-
-  std::vector<Diff> m_exclude;
-  std::vector<Diff> m_include;
-  bool m_failed_requirements = false;
-  bool m_include_active = false;
-};

Source/Core/DolphinQt/Debugger/CodeWidget.cpp

@@ -27,6 +27,7 @@
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
+#include "DolphinQt/Debugger/BranchWatchDialog.h"
 #include "DolphinQt/Host.h"
 #include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Settings.h"
@@ -35,7 +36,10 @@ static const QString BOX_SPLITTER_STYLESHEET = QStringLiteral(
     "QSplitter::handle { border-top: 1px dashed black; width: 1px; margin-left: 10px; "
     "margin-right: 10px; }");
 
-CodeWidget::CodeWidget(QWidget* parent) : QDockWidget(parent), m_system(Core::System::GetInstance())
+CodeWidget::CodeWidget(QWidget* parent)
+    : QDockWidget(parent), m_system(Core::System::GetInstance()),
+      m_branch_watch_dialog(
+          new BranchWatchDialog(m_system, m_system.GetPowerPC().GetBranchWatch(), this))
 {
   setWindowTitle(tr("Code"));
   setObjectName(QStringLiteral("code"));
@@ -105,7 +109,7 @@ void CodeWidget::CreateWidgets()
   layout->setSpacing(0);
 
   m_search_address = new QLineEdit;
-  m_code_diff = new QPushButton(tr("Diff"));
+  m_branch_watch = new QPushButton(tr("Branch Watch"));
   m_code_view = new CodeViewWidget;
 
   m_search_address->setPlaceholderText(tr("Search Address"));
@@ -149,7 +153,7 @@ void CodeWidget::CreateWidgets()
   m_code_splitter->addWidget(m_code_view);
 
   layout->addWidget(m_search_address, 0, 0);
-  layout->addWidget(m_code_diff, 0, 2);
+  layout->addWidget(m_branch_watch, 0, 2);
   layout->addWidget(m_code_splitter, 1, 0, -1, -1);
 
   QWidget* widget = new QWidget(this);
@@ -181,7 +185,7 @@ void CodeWidget::ConnectWidgets()
   });
   connect(m_search_callstack, &QLineEdit::textChanged, this, &CodeWidget::UpdateCallstack);
 
-  connect(m_code_diff, &QPushButton::pressed, this, &CodeWidget::OnDiff);
+  connect(m_branch_watch, &QPushButton::pressed, this, &CodeWidget::OnBranchWatchDialog);
 
   connect(m_symbols_list, &QListWidget::itemPressed, this, &CodeWidget::OnSelectSymbol);
   connect(m_callstack_list, &QListWidget::itemPressed, this, &CodeWidget::OnSelectCallstack);
@@ -209,15 +213,11 @@ void CodeWidget::ConnectWidgets()
   connect(m_code_view, &CodeViewWidget::ShowMemory, this, &CodeWidget::ShowMemory);
 }
 
-void CodeWidget::OnDiff()
+void CodeWidget::OnBranchWatchDialog()
 {
-  if (!m_diff_dialog)
-    m_diff_dialog = new CodeDiffDialog(this);
-  m_diff_dialog->setWindowFlag(Qt::WindowMinimizeButtonHint);
-  SetQWidgetWindowDecorations(m_diff_dialog);
-  m_diff_dialog->show();
-  m_diff_dialog->raise();
-  m_diff_dialog->activateWindow();
+  m_branch_watch_dialog->open();
+  m_branch_watch_dialog->raise();
+  m_branch_watch_dialog->activateWindow();
 }
 
 void CodeWidget::OnSearchAddress()
@@ -394,6 +394,10 @@ void CodeWidget::UpdateSymbols()
   }
 
   m_symbols_list->sortItems();
+
+  // TODO: There seems to be a lack of a ubiquitous signal for when symbols change.
+  // This is the best location to catch the signals from MenuBar and CodeViewWidget.
+  m_branch_watch_dialog->UpdateSymbols();
 }
 
 void CodeWidget::UpdateFunctionCalls(const Common::Symbol* symbol)
@@ -464,6 +468,9 @@ void CodeWidget::Step()
   power_pc.SetMode(old_mode);
   Core::DisplayMessage(tr("Step successful!").toStdString(), 2000);
   // Will get a UpdateDisasmDialog(), don't update the GUI here.
+
+  // TODO: Step doesn't cause EmulationStateChanged to be emitted, so it has to call this manually.
+  m_branch_watch_dialog->Update();
 }
 
 void CodeWidget::StepOver()

Source/Core/DolphinQt/Debugger/CodeWidget.h

@@ -7,9 +7,9 @@
 #include <QString>
 
 #include "Common/CommonTypes.h"
-#include "DolphinQt/Debugger/CodeDiffDialog.h"
 #include "DolphinQt/Debugger/CodeViewWidget.h"
 
+class BranchWatchDialog;
 class QCloseEvent;
 class QLineEdit;
 class QShowEvent;
@@ -41,7 +41,7 @@ public:
   void ShowPC();
   void SetPC();
 
-  void OnDiff();
+  void OnBranchWatchDialog();
   void ToggleBreakpoint();
   void AddBreakpoint();
   void SetAddress(u32 address, CodeViewWidget::SetAddressUpdate update);
@@ -72,9 +72,9 @@ private:
 
   Core::System& m_system;
 
-  CodeDiffDialog* m_diff_dialog = nullptr;
+  BranchWatchDialog* m_branch_watch_dialog;
   QLineEdit* m_search_address;
-  QPushButton* m_code_diff;
+  QPushButton* m_branch_watch;
 
   QLineEdit* m_search_callstack;
   QListWidget* m_callstack_list;

Source/Core/DolphinQt/DolphinQt.vcxproj

@@ -137,9 +137,10 @@
     <ClCompile Include="Debugger\AssembleInstructionDialog.cpp" />
     <ClCompile Include="Debugger\AssemblerWidget.cpp" />
     <ClCompile Include="Debugger\AssemblyEditor.cpp" />
+    <ClCompile Include="Debugger\BranchWatchDialog.cpp" />
+    <ClCompile Include="Debugger\BranchWatchTableModel.cpp" />
     <ClCompile Include="Debugger\BreakpointDialog.cpp" />
     <ClCompile Include="Debugger\BreakpointWidget.cpp" />
-    <ClCompile Include="Debugger\CodeDiffDialog.cpp" />
     <ClCompile Include="Debugger\CodeViewWidget.cpp" />
     <ClCompile Include="Debugger\CodeWidget.cpp" />
     <ClCompile Include="Debugger\GekkoSyntaxHighlight.cpp" />
@@ -349,9 +350,10 @@
     <QtMoc Include="Debugger\AssembleInstructionDialog.h" />
     <QtMoc Include="Debugger\AssemblerWidget.h" />
     <QtMoc Include="Debugger\AssemblyEditor.h" />
+    <QtMoc Include="Debugger\BranchWatchDialog.h" />
+    <QtMoc Include="Debugger\BranchWatchTableModel.h" />
     <QtMoc Include="Debugger\BreakpointDialog.h" />
     <QtMoc Include="Debugger\BreakpointWidget.h" />
-    <QtMoc Include="Debugger\CodeDiffDialog.h" />
     <QtMoc Include="Debugger\CodeViewWidget.h" />
     <QtMoc Include="Debugger\CodeWidget.h" />
     <QtMoc Include="Debugger\GekkoSyntaxHighlight.h" />

Source/Core/UICommon/UICommon.cpp

@@ -74,6 +74,8 @@ static void CreateDumpPath(std::string path)
   File::CreateFullPath(File::GetUserPath(D_DUMPFRAMES_IDX));
   File::CreateFullPath(File::GetUserPath(D_DUMPOBJECTS_IDX));
   File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX));
+  File::CreateFullPath(File::GetUserPath(D_DUMPDEBUG_IDX));
+  File::CreateFullPath(File::GetUserPath(D_DUMPDEBUG_BRANCHWATCH_IDX));
 }
 
 static void CreateLoadPath(std::string path)
@@ -253,6 +255,8 @@ void CreateDirectories()
   File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX));
   File::CreateFullPath(File::GetUserPath(D_DUMPSSL_IDX));
   File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX));
+  File::CreateFullPath(File::GetUserPath(D_DUMPDEBUG_IDX));
+  File::CreateFullPath(File::GetUserPath(D_DUMPDEBUG_BRANCHWATCH_IDX));
   File::CreateFullPath(File::GetUserPath(D_GAMESETTINGS_IDX));
   File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX));
   File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP);