update PR version 3

* change extended_object_t.class_prop struct
* change accessor macro name

JerryScript-DCO-1.0-Signed-off-by: Zidong Jiang [email protected]

Author: jiangzidong

jerry-core/ecma/base/ecma-gc.c

@@ -31,7 +31,6 @@
 #include "re-compiler.h"
 #include "vm-defines.h"
 #include "vm-stack.h"
-#include "jmem-heap.h"
 
 #define JERRY_INTERNAL
 #include "jerry-internal.h"
@@ -410,8 +409,6 @@ ecma_gc_sweep (ecma_object_t *object_p) /**< object to free */
     if (object_type == ECMA_OBJECT_TYPE_CLASS)
     {
       ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
-      bool is_contain_arraybuffer = false;
-      ecma_length_t arraybuffer_length = 0;
 
       switch (ext_object_p->u.class_prop.class_id)
       {
@@ -427,52 +424,46 @@ ecma_gc_sweep (ecma_object_t *object_p) /**< object to free */
         case LIT_MAGIC_STRING_STRING_UL:
         case LIT_MAGIC_STRING_NUMBER_UL:
         {
-          ecma_free_value (ext_object_p->u.class_prop.value);
-          break;
-        }
-        case LIT_MAGIC_STRING_ARRAY_BUFFER_UL:
-        {
-          arraybuffer_length = ecma_get_uint32_from_value (ext_object_p->u.class_prop.value);
-          is_contain_arraybuffer = true;
-          ecma_free_value (ext_object_p->u.class_prop.value);
+          ecma_free_value (ext_object_p->u.class_prop.u.value);
           break;
         }
 
         case LIT_MAGIC_STRING_DATE_UL:
         {
           ecma_number_t *num_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_number_t,
-                                                                  ext_object_p->u.class_prop.value);
+                                                                  ext_object_p->u.class_prop.u.value);
           ecma_dealloc_number (num_p);
           break;
         }
 
         case LIT_MAGIC_STRING_REGEXP_UL:
         {
           ecma_compiled_code_t *bytecode_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t,
-                                                                              ext_object_p->u.class_prop.value);
+                                                                              ext_object_p->u.class_prop.u.value);
           if (bytecode_p != NULL)
           {
             ecma_bytecode_deref (bytecode_p);
           }
           break;
         }
-
+#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
+        case LIT_MAGIC_STRING_ARRAY_BUFFER_UL:
+        {
+          ecma_length_t arraybuffer_length = ext_object_p->u.class_prop.u.length;
+          size_t size = sizeof (ecma_extended_object_t) + arraybuffer_length;
+          ecma_dealloc_extended_object ((ecma_extended_object_t *) object_p, size);
+          return;
+        }
+#endif /* CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
         default:
         {
           JERRY_UNREACHABLE ();
           break;
         }
       }
-      size_t size;
-      if (is_contain_arraybuffer)
-      {
-        size = sizeof (ecma_extended_object_t) + arraybuffer_length;
-      }
-      else
-      {
-        size = (ecma_get_object_is_builtin (object_p) ? sizeof (ecma_extended_built_in_object_t)
-                                                             : sizeof (ecma_extended_object_t));
-      }
+
+      size_t size = (ecma_get_object_is_builtin (object_p) ? sizeof (ecma_extended_built_in_object_t)
+                                                           : sizeof (ecma_extended_object_t));
       ecma_dealloc_extended_object ((ecma_extended_object_t *) object_p, size);
       return;
     }

jerry-core/ecma/base/ecma-globals.h

@@ -626,7 +626,14 @@ typedef struct
     struct
     {
       uint16_t class_id; /**< class id of the object */
-      ecma_value_t value; /**< value of the object (e.g. boolean, number, string, etc.) */
+      /*
+       * Description of extra fields. These extra fields depends on the class_id.
+       */
+      union
+      {
+        ecma_value_t value; /**< value of the object (e.g. boolean, number, string, etc.) */
+        uint32_t length; /**< length related property (e.g. length of ArrayBuffer) */
+      } u;
     } class_prop;
 
     /*

jerry-core/ecma/base/ecma-helpers.h

@@ -282,7 +282,7 @@ extern ecma_property_value_t *
 ecma_create_named_data_property (ecma_object_t *, ecma_string_t *, uint8_t, ecma_property_t **);
 extern ecma_property_value_t *
 ecma_create_named_accessor_property (ecma_object_t *, ecma_string_t *, ecma_object_t *,
-                                    ecma_object_t *, uint8_t, ecma_property_t **);
+                                     ecma_object_t *, uint8_t, ecma_property_t **);
 extern ecma_property_t *
 ecma_find_named_property (ecma_object_t *, ecma_string_t *);
 extern ecma_property_value_t *

jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h

@@ -83,6 +83,5 @@ ROUTINE (LIT_MAGIC_STRING_REDUCE_RIGHT_UL, ecma_builtin_array_prototype_object_r
 #undef STRING_VALUE
 #undef OBJECT_VALUE
 #undef ROUTINE
-#undef ACCESSOR_VALUE
-#undef ACCESSOR_RO_VALUE
-#undef ACCESSOR_WO_VALUE
+#undef ACCESSOR_READ_WRITE
+#undef ACCESSOR_READ_ONLY

jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h

@@ -62,6 +62,5 @@ ROUTINE (LIT_MAGIC_STRING_IS_ARRAY_UL, ecma_builtin_array_object_is_array, 1, 1)
 #undef STRING_VALUE
 #undef OBJECT_VALUE
 #undef ROUTINE
-#undef ACCESSOR_VALUE
-#undef ACCESSOR_RO_VALUE
-#undef ACCESSOR_WO_VALUE
+#undef ACCESSOR_READ_WRITE
+#undef ACCESSOR_READ_ONLY

jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c

@@ -13,14 +13,9 @@
  * limitations under the License.
  */
 
