| Index: src/arm64/instrument-arm64.cc
 | 
| diff --git a/src/arm64/instrument-arm64.cc b/src/arm64/instrument-arm64.cc
 | 
| index 2ed67ba57c259440e6da95fe175a217762d79750..c6e27f8ee32e6533518da87c387f0a0ab0b1b959 100644
 | 
| --- a/src/arm64/instrument-arm64.cc
 | 
| +++ b/src/arm64/instrument-arm64.cc
 | 
| @@ -377,7 +377,7 @@ void Instrument::InstrumentLoadStore(Instruction* instr) {
 | 
|    static Counter* load_fp_counter = GetCounter("Load FP");
 | 
|    static Counter* store_fp_counter = GetCounter("Store FP");
 | 
|  
 | 
| -  switch (instr->Mask(LoadStoreMask)) {
 | 
| +  switch (instr->Mask(LoadStoreOpMask)) {
 | 
|      case STRB_w:    // Fall through.
 | 
|      case STRH_w:    // Fall through.
 | 
|      case STR_w:     // Fall through.
 | 
| @@ -595,159 +595,6 @@ void Instrument::VisitFPFixedPointConvert(Instruction* instr) {
 | 
|    counter->Increment();
 | 
|  }
 | 
|  
 | 
| -void Instrument::VisitNEON2RegMisc(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEON3Different(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEON3Same(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONAcrossLanes(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONByIndexedElement(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONCopy(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONExtract(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONLoadStoreMultiStruct(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONLoadStoreMultiStructPostIndex(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONLoadStoreSingleStruct(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONLoadStoreSingleStructPostIndex(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONModifiedImmediate(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONPerm(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONScalar2RegMisc(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONScalar3Diff(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONScalar3Same(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONScalarByIndexedElement(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONScalarCopy(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONScalarPairwise(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONScalarShiftImmediate(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONShiftImmediate(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
| -
 | 
| -void Instrument::VisitNEONTable(Instruction* instr) {
 | 
| -  USE(instr);
 | 
| -  Update();
 | 
| -  static Counter* counter = GetCounter("NEON");
 | 
| -  counter->Increment();
 | 
| -}
 | 
|  
 | 
|  void Instrument::VisitUnallocated(Instruction* instr) {
 | 
|    Update();
 | 
| 
 |