Implement new inline cache.

vm/code_patcher_ia32.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/assembler.h"
 #include "vm/code_patcher.h"
 #include "vm/cpu.h"
@@ skipping 31 matching lines @@
     CPU::FlushICache(call_address(), kInstructionSize);
   }
 
   uint32_t immediate_one() const {
     return *reinterpret_cast<uint32_t*>(start_ + 1);
   }
 
   void set_immediate_one(uint32_t value) {
     uint32_t* target_addr = reinterpret_cast<uint32_t*>(start_ + 1);
     *target_addr = value;
-    CPU::FlushICache(call_address(), kInstructionSize);
+    CPU::FlushICache(start_, kInstructionSize);
   }
 
   uint32_t immediate_two() const {
     return *reinterpret_cast<uint32_t*>(start_ + kInstructionSize + 1);
   }
 
   int argument_count() const {
     Array& args_desc = Array::Handle();
     args_desc ^= reinterpret_cast<RawObject*>(immediate_two());
     Smi& num_args = Smi::Handle();
@@ skipping 84 matching lines @@
   *function = call.function();
 }
 
 
 void CodePatcher::PatchStaticCallAt(uword return_address, uword new_target) {
   StaticCall call(return_address);
   call.set_target(new_target);
 }
 
 
-static void InsertCallOrJump(uword at_addr,
-                             const ExternalLabel* label,
-                             uint8_t op) {
-  const int kInstructionSize = 5;
-  *reinterpret_cast<uint8_t*>(at_addr) = op;  // Call.
-  uword* target_addr = reinterpret_cast<uword*>(at_addr + 1);
-  uword offset = label->address() - (at_addr + kInstructionSize);
-  *target_addr = offset;
-  CPU::FlushICache(at_addr, kInstructionSize);
-}
-
-
-void CodePatcher::InsertCall(uword at_addr, const ExternalLabel* label) {
-  const uint8_t kCallOp = 0xE8;
-  InsertCallOrJump(at_addr, label, kCallOp);
-}
-
-
-void CodePatcher::InsertJump(uword at_addr, const ExternalLabel* label) {
-  const uint8_t kJumpOp = 0xE9;
-  InsertCallOrJump(at_addr, label, kJumpOp);
-}
-
-
 static void SwapCode(intptr_t num_bytes, char* a, char* b) {
   for (intptr_t i = 0; i < num_bytes; i++) {
     char tmp = *a;
     *a = *b;
     *b = tmp;
     a++;
     b++;
   }
 }
 
@@ skipping 61 matching lines @@
   ASSERT(target != NULL);
   InstanceCall call(return_address);
   *num_arguments = call.argument_count();
   *num_named_arguments = call.named_argument_count();
   *target = call.target();
   ICData ic_data(Array::ZoneHandle(call.ic_data()));
   *function_name = ic_data.FunctionName();
 }
 
 
-void CodePatcher::PatchInstanceCallAt(uword return_address, uword new_target) {
-  InstanceCall call(return_address);
-  call.set_target(new_target);
-}
-
-
 RawArray* CodePatcher::GetInstanceCallIcDataAt(uword return_address) {
   InstanceCall call(return_address);
   return call.ic_data();
 }
 
 
 void CodePatcher::SetInstanceCallIcDataAt(uword return_address,
                                           const Array& ic_data) {
   InstanceCall call(return_address);
   call.SetIcData(ic_data);
 }
 
 
 intptr_t CodePatcher::InstanceCallSizeInBytes() {
   return DartCallPattern::kNumInstructions * DartCallPattern::kInstructionSize;
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32