Fix build.

Some old names reappeared due to some merge problem.

Review URL: http://codereview.chromium.org/1334001

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@4271 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 9477ea87
...@@ -2704,8 +2704,8 @@ void CodeGenerator::Comparison(AstNode* node, ...@@ -2704,8 +2704,8 @@ void CodeGenerator::Comparison(AstNode* node,
bool known_non_smi = bool known_non_smi =
(left_side.is_constant() && !left_side.handle()->IsSmi()) || (left_side.is_constant() && !left_side.handle()->IsSmi()) ||
(right_side.is_constant() && !right_side.handle()->IsSmi()) || (right_side.is_constant() && !right_side.handle()->IsSmi()) ||
left_side.number_info().IsDouble() || left_side.type_info().IsDouble() ||
right_side.number_info().IsDouble(); right_side.type_info().IsDouble();
NaNInformation nan_info = NaNInformation nan_info =
(CouldBeNaN(left_side) && CouldBeNaN(right_side)) ? (CouldBeNaN(left_side) && CouldBeNaN(right_side)) ?
kBothCouldBeNaN : kBothCouldBeNaN :
...@@ -2817,7 +2817,7 @@ static void CheckComparisonOperand(MacroAssembler* masm_, ...@@ -2817,7 +2817,7 @@ static void CheckComparisonOperand(MacroAssembler* masm_,
Result* right_side, Result* right_side,
JumpTarget* not_numbers) { JumpTarget* not_numbers) {
// Perform check if operand is not known to be a number. // Perform check if operand is not known to be a number.
if (!operand->number_info().IsNumber()) { if (!operand->type_info().IsNumber()) {
Label done; Label done;
__ test(operand->reg(), Immediate(kSmiTagMask)); __ test(operand->reg(), Immediate(kSmiTagMask));
__ j(zero, &done); __ j(zero, &done);
...@@ -2834,10 +2834,10 @@ static void CheckComparisonOperand(MacroAssembler* masm_, ...@@ -2834,10 +2834,10 @@ static void CheckComparisonOperand(MacroAssembler* masm_,
static void LoadComparisonOperand(MacroAssembler* masm_, static void LoadComparisonOperand(MacroAssembler* masm_,
Result* operand) { Result* operand) {
Label done; Label done;
if (operand->number_info().IsDouble()) { if (operand->type_info().IsDouble()) {
// Operand is known to be a heap number, just load it. // Operand is known to be a heap number, just load it.
__ fld_d(FieldOperand(operand->reg(), HeapNumber::kValueOffset)); __ fld_d(FieldOperand(operand->reg(), HeapNumber::kValueOffset));
} else if (operand->number_info().IsSmi()) { } else if (operand->type_info().IsSmi()) {
// Operand is known to be a smi. Convert it to double and keep the original // Operand is known to be a smi. Convert it to double and keep the original
// smi. // smi.
__ SmiUntag(operand->reg()); __ SmiUntag(operand->reg());
...@@ -2873,10 +2873,10 @@ static void LoadComparisonOperandSSE2(MacroAssembler* masm_, ...@@ -2873,10 +2873,10 @@ static void LoadComparisonOperandSSE2(MacroAssembler* masm_,
Result* right_side, Result* right_side,
JumpTarget* not_numbers) { JumpTarget* not_numbers) {
Label done; Label done;
if (operand->number_info().IsDouble()) { if (operand->type_info().IsDouble()) {
// Operand is known to be a heap number, just load it. // Operand is known to be a heap number, just load it.
__ movdbl(reg, FieldOperand(operand->reg(), HeapNumber::kValueOffset)); __ movdbl(reg, FieldOperand(operand->reg(), HeapNumber::kValueOffset));
} else if (operand->number_info().IsSmi()) { } else if (operand->type_info().IsSmi()) {
// Operand is known to be a smi. Convert it to double and keep the original // Operand is known to be a smi. Convert it to double and keep the original
// smi. // smi.
__ SmiUntag(operand->reg()); __ SmiUntag(operand->reg());
...@@ -2887,7 +2887,7 @@ static void LoadComparisonOperandSSE2(MacroAssembler* masm_, ...@@ -2887,7 +2887,7 @@ static void LoadComparisonOperandSSE2(MacroAssembler* masm_,
Label smi; Label smi;
__ test(operand->reg(), Immediate(kSmiTagMask)); __ test(operand->reg(), Immediate(kSmiTagMask));
__ j(zero, &smi); __ j(zero, &smi);
if (!operand->number_info().IsNumber()) { if (!operand->type_info().IsNumber()) {
__ cmp(FieldOperand(operand->reg(), HeapObject::kMapOffset), __ cmp(FieldOperand(operand->reg(), HeapObject::kMapOffset),
Immediate(Factory::heap_number_map())); Immediate(Factory::heap_number_map()));
not_numbers->Branch(not_equal, left_side, right_side, taken); not_numbers->Branch(not_equal, left_side, right_side, taken);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment