diff options
Diffstat (limited to 'src')
49 files changed, 140 insertions, 341 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 9aec16506..610707411 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -1,6 +1,6 @@ +#include <QApplication> #include <QHBoxLayout> #include <QKeyEvent> -#include <QApplication> #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) // Required for screen DPI information @@ -8,23 +8,19 @@ #include <QWindow> #endif -#include "bootmanager.h" -#include "main.h" +#include "citra_qt/bootmanager.h" -#include "common/string_util.h" -#include "common/scm_rev.h" #include "common/key_map.h" #include "common/microprofile.h" +#include "common/scm_rev.h" +#include "common/string_util.h" #include "core/core.h" #include "core/settings.h" #include "core/system.h" -#include "video_core/debug_utils/debug_utils.h" - #include "video_core/video_core.h" - -#include "citra_qt/version.h" +#include "video_core/debug_utils/debug_utils.h" #define APP_NAME "citra" #define APP_VERSION "0.1-" VERSION diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h index 1a1e0e6a5..5b52a0a58 100644 --- a/src/citra_qt/bootmanager.h +++ b/src/citra_qt/bootmanager.h @@ -6,8 +6,8 @@ #include <condition_variable> #include <mutex> -#include <QThread> #include <QGLWidget> +#include <QThread> #include "common/emu_window.h" #include "common/thread.h" diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp index a20351fb8..1f4981ce1 100644 --- a/src/citra_qt/config.cpp +++ b/src/citra_qt/config.cpp @@ -6,10 +6,10 @@ #include <QString> #include <QStringList> -#include "core/settings.h" -#include "common/file_util.h" +#include "citra_qt/config.h" -#include "config.h" +#include "common/file_util.h" +#include "core/settings.h" Config::Config() { diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index e97e81b65..d45eed179 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp @@ -4,14 +4,14 @@ #include <QStandardItemModel> +#include "citra_qt/debugger/callstack.h" + #include "common/common_types.h" #include "common/symbols.h" -#include "callstack.h" - #include "core/core.h" -#include "core/arm/arm_interface.h" #include "core/memory.h" +#include "core/arm/arm_interface.h" #include "core/arm/disassembler/arm_disasm.h" CallstackWidget::CallstackWidget(QWidget* parent): QDockWidget(parent) diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index f23d823e8..d4f72809d 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -4,18 +4,16 @@ #include <QShortcut> -#include "disassembler.h" +#include "citra_qt/bootmanager.h" +#include "citra_qt/hotkeys.h" +#include "citra_qt/debugger/disassembler.h" +#include "citra_qt/util/util.h" -#include "../bootmanager.h" -#include "../hotkeys.h" - -#include "../util/util.h" - -#include "core/memory.h" - -#include "core/core.h" #include "common/break_points.h" #include "common/symbols.h" + +#include "core/core.h" +#include "core/memory.h" #include "core/arm/arm_interface.h" #include "core/arm/disassembler/arm_disasm.h" diff --git a/src/citra_qt/debugger/graphics.cpp b/src/citra_qt/debugger/graphics.cpp index 7d15028f0..8008f914c 100644 --- a/src/citra_qt/debugger/graphics.cpp +++ b/src/citra_qt/debugger/graphics.cpp @@ -2,11 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "graphics.h" #include <QListView> -#include <QVBoxLayout> -#include <QDebug> +#include "citra_qt/debugger/graphics.h" #include "citra_qt/util/util.h" extern GraphicsDebugger g_debugger; diff --git a/src/citra_qt/debugger/graphics_breakpoint_observer.cpp b/src/citra_qt/debugger/graphics_breakpoint_observer.cpp index 10ac1ebad..f134eef63 100644 --- a/src/citra_qt/debugger/graphics_breakpoint_observer.cpp +++ b/src/citra_qt/debugger/graphics_breakpoint_observer.cpp @@ -4,7 +4,7 @@ #include <QMetaType> -#include "graphics_breakpoint_observer.h" +#include "citra_qt/debugger/graphics_breakpoint_observer.h" BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context, const QString& title, QWidget* parent) diff --git a/src/citra_qt/debugger/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics_breakpoints.cpp index 5202c168c..819ec7707 100644 --- a/src/citra_qt/debugger/graphics_breakpoints.cpp +++ b/src/citra_qt/debugger/graphics_breakpoints.cpp @@ -2,16 +2,16 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <QLabel> #include <QMetaType> #include <QPushButton> #include <QTreeView> #include <QVBoxLayout> -#include <QLabel> -#include "common/assert.h" +#include "citra_qt/debugger/graphics_breakpoints.h" +#include "citra_qt/debugger/graphics_breakpoints_p.h" -#include "graphics_breakpoints.h" -#include "graphics_breakpoints_p.h" +#include "common/assert.h" BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent) : QAbstractListModel(parent), context_weak(debug_context), diff --git a/src/citra_qt/debugger/graphics_breakpoints.h b/src/citra_qt/debugger/graphics_breakpoints.h index d900729da..2371b0e39 100644 --- a/src/citra_qt/debugger/graphics_breakpoints.h +++ b/src/citra_qt/debugger/graphics_breakpoints.h @@ -6,7 +6,6 @@ #include <memory> -#include <QAbstractListModel> #include <QDockWidget> #include "video_core/debug_utils/debug_utils.h" diff --git a/src/citra_qt/debugger/graphics_breakpoints_p.h b/src/citra_qt/debugger/graphics_breakpoints_p.h index 00d8d5101..251114d06 100644 --- a/src/citra_qt/debugger/graphics_breakpoints_p.h +++ b/src/citra_qt/debugger/graphics_breakpoints_p.h @@ -23,7 +23,7 @@ public: int columnCount(const QModelIndex& parent = QModelIndex()) const override; int rowCount(const QModelIndex& parent = QModelIndex()) const override; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; - Qt::ItemFlags flags(const QModelIndex &index) const; + Qt::ItemFlags flags(const QModelIndex &index) const override; bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp index fa32d24b5..ab97c8d2d 100644 --- a/src/citra_qt/debugger/graphics_cmdlists.cpp +++ b/src/citra_qt/debugger/graphics_cmdlists.cpp @@ -4,26 +4,24 @@ #include <QApplication> #include <QClipboard> +#include <QComboBox> +#include <QHeaderView> #include <QLabel> #include <QListView> #include <QMainWindow> #include <QPushButton> -#include <QVBoxLayout> -#include <QTreeView> -#include <QHeaderView> #include <QSpinBox> -#include <QComboBox> +#include <QTreeView> +#include <QVBoxLayout> +#include "citra_qt/debugger/graphics_cmdlists.h" +#include "citra_qt/util/spinbox.h" #include "citra_qt/util/util.h" #include "common/vector_math.h" -#include "video_core/debug_utils/debug_utils.h" #include "video_core/pica.h" - -#include "graphics_cmdlists.h" - -#include "util/spinbox.h" +#include "video_core/debug_utils/debug_utils.h" QImage LoadTexture(u8* src, const Pica::DebugUtils::TextureInfo& info) { QImage decoded_image(info.width, info.height, QImage::Format_ARGB32); diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp index 39eefbf75..80b32eaff 100644 --- a/src/citra_qt/debugger/graphics_framebuffer.cpp +++ b/src/citra_qt/debugger/graphics_framebuffer.cpp @@ -9,18 +9,17 @@ #include <QPushButton> #include <QSpinBox> +#include "citra_qt/debugger/graphics_framebuffer.h" +#include "citra_qt/util/spinbox.h" + #include "common/color.h" -#include "core/hw/gpu.h" #include "core/memory.h" +#include "core/hw/gpu.h" #include "video_core/pica.h" #include "video_core/utils.h" -#include "graphics_framebuffer.h" - -#include "util/spinbox.h" - GraphicsFramebufferWidget::GraphicsFramebufferWidget(std::shared_ptr<Pica::DebugContext> debug_context, QWidget* parent) : BreakPointObserverDock(debug_context, tr("Pica Framebuffer"), parent), diff --git a/src/citra_qt/debugger/graphics_framebuffer.h b/src/citra_qt/debugger/graphics_framebuffer.h index e9eae679f..5cd96f2e9 100644 --- a/src/citra_qt/debugger/graphics_framebuffer.h +++ b/src/citra_qt/debugger/graphics_framebuffer.h @@ -4,9 +4,7 @@ #pragma once -#include <QDockWidget> - -#include "graphics_breakpoint_observer.h" +#include "citra_qt/debugger/graphics_breakpoint_observer.h" class QComboBox; class QLabel; diff --git a/src/citra_qt/debugger/graphics_tracing.cpp b/src/citra_qt/debugger/graphics_tracing.cpp index f80cb7493..b0bc782df 100644 --- a/src/citra_qt/debugger/graphics_tracing.cpp +++ b/src/citra_qt/debugger/graphics_tracing.cpp @@ -4,26 +4,25 @@ #include <memory> +#include <boost/range/algorithm/copy.hpp> + #include <QBoxLayout> #include <QComboBox> #include <QFileDialog> -#include <QLabel> #include <QMessageBox> #include <QPushButton> -#include <QSpinBox> -#include <boost/range/algorithm/copy.hpp> +#include "citra_qt/debugger/graphics_tracing.h" #include "common/common_types.h" #include "core/hw/gpu.h" #include "core/hw/lcd.h" -#include "video_core/pica.h" - #include "nihstro/float24.h" -#include "graphics_tracing.h" +#include "video_core/pica.h" + GraphicsTracingWidget::GraphicsTracingWidget(std::shared_ptr<Pica::DebugContext> debug_context, QWidget* parent) diff --git a/src/citra_qt/debugger/graphics_tracing.h b/src/citra_qt/debugger/graphics_tracing.h index 2a0e4819b..753dfa914 100644 --- a/src/citra_qt/debugger/graphics_tracing.h +++ b/src/citra_qt/debugger/graphics_tracing.h @@ -4,7 +4,7 @@ #pragma once -#include "graphics_breakpoint_observer.h" +#include "citra_qt/debugger/graphics_breakpoint_observer.h" class EmuThread; diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp index d48b3294b..f915d2bab 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp @@ -16,12 +16,11 @@ #include <QSpinBox> #include <QTreeView> +#include "citra_qt/debugger/graphics_vertex_shader.h" #include "citra_qt/util/util.h" #include "video_core/shader/shader.h" -#include "graphics_vertex_shader.h" - using nihstro::OpCode; using nihstro::Instruction; using nihstro::SourceRegister; diff --git a/src/citra_qt/debugger/graphics_vertex_shader.h b/src/citra_qt/debugger/graphics_vertex_shader.h index 0bf1652fc..7f06f496a 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.h +++ b/src/citra_qt/debugger/graphics_vertex_shader.h @@ -6,7 +6,7 @@ #include <QAbstractTableModel> -#include "graphics_breakpoint_observer.h" +#include "citra_qt/debugger/graphics_breakpoint_observer.h" #include "nihstro/parser_shbin.h" diff --git a/src/citra_qt/debugger/profiler.cpp b/src/citra_qt/debugger/profiler.cpp index 5261d4836..043f20659 100644 --- a/src/citra_qt/debugger/profiler.cpp +++ b/src/citra_qt/debugger/profiler.cpp @@ -6,12 +6,11 @@ #include <QPainter> #include <QString> -#include "profiler.h" - +#include "citra_qt/debugger/profiler.h" #include "citra_qt/util/util.h" -#include "common/profiler_reporting.h" #include "common/microprofile.h" +#include "common/profiler_reporting.h" // Include the implementation of the UI in this file. This isn't in microprofile.cpp because the // non-Qt frontends don't need it (and don't implement the UI drawing hooks either). diff --git a/src/citra_qt/debugger/ramview.cpp b/src/citra_qt/debugger/ramview.cpp index b6ebc7fc4..02347e83a 100644 --- a/src/citra_qt/debugger/ramview.cpp +++ b/src/citra_qt/debugger/ramview.cpp @@ -2,8 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "ramview.h" - +#include "citra_qt/debugger/ramview.h" GRamView::GRamView(QWidget* parent) : QHexEdit(parent) { diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp index 97384d5e8..6100d67c5 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/citra_qt/debugger/registers.cpp @@ -2,9 +2,10 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "registers.h" +#include <QTreeWidgetItem> -#include "../util/util.h" +#include "citra_qt/debugger/registers.h" +#include "citra_qt/util/util.h" #include "core/core.h" #include "core/arm/arm_interface.h" diff --git a/src/citra_qt/debugger/registers.h b/src/citra_qt/debugger/registers.h index 927fde188..cf27acc1c 100644 --- a/src/citra_qt/debugger/registers.h +++ b/src/citra_qt/debugger/registers.h @@ -5,9 +5,9 @@ #include "ui_registers.h" #include <QDockWidget> -#include <QTreeWidgetItem> class QTreeWidget; +class QTreeWidgetItem; class EmuThread; class RegistersWidget : public QDockWidget diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp index 5ed6cf0b1..ed6b12fc4 100644 --- a/src/citra_qt/hotkeys.cpp +++ b/src/citra_qt/hotkeys.cpp @@ -8,7 +8,7 @@ #include <QSettings> #include <QShortcut> -#include "hotkeys.h" +#include "citra_qt/hotkeys.h" struct Hotkey { diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 609886dfd..d2c7459a4 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -4,51 +4,49 @@ #include <thread> -#include <QtGui> #include <QDesktopWidget> +#include <QtGui> #include <QFileDialog> #include <QMessageBox> #include "qhexedit.h" -#include "main.h" -#include "common/string_util.h" -#include "common/logging/text_formatter.h" -#include "common/logging/log.h" -#include "common/logging/backend.h" -#include "common/logging/filter.h" +#include "citra_qt/bootmanager.h" +#include "citra_qt/config.h" +#include "citra_qt/hotkeys.h" +#include "citra_qt/main.h" + +// Debugger +#include "citra_qt/debugger/callstack.h" +#include "citra_qt/debugger/disassembler.h" +#include "citra_qt/debugger/graphics.h" +#include "citra_qt/debugger/graphics_breakpoints.h" +#include "citra_qt/debugger/graphics_cmdlists.h" +#include "citra_qt/debugger/graphics_framebuffer.h" +#include "citra_qt/debugger/graphics_tracing.h" +#include "citra_qt/debugger/graphics_vertex_shader.h" +#include "citra_qt/debugger/profiler.h" +#include "citra_qt/debugger/ramview.h" +#include "citra_qt/debugger/registers.h" + #include "common/make_unique.h" #include "common/microprofile.h" #include "common/platform.h" #include "common/scm_rev.h" #include "common/scope_exit.h" +#include "common/string_util.h" +#include "common/logging/backend.h" +#include "common/logging/filter.h" +#include "common/logging/log.h" +#include "common/logging/text_formatter.h" -#include "bootmanager.h" -#include "hotkeys.h" - -//debugger -#include "debugger/disassembler.h" -#include "debugger/registers.h" -#include "debugger/callstack.h" -#include "debugger/ramview.h" -#include "debugger/graphics.h" -#include "debugger/graphics_breakpoints.h" -#include "debugger/graphics_cmdlists.h" -#include "debugger/graphics_framebuffer.h" -#include "debugger/graphics_tracing.h" -#include "debugger/graphics_vertex_shader.h" -#include "debugger/profiler.h" - +#include "core/core.h" #include "core/settings.h" #include "core/system.h" -#include "core/core.h" -#include "core/loader/loader.h" #include "core/arm/disassembler/load_symbol_map.h" -#include "citra_qt/config.h" +#include "core/loader/loader.h" #include "video_core/video_core.h" -#include "version.h" - GMainWindow::GMainWindow() : emu_thread(nullptr) { Pica::g_debug_context = Pica::DebugContext::Construct(); diff --git a/src/citra_qt/util/spinbox.cpp b/src/citra_qt/util/spinbox.cpp index de4060116..415e7fbec 100644 --- a/src/citra_qt/util/spinbox.cpp +++ b/src/citra_qt/util/spinbox.cpp @@ -33,8 +33,8 @@ #include <QLineEdit> #include <QRegExpValidator> +#include "citra_qt/util/spinbox.h" #include "common/assert.h" -#include "spinbox.h" CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), min_value(-100), max_value(100), value(0), base(10), num_digits(0) { diff --git a/src/citra_qt/util/util.cpp b/src/citra_qt/util/util.cpp index 2cb939af1..f292046b7 100644 --- a/src/citra_qt/util/util.cpp +++ b/src/citra_qt/util/util.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "util.h" +#include "citra_qt/util/util.h" QFont GetMonospaceFont() { QFont font("monospace"); diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 2be6fe996..959084cdf 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -32,7 +32,6 @@ set(HEADERS common_funcs.h common_paths.h common_types.h - debug_interface.h emu_window.h file_util.h hash.h diff --git a/src/common/break_points.cpp b/src/common/break_points.cpp index 023a485a4..e7d0d3e43 100644 --- a/src/common/break_points.cpp +++ b/src/common/break_points.cpp @@ -2,7 +2,6 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "common/debug_interface.h" #include "common/break_points.h" #include "common/logging/log.h" @@ -101,92 +100,3 @@ void BreakPoints::Clear() m_BreakPoints.clear(); } - -MemChecks::TMemChecksStr MemChecks::GetStrings() const -{ - TMemChecksStr mcs; - for (auto memcheck : m_MemChecks) - { - std::stringstream mc; - mc << std::hex << memcheck.StartAddress; - mc << " " << (memcheck.bRange ? memcheck.EndAddress : memcheck.StartAddress) << " " - << (memcheck.bRange ? "n" : "") - << (memcheck.OnRead ? "r" : "") - << (memcheck.OnWrite ? "w" : "") - << (memcheck.Log ? "l" : "") - << (memcheck.Break ? "p" : ""); - mcs.push_back(mc.str()); - } - - return mcs; -} - -void MemChecks::AddFromStrings(const TMemChecksStr& mcs) -{ - for (auto mcs_item : mcs) - { - TMemCheck mc; - std::stringstream mcstr; - mcstr << std::hex << mcs_item; - mcstr >> mc.StartAddress; - mc.bRange = mcs_item.find("n") != mcs_item.npos; - mc.OnRead = mcs_item.find("r") != mcs_item.npos; - mc.OnWrite = mcs_item.find("w") != mcs_item.npos; - mc.Log = mcs_item.find("l") != mcs_item.npos; - mc.Break = mcs_item.find("p") != mcs_item.npos; - if (mc.bRange) - mcstr >> mc.EndAddress; - else - mc.EndAddress = mc.StartAddress; - Add(mc); - } -} - -void MemChecks::Add(const TMemCheck& rMemoryCheck) -{ - if (GetMemCheck(rMemoryCheck.StartAddress) == 0) - m_MemChecks.push_back(rMemoryCheck); -} - -void MemChecks::Remove(u32 Address) -{ - auto cond = [&Address](const TMemCheck& mc) { return mc.StartAddress == Address; }; - auto it = std::find_if(m_MemChecks.begin(), m_MemChecks.end(), cond); - if (it != m_MemChecks.end()) - m_MemChecks.erase(it); -} - -TMemCheck *MemChecks::GetMemCheck(u32 address) -{ - for (auto i = m_MemChecks.begin(); i != m_MemChecks.end(); ++i) - { - if (i->bRange) - { - if (address >= i->StartAddress && address <= i->EndAddress) - return &(*i); - } - else if (i->StartAddress == address) - return &(*i); - } - - // none found - return 0; -} - -void TMemCheck::Action(DebugInterface *debug_interface, u32 iValue, u32 addr, - bool write, int size, u32 pc) -{ - if ((write && OnWrite) || (!write && OnRead)) - { - if (Log) - { - LOG_DEBUG(Debug_Breakpoint, "CHK %08x (%s) %s%i %0*x at %08x (%s)", - pc, debug_interface->getDescription(pc).c_str(), - write ? "Write" : "Read", size*8, size*2, iValue, addr, - debug_interface->getDescription(addr).c_str() - ); - } - if (Break) - debug_interface->breakNow(); - } -} diff --git a/src/common/break_points.h b/src/common/break_points.h index f0a55e7b1..b0629df37 100644 --- a/src/common/break_points.h +++ b/src/common/break_points.h @@ -18,31 +18,6 @@ struct TBreakPoint bool bTemporary; }; -struct TMemCheck -{ - TMemCheck(): - StartAddress(0), EndAddress(0), - bRange(false), OnRead(false), OnWrite(false), - Log(false), Break(false), numHits(0) - { } - - u32 StartAddress; - u32 EndAddress; - - bool bRange; - - bool OnRead; - bool OnWrite; - - bool Log; - bool Break; - - u32 numHits; - - void Action(DebugInterface *dbg_interface, u32 iValue, u32 addr, - bool write, int size, u32 pc); -}; - // Code breakpoints. class BreakPoints { @@ -73,27 +48,3 @@ private: TBreakPoints m_BreakPoints; u32 m_iBreakOnCount; }; - - -// Memory breakpoints -class MemChecks -{ -public: - typedef std::vector<TMemCheck> TMemChecks; - typedef std::vector<std::string> TMemChecksStr; - - TMemChecks m_MemChecks; - - const TMemChecks& GetMemChecks() { return m_MemChecks; } - - TMemChecksStr GetStrings() const; - void AddFromStrings(const TMemChecksStr& mcs); - - void Add(const TMemCheck& rMemoryCheck); - - // memory breakpoint - TMemCheck *GetMemCheck(u32 address); - void Remove(u32 _Address); - - void Clear() { m_MemChecks.clear(); }; -}; diff --git a/src/common/debug_interface.h b/src/common/debug_interface.h deleted file mode 100644 index 32f55cb59..000000000 --- a/src/common/debug_interface.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include <cstring> -#include <string> - -class DebugInterface -{ -protected: - virtual ~DebugInterface() {} - -public: - virtual void disasm(unsigned int /*address*/, char *dest, int /*max_size*/) {strcpy(dest, "NODEBUGGER");} - virtual void getRawMemoryString(int /*memory*/, unsigned int /*address*/, char *dest, int /*max_size*/) {strcpy(dest, "NODEBUGGER");} - virtual int getInstructionSize(int /*instruction*/) {return 1;} - virtual bool isAlive() {return true;} - virtual bool isBreakpoint(unsigned int /*address*/) {return false;} - virtual void setBreakpoint(unsigned int /*address*/){} - virtual void clearBreakpoint(unsigned int /*address*/){} - virtual void clearAllBreakpoints() {} - virtual void toggleBreakpoint(unsigned int /*address*/){} - virtual bool isMemCheck(unsigned int /*address*/) {return false;} - virtual void toggleMemCheck(unsigned int /*address*/){} - virtual unsigned int readMemory(unsigned int /*address*/){return 0;} - virtual void writeExtraMemory(int /*memory*/, unsigned int /*value*/, unsigned int /*address*/) {} - virtual unsigned int readExtraMemory(int /*memory*/, unsigned int /*address*/){return 0;} - virtual unsigned int readInstruction(unsigned int /*address*/){return 0;} - virtual unsigned int getPC() {return 0;} - virtual void setPC(unsigned int /*address*/) {} - virtual void step() {} - virtual void runToBreakpoint() {} - virtual void breakNow() {} - virtual void insertBLR(unsigned int /*address*/, unsigned int /*value*/) {} - virtual void showJitResults(unsigned int /*address*/) {}; - virtual int getColor(unsigned int /*address*/){return 0xFFFFFFFF;} - virtual std::string getDescription(unsigned int /*address*/) = 0; -}; diff --git a/src/common/swap.h b/src/common/swap.h index b92e5bfa4..a7c37bc44 100644 --- a/src/common/swap.h +++ b/src/common/swap.h @@ -148,7 +148,7 @@ struct swap_struct_t { typedef swap_struct_t<T, F> swapped_t; protected: - T value; + T value = T(); static T swap(T v) { return F::swap(v); @@ -158,7 +158,7 @@ public: return swap(value); } - swap_struct_t() : value((T)0) {} + swap_struct_t() = default; swap_struct_t(const T &v): value(swap(v)) {} template <typename S> diff --git a/src/video_core/clipper.cpp b/src/video_core/clipper.cpp index bb6048cc0..ed99c4f13 100644 --- a/src/video_core/clipper.cpp +++ b/src/video_core/clipper.cpp @@ -4,10 +4,10 @@ #include <boost/container/static_vector.hpp> -#include "clipper.h" -#include "pica.h" -#include "rasterizer.h" -#include "shader/shader_interpreter.h" +#include "video_core/clipper.h" +#include "video_core/pica.h" +#include "video_core/rasterizer.h" +#include "video_core/shader/shader_interpreter.h" namespace Pica { diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index 6e9cb2586..47afd8938 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp @@ -2,25 +2,24 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <cmath> #include <boost/range/algorithm/fill.hpp> #include "common/microprofile.h" #include "common/profiler.h" +#include "core/settings.h" #include "core/hle/service/gsp_gpu.h" #include "core/hw/gpu.h" -#include "core/settings.h" - -#include "debug_utils/debug_utils.h" -#include "clipper.h" -#include "command_processor.h" -#include "math.h" -#include "pica.h" -#include "primitive_assembly.h" -#include "renderer_base.h" -#include "shader/shader_interpreter.h" -#include "video_core.h" +#include "video_core/clipper.h" +#include "video_core/command_processor.h" +#include "video_core/pica.h" +#include "video_core/primitive_assembly.h" +#include "video_core/renderer_base.h" +#include "video_core/video_core.h" +#include "video_core/debug_utils/debug_utils.h" +#include "video_core/shader/shader_interpreter.h" namespace Pica { diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 9a61e700b..77a4fe272 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -31,8 +31,7 @@ #include "video_core/renderer_base.h" #include "video_core/utils.h" #include "video_core/video_core.h" - -#include "debug_utils.h" +#include "video_core/debug_utils/debug_utils.h" using nihstro::DVLBHeader; using nihstro::DVLEHeader; diff --git a/src/video_core/pica.cpp b/src/video_core/pica.cpp index 61983bc6c..8c528989e 100644 --- a/src/video_core/pica.cpp +++ b/src/video_core/pica.cpp @@ -5,8 +5,8 @@ #include <cstring> #include <unordered_map> -#include "pica.h" -#include "shader/shader.h" +#include "video_core/pica.h" +#include "video_core/shader/shader.h" namespace Pica { diff --git a/src/video_core/pica.h b/src/video_core/pica.h index c1dca5087..ff81b409d 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h @@ -13,8 +13,8 @@ #include "common/bit_field.h" #include "common/common_funcs.h" #include "common/common_types.h" -#include "common/logging/log.h" #include "common/vector_math.h" +#include "common/logging/log.h" namespace Pica { diff --git a/src/video_core/primitive_assembly.cpp b/src/video_core/primitive_assembly.cpp index e2b1df44c..44a8dbfe9 100644 --- a/src/video_core/primitive_assembly.cpp +++ b/src/video_core/primitive_assembly.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "pica.h" -#include "primitive_assembly.h" -#include "shader/shader_interpreter.h" - #include "common/logging/log.h" + +#include "video_core/pica.h" +#include "video_core/primitive_assembly.h" #include "video_core/debug_utils/debug_utils.h" +#include "video_core/shader/shader_interpreter.h" namespace Pica { diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index 77eadda9e..a90ff5fef 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include <algorithm> +#include <cmath> #include "common/color.h" #include "common/common_types.h" @@ -10,15 +11,14 @@ #include "common/microprofile.h" #include "common/profiler.h" -#include "core/hw/gpu.h" #include "core/memory.h" +#include "core/hw/gpu.h" -#include "debug_utils/debug_utils.h" -#include "math.h" -#include "pica.h" -#include "rasterizer.h" -#include "shader/shader_interpreter.h" +#include "video_core/pica.h" +#include "video_core/rasterizer.h" #include "video_core/utils.h" +#include "video_core/debug_utils/debug_utils.h" +#include "video_core/shader/shader_interpreter.h" namespace Pica { diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 62ca18317..50eb157a5 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -12,9 +12,9 @@ #include "common/microprofile.h" #include "common/profiler.h" -#include "core/hw/gpu.h" #include "core/memory.h" #include "core/settings.h" +#include "core/hw/gpu.h" #include "video_core/pica.h" #include "video_core/utils.h" diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 24560d7f8..1fe307846 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -9,11 +9,10 @@ #include "common/common_types.h" #include "video_core/hwrasterizer_base.h" +#include "video_core/renderer_opengl/gl_rasterizer_cache.h" +#include "video_core/renderer_opengl/gl_state.h" #include "video_core/shader/shader_interpreter.h" -#include "gl_state.h" -#include "gl_rasterizer_cache.h" - class RasterizerOpenGL : public HWRasterizer { public: diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index d9ccf2a3f..10d4ab0b6 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -10,9 +10,9 @@ #include "core/memory.h" +#include "video_core/debug_utils/debug_utils.h" #include "video_core/renderer_opengl/gl_rasterizer_cache.h" #include "video_core/renderer_opengl/pica_to_gl.h" -#include "video_core/debug_utils/debug_utils.h" RasterizerCacheOpenGL::~RasterizerCacheOpenGL() { FullFlush(); diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h index ec56237b5..98a48ffbe 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h @@ -4,13 +4,13 @@ #pragma once -#include "gl_state.h" -#include "gl_resource_manager.h" -#include "video_core/debug_utils/debug_utils.h" -#include "video_core/pica.h" - -#include <memory> #include <map> +#include <memory> + +#include "video_core/pica.h" +#include "video_core/debug_utils/debug_utils.h" +#include "video_core/renderer_opengl/gl_resource_manager.h" +#include "video_core/renderer_opengl/gl_state.h" class RasterizerCacheOpenGL : NonCopyable { public: diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp index 42d0e597c..4cf246c06 100644 --- a/src/video_core/renderer_opengl/gl_shader_util.cpp +++ b/src/video_core/renderer_opengl/gl_shader_util.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "gl_shader_util.h" -#include "common/logging/log.h" - -#include <vector> #include <algorithm> +#include <vector> + +#include "common/logging/log.h" +#include "video_core/renderer_opengl/gl_shader_util.h" namespace ShaderUtil { diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index e02c27fbf..77b2816cb 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "video_core/renderer_opengl/gl_state.h" #include "video_core/pica.h" +#include "video_core/renderer_opengl/gl_state.h" OpenGLState OpenGLState::cur_state; diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index e1828c754..22f261c68 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -11,11 +11,11 @@ #include "common/logging/log.h" #include "common/profiler_reporting.h" +#include "core/memory.h" +#include "core/settings.h" #include "core/hw/gpu.h" #include "core/hw/hw.h" #include "core/hw/lcd.h" -#include "core/memory.h" -#include "core/settings.h" #include "video_core/video_core.h" #include "video_core/debug_utils/debug_utils.h" diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp index 69e4efa68..7b0c20b74 100644 --- a/src/video_core/shader/shader_interpreter.cpp +++ b/src/video_core/shader/shader_interpreter.cpp @@ -7,9 +7,8 @@ #include <nihstro/shader_bytecode.h> #include "video_core/pica.h" - -#include "shader.h" -#include "shader_interpreter.h" +#include "video_core/shader/shader.h" +#include "video_core/shader/shader_interpreter.h" using nihstro::OpCode; using nihstro::Instruction; diff --git a/src/video_core/shader/shader_interpreter.h b/src/video_core/shader/shader_interpreter.h index 791467252..294bca50e 100644 --- a/src/video_core/shader/shader_interpreter.h +++ b/src/video_core/shader/shader_interpreter.h @@ -4,7 +4,7 @@ #pragma once -#include "shader.h" +#include "video_core/shader/shader.h" namespace Pica { diff --git a/src/video_core/shader/shader_jit_x64.h b/src/video_core/shader/shader_jit_x64.h index 8668cfff4..3afbceccf 100644 --- a/src/video_core/shader/shader_jit_x64.h +++ b/src/video_core/shader/shader_jit_x64.h @@ -9,8 +9,7 @@ #include "common/x64/emitter.h" #include "video_core/pica.h" - -#include "shader.h" +#include "video_core/shader/shader.h" using nihstro::Instruction; using nihstro::OpCode; diff --git a/src/video_core/utils.cpp b/src/video_core/utils.cpp index c7cc93cea..6e1ff5cf4 100644 --- a/src/video_core/utils.cpp +++ b/src/video_core/utils.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include <stdio.h> -#include <string.h> +#include <cstdio> +#include <cstring> #include "video_core/utils.h" diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index 943fde5ee..eaddda668 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -2,17 +2,16 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "common/logging/log.h" #include "common/emu_window.h" +#include "common/logging/log.h" #include "core/core.h" #include "core/settings.h" -#include "video_core.h" -#include "renderer_base.h" -#include "renderer_opengl/renderer_opengl.h" - -#include "pica.h" +#include "video_core/pica.h" +#include "video_core/renderer_base.h" +#include "video_core/video_core.h" +#include "video_core/renderer_opengl/renderer_opengl.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Video Core namespace |