Revision: 4208
Author: [email protected]
Date: Mon Mar 22 07:31:28 2010
Log: Use bit fields to calculate compare stub minor key
Review URL: http://codereview.chromium.org/1081010
http://code.google.com/p/v8/source/detail?r=4208
Modified:
/branches/bleeding_edge/src/arm/codegen-arm.cc
/branches/bleeding_edge/src/codegen.h
/branches/bleeding_edge/src/ia32/codegen-ia32.cc
/branches/bleeding_edge/src/x64/codegen-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/codegen-arm.cc Mon Mar 22 05:16:11 2010
+++ /branches/bleeding_edge/src/arm/codegen-arm.cc Mon Mar 22 07:31:28 2010
@@ -7159,11 +7159,13 @@
int CompareStub::MinorKey() {
- // Encode the three parameters in a unique 16 bit value.
- ASSERT((static_cast<unsigned>(cc_) >> 26) < (1 << 16));
- int nnn_value = (never_nan_nan_ ? 2 : 0);
- if (cc_ != eq) nnn_value = 0; // Avoid duplicate stubs.
- return (static_cast<unsigned>(cc_) >> 26) | nnn_value | (strict_ ? 1 :
0);
+ // Encode the three parameters in a unique 16 bit value. To avoid
duplicate
+ // stubs the never NaN NaN condition is only taken into account if the
+ // condition is equals.
+ ASSERT((static_cast<unsigned>(cc_) >> 28) < (1 << 14));
+ return ConditionField::encode(static_cast<unsigned>(cc_) >> 28)
+ | StrictField::encode(strict_)
+ | NeverNanNanField::encode(cc_ == eq ? never_nan_nan_ : false);
}
=======================================
--- /branches/bleeding_edge/src/codegen.h Thu Mar 11 01:27:12 2010
+++ /branches/bleeding_edge/src/codegen.h Mon Mar 22 07:31:28 2010
@@ -361,6 +361,11 @@
// stubs.
bool never_nan_nan_;
+ // Encoding of the minor key CCCCCCCCCCCCCCNS.
+ class StrictField: public BitField<bool, 0, 1> {};
+ class NeverNanNanField: public BitField<bool, 1, 1> {};
+ class ConditionField: public BitField<int, 2, 14> {};
+
Major MajorKey() { return Compare; }
int MinorKey();
=======================================
--- /branches/bleeding_edge/src/ia32/codegen-ia32.cc Mon Mar 22 04:55:12
2010
+++ /branches/bleeding_edge/src/ia32/codegen-ia32.cc Mon Mar 22 07:31:28
2010
@@ -11534,11 +11534,13 @@
int CompareStub::MinorKey() {
- // Encode the three parameters in a unique 16 bit value.
+ // Encode the three parameters in a unique 16 bit value. To avoid
duplicate
+ // stubs the never NaN NaN condition is only taken into account if the
+ // condition is equals.
ASSERT(static_cast<unsigned>(cc_) < (1 << 14));
- int nnn_value = (never_nan_nan_ ? 2 : 0);
- if (cc_ != equal) nnn_value = 0; // Avoid duplicate stubs.
- return (static_cast<unsigned>(cc_) << 2) | nnn_value | (strict_ ? 1 : 0);
+ return ConditionField::encode(static_cast<unsigned>(cc_))
+ | StrictField::encode(strict_)
+ | NeverNanNanField::encode(cc_ == equal ? never_nan_nan_ : false);
}
=======================================
--- /branches/bleeding_edge/src/x64/codegen-x64.cc Fri Mar 19 05:01:17 2010
+++ /branches/bleeding_edge/src/x64/codegen-x64.cc Mon Mar 22 07:31:28 2010
@@ -9105,11 +9105,13 @@
int CompareStub::MinorKey() {
- // Encode the three parameters in a unique 16 bit value.
+ // Encode the three parameters in a unique 16 bit value. To avoid
duplicate
+ // stubs the never NaN NaN condition is only taken into account if the
+ // condition is equals.
ASSERT(static_cast<unsigned>(cc_) < (1 << 14));
- int nnn_value = (never_nan_nan_ ? 2 : 0);
- if (cc_ != equal) nnn_value = 0; // Avoid duplicate stubs.
- return (static_cast<unsigned>(cc_) << 2) | nnn_value | (strict_ ? 1 : 0);
+ return ConditionField::encode(static_cast<unsigned>(cc_))
+ | StrictField::encode(strict_)
+ | NeverNanNanField::encode(cc_ == equal ? never_nan_nan_ : false);
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
To unsubscribe from this group, send email to v8-dev+unsubscribegooglegroups.com or reply
to this email with the words "REMOVE ME" as the subject.
