diff --git a/include/r8asm/r8asm.hh b/include/r8asm/r8asm.hh index b66d677..5fb05e4 100644 --- a/include/r8asm/r8asm.hh +++ b/include/r8asm/r8asm.hh @@ -8,7 +8,11 @@ #include #include -#define ROT8_BC_TO_CHAR(bc) ("><+-[].,"[static_cast(bc)]) +typedef uint32_t r8asm_label; +typedef uint32_t r8asm_data; +typedef uint32_t unit_size_type; + +#define ROT8_BC_TO_CHAR(bc) ("><+-[].,"[static_cast(bc)]) enum class rot8_bytecode { STP, BTP, ROR, FLB, BIZ, RNZ, OUT, INP }; enum class r8asm_macro { @@ -18,7 +22,7 @@ enum class r8asm_macro { XOR, }; -using R8Operand = std::variant; +using R8Operand = std::variant; using R8MetaOp = std::variant; struct R8Instruction { @@ -33,11 +37,13 @@ class R8Macro { std::vector r8asm_tape_out(std::span ops); -extern std::map labels; -extern std::map datas; +extern std::map labels; +extern std::map datas; extern std::map> macros; -extern uint8_t UNIT_SIZE; -#define UNIT_MAX ((1 << UNIT_SIZE) - 1) +extern unit_size_type UNIT_SIZE; +// #define DEFAULT_UNIT_SIZE (sizeof(unit_size_type) * 8) +#define DEFAULT_UNIT_SIZE 17 // Just for test. +#define UNIT_MAX (((uint64_t)1 << UNIT_SIZE) - 1) #endif \ No newline at end of file diff --git a/src/r8asm.cc b/src/r8asm.cc index 92ce36e..7a3e208 100644 --- a/src/r8asm.cc +++ b/src/r8asm.cc @@ -3,23 +3,24 @@ #include #include -uint8_t UNIT_SIZE = 8; +unit_size_type UNIT_SIZE = DEFAULT_UNIT_SIZE; -std::map labels = {{std::string("main"), 0}}; -std::map datas = {{std::string("_UNIT_MAX"), UNIT_MAX}}; +std::map labels = {{std::string("main"), 0}}; +std::map datas = { + {std::string("_UNIT_MAX"), UNIT_MAX}}; -int read_opr(R8Operand arg, int default_opr = 1) { +r8asm_data read_opr(R8Operand arg, r8asm_data default_opr = 1) { if (const std::string *operand = std::get_if(&arg)) return (datas[*operand]); - else if (const int *operand = std::get_if(&arg)) + else if (const r8asm_data *operand = std::get_if(&arg)) return (*operand); return (default_opr); } void expand_xor(std::vector &tape, R8Operand arg) { - int opr = read_opr(arg); + r8asm_data opr = read_opr(arg); - for (int i = 0; i < UNIT_SIZE; i++) { + for (unit_size_type i = 0; i < UNIT_SIZE; i++) { if ((opr & 1) == 1) tape.push_back(rot8_bytecode::FLB); tape.push_back(rot8_bytecode::ROR); opr >>= 1; @@ -27,7 +28,7 @@ void expand_xor(std::vector &tape, R8Operand arg) { } void expand_loop(std::vector &tape, R8Operand arg) { - int opr = read_opr(arg, UNIT_MAX); + r8asm_data opr = read_opr(arg, UNIT_MAX); tape.push_back(rot8_bytecode::STP); expand_xor(tape, opr); @@ -46,8 +47,8 @@ std::vector r8asm_tape_out(std::span ops) { std::vector tape; for (const auto it : ops) { if (const rot8_bytecode *bc = std::get_if(&it.op)) { - int repeat = read_opr(it.arg); - for (int i = 0; i < repeat; i++) tape.push_back(*bc); + r8asm_data repeat = read_opr(it.arg); + for (r8asm_data i = 0; i < repeat; i++) tape.push_back(*bc); } else if (const r8asm_macro *macro = std::get_if(&it.op)) switch (*macro) { case r8asm_macro::LOOP: