Reviewers: baptiste.afsa1, jbramley,
Message:
PTAL, this fixes the cpu-profiler failures.
Description:
A64: Fix sampling of fp register for CPU profile and bailout if sp or fp is
zero.
TEST=cctest/test-cpu-profiler
Please review this at https://codereview.chromium.org/145583004/
SVN Base: https://v8.googlecode.com/svn/branches/experimental/a64
Affected files (+12, -4 lines):
M src/a64/simulator-a64.h
M src/sampler.cc
Index: src/a64/simulator-a64.h
diff --git a/src/a64/simulator-a64.h b/src/a64/simulator-a64.h
index
af4b9a59257c3a25127467f757dc1b146b3faf38..e20ce685b5c6bd742003c2e4600138ec875070f8
100644
--- a/src/a64/simulator-a64.h
+++ b/src/a64/simulator-a64.h
@@ -440,6 +440,7 @@ class Simulator : public DecoderVisitor {
inline int64_t sp() { return xreg(31, Reg31IsStackPointer); }
inline int64_t jssp() { return xreg(kJSSPCode, Reg31IsStackPointer); }
+ inline int64_t fp() { return xreg(29, Reg31IsStackPointer); }
inline Instruction* lr() { return reg<Instruction*>(kLinkRegCode); }
// Return 'size' bits of the value of a floating-point register, as the
Index: src/sampler.cc
diff --git a/src/sampler.cc b/src/sampler.cc
index
0e8e1ee24814b9ce0003693d5357198b88d12a69..d779152ddbc9fa0cb42b8ad528e9e91c9827e32a
100644
--- a/src/sampler.cc
+++ b/src/sampler.cc
@@ -256,9 +256,16 @@ class SampleHelper {
sample->fp = reinterpret_cast<Address>(simulator_->get_register(
Simulator::r11));
#elif V8_TARGET_ARCH_A64
+ if (simulator_->sp() == 0 || simulator_->fp() == 0) {
+ // It possible that the simulator is interrupted while it is updating
+ // the sp or fp register. A64 simulator does this in two steps:
+ // first setting it to zero and then setting it to the new value.
+ // Bailout if sp/fp doesn't contain the new value.
+ return;
+ }
sample->pc = reinterpret_cast<Address>(simulator_->pc());
sample->sp = reinterpret_cast<Address>(simulator_->sp());
- sample->fp = reinterpret_cast<Address>(simulator_->lr());
+ sample->fp = reinterpret_cast<Address>(simulator_->fp());
#elif V8_TARGET_ARCH_MIPS
sample->pc = reinterpret_cast<Address>(simulator_->get_pc());
sample->sp = reinterpret_cast<Address>(simulator_->get_register(
@@ -341,10 +348,10 @@ void SignalHandler::HandleProfilerSignal(int signal,
siginfo_t* info,
#if defined(USE_SIMULATOR)
helper.FillRegisters(sample);
// It possible that the simulator is interrupted while it is updating
- // the sp register. A64 simulator does this in two steps:
+ // the sp or fp register. A64 simulator does this in two steps:
// first setting it to zero and then setting it to the new value.
- // Bailout if sp doesn't contain the new value.
- if (sample->sp == 0) return;
+ // Bailout if sp/fp doesn't contain the new value.
+ if (sample->sp == 0 || sample->fp == 0) return;
#else
// Extracting the sample from the context is extremely machine dependent.
ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