-#include "ecma-alloc.h"
-#include "ecma-array-object.h"
 #include "ecma-builtin-helpers.h"
 #include "ecma-builtins.h"
-#include "ecma-conversion.h"
 #include "ecma-exceptions.h"
-#include "ecma-function-object.h"
-#include "ecma-gc.h"
 #include "ecma-globals.h"
 #include "ecma-helpers.h"
 #include "ecma-objects.h"
@@ -29,8 +24,6 @@
 #include "jrt.h"
 #include "jrt-libc-includes.h"
 
-
-
 #ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
 
 #define ECMA_BUILTINS_INTERNAL
@@ -60,7 +53,7 @@
  *         Returned value must be freed with ecma_free_value.
  */
 static ecma_value_t
-ecma_builtin_arraybuffer_prototype_bytelength_getter (ecma_value_t this_arg)
+ecma_builtin_arraybuffer_prototype_bytelength_getter (ecma_value_t this_arg) /**< this argument */
 {
   if (ecma_is_value_object (this_arg))
   {
@@ -71,8 +64,8 @@ ecma_builtin_arraybuffer_prototype_bytelength_getter (ecma_value_t this_arg)
 
       return ecma_make_uint32_value (len);
     }
-
   }
+
   return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is not a ArrayBuffer object."));
 } /* ecma_builtin_arraybuffer_prototype_bytelength_getter */
 
@@ -114,11 +107,7 @@ ecma_builtin_arraybuffer_prototype_object_slice (ecma_value_t this_arg, /**< thi
 
   start = ecma_builtin_helper_array_index_normalize (start_num, len);
 
-  if (ecma_is_value_undefined (arg2))
-  {
-    end = len;
-  }
-  else
+  if (!ecma_is_value_undefined (arg2))
   {
     ECMA_OP_TO_NUMBER_TRY_CATCH (end_num,
                                  arg2,

jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h

@@ -29,17 +29,13 @@
 # define ROUTINE(name, c_function_name, args_number, length_prop_value)
 #endif /* !ROUTINE */
 
-#ifndef ACCESSOR_VALUE
-# define ACCESSOR_VALUE(name, c_getter_func_name, c_setter_func_name, prop_attributes)
+#ifndef ACCESSOR_READ_WRITE
+# define ACCESSOR_READ_WRITE(name, c_getter_func_name, c_setter_func_name, prop_attributes)
 #endif /* !ROUTINE */
 
-#ifndef ACCESSOR_RO_VALUE
-# define ACCESSOR_RO_VALUE(name, c_getter_func_name, prop_attributes)
-#endif /* !ACCESSOR_RO_VALUE */
-
-#ifndef ACCESSOR_WO_VALUE
-# define ACCESSOR_WO_VALUE(name, c_setter_func_name, prop_attributes)
-#endif /* !ACCESSOR_WO_VALUE */
+#ifndef ACCESSOR_READ_ONLY
+# define ACCESSOR_READ_ONLY(name, c_getter_func_name, prop_attributes)
+#endif /* !ACCESSOR_READ_ONLY */
 
 /* Object identifier */
 OBJECT_ID (ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE)
@@ -51,23 +47,20 @@ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR,
               ECMA_BUILTIN_ID_ARRAYBUFFER,
               ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
 
-
+/* Readonly accessor properties */
+ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BYTE_LENGTH_UL,
+                    ecma_builtin_arraybuffer_prototype_bytelength_getter,
+                    ECMA_PROPERTY_FIXED)
 
 /* Routine properties:
  *  (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */
 ROUTINE (LIT_MAGIC_STRING_SLICE, ecma_builtin_arraybuffer_prototype_object_slice, 2, 2)
 
