Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(644)

Unified Diff: runtime/vm/code_patcher_arm64.cc

Issue 1343383003: VM: Store edge counters in one per-function array. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: clean up comments, save space in IL Instruction class. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/code_patcher_arm64.cc
diff --git a/runtime/vm/code_patcher_arm64.cc b/runtime/vm/code_patcher_arm64.cc
index 3e10b5a35512076d78095afef2f5abf68c05c427..3fb73b0d2105dd77044cb15c433879bda2f0fe60 100644
--- a/runtime/vm/code_patcher_arm64.cc
+++ b/runtime/vm/code_patcher_arm64.cc
@@ -138,48 +138,6 @@ uword CodePatcher::GetNativeCallAt(uword return_address,
return call.target();
}
-
-// This class pattern matches on a load from the object pool. Loading on
-// ARM64 is complicated because it can take more than one form. We
-// match backwards from the end of the sequence so we can reuse the code for
-// matching object pool loads at calls.
-class EdgeCounter : public ValueObject {
- public:
- EdgeCounter(uword pc, const Code& code)
- : end_(pc - kAdjust),
- object_pool_(ObjectPool::Handle(code.GetObjectPool())) {
- // An IsValid predicate is complicated and duplicates the code in the
- // decoding function. Instead we rely on decoding the pattern which
- // will assert partial validity.
- }
-
- RawObject* edge_counter() const {
- Register ignored;
- intptr_t index;
- InstructionPattern::DecodeLoadWordFromPool(end_, &ignored, &index);
- ASSERT(ignored == R0);
- return object_pool_.ObjectAt(index);
- }
-
- private:
- // The object pool load is followed by the fixed-size edge counter
- // incrementing code:
- // ldr ip, [r0, #+11]
- // adds ip, ip, #2
- // str ip, [r0, #+11]
- static const intptr_t kAdjust = 3 * Instr::kInstrSize;
-
- uword end_;
- const ObjectPool& object_pool_;
-};
-
-
-RawObject* CodePatcher::GetEdgeCounterAt(uword pc, const Code& code) {
- ASSERT(code.ContainsInstructionAt(pc));
- EdgeCounter counter(pc, code);
- return counter.edge_counter();
-}
-
} // namespace dart
#endif // defined TARGET_ARCH_ARM64

Powered by Google App Engine
This is Rietveld 408576698