diff options
| author | 2018-09-04 11:02:59 +0200 | |
|---|---|---|
| committer | 2018-09-04 11:04:26 +0200 | |
| commit | 10bc725944d41f09ae1425aa1eb8acffcae0a091 (patch) | |
| tree | 794211794cccdc2c23431a64ab76f7789623cf41 /src/core | |
| parent | Merge pull request #1231 from lioncash/global (diff) | |
| download | yuzu-10bc725944d41f09ae1425aa1eb8acffcae0a091.tar.gz yuzu-10bc725944d41f09ae1425aa1eb8acffcae0a091.tar.xz yuzu-10bc725944d41f09ae1425aa1eb8acffcae0a091.zip | |
Update microprofile scopes.
Blame the subsystems which deserve the blame :)
The updated list is not complete, just the ones I've spotted on random sampling the stack trace.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 4 | ||||
| -rw-r--r-- | src/core/arm/unicorn/arm_unicorn.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index de44ccebd..b47f04988 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <dynarmic/A64/a64.h> | 7 | #include <dynarmic/A64/a64.h> |
| 8 | #include <dynarmic/A64/config.h> | 8 | #include <dynarmic/A64/config.h> |
| 9 | #include "common/logging/log.h" | 9 | #include "common/logging/log.h" |
| 10 | #include "common/microprofile.h" | ||
| 10 | #include "core/arm/dynarmic/arm_dynarmic.h" | 11 | #include "core/arm/dynarmic/arm_dynarmic.h" |
| 11 | #include "core/core.h" | 12 | #include "core/core.h" |
| 12 | #include "core/core_cpu.h" | 13 | #include "core/core_cpu.h" |
| @@ -143,7 +144,10 @@ std::unique_ptr<Dynarmic::A64::Jit> ARM_Dynarmic::MakeJit() const { | |||
| 143 | return std::make_unique<Dynarmic::A64::Jit>(config); | 144 | return std::make_unique<Dynarmic::A64::Jit>(config); |
| 144 | } | 145 | } |
| 145 | 146 | ||
| 147 | MICROPROFILE_DEFINE(ARM_Jit_Dynarmic, "ARM JIT", "Dynarmic", MP_RGB(255, 64, 64)); | ||
| 148 | |||
| 146 | void ARM_Dynarmic::Run() { | 149 | void ARM_Dynarmic::Run() { |
| 150 | MICROPROFILE_SCOPE(ARM_Jit_Dynarmic); | ||
| 147 | ASSERT(Memory::GetCurrentPageTable() == current_page_table); | 151 | ASSERT(Memory::GetCurrentPageTable() == current_page_table); |
| 148 | 152 | ||
| 149 | jit->Run(); | 153 | jit->Run(); |
diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index 307f12198..4c4de2623 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp | |||
| @@ -193,10 +193,10 @@ void ARM_Unicorn::Step() { | |||
| 193 | ExecuteInstructions(1); | 193 | ExecuteInstructions(1); |
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | MICROPROFILE_DEFINE(ARM_Jit, "ARM JIT", "ARM JIT", MP_RGB(255, 64, 64)); | 196 | MICROPROFILE_DEFINE(ARM_Jit_Unicorn, "ARM JIT", "Unicorn", MP_RGB(255, 64, 64)); |
| 197 | 197 | ||
| 198 | void ARM_Unicorn::ExecuteInstructions(int num_instructions) { | 198 | void ARM_Unicorn::ExecuteInstructions(int num_instructions) { |
| 199 | MICROPROFILE_SCOPE(ARM_Jit); | 199 | MICROPROFILE_SCOPE(ARM_Jit_Unicorn); |
| 200 | CHECKED(uc_emu_start(uc, GetPC(), 1ULL << 63, 0, num_instructions)); | 200 | CHECKED(uc_emu_start(uc, GetPC(), 1ULL << 63, 0, num_instructions)); |
| 201 | CoreTiming::AddTicks(num_instructions); | 201 | CoreTiming::AddTicks(num_instructions); |
| 202 | if (GDBStub::IsServerEnabled()) { | 202 | if (GDBStub::IsServerEnabled()) { |