Chromium Code Reviews| Index: src/vm/object.h |
| diff --git a/src/vm/object.h b/src/vm/object.h |
| index 9fe153b09d07f68f938c7f1a9645059931f43264..d2a69ead9d71b32ab4e90848975d86afba457380 100644 |
| --- a/src/vm/object.h |
| +++ b/src/vm/object.h |
| @@ -70,7 +70,8 @@ class Object { |
| inline bool IsStack(); |
| inline bool IsCoroutine(); |
| inline bool IsPort(); |
| - inline bool IsForeign(); |
| + inline bool IsForeignFunction(); |
| + inline bool IsForeignMemory(); |
| // - based on marker field in class. |
| inline bool IsNull(); |
| @@ -155,28 +156,29 @@ class Smi: public Object { |
| class InstanceFormat { |
| public: |
| enum Type { |
| - CLASS_TYPE = 0, |
| - INSTANCE_TYPE = 1, |
| - STRING_TYPE = 2, |
| - ARRAY_TYPE = 3, |
| - FUNCTION_TYPE = 4, |
| - LARGE_INTEGER_TYPE = 5, |
| - BYTE_ARRAY_TYPE = 6, |
| - DOUBLE_TYPE = 7, |
| - BOXED_TYPE = 8, |
| - STACK_TYPE = 9, |
| - INITIALIZER_TYPE = 10, |
| - IMMEDIATE_TYPE = 15 // No instances. |
| + CLASS_TYPE = 0, |
| + INSTANCE_TYPE = 1, |
| + STRING_TYPE = 2, |
| + ARRAY_TYPE = 3, |
| + FUNCTION_TYPE = 4, |
| + LARGE_INTEGER_TYPE = 5, |
| + BYTE_ARRAY_TYPE = 6, |
| + DOUBLE_TYPE = 7, |
| + BOXED_TYPE = 8, |
| + STACK_TYPE = 9, |
| + INITIALIZER_TYPE = 10, |
| + IMMEDIATE_TYPE = 15 // No instances. |
| }; |
| enum Marker { |
| - NULL_MARKER = 0, |
| - TRUE_MARKER = 1, |
| - FALSE_MARKER = 2, |
| - COROUTINE_MARKER = 3, |
| - PORT_MARKER = 4, |
| - FOREIGN_MARKER = 5, |
| - NO_MARKER = 7 // Else marker. |
| + NULL_MARKER = 0, |
| + TRUE_MARKER = 1, |
| + FALSE_MARKER = 2, |
| + COROUTINE_MARKER = 3, |
| + PORT_MARKER = 4, |
| + FOREIGNFUNCTION_MARKER = 5, |
|
kasperl
2015/07/03 07:49:54
FOREIGN_FUNCTION_MARKER
FOREIGN_MEMORY_MARKER
ricow1
2015/07/03 08:57:25
Done.
|
| + FOREIGNMEMORY_MARKER = 6, |
| + NO_MARKER = 7 // Else marker. |
| }; |
| // Factory functions. |
| @@ -1187,12 +1189,19 @@ bool Object::IsPort() { |
| return h->format().marker() == InstanceFormat::PORT_MARKER; |
| } |
| -bool Object::IsForeign() { |
| +bool Object::IsForeignFunction() { |
| if (IsSmi()) return false; |
| HeapObject* h = HeapObject::cast(this); |
| - return h->format().marker() == InstanceFormat::FOREIGN_MARKER; |
| + return h->format().marker() == InstanceFormat::FOREIGNFUNCTION_MARKER; |
| } |
| +bool Object::IsForeignMemory() { |
| + if (IsSmi()) return false; |
| + HeapObject* h = HeapObject::cast(this); |
| + return h->format().marker() == InstanceFormat::FOREIGNMEMORY_MARKER; |
| +} |
| + |
|
kasperl
2015/07/03 07:49:54
Only one newline between functions.
ricow1
2015/07/03 08:57:25
Done.
|
| + |
| bool Object::IsNull() { |
| if (IsSmi()) return false; |
| HeapObject* h = HeapObject::cast(this); |