Merge 76320 - Implementation of an STL compatible allocator for Courgette on ...

courgette/assembly_program.h

 // Copyright (c) 2009 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.
 
 #ifndef COURGETTE_ASSEMBLY_PROGRAM_H_
 #define COURGETTE_ASSEMBLY_PROGRAM_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 
 #include "courgette/image_info.h"
+#include "courgette/memory_allocator.h"
 
 namespace courgette {
 
 class EncodedProgram;
 class Instruction;
 
+typedef std::vector<Instruction*, MemoryAllocator<Instruction*> >
+    InstructionVector;
+
 // A Label is a symbolic reference to an address.  Unlike a conventional
 // assembly language, we always know the address.  The address will later be
 // stored in a table and the Label will be replaced with the index into the
 // table.
 //
 // TODO(sra): Make fields private and add setters and getters.
 class Label {
  public:
   static const int kNoIndex = -1;
   Label() : rva_(0), index_(kNoIndex) {}
@@ skipping 51 matching lines @@
   Label* FindOrMakeAbs32Label(RVA rva);
   Label* FindOrMakeRel32Label(RVA rva);
 
   void DefaultAssignIndexes();
   void UnassignIndexes();
   void AssignRemainingIndexes();
 
   EncodedProgram* Encode() const;
 
   // Accessor for instruction list.
-  const std::vector<Instruction*>& instructions() const {
+  const InstructionVector& instructions() const {
     return instructions_;
   }
 
   // Returns the label if the instruction contains and absolute address,
   // otherwise returns NULL.
   Label* InstructionAbs32Label(const Instruction* instruction) const;
 
   // Returns the label if the instruction contains and rel32 offset,
   // otherwise returns NULL.
   Label* InstructionRel32Label(const Instruction* instruction) const;
 
-
  private:
   void Emit(Instruction* instruction) { instructions_.push_back(instruction); }
 
   Label* FindLabel(RVA rva, RVAToLabel* labels);
 
   // Helper methods for the public versions.
   static void UnassignIndexes(RVAToLabel* labels);
   static void DefaultAssignIndexes(RVAToLabel* labels);
   static void AssignRemainingIndexes(RVAToLabel* labels);
 
   // Sharing instructions that emit a single byte saves a lot of space.
   Instruction* GetByteInstruction(uint8 byte);
   Instruction** byte_instruction_cache_;
 
   uint64 image_base_;  // Desired or mandated base address of image.
 
-  std::vector<Instruction*> instructions_;  // All the instructions in program.
+  InstructionVector instructions_;  // All the instructions in program.
 
   // These are lookup maps to find the label associated with a given address.
   // We have separate label spaces for addresses referenced by rel32 labels and
   // abs32 labels.  This is somewhat arbitrary.
   RVAToLabel rel32_labels_;
   RVAToLabel abs32_labels_;
 
   DISALLOW_COPY_AND_ASSIGN(AssemblyProgram);
 };
 
 }  // namespace courgette
 #endif  // COURGETTE_ASSEMBLY_PROGRAM_H_