Revision: 6755
Author: [email protected]
Date: Fri Feb 11 06:34:02 2011
Log: Revert r6748.
I'm seeing some crashes after this change which I need to investigate.
Review URL: http://codereview.chromium.org/6486033
http://code.google.com/p/v8/source/detail?r=6755
Modified:
/branches/bleeding_edge/src/arm/lithium-arm.cc
/branches/bleeding_edge/src/flag-definitions.h
/branches/bleeding_edge/src/hydrogen-instructions.cc
/branches/bleeding_edge/src/hydrogen-instructions.h
/branches/bleeding_edge/src/hydrogen.cc
/branches/bleeding_edge/src/ia32/lithium-codegen-ia32.cc
/branches/bleeding_edge/src/ia32/lithium-ia32.cc
/branches/bleeding_edge/src/ia32/lithium-ia32.h
/branches/bleeding_edge/src/x64/lithium-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/lithium-arm.cc Fri Feb 11 04:56:30 2011
+++ /branches/bleeding_edge/src/arm/lithium-arm.cc Fri Feb 11 06:34:02 2011
@@ -1296,12 +1296,6 @@
ASSERT(instr->representation().IsInteger32());
return DefineSameAsFirst(new
LBitNotI(UseRegisterAtStart(instr->value())));
}
-
-
-LInstruction* LChunkBuilder::DoNeg(HNeg* instr) {
- Abort("Unimplemented: %s", "DoNeg");
- return NULL;
-}
LInstruction* LChunkBuilder::DoBitOr(HBitOr* instr) {
=======================================
--- /branches/bleeding_edge/src/flag-definitions.h Fri Feb 11 06:26:56 2011
+++ /branches/bleeding_edge/src/flag-definitions.h Fri Feb 11 06:34:02 2011
@@ -120,7 +120,6 @@
DEFINE_bool(trace_hydrogen, false, "trace generated hydrogen to file")
DEFINE_bool(trace_inlining, false, "trace inlining decisions")
DEFINE_bool(trace_alloc, false, "trace register allocator")
-DEFINE_bool(trace_all_uses, false, "trace all use positions")
DEFINE_bool(trace_range, false, "trace range analysis")
DEFINE_bool(trace_gvn, false, "trace global value numbering")
DEFINE_bool(trace_representation, false, "trace representation types")
=======================================
--- /branches/bleeding_edge/src/hydrogen-instructions.cc Fri Feb 11
05:20:06 2011
+++ /branches/bleeding_edge/src/hydrogen-instructions.cc Fri Feb 11
06:34:02 2011
@@ -719,12 +719,6 @@
if (CanTruncateToInt32()) stream->Add(" truncating-int32");
if (CheckFlag(kBailoutOnMinusZero)) stream->Add(" -0?");
}
-
-
-void HNeg::PrintDataTo(StringStream* stream) const {
- HUnaryOperation::PrintDataTo(stream);
- if (CheckFlag(kBailoutOnMinusZero)) stream->Add(" -0?");
-}
HCheckInstanceType* HCheckInstanceType::NewIsJSObjectOrJSFunction(
@@ -896,22 +890,6 @@
return HArithmeticBinaryOperation::InferRange();
}
}
-
-
-Range* HNeg::InferRange() {
- if (representation().IsInteger32()) {
- Range* input_range = value()->range();
- Range* result = input_range->Copy();
- Range neg_one(-1, -1);
- if (!result->MulAndCheckOverflow(&neg_one)) {
- ClearFlag(HValue::kCanOverflow);
- }
- result->set_can_be_minus_zero(input_range->CanBeZero());
- return result;
- } else {
- return HValue::InferRange();
- }
-}
void HPhi::PrintTo(StringStream* stream) const {
@@ -1334,11 +1312,6 @@
HType HBitNot::CalculateInferredType() const {
return HType::TaggedNumber();
}
-
-
-HType HNeg::CalculateInferredType() const {
- return HType::TaggedNumber();
-}
HType HUnaryMathOperation::CalculateInferredType() const {
@@ -1417,15 +1390,6 @@
}
return NULL;
}
-
-
-HValue* HNeg::EnsureAndPropagateNotMinusZero(BitVector* visited) {
- visited->Add(id());
- if (range() == NULL || range()->CanBeMinusZero()) {
- SetFlag(kBailoutOnMinusZero);
- }
- return NULL;
-}
HValue* HSub::EnsureAndPropagateNotMinusZero(BitVector* visited) {
=======================================
--- /branches/bleeding_edge/src/hydrogen-instructions.h Fri Feb 11 05:20:06
2011
+++ /branches/bleeding_edge/src/hydrogen-instructions.h Fri Feb 11 06:34:02
2011
@@ -133,7 +133,6 @@
V(LoadPixelArrayExternalPointer) \
V(Mod) \
V(Mul) \
- V(Neg) \
V(ObjectLiteral) \
V(OsrEntry) \
V(OuterContext) \
@@ -1418,39 +1417,6 @@
};
-class HNeg: public HUnaryOperation {
- public:
- explicit HNeg(HValue* value) : HUnaryOperation(value) {
- set_representation(Representation::Tagged());
- SetFlag(kFlexibleRepresentation);
- SetFlag(kCanOverflow);
- SetAllSideEffects();
- }
-
- virtual void RepresentationChanged(Representation to) {
- // May change from tagged to untagged, not vice versa.
- ASSERT(representation().IsTagged() || representation().Equals(to));
- if (!to.IsTagged()) {
- ClearAllSideEffects();
- SetFlag(kUseGVN);
- }
- }
-
- virtual Representation RequiredInputRepresentation(int index) const {
- return representation();
- }
-
- virtual HType CalculateInferredType() const;
- virtual HValue* EnsureAndPropagateNotMinusZero(BitVector* visited);
- virtual void PrintDataTo(StringStream* stream) const;
- DECLARE_CONCRETE_INSTRUCTION(Neg, "neg")
-
- protected:
- virtual bool DataEquals(HValue* other) const { return true; }
- virtual Range* InferRange();
-};
-
-
class HUnaryMathOperation: public HUnaryOperation {
public:
HUnaryMathOperation(HValue* value, BuiltinFunctionId op)
=======================================
--- /branches/bleeding_edge/src/hydrogen.cc Fri Feb 11 06:26:56 2011
+++ /branches/bleeding_edge/src/hydrogen.cc Fri Feb 11 06:34:02 2011
@@ -4693,7 +4693,7 @@
instr = new HBitNot(value);
break;
case Token::SUB:
- instr = new HNeg(value);
+ instr = new HMul(graph_->GetConstantMinus1(), value);
break;
default:
UNREACHABLE();
@@ -5904,7 +5904,7 @@
UsePosition* current_pos = range->first_pos();
while (current_pos != NULL) {
- if (current_pos->RegisterIsBeneficial() || FLAG_trace_all_uses) {
+ if (current_pos->RegisterIsBeneficial()) {
trace_.Add(" %d M", current_pos->pos().Value());
}
current_pos = current_pos->next();
=======================================
--- /branches/bleeding_edge/src/ia32/lithium-codegen-ia32.cc Fri Feb 11
04:56:30 2011
+++ /branches/bleeding_edge/src/ia32/lithium-codegen-ia32.cc Fri Feb 11
06:34:02 2011
@@ -1033,36 +1033,6 @@
ASSERT(input->Equals(instr->result()));
__ not_(ToRegister(input));
}
-
-
-void LCodeGen::DoNegI(LNegI* instr) {
- Register input = ToRegister(instr->value());
- if (instr->hydrogen()->CheckFlag(HValue::kBailoutOnMinusZero)) {
- __ test(input, Operand(input));
- DeoptimizeIf(zero, instr->environment());
- }
- __ neg(input);
- if (instr->hydrogen()->CheckFlag(HValue::kCanOverflow)) {
- DeoptimizeIf(overflow, instr->environment());
- }
-}
-
-
-void LCodeGen::DoNegD(LNegD* instr) {
- XMMRegister reg = ToDoubleRegister(instr->value());
- Register temp = ToRegister(instr->TempAt(0));
- __ Set(temp, Immediate(0x80000000));
- __ movd(xmm0, Operand(temp));
- __ psllq(xmm0, 32);
- __ xorpd(reg, xmm0);
-}
-
-
-void LCodeGen::DoNegT(LNegT* instr) {
- UnaryOverwriteMode overwrite = UNARY_NO_OVERWRITE;
- GenericUnaryOpStub stub(Token::SUB, overwrite, NO_UNARY_FLAGS);
- CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr);
-}
void LCodeGen::DoThrow(LThrow* instr) {
=======================================
--- /branches/bleeding_edge/src/ia32/lithium-ia32.cc Fri Feb 11 04:56:30
2011
+++ /branches/bleeding_edge/src/ia32/lithium-ia32.cc Fri Feb 11 06:34:02
2011
@@ -1314,29 +1314,6 @@
LBitNotI* result = new LBitNotI(input);
return DefineSameAsFirst(result);
}
-
-
-LInstruction* LChunkBuilder::DoNeg(HNeg* instr) {
- Representation r = instr->representation();
- if (r.IsInteger32()) {
- LOperand* input = UseRegister(instr->value());
- LNegI* result = new LNegI(input);
- if (instr->CheckFlag(HValue::kBailoutOnMinusZero) ||
- instr->CheckFlag(HValue::kCanOverflow)) {
- AssignEnvironment(result);
- }
- return DefineSameAsFirst(result);
- } else if (r.IsDouble()) {
- LOperand* input = UseRegister(instr->value());
- LOperand* temp = TempRegister();
- return DefineSameAsFirst(new LNegD(input, temp));
- } else {
- ASSERT(r.IsTagged());
- LOperand* input = UseFixed(instr->value(), eax);
- LNegT* result = new LNegT(input);
- return MarkAsCall(DefineFixed(result, eax), instr);
- }
-}
LInstruction* LChunkBuilder::DoBitOr(HBitOr* instr) {
=======================================
--- /branches/bleeding_edge/src/ia32/lithium-ia32.h Fri Feb 11 04:56:30 2011
+++ /branches/bleeding_edge/src/ia32/lithium-ia32.h Fri Feb 11 06:34:02 2011
@@ -128,9 +128,6 @@
V(LoadPixelArrayExternalPointer) \
V(ModI) \
V(MulI) \
- V(NegI) \
- V(NegD) \
- V(NegT) \
V(NumberTagD) \
V(NumberTagI) \
V(NumberUntagD) \
@@ -1082,40 +1079,6 @@
};
-class LNegI: public LTemplateInstruction<1, 1, 0> {
- public:
- explicit LNegI(LOperand* value) {
- inputs_[0] = value;
- }
-
- DECLARE_CONCRETE_INSTRUCTION(NegI, "neg-i")
- DECLARE_HYDROGEN_ACCESSOR(Neg)
- LOperand* value() { return inputs_[0]; }
-};
-
-
-class LNegD: public LTemplateInstruction<1, 1, 1> {
- public:
- explicit LNegD(LOperand* value, LOperand* temp) {
- inputs_[0] = value;
- temps_[0] = temp;
- }
-
- DECLARE_CONCRETE_INSTRUCTION(NegD, "neg-d")
- LOperand* value() { return inputs_[0]; }
-};
-
-
-class LNegT: public LTemplateInstruction<1, 1, 0> {
- public:
- explicit LNegT(LOperand* value) {
- inputs_[0] = value;
- }
-
- DECLARE_CONCRETE_INSTRUCTION(NegT, "neg-t")
-};
-
-
class LAddI: public LTemplateInstruction<1, 2, 0> {
public:
LAddI(LOperand* left, LOperand* right) {
=======================================
--- /branches/bleeding_edge/src/x64/lithium-x64.cc Fri Feb 11 04:56:30 2011
+++ /branches/bleeding_edge/src/x64/lithium-x64.cc Fri Feb 11 06:34:02 2011
@@ -1248,12 +1248,6 @@
LBitNotI* result = new LBitNotI(input);
return DefineSameAsFirst(result);
}
-
-
-LInstruction* LChunkBuilder::DoNeg(HNeg* instr) {
- Abort("Unimplemented: %s", "DoNeg");
- return NULL;
-}
LInstruction* LChunkBuilder::DoBitOr(HBitOr* instr) {
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
