Revision: 4888
Author: [email protected]
Date: Thu Jun 17 01:41:48 2010
Log: Move definition of NegateConditon from assembler*-inl.h files to
assembler*.h files to make clang happy. There was no reason for having
the definition in the -inl.h files in the first place.
Review URL: http://codereview.chromium.org/2825008
http://code.google.com/p/v8/source/detail?r=4888
Modified:
/branches/bleeding_edge/src/arm/assembler-arm-inl.h
/branches/bleeding_edge/src/arm/assembler-arm.h
/branches/bleeding_edge/src/ia32/assembler-ia32-inl.h
/branches/bleeding_edge/src/ia32/assembler-ia32.h
/branches/bleeding_edge/src/x64/assembler-x64-inl.h
/branches/bleeding_edge/src/x64/assembler-x64.h
=======================================
--- /branches/bleeding_edge/src/arm/assembler-arm-inl.h Wed Jun 9 00:40:35
2010
+++ /branches/bleeding_edge/src/arm/assembler-arm-inl.h Thu Jun 17 01:41:48
2010
@@ -45,11 +45,6 @@
namespace v8 {
namespace internal {
-Condition NegateCondition(Condition cc) {
- ASSERT(cc != al);
- return static_cast<Condition>(cc ^ ne);
-}
-
void RelocInfo::apply(intptr_t delta) {
if (RelocInfo::IsInternalReference(rmode_)) {
=======================================
--- /branches/bleeding_edge/src/arm/assembler-arm.h Mon Jun 14 04:20:36 2010
+++ /branches/bleeding_edge/src/arm/assembler-arm.h Thu Jun 17 01:41:48 2010
@@ -279,7 +279,10 @@
// Returns the equivalent of !cc.
-INLINE(Condition NegateCondition(Condition cc));
+inline Condition NegateCondition(Condition cc) {
+ ASSERT(cc != al);
+ return static_cast<Condition>(cc ^ ne);
+}
// Corresponds to transposing the operands of a comparison.
=======================================
--- /branches/bleeding_edge/src/ia32/assembler-ia32-inl.h Tue Jun 8
05:20:24 2010
+++ /branches/bleeding_edge/src/ia32/assembler-ia32-inl.h Thu Jun 17
01:41:48 2010
@@ -43,10 +43,6 @@
namespace v8 {
namespace internal {
-Condition NegateCondition(Condition cc) {
- return static_cast<Condition>(cc ^ 1);
-}
-
// The modes possibly affected by apply must be in kApplyMask.
void RelocInfo::apply(intptr_t delta) {
=======================================
--- /branches/bleeding_edge/src/ia32/assembler-ia32.h Wed Jun 16 05:32:34
2010
+++ /branches/bleeding_edge/src/ia32/assembler-ia32.h Thu Jun 17 01:41:48
2010
@@ -146,7 +146,10 @@
// Negation of the default no_condition (-1) results in a non-default
// no_condition value (-2). As long as tests for no_condition check
// for condition < 0, this will work as expected.
-inline Condition NegateCondition(Condition cc);
+inline Condition NegateCondition(Condition cc) {
+ return static_cast<Condition>(cc ^ 1);
+}
+
// Corresponds to transposing the operands of a comparison.
inline Condition ReverseCondition(Condition cc) {
@@ -171,6 +174,7 @@
return cc;
};
}
+
enum Hint {
no_hint = 0,
@@ -178,6 +182,7 @@
taken = 0x3e
};
+
// The result of negating a hint is as if the corresponding condition
// were negated by NegateCondition. That is, no_hint is mapped to
// itself and not_taken and taken are mapped to each other.
=======================================
--- /branches/bleeding_edge/src/x64/assembler-x64-inl.h Tue Jun 8 05:20:24
2010
+++ /branches/bleeding_edge/src/x64/assembler-x64-inl.h Thu Jun 17 01:41:48
2010
@@ -35,16 +35,11 @@
namespace v8 {
namespace internal {
-inline Condition NegateCondition(Condition cc) {
- return static_cast<Condition>(cc ^ 1);
-}
-
//
-----------------------------------------------------------------------------
// Implementation of Assembler
-
void Assembler::emitl(uint32_t x) {
Memory::uint32_at(pc_) = x;
pc_ += sizeof(uint32_t);
=======================================
--- /branches/bleeding_edge/src/x64/assembler-x64.h Wed Jun 16 05:32:34 2010
+++ /branches/bleeding_edge/src/x64/assembler-x64.h Thu Jun 17 01:41:48 2010
@@ -215,7 +215,10 @@
// Negation of the default no_condition (-1) results in a non-default
// no_condition value (-2). As long as tests for no_condition check
// for condition < 0, this will work as expected.
-inline Condition NegateCondition(Condition cc);
+inline Condition NegateCondition(Condition cc) {
+ return static_cast<Condition>(cc ^ 1);
+}
+
// Corresponds to transposing the operands of a comparison.
inline Condition ReverseCondition(Condition cc) {
@@ -240,6 +243,7 @@
return cc;
};
}
+
enum Hint {
no_hint = 0,
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
