bilbo/dsp-asm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: add file output

Browse Source
This commit is contained in:
Zack Buhman 2023-08-23 22:56:54 +00:00
parent 37fe5d5f81
commit 0df0b66a6e
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
main.cpp
View File

@ -3,6 +3,7 @@
#include <string>
#include <optional>
#include <bitset>
#include <sstream>
#include "lexer.hpp"
#include "token.hpp"
@ -17,7 +18,18 @@ bool had_error = false;
}
static void run(std::string source)
static void write(std::ostream& os, uint32_t v)
{
const char out[4] = {
static_cast<char>((v >> 24) & 0xff),
static_cast<char>((v >> 16) & 0xff),
static_cast<char>((v >> 8 ) & 0xff),
static_cast<char>((v >> 0 ) & 0xff),
};
os.write(out, 4);
}
static void run(std::ostream& os, std::string source)
{
using namespace dsp;
@ -41,6 +53,7 @@ static void run(std::string source)
uint32_t output = (*stmt_o)->accept(&emitter);
if (output != 0xffff'ffff) {
std::cout << std::bitset<32>(output) << std::endl;
write(os, output);
}
}
}
@ -51,16 +64,17 @@ static void run_prompt()
std::string line;
std::cout << prompt << std::flush;
while (std::getline(std::cin, line)) {
run(line);
std::ostringstream os;
run(os, line);
std::cout << prompt << std::flush;
}
}
static int run_file(char const * const filename)
static int run_file(char const * const input_filename, char const * const output_filename)
{
std::ifstream is {filename, std::ios::binary | std::ios::ate};
std::ifstream is {input_filename, std::ios::binary | std::ios::ate};
if (!is.is_open()) {
std::cerr << "failed to open " << filename << std::endl;
std::cerr << "failed to open " << input_filename << std::endl;
return -1;
}
const std::streampos size = is.tellg();
@ -70,7 +84,19 @@ static int run_file(char const * const filename)
std::cerr << "read failed" << std::endl;
return -1;
}
run(buf);
std::ostringstream os;
run(os, buf);
if (!dsp::had_error) {
std::ofstream ofs {output_filename, std::ios::binary | std::ios::trunc};
if (!ofs.is_open()) {
std::cerr << "failed to open " << output_filename << std::endl;
return -1;
}
ofs << os.str();
}
return dsp::had_error;
}
@ -78,9 +104,9 @@ int main(const int argc, char const * const argv[])
{
switch (argc) {
case 1: run_prompt(); return dsp::had_error;
case 2: return run_file(argv[1]);
case 3: return run_file(argv[1], argv[2]);
default:
std::cerr << "Usage: " << argv[0] << " [filename]" << std::endl;
std::cerr << "Usage: " << argv[0] << " [input-filename output-filename]" << std::endl;
return -1;
}
}

10
stmt.hpp
View File

@ -234,9 +234,9 @@ struct mov_imm_d1_t : op_t, stmt_accept_t<mov_imm_d1_t>
const uimm_t<8> imm;
const d1_dest_t dest;
uint32_t mask() const { return op_mask(0b11'1111'1111'1111 << 0 ); }
uint32_t code() const { return op_code(0b01'0000'0000'0000 << 14); }
uint32_t bits() const { return d1_dest_bits(dest); }
uint32_t mask() const { return op_mask(0b11'1111'1111'1111 << 0); }
uint32_t code() const { return op_code(0b01'0000'0000'0000 << 0); }
uint32_t bits() const { return d1_dest_bits(dest); }
};
struct mov_ram_d1_t : op_t, stmt_accept_t<mov_ram_d1_t>
@ -247,8 +247,8 @@ struct mov_ram_d1_t : op_t, stmt_accept_t<mov_ram_d1_t>
const d1_src_t src;
const d1_dest_t dest;
uint32_t mask() const { return op_mask(0b11'1111'0000'1111 << 0 ); }
uint32_t code() const { return op_code(0b11'0000'0000'0000 << 14); }
uint32_t mask() const { return op_mask(0b11'1111'0000'1111 << 0); }
uint32_t code() const { return op_code(0b11'0000'0000'0000 << 0); }
uint32_t bits() const { return d1_dest_bits(dest) | d1_src_bits(src); }
};