jitcraft/Array.cpp
changeset 13 627b6b94e774
parent 12 75e385f68b7e
child 20 e020a14e21be
     1.1 --- a/jitcraft/Array.cpp	Sat Jun 30 19:38:53 2012 -0700
     1.2 +++ b/jitcraft/Array.cpp	Sat Jun 30 20:20:39 2012 -0700
     1.3 @@ -31,7 +31,8 @@
     1.4          return NULL;
     1.5  
     1.6      ArrayMap *map = ArrayMap::cast(obj);
     1.7 -    map->init(type, contained);
     1.8 +    map->type_ = type;
     1.9 +    map->contained_ = contained;
    1.10      return map;
    1.11  }
    1.12  
    1.13 @@ -46,13 +47,6 @@
    1.14      return sizeof(Array) + elements * sizeof(float);
    1.15  }
    1.16  
    1.17 -void
    1.18 -Array::init(uint32 nelements)
    1.19 -{
    1.20 -    WRITE_FIELD(nelements, nelements);
    1.21 -    WRITE_FIELD(elements, VoidPtr(this + 1));
    1.22 -}
    1.23 -
    1.24  Array *
    1.25  Array::New(Zone *zone, ArrayMap *map, uint32 elements, Heap::Tenure tenure)
    1.26  {
    1.27 @@ -63,6 +57,7 @@
    1.28          return NULL;
    1.29  
    1.30      Array *array = Array::cast(obj);
    1.31 -    array->init(elements);
    1.32 +    array->nelements_ = elements;
    1.33 +    array->elements_ = VoidPtr(array + 1);
    1.34      return Array::cast(obj);
    1.35  }