MIPS: Increase external array allocation header size to 8 bytes.

This fixes alignment issues on MIPS HW, found for example in mjsunit external-array.
The issue originates from r11144 (86563c3e21) which adds a 4-byte header to these arrays.
This causes problems on MIPS, where certain pointers need to be 8-byte aligned.

BUG=
TEST=mjsunit/external-array

Review URL: https://chromiumcodereview.appspot.com/9956049

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11303 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent d1f83dd9
...@@ -318,6 +318,7 @@ static size_t convertToUint(Local<Value> value_in, TryCatch* try_catch) { ...@@ -318,6 +318,7 @@ static size_t convertToUint(Local<Value> value_in, TryCatch* try_catch) {
const char kArrayBufferReferencePropName[] = "_is_array_buffer_"; const char kArrayBufferReferencePropName[] = "_is_array_buffer_";
const char kArrayBufferMarkerPropName[] = "_array_buffer_ref_"; const char kArrayBufferMarkerPropName[] = "_array_buffer_ref_";
static const int kExternalArrayAllocationHeaderSize = 2;
Handle<Value> Shell::CreateExternalArray(const Arguments& args, Handle<Value> Shell::CreateExternalArray(const Arguments& args,
ExternalArrayType type, ExternalArrayType type,
...@@ -433,13 +434,14 @@ Handle<Value> Shell::CreateExternalArray(const Arguments& args, ...@@ -433,13 +434,14 @@ Handle<Value> Shell::CreateExternalArray(const Arguments& args,
return ThrowException(String::New("Array exceeds maximum size (2G)")); return ThrowException(String::New("Array exceeds maximum size (2G)"));
} }
// Prepend the size of the allocated chunk to the data itself. // Prepend the size of the allocated chunk to the data itself.
int total_size = length * element_size + sizeof(size_t); int total_size = length * element_size +
kExternalArrayAllocationHeaderSize * sizeof(size_t);
data = malloc(total_size); data = malloc(total_size);
if (data == NULL) { if (data == NULL) {
return ThrowException(String::New("Memory allocation failed.")); return ThrowException(String::New("Memory allocation failed."));
} }
*reinterpret_cast<size_t*>(data) = total_size; *reinterpret_cast<size_t*>(data) = total_size;
data = reinterpret_cast<size_t*>(data) + 1; data = reinterpret_cast<size_t*>(data) + kExternalArrayAllocationHeaderSize;
memset(data, 0, length * element_size); memset(data, 0, length * element_size);
V8::AdjustAmountOfExternalAllocatedMemory(total_size); V8::AdjustAmountOfExternalAllocatedMemory(total_size);
} }
...@@ -463,7 +465,7 @@ void Shell::ExternalArrayWeakCallback(Persistent<Value> object, void* data) { ...@@ -463,7 +465,7 @@ void Shell::ExternalArrayWeakCallback(Persistent<Value> object, void* data) {
Handle<Object> converted_object = object->ToObject(); Handle<Object> converted_object = object->ToObject();
Local<Value> prop_value = converted_object->Get(prop_name); Local<Value> prop_value = converted_object->Get(prop_name);
if (data != NULL && !prop_value->IsObject()) { if (data != NULL && !prop_value->IsObject()) {
data = reinterpret_cast<size_t*>(data) - 1; data = reinterpret_cast<size_t*>(data) - kExternalArrayAllocationHeaderSize;
V8::AdjustAmountOfExternalAllocatedMemory( V8::AdjustAmountOfExternalAllocatedMemory(
-static_cast<int>(*reinterpret_cast<size_t*>(data))); -static_cast<int>(*reinterpret_cast<size_t*>(data)));
free(data); free(data);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment