[back] Support older version of glibc

chiragsakhuja · Sep 3, 2019 · 253abf8 · 253abf8
1 parent f7c111b
commit 253abf8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/backend/assembler.cpp b/backend/assembler.cpp
@@ -17,7 +17,7 @@
 
 static constexpr uint32_t INST_NAME_CLOSENESS = 2;
 
-std::stringstream lc3::core::Assembler::assemble(std::istream & buffer)
+std::shared_ptr<std::stringstream> lc3::core::Assembler::assemble(std::istream & buffer)
 {
     using namespace asmbl;
     using namespace lc3::utils;
@@ -62,11 +62,11 @@ std::stringstream lc3::core::Assembler::assemble(std::istream & buffer)
         throw lc3::utils::exception("assembly failed");
     }
 
-    std::stringstream ret(std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-    ret << getMagicHeader();
-    ret << getVersionString();
+    auto ret = std::make_shared<std::stringstream>(std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+    (*ret) << getMagicHeader();
+    (*ret) << getVersionString();
     for(MemEntry const & entry : machine_code_blob.second) {
-        ret << entry;
+        (*ret) << entry;
     }
     return ret;
 }

diff --git a/backend/assembler.h b/backend/assembler.h
@@ -4,6 +4,7 @@
 #ifndef ASSEMBLER_H
 #define ASSEMBLER_H
 
+#include <memory>
 #include <sstream>
 #include <vector>
 
@@ -26,7 +27,7 @@ namespace core
         Assembler & operator=(Assembler const &) = delete;
         ~Assembler(void) = default;
 
-        std::stringstream assemble(std::istream & buffer);
+        std::shared_ptr<std::stringstream> assemble(std::istream & buffer);
         void setFilename(std::string const & filename) { logger.setFilename(filename); }
 
     private:

diff --git a/backend/converter.cpp b/backend/converter.cpp
@@ -15,7 +15,7 @@
 #include "mem.h"
 #include "converter.h"
 
-std::stringstream lc3::core::Converter::convertBin(std::istream & buffer)
+std::shared_ptr<std::stringstream> lc3::core::Converter::convertBin(std::istream & buffer)
 {
     using namespace lc3::utils;
 
@@ -63,11 +63,11 @@ std::stringstream lc3::core::Converter::convertBin(std::istream & buffer)
 
     logger.printf(PrintType::P_INFO, true, "conversion successful");
 
-    std::stringstream ret(std::ios_base::in | std::ios_base::out | std::ios_base::binary);
-    ret << getMagicHeader();
-    ret << getVersionString();
+    auto ret = std::make_shared<std::stringstream>(std::ios_base::in | std::ios_base::out | std::ios_base::binary);
+    (*ret) << getMagicHeader();
+    (*ret) << getVersionString();
     for(MemEntry entry : obj_blob) {
-        ret << entry;
+        (*ret) << entry;
     }
 
     return ret;

diff --git a/backend/converter.h b/backend/converter.h
@@ -4,6 +4,8 @@
 #ifndef CONVERTER_H
 #define CONVERTER_H
 
+#include <memory>
+
 #include "logger.h"
 #include "printer.h"
 
@@ -15,7 +17,7 @@ namespace core
     {
     public:
         Converter(lc3::utils::IPrinter & printer, uint32_t print_level) : logger(printer, print_level) {}
-        std::stringstream convertBin(std::istream & buffer);
+        std::shared_ptr<std::stringstream> convertBin(std::istream & buffer);
 
     private:
         lc3::utils::Logger logger;

diff --git a/backend/interface.cpp b/backend/interface.cpp
@@ -82,8 +82,8 @@ void lc3::sim::loadOS(void)
 
     std::stringstream src_buffer;
     src_buffer << lc3::core::getOSSrc();
-    std::stringstream obj_stream = assembler.assemble(src_buffer);
-    simulator.loadObj(obj_stream);
+    std::shared_ptr<std::stringstream> obj_stream = assembler.assemble(src_buffer);
+    simulator.loadObj(*obj_stream);
     getMachineState().pc = RESET_PC;
 }
 
@@ -512,7 +512,7 @@ lc3::optional<std::string> lc3::as::assemble(std::string const & asm_filename)
     printer.print("attemping to assemble " + asm_filename + " into " + obj_filename);
     printer.newline();
 
-    std::stringstream out_stream;
+    std::shared_ptr<std::stringstream> out_stream;
 
 #ifdef _ENABLE_DEBUG
     auto start = std::chrono::high_resolution_clock::now();
@@ -556,7 +556,7 @@ lc3::optional<std::string> lc3::as::assemble(std::string const & asm_filename)
         }
     }
 
-    out_file << out_stream.rdbuf();
+    out_file << out_stream->rdbuf();
     out_file.close();
 
     return obj_filename;
@@ -579,7 +579,7 @@ lc3::optional<std::string> lc3::conv::convertBin(std::string const & bin_filenam
     printer.print("attemping to convert " + bin_filename + " into " + obj_filename);
     printer.newline();
 
-    std::stringstream out_stream;
+    std::shared_ptr<std::stringstream> out_stream;
 
 #ifdef _ENABLE_DEBUG
     auto start = std::chrono::high_resolution_clock::now();
@@ -623,7 +623,7 @@ lc3::optional<std::string> lc3::conv::convertBin(std::string const & bin_filenam
         }
     }
 
-    out_file << out_stream.rdbuf();
+    out_file << out_stream->rdbuf();
     out_file.close();
 
     return obj_filename;