diff options
| author | 2023-02-15 17:42:38 -0500 | |
|---|---|---|
| committer | 2023-02-15 17:42:38 -0500 | |
| commit | 04d2d2ef5fdd56baa0ecf60e59ea4e915262161d (patch) | |
| tree | 3951ff8988fff573acd7f2b4edf5d95774b3721d /src/core/debugger/gdbstub_arch.cpp | |
| parent | Merge pull request #9809 from liamwhite/unused-service (diff) | |
| parent | remove constexpr from virtual function (diff) | |
| download | yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.gz yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.xz yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.zip | |
Merge pull request #9782 from arades79/fix-consexpr-value-declaration-usage
Fix consexpr value declaration usage
Diffstat (limited to 'src/core/debugger/gdbstub_arch.cpp')
| -rw-r--r-- | src/core/debugger/gdbstub_arch.cpp | 14 |
1 files changed, 4 insertions, 10 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 | |||
| 41 | 41 | ||
| 42 | // For sample XML files see the GDB source /gdb/features | 42 | // For sample XML files see the GDB source /gdb/features |
| 43 | // This XML defines what the registers are for this specific ARM device | 43 | // This XML defines what the registers are for this specific ARM device |
| 44 | std::string GDBStubA64::GetTargetXML() const { | 44 | std::string_view GDBStubA64::GetTargetXML() const { |
| 45 | constexpr const char* target_xml = | 45 | return R"(<?xml version="1.0"?> |
| 46 | R"(<?xml version="1.0"?> | ||
| 47 | <!DOCTYPE target SYSTEM "gdb-target.dtd"> | 46 | <!DOCTYPE target SYSTEM "gdb-target.dtd"> |
| 48 | <target version="1.0"> | 47 | <target version="1.0"> |
| 49 | <architecture>aarch64</architecture> | 48 | <architecture>aarch64</architecture> |
| @@ -178,8 +177,6 @@ std::string GDBStubA64::GetTargetXML() const { | |||
| 178 | <reg name="fpcr" bitsize="32"/> | 177 | <reg name="fpcr" bitsize="32"/> |
| 179 | </feature> | 178 | </feature> |
| 180 | </target>)"; | 179 | </target>)"; |
| 181 | |||
| 182 | return target_xml; | ||
| 183 | } | 180 | } |
| 184 | 181 | ||
| 185 | std::string GDBStubA64::RegRead(const Kernel::KThread* thread, size_t id) const { | 182 | std::string GDBStubA64::RegRead(const Kernel::KThread* thread, size_t id) const { |
| @@ -270,9 +267,8 @@ u32 GDBStubA64::BreakpointInstruction() const { | |||
| 270 | return 0xd4200000; | 267 | return 0xd4200000; |
| 271 | } | 268 | } |
| 272 | 269 | ||
| 273 | std::string GDBStubA32::GetTargetXML() const { | 270 | std::string_view GDBStubA32::GetTargetXML() const { |
| 274 | constexpr const char* target_xml = | 271 | return R"(<?xml version="1.0"?> |
| 275 | R"(<?xml version="1.0"?> | ||
| 276 | <!DOCTYPE target SYSTEM "gdb-target.dtd"> | 272 | <!DOCTYPE target SYSTEM "gdb-target.dtd"> |
| 277 | <target version="1.0"> | 273 | <target version="1.0"> |
| 278 | <architecture>arm</architecture> | 274 | <architecture>arm</architecture> |
| @@ -378,8 +374,6 @@ std::string GDBStubA32::GetTargetXML() const { | |||
| 378 | <reg name="fpscr" bitsize="32" type="int" group="float" regnum="80"/> | 374 | <reg name="fpscr" bitsize="32" type="int" group="float" regnum="80"/> |
| 379 | </feature> | 375 | </feature> |
| 380 | </target>)"; | 376 | </target>)"; |
| 381 | |||
| 382 | return target_xml; | ||
| 383 | } | 377 | } |
| 384 | 378 | ||
| 385 | std::string GDBStubA32::RegRead(const Kernel::KThread* thread, size_t id) const { | 379 | std::string GDBStubA32::RegRead(const Kernel::KThread* thread, size_t id) const { |