Refactor and cleanup VirtualMemory.

src/arm/codegen-arm.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 46 matching lines @@
 double fast_exp_simulator(double x) {
   return Simulator::current(Isolate::Current())->CallFP(
       fast_exp_arm_machine_code, x, 0);
 }
 #endif
 
 
 UnaryMathFunction CreateExpFunction() {
   if (!FLAG_fast_math) return &exp;
   size_t actual_size;
-  byte* buffer = static_cast<byte*>(OS::Allocate(1 * KB, &actual_size, true));
+  byte* buffer = static_cast<byte*>(VirtualMemory::AllocateRegion(
+          1 * KB, &actual_size, VirtualMemory::EXECUTABLE));
   if (buffer == NULL) return &exp;
   ExternalReference::InitializeMathExpData();
 
   MacroAssembler masm(NULL, buffer, static_cast<int>(actual_size));
 
   {
     DwVfpRegister input = d0;
     DwVfpRegister result = d1;
     DwVfpRegister double_scratch1 = d2;
     DwVfpRegister double_scratch2 = d3;
@@ skipping 17 matching lines @@
       __ vmov(r0, r1, result);
     }
     __ Ret();
   }
 
   CodeDesc desc;
   masm.GetCode(&desc);
   ASSERT(!RelocInfo::RequiresRelocation(desc));
 
   CPU::FlushICache(buffer, actual_size);
-  OS::ProtectCode(buffer, actual_size);
+  bool result = VirtualMemory::WriteProtectRegion(buffer, actual_size);
+  ASSERT(result);
+  USE(result);
 
 #if !defined(USE_SIMULATOR)
   return FUNCTION_CAST<UnaryMathFunction>(buffer);
 #else
   fast_exp_arm_machine_code = buffer;
   return &fast_exp_simulator;
 #endif
 }
 
 #if defined(V8_HOST_ARCH_ARM)
 OS::MemCopyUint8Function CreateMemCopyUint8Function(
       OS::MemCopyUint8Function stub) {
 #if defined(USE_SIMULATOR)
   return stub;
 #else
   if (Serializer::enabled() || !CpuFeatures::IsSupported(UNALIGNED_ACCESSES)) {
     return stub;
   }
   size_t actual_size;
-  byte* buffer = static_cast<byte*>(OS::Allocate(1 * KB, &actual_size, true));
+  byte* buffer = static_cast<byte*>(VirtualMemory::AllocateRegion(
+          1 * KB, &actual_size, VirtualMemory::EXECUTABLE));
   if (buffer == NULL) return stub;
 
   MacroAssembler masm(NULL, buffer, static_cast<int>(actual_size));
 
   Register dest = r0;
   Register src = r1;
   Register chars = r2;
   Register temp1 = r3;
   Label less_4;
 
@@ skipping 121 matching lines @@
   __ strh(temp1, MemOperand(dest, 2, PostIndex), cs);
   __ ldrb(temp1, MemOperand(src), ne);
   __ strb(temp1, MemOperand(dest), ne);
   __ Ret();
 
   CodeDesc desc;
   masm.GetCode(&desc);
   ASSERT(!RelocInfo::RequiresRelocation(desc));
 
   CPU::FlushICache(buffer, actual_size);
-  OS::ProtectCode(buffer, actual_size);
+  bool result = VirtualMemory::WriteProtectRegion(buffer, actual_size);
+  ASSERT(result);
+  USE(result);
   return FUNCTION_CAST<OS::MemCopyUint8Function>(buffer);
 #endif
 }
 
 
 // Convert 8 to 16. The number of character to copy must be at least 8.
 OS::MemCopyUint16Uint8Function CreateMemCopyUint16Uint8Function(
       OS::MemCopyUint16Uint8Function stub) {
 #if defined(USE_SIMULATOR)
   return stub;
 #else
   if (Serializer::enabled() || !CpuFeatures::IsSupported(UNALIGNED_ACCESSES)) {
     return stub;
   }
   size_t actual_size;
-  byte* buffer = static_cast<byte*>(OS::Allocate(1 * KB, &actual_size, true));
+  byte* buffer = static_cast<byte*>(VirtualMemory::AllocateRegion(
+          1 * KB, &actual_size, VirtualMemory::EXECUTABLE));
   if (buffer == NULL) return stub;
 
   MacroAssembler masm(NULL, buffer, static_cast<int>(actual_size));
 
   Register dest = r0;
   Register src = r1;
   Register chars = r2;
   if (CpuFeatures::IsSupported(NEON)) {
     Register temp = r3;
     Label loop;
@@ skipping 51 matching lines @@
     __ bind(&not_two);
     __ ldrb(temp1, MemOperand(src), ne);
     __ strh(temp1, MemOperand(dest), ne);
     __ Pop(pc, r4);
   }
 
   CodeDesc desc;
   masm.GetCode(&desc);
 
   CPU::FlushICache(buffer, actual_size);
-  OS::ProtectCode(buffer, actual_size);
+  bool result = VirtualMemory::WriteProtectRegion(buffer, actual_size);
+  ASSERT(result);
+  USE(result);
 
   return FUNCTION_CAST<OS::MemCopyUint16Uint8Function>(buffer);
 #endif
 }
 #endif
 
 #undef __
 
 
 UnaryMathFunction CreateSqrtFunction() {
@@ skipping 518 matching lines @@
     patcher.masm()->add(r0, pc, Operand(-8));
     patcher.masm()->ldr(pc, MemOperand(pc, -4));
     patcher.masm()->dd(reinterpret_cast<uint32_t>(stub->instruction_start()));
   }
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM