diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-02-15 23:42:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-15 23:42:38 +0100 |
commit | 04d2d2ef5fdd56baa0ecf60e59ea4e915262161d (patch) | |
tree | 3951ff8988fff573acd7f2b4edf5d95774b3721d /src/core/debugger | |
parent | Merge pull request #9809 from liamwhite/unused-service (diff) | |
parent | remove constexpr from virtual function (diff) | |
download | yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.gz yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.bz2 yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.lz yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.xz yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.zst yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/debugger/gdbstub_arch.cpp | 14 | ||||
-rw-r--r-- | src/core/debugger/gdbstub_arch.h | 6 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/core/debugger/gdbstub_arch.cpp b/src/core/debugger/gdbstub_arch.cpp index 4bef09bd7..831c48513 100644 --- a/src/core/debugger/gdbstub_arch.cpp +++ b/src/core/debugger/gdbstub_arch.cpp @@ -41,9 +41,8 @@ static void PutSIMDRegister(std::array<u32, 64>& simd_regs, size_t offset, const // For sample XML files see the GDB source /gdb/features // This XML defines what the registers are for this specific ARM device -std::string GDBStubA64::GetTargetXML() const { - constexpr const char* target_xml = - R"(<?xml version="1.0"?> +std::string_view GDBStubA64::GetTargetXML() const { + return R"(<?xml version="1.0"?> <!DOCTYPE target SYSTEM "gdb-target.dtd"> <target version="1.0"> <architecture>aarch64</architecture> @@ -178,8 +177,6 @@ std::string GDBStubA64::GetTargetXML() const { <reg name="fpcr" bitsize="32"/> </feature> </target>)"; - - return target_xml; } std::string GDBStubA64::RegRead(const Kernel::KThread* thread, size_t id) const { @@ -270,9 +267,8 @@ u32 GDBStubA64::BreakpointInstruction() const { return 0xd4200000; } -std::string GDBStubA32::GetTargetXML() const { - constexpr const char* target_xml = - R"(<?xml version="1.0"?> +std::string_view GDBStubA32::GetTargetXML() const { + return R"(<?xml version="1.0"?> <!DOCTYPE target SYSTEM "gdb-target.dtd"> <target version="1.0"> <architecture>arm</architecture> @@ -378,8 +374,6 @@ std::string GDBStubA32::GetTargetXML() const { <reg name="fpscr" bitsize="32" type="int" group="float" regnum="80"/> </feature> </target>)"; - - return target_xml; } std::string GDBStubA32::RegRead(const Kernel::KThread* thread, size_t id) const { diff --git a/src/core/debugger/gdbstub_arch.h b/src/core/debugger/gdbstub_arch.h index 2540d6456..34530c788 100644 --- a/src/core/debugger/gdbstub_arch.h +++ b/src/core/debugger/gdbstub_arch.h @@ -16,7 +16,7 @@ namespace Core { class GDBStubArch { public: virtual ~GDBStubArch() = default; - virtual std::string GetTargetXML() const = 0; + virtual std::string_view GetTargetXML() const = 0; virtual std::string RegRead(const Kernel::KThread* thread, size_t id) const = 0; virtual void RegWrite(Kernel::KThread* thread, size_t id, std::string_view value) const = 0; virtual std::string ReadRegisters(const Kernel::KThread* thread) const = 0; @@ -27,7 +27,7 @@ public: class GDBStubA64 final : public GDBStubArch { public: - std::string GetTargetXML() const override; + std::string_view GetTargetXML() const override; std::string RegRead(const Kernel::KThread* thread, size_t id) const override; void RegWrite(Kernel::KThread* thread, size_t id, std::string_view value) const override; std::string ReadRegisters(const Kernel::KThread* thread) const override; @@ -47,7 +47,7 @@ private: class GDBStubA32 final : public GDBStubArch { public: - std::string GetTargetXML() const override; + std::string_view GetTargetXML() const override; std::string RegRead(const Kernel::KThread* thread, size_t id) const override; void RegWrite(Kernel::KThread* thread, size_t id, std::string_view value) const override; std::string ReadRegisters(const Kernel::KThread* thread) const override; |