-/* readonly accessor properties */
-ACCESSOR_RO_VALUE (LIT_MAGIC_STRING_BYTE_LENGTH_UL,
-                  ecma_builtin_arraybuffer_prototype_bytelength_getter,
-                  ECMA_PROPERTY_FIXED)
-
 #undef OBJECT_ID
 #undef SIMPLE_VALUE
 #undef NUMBER_VALUE
 #undef STRING_VALUE
 #undef OBJECT_VALUE
 #undef ROUTINE
-#undef ACCESSOR_VALUE
-#undef ACCESSOR_RO_VALUE
-#undef ACCESSOR_WO_VALUE
+#undef ACCESSOR_READ_WRITE
+#undef ACCESSOR_READ_ONLY

jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c

@@ -13,21 +13,17 @@
  * limitations under the License.
  */
 
-#include "ecma-alloc.h"
 #include "ecma-builtins.h"
-#include "ecma-conversion.h"
 #include "ecma-exceptions.h"
 #include "ecma-gc.h"
 #include "ecma-globals.h"
 #include "ecma-helpers.h"
-#include "ecma-objects.h"
 #include "ecma-arraybuffer-object.h"
 #include "ecma-try-catch-macro.h"
 #include "jrt.h"
 
 #ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
 
-
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
 
@@ -56,13 +52,13 @@
  */
 static ecma_value_t
 ecma_builtin_arraybuffer_object_is_view (ecma_value_t this_arg, /**< 'this' argument */
-                                  ecma_value_t arg) /**< argument 1 */
+                                         ecma_value_t arg) /**< argument 1 */
 {
   JERRY_UNUSED (this_arg);
-  if (ecma_is_value_object (arg))
-  {
-    /* TODO: if arg has [[ViewArrayBuffer]], return true */
-  }
+  JERRY_UNUSED (arg);
+
+  /* TODO: if arg has [[ViewArrayBuffer]], return true */
+
   return ecma_make_boolean_value (false);
 } /* ecma_builtin_arraybuffer_object_is_view */
 
@@ -77,9 +73,10 @@ ecma_builtin_arraybuffer_object_is_view (ecma_value_t this_arg, /**< 'this' argu
  */
 ecma_value_t
 ecma_builtin_arraybuffer_dispatch_call (const ecma_value_t *arguments_list_p, /**< arguments list */
-                                   ecma_length_t arguments_list_len) /**< number of arguments */
+                                        ecma_length_t arguments_list_len) /**< number of arguments */
 {
   JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL);
+
   return ecma_raise_type_error (ECMA_ERR_MSG ("Constructor ArrayBuffer requires 'new'"));
 } /* ecma_builtin_arraybuffer_dispatch_call */
 
@@ -90,7 +87,7 @@ ecma_builtin_arraybuffer_dispatch_call (const ecma_value_t *arguments_list_p, /*
  */
 ecma_value_t
 ecma_builtin_arraybuffer_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */
-                                        ecma_length_t arguments_list_len) /**< number of arguments */
+                                             ecma_length_t arguments_list_len) /**< number of arguments */
 {
   JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL);
 
@@ -103,5 +100,4 @@ ecma_builtin_arraybuffer_dispatch_construct (const ecma_value_t *arguments_list_
  * @}
  */
 
-#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
- */
+#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */

jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h

@@ -52,7 +52,8 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE,
 
 /* Routine properties:
  *  (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */
-// ES2015 24.1.3.1
+
+/* ES2015 24.1.3.1 */
 ROUTINE (LIT_MAGIC_STRING_IS_VIEW_UL, ecma_builtin_arraybuffer_object_is_view, 1, 1)
 
 #undef OBJECT_ID
@@ -61,6 +62,5 @@ ROUTINE (LIT_MAGIC_STRING_IS_VIEW_UL, ecma_builtin_arraybuffer_object_is_view, 1
 #undef STRING_VALUE
 #undef OBJECT_VALUE
 #undef ROUTINE
-#undef ACCESSOR_VALUE
-#undef ACCESSOR_RO_VALUE
-#undef ACCESSOR_WO_VALUE
+#undef ACCESSOR_READ_WRITE
+#undef ACCESSOR_READ_ONLY

jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.c

@@ -106,9 +106,9 @@ ecma_builtin_boolean_prototype_object_value_of (ecma_value_t this_arg) /**< this
     {
       ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
 
-      JERRY_ASSERT (ecma_is_value_boolean (ext_object_p->u.class_prop.value));
+      JERRY_ASSERT (ecma_is_value_boolean (ext_object_p->u.class_prop.u.value));
 
-      return ext_object_p->u.class_prop.value;
+      return ext_object_p->u.class_prop.u.value;
     }
   }