diff options
| author | Ben Murdoch <benm@google.com> | 2011-12-02 17:19:32 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:27:49 +0000 |
| commit | 3fb3ca8c7ca439d408449a395897395c0faae8d1 (patch) | |
| tree | 5cb33db083ae7ebe431e2a460fb3806c54531f9c /src/macros.py | |
| parent | 257744e915dfc84d6d07a6b2accf8402d9ffc708 (diff) | |
| download | android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.tar.gz android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.tar.bz2 android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.zip | |
Upgrade to V8 3.4
Merge 3.4.14.35
Simple merge required updates to makefiles only.
Bug: 568872
Change-Id: I403a38452c547e06fcfa951c12eca12a1bc40978
Diffstat (limited to 'src/macros.py')
| -rw-r--r-- | src/macros.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/macros.py b/src/macros.py index 28d501f3..fc08cb12 100644 --- a/src/macros.py +++ b/src/macros.py @@ -38,12 +38,13 @@ const GETTER = 0; const SETTER = 1; # These definitions must match the index of the properties in objects.h. -const kApiTagOffset = 0; -const kApiPropertyListOffset = 1; -const kApiSerialNumberOffset = 2; -const kApiConstructorOffset = 2; -const kApiPrototypeTemplateOffset = 5; -const kApiParentTemplateOffset = 6; +const kApiTagOffset = 0; +const kApiPropertyListOffset = 1; +const kApiSerialNumberOffset = 2; +const kApiConstructorOffset = 2; +const kApiPrototypeTemplateOffset = 5; +const kApiParentTemplateOffset = 6; +const kApiPrototypeAttributesOffset = 15; const NO_HINT = 0; const NUMBER_HINT = 1; @@ -128,6 +129,7 @@ macro TO_UINT32(arg) = (arg >>> 0); macro TO_STRING_INLINE(arg) = (IS_STRING(%IS_VAR(arg)) ? arg : NonStringToString(arg)); macro TO_NUMBER_INLINE(arg) = (IS_NUMBER(%IS_VAR(arg)) ? arg : NonNumberToNumber(arg)); macro TO_OBJECT_INLINE(arg) = (IS_SPEC_OBJECT(%IS_VAR(arg)) ? arg : ToObject(arg)); +macro JSON_NUMBER_TO_STRING(arg) = ((%_IsSmi(%IS_VAR(arg)) || arg - arg == 0) ? %_NumberToString(arg) : "null"); # Macros implemented in Python. python macro CHAR_CODE(str) = ord(str[1]); |
