[Courgette] Refactor: Add AssemblyProgram::DispatchInstructionLabels() to hide InstructionVector us…

courgette/assembly_program.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "courgette/assembly_program.h"
 
 #include <memory.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 199 matching lines @@
 }
 
 Label* AssemblyProgram::FindAbs32Label(RVA rva) {
   return abs32_label_manager_.Find(rva);
 }
 
 Label* AssemblyProgram::FindRel32Label(RVA rva) {
   return rel32_label_manager_.Find(rva);
 }
 
-Label* AssemblyProgram::InstructionAbs32Label(
-    const Instruction* instruction) const {
-  if (instruction->op() == ABS32)
-    return static_cast<const InstructionWithLabel*>(instruction)->label();
-  return NULL;
-}
-
-Label* AssemblyProgram::InstructionAbs64Label(
-    const Instruction* instruction) const {
-  if (instruction->op() == ABS64)
-    return static_cast<const InstructionWithLabel*>(instruction)->label();
-  return NULL;
-}
-
-Label* AssemblyProgram::InstructionRel32Label(
-    const Instruction* instruction) const {
-  if (instruction->op() == REL32 || instruction->op() == REL32ARM) {
-    Label* label =
-        static_cast<const InstructionWithLabel*>(instruction)->label();
-    return label;
+void AssemblyProgram::HandleInstructionLabels(
+    const AssemblyProgram::LabelHandlerMap& handler_map) const {
+  for (const Instruction* instruction : instructions_) {
+    LabelHandlerMap::const_iterator it = handler_map.find(instruction->op());
+    if (it != handler_map.end()) {
+      it->second.Run(
+          static_cast<const InstructionWithLabel*>(instruction)->label());
+    }
   }
-  return NULL;
 }
 
 CheckBool AssemblyProgram::Emit(ScopedInstruction instruction) {
   if (!instruction || !instructions_.push_back(instruction.get()))
     return false;
   // Ownership successfully passed to instructions_.
   ignore_result(instruction.release());
   return true;
 }
 
@@ skipping 228 matching lines @@
 Status Encode(const AssemblyProgram& program,
               std::unique_ptr<EncodedProgram>* output) {
   // Explicitly release any memory associated with the output before encoding.
   output->reset();
 
   *output = program.Encode();
   return (*output) ? C_OK : C_GENERAL_ERROR;
 }
 
 }  // namespace courgette