Reviewers: Toon Verwaest,
Message:
HI Toon,
Here is the change we discussed. I will revisit eliminating ContextualMode
later. thx,
--Michael
Description:
Express LoadIC extra ic state with LoadIC::State
Soon we will create code stubs that need to match LoadIC state. It's easier
to
express if the state is encapsulated in a single class rather than multiple
bit
fields.
[email protected]
Please review this at https://codereview.chromium.org/415543002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+23, -6 lines):
M src/ic.h
Index: src/ic.h
diff --git a/src/ic.h b/src/ic.h
index
44dd3c8c41a72f20bc0b2dcb6073f33dc6dceab0..c9e2b6349f2bb324b01f7c05c582b90fe8faaf9a
100644
--- a/src/ic.h
+++ b/src/ic.h
@@ -374,9 +374,6 @@ OStream& operator<<(OStream& os, const CallIC::State&
s);
class LoadIC: public IC {
public:
- // ExtraICState bits
- class ContextualModeBits: public BitField<ContextualMode, 0, 1> {};
- STATIC_ASSERT(static_cast<int>(NOT_CONTEXTUAL) == 0);
enum ParameterIndices {
kReceiverIndex,
@@ -391,16 +388,36 @@ class LoadIC: public IC {
static const Register SlotRegister();
static const Register VectorRegister();
+ class State V8_FINAL BASE_EMBEDDED {
+ public:
+ explicit State(ExtraICState extra_ic_state)
+ : mode_(ContextualModeBits::decode(extra_ic_state)) {}
+
+ explicit State(ContextualMode mode) : mode_(mode) {}
+
+ ExtraICState GetExtraICState() const {
+ return ContextualModeBits::encode(mode_);
+ }
+
+ ContextualMode contextual_mode() const { return mode_; }
+
+ private:
+ class ContextualModeBits: public BitField<ContextualMode, 0, 1> {};
+ STATIC_ASSERT(static_cast<int>(NOT_CONTEXTUAL) == 0);
+
+ const ContextualMode mode_;
+ };
+
static ExtraICState ComputeExtraICState(ContextualMode contextual_mode) {
- return ContextualModeBits::encode(contextual_mode);
+ return State(contextual_mode).GetExtraICState();
}
static ContextualMode GetContextualMode(ExtraICState state) {
- return ContextualModeBits::decode(state);
+ return State(state).contextual_mode();
}
ContextualMode contextual_mode() const {
- return ContextualModeBits::decode(extra_ic_state());
+ return GetContextualMode(extra_ic_state());
}
explicit LoadIC(FrameDepth depth, Isolate* isolate)
--
--
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/d/optout.
