Index: courgette/assembly_program.h |
diff --git a/courgette/assembly_program.h b/courgette/assembly_program.h |
index 45658abedf5a233a6b8f28642476cb0acb2b9259..227a4f0d582228536794ac017607cd1379f0a2c8 100644 |
--- a/courgette/assembly_program.h |
+++ b/courgette/assembly_program.h |
@@ -14,7 +14,7 @@ |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
-#include "courgette/disassembler.h" |
+#include "courgette/courgette.h" |
#include "courgette/image_utils.h" |
#include "courgette/label_manager.h" |
#include "courgette/memory_allocator.h" |
@@ -132,7 +132,7 @@ class AssemblyProgram { |
void UnassignIndexes(); |
void AssignRemainingIndexes(); |
- EncodedProgram* Encode() const; |
+ scoped_ptr<EncodedProgram> Encode() const; |
// Accessor for instruction list. |
const InstructionVector& instructions() const { |
@@ -191,5 +191,11 @@ class AssemblyProgram { |
DISALLOW_COPY_AND_ASSIGN(AssemblyProgram); |
}; |
+// Converts |program| into encoded form, returning it as |*output|. |
+// Returns C_OK if succeeded, otherwise returns an error status and |
+// sets |*output| to NULL |
grt (UTC plus 2)
2016/01/26 16:39:54
nit: NULL -> null, and add a trailing period.
huangs
2016/01/26 18:42:24
Done.
|
+Status Encode(const AssemblyProgram& program, |
+ scoped_ptr<EncodedProgram>* output); |
+ |
} // namespace courgette |
grt (UTC plus 2)
2016/01/26 16:39:54
nit: newline after this
huangs
2016/01/26 18:42:24
Done.
|
#endif // COURGETTE_ASSEMBLY_PROGRAM_H_ |