| Index: src/arm/codegen-arm.cc
|
| diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc
|
| index a916d97f0e1888bd03dfef2aaa456cd6dbf1535c..ef7b2448eff265e6225a0bb77e4f58f09bdf8aa8 100644
|
| --- a/src/arm/codegen-arm.cc
|
| +++ b/src/arm/codegen-arm.cc
|
| @@ -79,7 +79,8 @@ UnaryMathFunctionWithIsolate CreateExpFunction(Isolate* isolate) {
|
| }
|
|
|
| #if defined(V8_HOST_ARCH_ARM)
|
| -MemCopyUint8Function CreateMemCopyUint8Function(MemCopyUint8Function stub) {
|
| +MemCopyUint8Function CreateMemCopyUint8Function(Isolate* isolate,
|
| + MemCopyUint8Function stub) {
|
| #if defined(USE_SIMULATOR)
|
| return stub;
|
| #else
|
| @@ -87,9 +88,9 @@ MemCopyUint8Function CreateMemCopyUint8Function(MemCopyUint8Function stub) {
|
| size_t actual_size;
|
| byte* buffer =
|
| static_cast<byte*>(base::OS::Allocate(1 * KB, &actual_size, true));
|
| - if (buffer == NULL) return stub;
|
| + if (buffer == nullptr) return stub;
|
|
|
| - MacroAssembler masm(NULL, buffer, static_cast<int>(actual_size),
|
| + MacroAssembler masm(isolate, buffer, static_cast<int>(actual_size),
|
| CodeObjectRequired::kNo);
|
|
|
| Register dest = r0;
|
| @@ -228,7 +229,7 @@ MemCopyUint8Function CreateMemCopyUint8Function(MemCopyUint8Function stub) {
|
| masm.GetCode(&desc);
|
| DCHECK(!RelocInfo::RequiresRelocation(desc));
|
|
|
| - Assembler::FlushICacheWithoutIsolate(buffer, actual_size);
|
| + Assembler::FlushICache(isolate, buffer, actual_size);
|
| base::OS::ProtectCode(buffer, actual_size);
|
| return FUNCTION_CAST<MemCopyUint8Function>(buffer);
|
| #endif
|
| @@ -237,7 +238,7 @@ MemCopyUint8Function CreateMemCopyUint8Function(MemCopyUint8Function stub) {
|
|
|
| // Convert 8 to 16. The number of character to copy must be at least 8.
|
| MemCopyUint16Uint8Function CreateMemCopyUint16Uint8Function(
|
| - MemCopyUint16Uint8Function stub) {
|
| + Isolate* isolate, MemCopyUint16Uint8Function stub) {
|
| #if defined(USE_SIMULATOR)
|
| return stub;
|
| #else
|
| @@ -245,9 +246,9 @@ MemCopyUint16Uint8Function CreateMemCopyUint16Uint8Function(
|
| size_t actual_size;
|
| byte* buffer =
|
| static_cast<byte*>(base::OS::Allocate(1 * KB, &actual_size, true));
|
| - if (buffer == NULL) return stub;
|
| + if (buffer == nullptr) return stub;
|
|
|
| - MacroAssembler masm(NULL, buffer, static_cast<int>(actual_size),
|
| + MacroAssembler masm(isolate, buffer, static_cast<int>(actual_size),
|
| CodeObjectRequired::kNo);
|
|
|
| Register dest = r0;
|
| @@ -316,7 +317,7 @@ MemCopyUint16Uint8Function CreateMemCopyUint16Uint8Function(
|
| CodeDesc desc;
|
| masm.GetCode(&desc);
|
|
|
| - Assembler::FlushICacheWithoutIsolate(buffer, actual_size);
|
| + Assembler::FlushICache(isolate, buffer, actual_size);
|
| base::OS::ProtectCode(buffer, actual_size);
|
|
|
| return FUNCTION_CAST<MemCopyUint16Uint8Function>(buffer);
|
|
|