Introduce a class encapsulating arguments descriptor arrays.

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"
+#include "vm/dart_entry.h"
 #include "vm/instructions.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
 
 namespace dart {
 
 // The pattern of a Dart instance call is:
 //  1: mov ECX, immediate 1
 //  2: mov EDX, immediate 2
 //  3: call target_address
@@ skipping 20 matching lines @@
     return return_address() + offset;
   }
 
   void set_target(uword target) const {
     uword* target_addr = reinterpret_cast<uword*>(call_address() + 1);
     uword offset = target - return_address();
     *target_addr = offset;
     CPU::FlushICache(call_address(), kInstructionSize);
   }
 
-  uint32_t immediate_one() const {
-    return *reinterpret_cast<uint32_t*>(start_ + 1);
+  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);
   }
 
-  uint32_t immediate_two() const {
-    return *reinterpret_cast<uint32_t*>(start_ + kInstructionSize + 1);
+  RawObject* immediate_two() const {
+    return *reinterpret_cast<RawObject**>(start_ + kInstructionSize + 1);
   }
 
-  int argument_count() const {
-    Array& args_desc = Array::Handle();
-    args_desc ^= reinterpret_cast<RawObject*>(immediate_two());
-    Smi& num_args = Smi::Handle();
-    num_args ^= args_desc.At(0);
-    return num_args.Value();
+  intptr_t argument_count() const {
+    ArgumentsDescriptor args_desc(immediate_two());
+    return args_desc.Count();
   }
 
-  int named_argument_count() const {
-    Array& args_desc = Array::Handle();
-    args_desc ^= reinterpret_cast<RawObject*>(immediate_two());
-    Smi& num_args = Smi::Handle();
-    num_args ^= args_desc.At(0);
-    Smi& num_pos_args = Smi::Handle();
-    num_pos_args ^= args_desc.At(1);
-    return num_args.Value() - num_pos_args.Value();
+  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, argument_descriptor_array
+//  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 ^= reinterpret_cast<RawObject*>(immediate_one());
+    ic_data ^= immediate_one();
     return ic_data.raw();
   }
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(InstanceCall);
 };
 
 
 // The expected pattern of a dart static call:
-//  mov EDX, argument_descriptor_array
+//  mov EDX, arguments_descriptor_array
 //  call target_address
 //  <- return address
 class StaticCall : public ValueObject {
  public:
   explicit StaticCall(uword return_address)
       : start_(return_address - (kNumInstructions * kInstructionSize)) {
     ASSERT(IsValid(return_address));
     ASSERT(kInstructionSize == Assembler::kCallExternalLabelSize);
   }
 
@@ skipping 155 matching lines @@
   *reinterpret_cast<uint8_t*>(start) = 0xE8;
   CallPattern call(start);
   call.SetTargetAddress(target);
   CPU::FlushICache(start, CallPattern::InstructionLength());
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32