diff --git a/include/r8asm/r8asm_core.hh b/include/r8asm/r8asm_core.hh index dac8b95..3c7dc07 100644 --- a/include/r8asm/r8asm_core.hh +++ b/include/r8asm/r8asm_core.hh @@ -7,12 +7,13 @@ #include #include -typedef uint32_t r8asm_label; -typedef int32_t r8asm_data; -typedef uint8_t cell_size_type; -typedef int32_t cell_offset_type; -typedef uint32_t mem_size_type; -typedef uint32_t argc_type; +using r8asm_label = uint32_t; +using r8asm_cell_size = uint8_t; +using r8asm_cell_offset = int32_t; +using r8asm_mem_size = uint32_t; +using r8asm_argc = r8asm_mem_size; + +using r8asm_data = int32_t; #define ROT8_BC_TO_CHAR(bc) ("><+-[].,"[static_cast(bc)]) @@ -59,16 +60,16 @@ struct R8Instruction { R8Operand formal_para; }; -extern std::map labels; -extern std::map datas; -extern mem_size_type dataptr; +extern std::map + r8asm_labelmap; // TODO:sections support +extern std::map r8asm_datamap; +extern r8asm_mem_size rot8_dataptr; extern std::map r8asm_insmap; -extern cell_size_type CELL_SIZE; +extern r8asm_cell_size CELL_SIZE; #define CELL_MAX (((uint64_t)1 << CELL_SIZE) - 1) -// #define DEFAULT_cell_SIZE (sizeof(cell_size_type) * 8) #define DEFAULT_CELL_SIZE 8 // Just for test. #define DEFAULT_CELL_MAX (((uint64_t)1 << DEFAULT_CELL_SIZE) - 1) diff --git a/include/r8asm/r8asm_macro.hh b/include/r8asm/r8asm_macro.hh index 7876198..933d82e 100644 --- a/include/r8asm/r8asm_macro.hh +++ b/include/r8asm/r8asm_macro.hh @@ -4,14 +4,14 @@ #include "r8asm/r8asm_core.hh" #include struct R8Macro { - argc_type argc = 0; + r8asm_argc argc = 0; std::vector ins; }; extern std::map r8asm_macromap; -std::vector expand_single_macro(std::string macro_name, - std::vector argv); +std::vector +r8asm_expand_single_macro(std::string macro_name, std::vector argv); -std::vector expand_macros(std::vector ins); +std::vector r8asm_expand_macros(std::vector ins); #endif \ No newline at end of file diff --git a/include/r8asm/r8asm_parse.hh b/include/r8asm/r8asm_parse.hh index f5b7d2d..7d14913 100644 --- a/include/r8asm/r8asm_parse.hh +++ b/include/r8asm/r8asm_parse.hh @@ -20,7 +20,7 @@ struct R8Src { void preprocess_lines(); }; -R8Src read_src(std::string filename); +R8Src r8asm_read_src(std::string filename); std::vector r8asm_preprocess(R8Src &src); extern std::unordered_map r8asm_parsemap; diff --git a/src/r8asm_asm.cc b/src/r8asm_asm.cc index 535ccd9..223cfed 100644 --- a/src/r8asm_asm.cc +++ b/src/r8asm_asm.cc @@ -10,8 +10,8 @@ r8asm_data read_opr(R8Operand arg, { if (const std::string *operand = std::get_if(&arg)) { if ((*operand) == "$") - return dataptr; - return (datas[*operand]); + return rot8_dataptr; + return (r8asm_datamap[*operand]); } else if (const r8asm_data *operand = std::get_if(&arg)) return (*operand); return (default_opr); @@ -20,7 +20,7 @@ r8asm_data read_opr(R8Operand arg, void expand_xor(std::vector &tape, R8Operand arg) { r8asm_data real_arg = read_opr(arg); - for (cell_size_type i = 0; i < CELL_SIZE; i++) { + for (r8asm_cell_size i = 0; i < CELL_SIZE; i++) { if ((real_arg & 1) == 1) tape.push_back(rot8_bytecode::FLB); tape.push_back(rot8_bytecode::ROR); @@ -46,21 +46,22 @@ void expand_tp(std::vector &tape, R8Operand arg, bool count_offset = true) { r8asm_data opr = read_opr(arg); - cell_offset_type offset = (cell_offset_type)opr - (cell_offset_type)dataptr; + r8asm_cell_offset offset = + (r8asm_cell_offset)opr - (r8asm_cell_offset)rot8_dataptr; bool stepforward = (offset > 0); offset = abs(offset); - for (cell_offset_type i = 0; i < offset; i++) { + for (r8asm_cell_offset i = 0; i < offset; i++) { tape.push_back(stepforward ? rot8_bytecode::STP : rot8_bytecode::BTP); } if (count_offset) - dataptr = opr; + rot8_dataptr = opr; } void expand_anchor(std::vector &tape, R8Operand arg) { if (const std::string *name = std::get_if(&arg)) - datas.insert_or_assign(*name, dataptr); + r8asm_datamap.insert_or_assign(*name, rot8_dataptr); else if (const r8asm_data *name = std::get_if(&arg)) - datas.insert_or_assign(std::to_string(*name), dataptr); + r8asm_datamap.insert_or_assign(std::to_string(*name), rot8_dataptr); } void expand_bytecode(std::vector &tape, R8Operand arg, @@ -69,9 +70,9 @@ void expand_bytecode(std::vector &tape, R8Operand arg, for (r8asm_data i = 0; i < repeat; i++) { tape.push_back(op); if (op == rot8_bytecode::STP) - dataptr++; + rot8_dataptr++; else if (op == rot8_bytecode::BTP) - dataptr--; + rot8_dataptr--; } } diff --git a/src/r8asm_core.cc b/src/r8asm_core.cc index 1490423..c9a0a04 100644 --- a/src/r8asm_core.cc +++ b/src/r8asm_core.cc @@ -1,9 +1,9 @@ #include "r8asm/r8asm_core.hh" -cell_size_type CELL_SIZE = DEFAULT_CELL_SIZE; -mem_size_type dataptr = 0; +r8asm_cell_size CELL_SIZE = DEFAULT_CELL_SIZE; +r8asm_mem_size rot8_dataptr = 0; -std::map labels = {{std::string("main"), 0}}; -std::map datas = { +std::map r8asm_labelmap = {{std::string("main"), 0}}; +std::map r8asm_datamap = { {std::string("_CELL_MAX"), DEFAULT_CELL_MAX}, {std::string{"_CELL_SIZE"}, DEFAULT_CELL_SIZE}}; diff --git a/src/r8asm_macro.cc b/src/r8asm_macro.cc index 308473a..fc04991 100644 --- a/src/r8asm_macro.cc +++ b/src/r8asm_macro.cc @@ -5,7 +5,7 @@ std::map r8asm_macromap; R8Operand read_arg(std::vector &actual_args, R8Operand formal_para, - argc_type argc) { + r8asm_argc argc) { if (std::string *str = std::get_if(&formal_para)) { if ((*str) == "%0") return ((r8asm_data)argc); @@ -17,8 +17,8 @@ R8Operand read_arg(std::vector &actual_args, R8Operand formal_para, } std::vector -expand_single_macro(std::string macro_name, - std::vector actual_args) { +r8asm_expand_single_macro(std::string macro_name, + std::vector actual_args) { std::vector tmp_tape; R8Macro this_macro = r8asm_macromap[macro_name]; @@ -33,7 +33,7 @@ expand_single_macro(std::string macro_name, for (auto j : tmp_macro->actual_args) macro_args.push_back(read_arg(actual_args, j, this_macro.argc)); std::vector macro_body = - expand_single_macro(tmp_macro->name, macro_args); + r8asm_expand_single_macro(tmp_macro->name, macro_args); tmp_tape.insert(tmp_tape.end(), macro_body.begin(), macro_body.end()); } @@ -42,12 +42,12 @@ expand_single_macro(std::string macro_name, return (tmp_tape); } -std::vector expand_macros(std::vector ins) { +std::vector r8asm_expand_macros(std::vector ins) { std::vector tape; for (auto i : ins) { if (r8asm_macrocall *tmp_macro = std::get_if(&i.op)) { - std::vector tmp_tape = - (expand_single_macro(tmp_macro->name, tmp_macro->actual_args)); + std::vector tmp_tape = (r8asm_expand_single_macro( + tmp_macro->name, tmp_macro->actual_args)); tape.insert(tape.end(), tmp_tape.begin(), tmp_tape.end()); } else tape.push_back(i); diff --git a/src/r8asm_parse.cc b/src/r8asm_parse.cc index c7214fa..e9e3e7e 100644 --- a/src/r8asm_parse.cc +++ b/src/r8asm_parse.cc @@ -44,7 +44,7 @@ std::string r8asm_peel(std::string &str) { // Peel the first word from string. } } -R8Src read_src(std::string filename) { +R8Src r8asm_read_src(std::string filename) { R8Src src; std::ifstream ifile; @@ -82,8 +82,8 @@ R8Operand r8asm_arg_stoi(std::string raw_arg) { // TODO:expression evaluating r8asm_data arg = std::stoi(raw_arg); return (arg); } catch (std::invalid_argument) { - if (datas.find(raw_arg) != datas.end()) - return (datas[raw_arg]); + if (r8asm_datamap.find(raw_arg) != r8asm_datamap.end()) + return (r8asm_datamap[raw_arg]); return (raw_arg); } } @@ -111,11 +111,11 @@ void R8Src::preprocess_lines() { for (auto i = (this->raw_src).begin(); i != (this->raw_src).end();) { auto tmp_i = i; if ((*i)[0] == r8asm_parsemap[r8asm_parse::VAR]) { - datas.insert_or_assign( + r8asm_datamap.insert_or_assign( (*i)[1], std::get(r8asm_arg_stoi((*i)[2]))); i = this->raw_src.erase(i); } else if ((*i)[0] == r8asm_parsemap[r8asm_parse::INCLUDE]) { - tmp_src = read_src((*i)[1]); + tmp_src = r8asm_read_src((*i)[1]); tmp_src.preprocess_lines(); tmp_src.preprocess_blocks(); i = this->raw_src.erase(i); @@ -141,7 +141,7 @@ void R8Src::preprocess_blocks() { tmp_codeblock.push_back(r8asm_translate_single_ins(j)); if ((*i.first)[0] == r8asm_parsemap[r8asm_parse::MACRO]) { r8asm_macromap.insert_or_assign( - (*i.first)[1], R8Macro{(argc_type)std::get( + (*i.first)[1], R8Macro{(r8asm_argc)std::get( r8asm_arg_stoi((*i.first)[2])), tmp_codeblock}); } else if ((*i.first)[0] == r8asm_parsemap[r8asm_parse::REPEAT]) { diff --git a/tests/r8_test.cc b/tests/r8_test.cc index b284ca4..12dfb3e 100644 --- a/tests/r8_test.cc +++ b/tests/r8_test.cc @@ -4,8 +4,8 @@ int main(int argc, char *argv[]) { std::string src_filename = argv[1]; - auto src = read_src(src_filename.c_str()); - auto out_tape = r8asm_tape_out(expand_macros(r8asm_preprocess(src))); + auto src = r8asm_read_src(src_filename.c_str()); + auto out_tape = r8asm_tape_out(r8asm_expand_macros(r8asm_preprocess(src))); for (auto i : out_tape) std::cout << ROT8_BC_TO_CHAR(i); std::cout << std::endl;