diff options
| author | 2020-11-27 19:29:59 -0300 | |
|---|---|---|
| committer | 2020-11-27 19:29:59 -0300 | |
| commit | 1dbe39f7a25357b40541ca536698cb09bb7df4ff (patch) | |
| tree | 285ffb3801aa773cb3537f77153a9e432390f6b8 /src/core/loader/nso.cpp | |
| parent | Merge pull request #5023 from lioncash/save-global (diff) | |
| parent | core: Eliminate remaining usages of the global system instance (diff) | |
| download | yuzu-1dbe39f7a25357b40541ca536698cb09bb7df4ff.tar.gz yuzu-1dbe39f7a25357b40541ca536698cb09bb7df4ff.tar.xz yuzu-1dbe39f7a25357b40541ca536698cb09bb7df4ff.zip | |
Merge pull request #5028 from lioncash/final-system
core: Eliminate remaining usages of the global system instance
Diffstat (limited to 'src/core/loader/nso.cpp')
| -rw-r--r-- | src/core/loader/nso.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index aa85c1a29..95b6f339a 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp | |||
| @@ -14,10 +14,10 @@ | |||
| 14 | #include "common/swap.h" | 14 | #include "common/swap.h" |
| 15 | #include "core/core.h" | 15 | #include "core/core.h" |
| 16 | #include "core/file_sys/patch_manager.h" | 16 | #include "core/file_sys/patch_manager.h" |
| 17 | #include "core/gdbstub/gdbstub.h" | ||
| 18 | #include "core/hle/kernel/code_set.h" | 17 | #include "core/hle/kernel/code_set.h" |
| 19 | #include "core/hle/kernel/memory/page_table.h" | 18 | #include "core/hle/kernel/memory/page_table.h" |
| 20 | #include "core/hle/kernel/process.h" | 19 | #include "core/hle/kernel/process.h" |
| 20 | #include "core/hle/kernel/thread.h" | ||
| 21 | #include "core/loader/nso.h" | 21 | #include "core/loader/nso.h" |
| 22 | #include "core/memory.h" | 22 | #include "core/memory.h" |
| 23 | #include "core/settings.h" | 23 | #include "core/settings.h" |
| @@ -159,9 +159,6 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::Process& process, Core::S | |||
| 159 | codeset.memory = std::move(program_image); | 159 | codeset.memory = std::move(program_image); |
| 160 | process.LoadModule(std::move(codeset), load_base); | 160 | process.LoadModule(std::move(codeset), load_base); |
| 161 | 161 | ||
| 162 | // Register module with GDBStub | ||
| 163 | GDBStub::RegisterModule(file.GetName(), load_base, load_base); | ||
| 164 | |||
| 165 | return load_base + image_size; | 162 | return load_base + image_size; |
| 166 | } | 163 | } |
| 167 | 164 | ||