Pass IC data and arguments descriptor to IC miss runtime functions.

runtime/vm/code_patcher_ia32.cc

 // Copyright (c) 2012, 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 35 matching lines @@
     uword* target_addr = reinterpret_cast<uword*>(call_address() + 1);
     uword offset = target - return_address();
     *target_addr = offset;
     CPU::FlushICache(call_address(), kInstructionSize);
   }
 
   RawObject* immediate_one() const {
     return *reinterpret_cast<RawObject**>(start_ + 1);
   }
 
-  void set_immediate_one(uint32_t value) {
-    uint32_t* target_addr = reinterpret_cast<uint32_t*>(start_ + 1);
-    *target_addr = value;
-    CPU::FlushICache(start_, kInstructionSize);
-  }
-
   RawObject* immediate_two() const {
     return *reinterpret_cast<RawObject**>(start_ + kInstructionSize + 1);
   }
 
-  intptr_t argument_count() const {
-    ArgumentsDescriptor args_desc(immediate_two());
-    return args_desc.Count();
-  }
-
-  intptr_t named_argument_count() const {
-    ArgumentsDescriptor args_desc(immediate_two());
-    return args_desc.NamedCount();
-  }
-
   static const int kNumInstructions = 3;
   static const int kInstructionSize = 5;  // All instructions have same length.
 
  private:
   uword return_address() const {
     return start_ + kNumInstructions * kInstructionSize;
   }
 
   uword call_address() const {
     return start_ + 2 * kInstructionSize;
   }
 
   uword start_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(DartCallPattern);
 };
 
 
 // The expected pattern of a dart instance call:
 //  mov ECX, ic-data
 //  mov EDX, arguments_descriptor_array
 //  call target_address
 //  <- return address
 class InstanceCall : public DartCallPattern {
  public:
   explicit InstanceCall(uword return_address)
       : DartCallPattern(return_address) {}
 
-  RawICData* ic_data() const {
-    ICData& ic_data = ICData::Handle();
-    ic_data ^= immediate_one();
-    return ic_data.raw();
-  }
+  RawObject* ic_data() const { return immediate_one(); }
+  RawObject* arguments_descriptor() const { return immediate_two(); }
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(InstanceCall);
 };
 
 
 // The expected pattern of a dart static call:
 //  mov EDX, arguments_descriptor_array
 //  call target_address
 //  <- return address
@@ skipping 122 matching lines @@
   }
   return true;
 }
 
 
 bool CodePatcher::IsDartCall(uword return_address) {
   return DartCallPattern::IsValid(return_address);
 }
 
 
-void CodePatcher::GetInstanceCallAt(uword return_address,
-                                    String* function_name,
-                                    int* num_arguments,
-                                    int* num_named_arguments,
-                                    uword* target) {
-  ASSERT(num_arguments != NULL);
-  ASSERT(num_named_arguments != NULL);
-  ASSERT(target != NULL);
+uword CodePatcher::GetInstanceCallAt(uword return_address,
+                                     ICData* ic_data,
+                                     Array* arguments_descriptor) {
   InstanceCall call(return_address);
-  *num_arguments = call.argument_count();
-  *num_named_arguments = call.named_argument_count();
-  *target = call.target();
-  const ICData& ic_data = ICData::Handle(call.ic_data());
-  if (function_name != NULL) {
-    *function_name = ic_data.target_name();
+  if (ic_data != NULL) {
+    *ic_data ^= call.ic_data();
   }
+  if (arguments_descriptor != NULL) {
+    *arguments_descriptor ^= call.arguments_descriptor();
+  }
+  return call.target();
 }
 
 
-RawICData* CodePatcher::GetInstanceCallIcDataAt(uword return_address) {
-  InstanceCall call(return_address);
-  return call.ic_data();
-}
-
-
 intptr_t CodePatcher::InstanceCallSizeInBytes() {
   return DartCallPattern::kNumInstructions * DartCallPattern::kInstructionSize;
 }
 
 
 void CodePatcher::InsertCallAt(uword start, uword target) {
   *reinterpret_cast<uint8_t*>(start) = 0xE8;
   CallPattern call(start);
   call.SetTargetAddress(target);
   CPU::FlushICache(start, CallPattern::InstructionLength());
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32