Attachment 777269 Details for Bug 578700

[patch] Patch 4: Interdiff

struct (text/plain), 7.69 KB, created by Nikhil Marathe [:nsm] (No longer reading bugmail, please needinfo?)

(hide)

Description:

Filename:

MIME Type:

Creator: Nikhil Marathe [:nsm] (No longer reading bugmail, please needinfo?)

Size: 7.69 KB

patch

obsolete

>diff --git a/structtype b/structtype
>--- a/structtype
>+++ b/structtype
>@@ -1,10 +1,10 @@
> # HG changeset patch
>-# Parent 05f78fdc909aa836f74b443dd024b88cb6157b85
>+# Parent fdf2217e9ac0eeb43557d4e8aab45b9fc6bef0bc
> # User Nikhil Marathe <nsm.nikhil@gmail.com>
> Bug 578700 - StructType and BinaryStruct implementation
> 
> diff --git a/js/src/builtin/BinaryData.cpp b/js/src/builtin/BinaryData.cpp
> --- a/js/src/builtin/BinaryData.cpp
> +++ b/js/src/builtin/BinaryData.cpp
> @@ -1,16 +1,18 @@
>  /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
>@@ -120,28 +120,28 @@ diff --git a/js/src/builtin/BinaryData.c
> +            out->offset = it->offset;
> +            return true;
> +        }
> +    }
> +    return false;
> +}
> +
> +static bool
>-+IsSame(JSContext *cx, HandleObject type1, HandleObject type2);
>++IsSameBinaryDataType(JSContext *cx, HandleObject type1, HandleObject type2);
> +
> +static bool
> +IsSameArrayType(JSContext *cx, HandleObject type1, HandleObject type2)
> +{
> +    JS_ASSERT(IsArrayType(type1) && IsArrayType(type2));
> +    if (ArrayType::length(cx, type1) != ArrayType::length(cx, type2))
> +        return false;
> +
> +    RootedObject elementType1(cx, ArrayType::elementType(cx, type1));
> +    RootedObject elementType2(cx, ArrayType::elementType(cx, type2));
>-+    return IsSame(cx, elementType1, elementType2);
>++    return IsSameBinaryDataType(cx, elementType1, elementType2);
> +}
> +
> +static bool
> +IsSameStructType(JSContext *cx, HandleObject type1, HandleObject type2)
> +{
> +    JS_ASSERT(IsStructType(type1) && IsStructType(type2));
> +
> +    FieldList *fieldList1 = static_cast<FieldList *>(type1->getPrivate());
>@@ -158,38 +158,38 @@ diff --git a/js/src/builtin/BinaryData.c
> +        if (fieldInfo1.name != fieldInfo2.name)
> +            return false;
> +
> +        if (fieldInfo1.offset != fieldInfo2.offset)
> +            return false;
> +
> +        RootedObject fieldType1(cx, fieldInfo1.type);
> +        RootedObject fieldType2(cx, fieldInfo2.type);
>-+        if (!IsSame(cx, fieldType1, fieldType2))
>++        if (!IsSameBinaryDataType(cx, fieldType1, fieldType2))
> +            return false;
> +    }
> +
> +    return true;
> +}
> +
>  static bool
>- IsSame(JSContext *cx, HandleObject type1, HandleObject type2)
>+ IsSameBinaryDataType(JSContext *cx, HandleObject type1, HandleObject type2)
>  {
>      JS_ASSERT(IsBinaryType(type1));
>      JS_ASSERT(IsBinaryType(type2));
>  
>      if (IsNumericType(type1)) {
>          return type1->hasClass(type2->getClass());
>      } else if (IsArrayType(type1) && IsArrayType(type2)) {
> -        if (ArrayType::length(cx, type1) != ArrayType::length(cx, type2))
> -            return false;
> -
> -        RootedObject elementType1(cx, ArrayType::elementType(cx, type1));
> -        RootedObject elementType2(cx, ArrayType::elementType(cx, type2));
>--        return IsSame(cx, elementType1, elementType2);
>+-        return IsSameBinaryDataType(cx, elementType1, elementType2);
> +        return IsSameArrayType(cx, type1, type2);
>      } else if (IsStructType(type1) && IsStructType(type2)) {
> -        // Struct types compare on structural equality.
> -        // FIXME(nsm): Implement.
> -        JS_ASSERT(0);
> -        return false;
> +        return IsSameStructType(cx, type1, type2);
>      }
>@@ -464,17 +464,17 @@ diff --git a/js/src/builtin/BinaryData.c
> +
> +    if (!from.isObject()) {
> +        return ReportTypeError(cx, from, exemplar);
> +    }
> +
> +    RootedObject val(cx, from.toObjectOrNull());
> +    if (IsBlock(val)) {
> +        RootedObject type(cx, GetType(val));
>-+        if (IsSame(cx, exemplar, type)) {
>++        if (IsSameBinaryDataType(cx, exemplar, type)) {
> +            uint8_t *priv = (uint8_t*) val->getPrivate();
> +            memcpy(mem, priv, GetMemSize(cx, exemplar));
> +            return true;
> +        }
> +        return ReportTypeError(cx, from, exemplar);
> +    }
> +
> +    RootedObject valRooted(cx, val);
>@@ -898,17 +898,17 @@ diff --git a/js/src/builtin/BinaryData.c
>  }
>  
>  JSObject *
>  js_InitBinaryDataClasses(JSContext *cx, HandleObject obj)
>  {
> diff --git a/js/src/builtin/BinaryData.h b/js/src/builtin/BinaryData.h
> --- a/js/src/builtin/BinaryData.h
> +++ b/js/src/builtin/BinaryData.h
>-@@ -271,25 +271,79 @@ class BinaryArray
>+@@ -271,22 +271,76 @@ class BinaryArray
>                                      JSIterateOp enum_op,
>                                      MutableHandleValue statep,
>                                      MutableHandleId idp);
>  
>          static JSBool lengthGetter(JSContext *cx, unsigned int argc, jsval *vp);
>  
>  };
>  
>@@ -984,19 +984,16 @@ diff --git a/js/src/builtin/BinaryData.h
> +        static JSBool obj_setProperty(JSContext *cx, HandleObject obj,
> +                                      HandlePropertyName name,
> +                                      MutableHandleValue vp,
> +                                      JSBool strict);
> +
>  };
>  }
>  
>- extern JS_FRIEND_API(JSObject *)
>- js_InitBinaryDataClasses(JSContext *cx, js::HandleObject obj);
>- 
>  #endif /* builtin_BinaryData_h */
> diff --git a/js/src/js.msg b/js/src/js.msg
> --- a/js/src/js.msg
> +++ b/js/src/js.msg
> @@ -399,8 +399,10 @@ MSG_DEF(JSMSG_BAD_ARROW_ARGS,         34
>  MSG_DEF(JSMSG_YIELD_IN_ARROW,         346, 0, JSEXN_SYNTAXERR, "arrow function may not contain yield")
>  MSG_DEF(JSMSG_WRONG_VALUE,            347, 2, JSEXN_ERR, "expected {0} but found {1}")
>  MSG_DEF(JSMSG_PAR_ARRAY_SCATTER_BAD_TARGET, 348, 1, JSEXN_ERR, "target for index {0} is not an integer")
>@@ -1005,35 +1002,35 @@ diff --git a/js/src/js.msg b/js/src/js.m
>  MSG_DEF(JSMSG_BAD_DESTRUCT_ASSIGN,    351, 1, JSEXN_SYNTAXERR, "can't assign to {0} using destructuring assignment")
>  MSG_DEF(JSMSG_BINARYDATA_ARRAYTYPE_BAD_ARGS, 352, 0, JSEXN_ERR, "Invalid arguments")
>  MSG_DEF(JSMSG_BINARYDATA_BINARYARRAY_BAD_INDEX, 353, 0, JSEXN_RANGEERR, "invalid or out-of-range index")
> +MSG_DEF(JSMSG_BINARYDATA_STRUCTTYPE_BAD_ARGS, 354, 0, JSEXN_RANGEERR, "invalid field descriptor")
> +MSG_DEF(JSMSG_BINARYDATA_NOT_BINARYSTRUCT,   355, 1, JSEXN_TYPEERR, "{0} is not a BinaryStruct")
> diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
> --- a/js/src/jsapi.cpp
> +++ b/js/src/jsapi.cpp
>-@@ -1786,17 +1786,17 @@ static const JSStdName standard_class_at
>+@@ -1846,17 +1846,17 @@ static const JSStdName standard_class_na
>  #ifdef ENABLE_BINARYDATA
>      {js_InitBinaryDataClasses,          EAGER_ATOM_AND_CLASP(Type)},
>      {js_InitBinaryDataClasses,          EAGER_ATOM_AND_CLASP(Data)},
>  #define BINARYDATA_NUMERIC_NAMES(constant_, type_)\
>      {js_InitBinaryDataClasses,          EAGER_CLASS_ATOM(type_),      &NumericTypeClasses[constant_]},
>      BINARYDATA_FOR_EACH_NUMERIC_TYPES(BINARYDATA_NUMERIC_NAMES)
>  #undef BINARYDATA_NUMERIC_NAMES
>      {js_InitBinaryDataClasses,          EAGER_CLASS_ATOM(ArrayType),  &js::ArrayType::class_},
> -    {js_InitBinaryDataClasses,          EAGER_ATOM_AND_CLASP(StructType)},
> +    {js_InitBinaryDataClasses,          EAGER_CLASS_ATOM(StructType), &js::StructType::class_},
>  #endif
>-     {NULL,                              0, NULL}
>+     {NULL,                      0, NULL}
>  };
>  
>- /*
>-  * Table of top-level function and constant names and their init functions.
>-  * If you add a "standard" global function or property, remember to update
>-  * this table.
>+ static const JSStdName object_prototype_names[] = {
>+     /* Object.prototype properties (global delegates to Object.prototype). */
>+     {js_InitObjectClass,        EAGER_ATOM(proto), &JSObject::class_},
>+ #if JS_HAS_TOSOURCE
> diff --git a/js/src/tests/ecma_6/BinaryData/memory.js b/js/src/tests/ecma_6/BinaryData/memory.js
> --- a/js/src/tests/ecma_6/BinaryData/memory.js
> +++ b/js/src/tests/ecma_6/BinaryData/memory.js
> @@ -32,16 +32,34 @@ function runTests() {
>      aaa[0] = [[0,1,2,3,4], [0,1,2,3,4], [0,1,2,3,4], [0,1,2,3,4], [0,1,2,3,4]];
>  
>      aaa = null;
>      gc();

Actions: View | Diff | Review

Attachments on bug 578700: 676376 | 676377 | 676378 | 676380 | 676382 | 676385 | 736349 | 736351 | 736352 | 736353 | 736354 | 736356 | 752284 | 752285 | 752286 | 752287 | 752288 | 752291 | 752294 | 757541 | 757564 | 769187 | 769188 | 769189 | 769191 | 769214 | 772304 | 772849 | 772853 | 772858 | 774769 | 776613 | 776616 | 776619 | 776621 | 776625 | 777252 | 777257 | 777261 | 777267 | 777269 | 777271 | 781071 | 781075