Index: courgette/assembly_program.h |
diff --git a/courgette/assembly_program.h b/courgette/assembly_program.h |
index ba7ad59f1823b2c1652d43300a04eed9d22efcf7..88cf2e82746eec7b79fc72cbd81f51a2bf73f966 100644 |
--- a/courgette/assembly_program.h |
+++ b/courgette/assembly_program.h |
@@ -13,29 +13,13 @@ |
#include "base/memory/scoped_ptr.h" |
#include "courgette/disassembler.h" |
+#include "courgette/image_utils.h" |
#include "courgette/memory_allocator.h" |
namespace courgette { |
class EncodedProgram; |
-// 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), count_(0) {} |
- explicit Label(RVA rva) : rva_(rva), index_(kNoIndex), count_(0) {} |
- |
- RVA rva_; // Address referred to by the label. |
- int index_; // Index of address in address table, kNoIndex until assigned. |
- int count_; |
-}; |
- |
typedef std::map<RVA, Label*> RVAToLabel; |
// Opcodes of simple assembly language |