diff -r c4b1341297e5 -r ba85a47ee414 src/FixedArray.cpp --- a/src/FixedArray.cpp Mon Jun 10 00:46:29 2013 +0100 +++ b/src/FixedArray.cpp Mon Jun 10 01:04:43 2013 +0100 @@ -1,78 +1,78 @@ -/* - * Copyright (C) 2012 David Anderson - * - * This file is part of SourcePawn. - * - * SourcePawn is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free - * Software Foundation, either version 3 of the License, or (at your option) - * any later version. - * - * SourcePawn is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * SourcePawn. If not, see http://www.gnu.org/licenses/. - */ -#include -#include -#include "FixedArray.h" -#include "Zone.h" -#include "Heap-inl.h" - -using namespace ke; - -static const unsigned kMaxFixedArrayLength = ((INT_MAX - sizeof(FixedArray)) / sizeof(ke::Object *)); - -FixedArray * -FixedArray::New(Zone *zone, unsigned length, Heap::Tenure tenure) -{ - if (length >= kMaxFixedArrayLength) { - zone->reportError(Message_ArrayTooBig); - return NULL; - } - - Local array(zone, FixedArray::cast(zone->allocate(MapKind_FixedArray, SizeFor(length), tenure))); - if (!array) - return NULL; - - array->length_ = length; - memset(array->vec(), 0, length * sizeof(Object *)); - return array; -} - -ByteArray * -ByteArray::New(Zone *zone, unsigned length, Heap::Tenure tenure) -{ - if (length >= kMaxFixedArrayLength) { - zone->reportError(Message_ArrayTooBig); - return NULL; - } - - Local array(zone, ByteArray::cast(zone->allocate(MapKind_ByteArray, SizeFor(length), tenure))); - if (!array) - return NULL; - - array->length_ = length; - memset(array->raw(), 0, length); - return array; -} - -ByteArray * -ByteArray::New(Zone *zone, Handle map, unsigned length, Heap::Tenure tenure) -{ - if (length >= kMaxFixedArrayLength) { - zone->reportError(Message_ArrayTooBig); - return NULL; - } - - Local array(zone, ByteArray::cast(zone->allocate(map, SizeFor(length), tenure))); - if (!array) - return NULL; - - array->length_ = length; - memset(array->raw(), 0, length); - return array; -} - +/* + * Copyright (C) 2012 David Anderson + * + * This file is part of SourcePawn. + * + * SourcePawn is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * SourcePawn is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * SourcePawn. If not, see http://www.gnu.org/licenses/. + */ +#include +#include +#include "FixedArray.h" +#include "Zone.h" +#include "Heap-inl.h" + +using namespace ke; + +static const unsigned kMaxFixedArrayLength = ((INT_MAX - sizeof(FixedArray)) / sizeof(ke::Object *)); + +FixedArray * +FixedArray::New(Zone *zone, unsigned length, Heap::Tenure tenure) +{ + if (length >= kMaxFixedArrayLength) { + zone->reportError(Message_ArrayTooBig); + return NULL; + } + + Local array(zone, FixedArray::cast(zone->allocate(MapKind_FixedArray, SizeFor(length), tenure))); + if (!array) + return NULL; + + array->length_ = length; + memset(array->vec(), 0, length * sizeof(Object *)); + return array; +} + +ByteArray * +ByteArray::New(Zone *zone, unsigned length, Heap::Tenure tenure) +{ + if (length >= kMaxFixedArrayLength) { + zone->reportError(Message_ArrayTooBig); + return NULL; + } + + Local array(zone, ByteArray::cast(zone->allocate(MapKind_ByteArray, SizeFor(length), tenure))); + if (!array) + return NULL; + + array->length_ = length; + memset(array->raw(), 0, length); + return array; +} + +ByteArray * +ByteArray::New(Zone *zone, Handle map, unsigned length, Heap::Tenure tenure) +{ + if (length >= kMaxFixedArrayLength) { + zone->reportError(Message_ArrayTooBig); + return NULL; + } + + Local array(zone, ByteArray::cast(zone->allocate(map, SizeFor(length), tenure))); + if (!array) + return NULL; + + array->length_ = length; + memset(array->raw(), 0, length); + return array; +} +