Merges ARM load/store type enums into one enum.

runtime/vm/flow_graph_compiler_arm.cc

 // Copyright (c) 2013, 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_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
@@ skipping 1019 matching lines @@
   __ subs(R8, R8, ShifterOperand(1));
   __ b(&null_args_loop, PL);
 }
 
 
 void FlowGraphCompiler::GenerateInlinedGetter(intptr_t offset) {
   // LR: return address.
   // SP: receiver.
   // Sequence node has one return node, its input is load field node.
   __ ldr(R0, Address(SP, 0 * kWordSize));
-  __ LoadFromOffset(kLoadWord, R0, R0, offset - kHeapObjectTag);
+  __ LoadFromOffset(kWord, R0, R0, offset - kHeapObjectTag);
   __ Ret();
 }
 
 
 void FlowGraphCompiler::GenerateInlinedSetter(intptr_t offset) {
   // LR: return address.
   // SP+1: receiver.
   // SP+0: value.
   // Sequence node has one store node and one return NULL node.
   __ ldr(R0, Address(SP, 1 * kWordSize));  // Receiver.
@@ skipping 276 matching lines @@
     intptr_t token_pos,
     LocationSummary* locs) {
   MegamorphicCacheTable* table = Isolate::Current()->megamorphic_cache_table();
   const String& name = String::Handle(ic_data.target_name());
   const Array& arguments_descriptor =
       Array::ZoneHandle(ic_data.arguments_descriptor());
   ASSERT(!arguments_descriptor.IsNull());
   const MegamorphicCache& cache =
       MegamorphicCache::ZoneHandle(table->Lookup(name, arguments_descriptor));
   Label not_smi, load_cache;
-  __ LoadFromOffset(kLoadWord, R0, SP, (argument_count - 1) * kWordSize);
+  __ LoadFromOffset(kWord, R0, SP, (argument_count - 1) * kWordSize);
   __ tst(R0, ShifterOperand(kSmiTagMask));
   __ b(&not_smi, NE);
   __ mov(R0, ShifterOperand(Smi::RawValue(kSmiCid)));
   __ b(&load_cache);
 
   __ Bind(&not_smi);
   __ LoadClassId(R0, R0);
   __ SmiTag(R0);
 
   // R0: class ID of the receiver (smi).
@@ skipping 531 matching lines @@
   DRegister dreg = EvenDRegisterOf(reg);
   __ vldrd(dreg, Address(SP, kDoubleSize, Address::PostIndex));
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM