| Index: src/ia32/virtual-frame-ia32.cc
|
| ===================================================================
|
| --- src/ia32/virtual-frame-ia32.cc (revision 4259)
|
| +++ src/ia32/virtual-frame-ia32.cc (working copy)
|
| @@ -162,7 +162,7 @@
|
| if (element.is_constant() || element.is_copy()) {
|
| if (element.is_synced()) {
|
| // Just spill.
|
| - elements_[i] = FrameElement::MemoryElement(NumberInfo::Unknown());
|
| + elements_[i] = FrameElement::MemoryElement(TypeInfo::Unknown());
|
| } else {
|
| // Allocate to a register.
|
| FrameElement backing_element; // Invalid if not a copy.
|
| @@ -174,7 +174,7 @@
|
| elements_[i] =
|
| FrameElement::RegisterElement(fresh.reg(),
|
| FrameElement::NOT_SYNCED,
|
| - NumberInfo::Unknown());
|
| + TypeInfo::Unknown());
|
| Use(fresh.reg(), i);
|
|
|
| // Emit a move.
|
| @@ -207,7 +207,7 @@
|
| // The copy flag is not relied on before the end of this loop,
|
| // including when registers are spilled.
|
| elements_[i].clear_copied();
|
| - elements_[i].set_number_info(NumberInfo::Unknown());
|
| + elements_[i].set_type_info(TypeInfo::Unknown());
|
| }
|
| }
|
| }
|
| @@ -597,12 +597,12 @@
|
| elements_[new_backing_index] =
|
| FrameElement::RegisterElement(backing_reg,
|
| FrameElement::SYNCED,
|
| - original.number_info());
|
| + original.type_info());
|
| } else {
|
| elements_[new_backing_index] =
|
| FrameElement::RegisterElement(backing_reg,
|
| FrameElement::NOT_SYNCED,
|
| - original.number_info());
|
| + original.type_info());
|
| }
|
| // Update the other copies.
|
| for (int i = new_backing_index + 1; i < element_count(); i++) {
|
| @@ -634,7 +634,7 @@
|
| FrameElement new_element =
|
| FrameElement::RegisterElement(fresh.reg(),
|
| FrameElement::NOT_SYNCED,
|
| - original.number_info());
|
| + original.type_info());
|
| Use(fresh.reg(), element_count());
|
| elements_.Add(new_element);
|
| __ mov(fresh.reg(), Operand(ebp, fp_relative(index)));
|
| @@ -796,7 +796,7 @@
|
| FrameElement new_element =
|
| FrameElement::RegisterElement(fresh_reg,
|
| FrameElement::NOT_SYNCED,
|
| - original.number_info());
|
| + original.type_info());
|
| new_element.set_untagged_int32(true);
|
| Use(fresh_reg, element_count());
|
| fresh.Unuse(); // BreakTarget does not handle a live Result well.
|
| @@ -808,7 +808,7 @@
|
| __ mov(fresh_reg, Operand(ebp, fp_relative(index)));
|
| }
|
| // Now convert the value to int32, or bail out.
|
| - if (original.number_info().IsSmi()) {
|
| + if (original.type_info().IsSmi()) {
|
| __ SmiUntag(fresh_reg);
|
| // Pushing the element is completely done.
|
| } else {
|
| @@ -819,7 +819,7 @@
|
| __ jmp(&done);
|
|
|
| __ bind(¬_smi);
|
| - if (!original.number_info().IsNumber()) {
|
| + if (!original.type_info().IsNumber()) {
|
| __ cmp(FieldOperand(fresh_reg, HeapObject::kMapOffset),
|
| Factory::heap_number_map());
|
| cgen()->unsafe_bailout_->Branch(not_equal);
|
| @@ -1146,11 +1146,11 @@
|
| ASSERT(element.is_untagged_int32() == cgen()->in_safe_int32_mode());
|
|
|
| // Get number type information of the result.
|
| - NumberInfo info;
|
| + TypeInfo info;
|
| if (!element.is_copy()) {
|
| - info = element.number_info();
|
| + info = element.type_info();
|
| } else {
|
| - info = elements_[element.index()].number_info();
|
| + info = elements_[element.index()].type_info();
|
| }
|
|
|
| bool pop_needed = (stack_pointer_ == index);
|
| @@ -1160,7 +1160,7 @@
|
| Result temp = cgen()->allocator()->Allocate();
|
| ASSERT(temp.is_valid());
|
| __ pop(temp.reg());
|
| - temp.set_number_info(info);
|
| + temp.set_type_info(info);
|
| temp.set_untagged_int32(element.is_untagged_int32());
|
| return temp;
|
| }
|
| @@ -1193,7 +1193,7 @@
|
| FrameElement new_element =
|
| FrameElement::RegisterElement(temp.reg(),
|
| FrameElement::SYNCED,
|
| - element.number_info());
|
| + element.type_info());
|
| // Preserve the copy flag on the element.
|
| if (element.is_copied()) new_element.set_copied();
|
| elements_[index] = new_element;
|
| @@ -1228,7 +1228,7 @@
|
| }
|
|
|
|
|
| -void VirtualFrame::EmitPush(Register reg, NumberInfo info) {
|
| +void VirtualFrame::EmitPush(Register reg, TypeInfo info) {
|
| ASSERT(stack_pointer_ == element_count() - 1);
|
| elements_.Add(FrameElement::MemoryElement(info));
|
| stack_pointer_++;
|
| @@ -1236,7 +1236,7 @@
|
| }
|
|
|
|
|
| -void VirtualFrame::EmitPush(Operand operand, NumberInfo info) {
|
| +void VirtualFrame::EmitPush(Operand operand, TypeInfo info) {
|
| ASSERT(stack_pointer_ == element_count() - 1);
|
| elements_.Add(FrameElement::MemoryElement(info));
|
| stack_pointer_++;
|
| @@ -1244,7 +1244,7 @@
|
| }
|
|
|
|
|
| -void VirtualFrame::EmitPush(Immediate immediate, NumberInfo info) {
|
| +void VirtualFrame::EmitPush(Immediate immediate, TypeInfo info) {
|
| ASSERT(stack_pointer_ == element_count() - 1);
|
| elements_.Add(FrameElement::MemoryElement(info));
|
| stack_pointer_++;
|
|
|