summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-09-04 17:50:58 +0200
committerGitHub <noreply@github.com>2018-09-04 17:50:58 +0200
commit5a29b358aace5d43fd0208fc390b3198af995174 (patch)
treee11b1f17b1037dc1bc7165c4af467128e6dc3b55 /src/core
parentMerge pull request #1230 from lioncash/ssl (diff)
parentUpdate microprofile scopes. (diff)
downloadyuzu-5a29b358aace5d43fd0208fc390b3198af995174.tar
yuzu-5a29b358aace5d43fd0208fc390b3198af995174.tar.gz
yuzu-5a29b358aace5d43fd0208fc390b3198af995174.tar.bz2
yuzu-5a29b358aace5d43fd0208fc390b3198af995174.tar.lz
yuzu-5a29b358aace5d43fd0208fc390b3198af995174.tar.xz
yuzu-5a29b358aace5d43fd0208fc390b3198af995174.tar.zst
yuzu-5a29b358aace5d43fd0208fc390b3198af995174.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp4
-rw-r--r--src/core/arm/unicorn/arm_unicorn.cpp4
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 @@
#include <dynarmic/A64/a64.h>
#include <dynarmic/A64/config.h>
#include "common/logging/log.h"
+#include "common/microprofile.h"
#include "core/arm/dynarmic/arm_dynarmic.h"
#include "core/core.h"
#include "core/core_cpu.h"
@@ -143,7 +144,10 @@ std::unique_ptr<Dynarmic::A64::Jit> ARM_Dynarmic::MakeJit() const {
return std::make_unique<Dynarmic::A64::Jit>(config);
}
+MICROPROFILE_DEFINE(ARM_Jit_Dynarmic, "ARM JIT", "Dynarmic", MP_RGB(255, 64, 64));
+
void ARM_Dynarmic::Run() {
+ MICROPROFILE_SCOPE(ARM_Jit_Dynarmic);
ASSERT(Memory::GetCurrentPageTable() == current_page_table);
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() {
ExecuteInstructions(1);
}
-MICROPROFILE_DEFINE(ARM_Jit, "ARM JIT", "ARM JIT", MP_RGB(255, 64, 64));
+MICROPROFILE_DEFINE(ARM_Jit_Unicorn, "ARM JIT", "Unicorn", MP_RGB(255, 64, 64));
void ARM_Unicorn::ExecuteInstructions(int num_instructions) {
- MICROPROFILE_SCOPE(ARM_Jit);
+ MICROPROFILE_SCOPE(ARM_Jit_Unicorn);
CHECKED(uc_emu_start(uc, GetPC(), 1ULL << 63, 0, num_instructions));
CoreTiming::AddTicks(num_instructions);
if (GDBStub::IsServerEnabled()) {