christoph/logisim-assembler
1
Fork 0
Code Activity

Update the CodegenObserver to return a vector

Browse Source
This commit is contained in:
Christoph Urlacher
2023-03-21 16:27:55 +01:00
parent 97072149db
commit 2ab33ed85b
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/codegen/CodegenObserver.cpp
View File

@ -6,15 +6,19 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include <iostream> #include <iostream>
CodegenObserver::CodegenObserver(const Node &node, std::string &output_string) CodegenObserver::CodegenObserver(const Node &node, std::vector<std::string> &output_string)
: PostfixObserver(node), output_string(output_string) {} : PostfixObserver(node), output_string(output_string) {}
void CodegenObserver::action(const Node &node) { void CodegenObserver::action(const Node &node) {
const uint8_t opcode = node.compile(); const uint8_t dec = node.compile();
const uint8_t INVALID = -1; const uint8_t INVALID = -1;
if (opcode != INVALID) { if (dec != INVALID) {
output_string += (boost::format("%x") % static_cast<uint32_t>(opcode)).str(); // uint8_t is always interpreted as char // uint8_t is always interpreted as char, so cast to uint32_t
output_string += ' '; const std::string hex = (boost::format("%x") % static_cast<uint32_t>(dec)).str();
if (hex.empty() || hex.size() > 2) {
throw "Compile Error: Resulting instruction has invalid size!";
}
output_string.push_back(hex.length() == 2 ? hex : "0" + hex);
} }
} }

4
src/codegen/CodegenObserver.h
View File

@ -9,7 +9,7 @@
class CodegenObserver : public PostfixObserver { class CodegenObserver : public PostfixObserver {
public: public:
CodegenObserver(const Node &node, std::string &output_string); CodegenObserver(const Node &node, std::vector<std::string> &output_string);
~CodegenObserver() override = default; ~CodegenObserver() override = default;
@ -17,7 +17,7 @@ protected:
void action(const Node &node) override; void action(const Node &node) override;
private: private:
std::string &output_string; std::vector<std::string> &output_string;
}; };
#endif //LOGISIMASSEMBLER_CODEGENOBSERVER_H #endif //LOGISIMASSEMBLER_CODEGENOBSERVER_H