Index: src/x64/virtual-frame-x64.h |
=================================================================== |
--- src/x64/virtual-frame-x64.h (revision 4259) |
+++ src/x64/virtual-frame-x64.h (working copy) |
@@ -28,7 +28,7 @@ |
#ifndef V8_X64_VIRTUAL_FRAME_X64_H_ |
#define V8_X64_VIRTUAL_FRAME_X64_H_ |
-#include "number-info.h" |
+#include "type-info.h" |
#include "register-allocator.h" |
#include "scopes.h" |
@@ -83,7 +83,7 @@ |
// Create a duplicate of an existing valid frame element. |
FrameElement CopyElementAt(int index, |
- NumberInfo info = NumberInfo::Uninitialized()); |
+ TypeInfo info = TypeInfo::Uninitialized()); |
// The number of elements on the virtual frame. |
int element_count() { return elements_.length(); } |
@@ -383,19 +383,19 @@ |
// Push an element on top of the expression stack and emit a |
// corresponding push instruction. |
void EmitPush(Register reg, |
- NumberInfo info = NumberInfo::Unknown()); |
+ TypeInfo info = TypeInfo::Unknown()); |
void EmitPush(const Operand& operand, |
- NumberInfo info = NumberInfo::Unknown()); |
+ TypeInfo info = TypeInfo::Unknown()); |
void EmitPush(Heap::RootListIndex index, |
- NumberInfo info = NumberInfo::Unknown()); |
+ TypeInfo info = TypeInfo::Unknown()); |
void EmitPush(Immediate immediate, |
- NumberInfo info = NumberInfo::Unknown()); |
+ TypeInfo info = TypeInfo::Unknown()); |
void EmitPush(Smi* value); |
// Uses kScratchRegister, emits appropriate relocation info. |
void EmitPush(Handle<Object> value); |
// Push an element on the virtual frame. |
- inline void Push(Register reg, NumberInfo info = NumberInfo::Unknown()); |
+ inline void Push(Register reg, TypeInfo info = TypeInfo::Unknown()); |
inline void Push(Handle<Object> value); |
inline void Push(Smi* value); |
@@ -403,7 +403,7 @@ |
// frame). |
void Push(Result* result) { |
if (result->is_register()) { |
- Push(result->reg(), result->number_info()); |
+ Push(result->reg(), result->type_info()); |
} else { |
ASSERT(result->is_constant()); |
Push(result->handle()); |
@@ -416,8 +416,8 @@ |
// the frame. Nip(k) is equivalent to x = Pop(), Drop(k), Push(x). |
inline void Nip(int num_dropped); |
- inline void SetTypeForLocalAt(int index, NumberInfo info); |
- inline void SetTypeForParamAt(int index, NumberInfo info); |
+ inline void SetTypeForLocalAt(int index, TypeInfo info); |
+ inline void SetTypeForParamAt(int index, TypeInfo info); |
private: |
static const int kLocal0Offset = JavaScriptFrameConstants::kLocal0Offset; |