diff --git a/include/r8asm/r8asm_core.hh b/include/r8asm/r8asm_core.hh index 5211850..b5b23e1 100644 --- a/include/r8asm/r8asm_core.hh +++ b/include/r8asm/r8asm_core.hh @@ -8,10 +8,10 @@ #include using r8asm_label = uint32_t; -using r8asm_cell_size = uint8_t; +using r8asm_cell = uint8_t; using r8asm_cell_offset = int32_t; -using r8asm_mem_size = uint32_t; -using r8asm_argc = r8asm_mem_size; +using r8asm_mem = uint32_t; +using r8asm_argc = r8asm_mem; using r8asm_data = int32_t; @@ -63,11 +63,11 @@ struct R8Instruction { extern std::map r8asm_labelmap; // TODO:sections support extern std::map r8asm_datamap; -extern r8asm_mem_size rot8_dataptr; +extern r8asm_mem rot8_dataptr; extern std::map r8asm_insmap; -extern r8asm_cell_size CELL_SIZE; +extern r8asm_cell CELL_SIZE; #define CELL_MAX (((uint64_t)1 << CELL_SIZE) - 1) #define ROL_STEP (CELL_SIZE - 1) diff --git a/src/r8asm_asm.cc b/src/r8asm_asm.cc index 223cfed..155481c 100644 --- a/src/r8asm_asm.cc +++ b/src/r8asm_asm.cc @@ -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 (r8asm_cell_size i = 0; i < CELL_SIZE; i++) { + for (r8asm_cell i = 0; i < CELL_SIZE; i++) { if ((real_arg & 1) == 1) tape.push_back(rot8_bytecode::FLB); tape.push_back(rot8_bytecode::ROR); diff --git a/src/r8asm_core.cc b/src/r8asm_core.cc index 699ebc4..236b1bb 100644 --- a/src/r8asm_core.cc +++ b/src/r8asm_core.cc @@ -1,6 +1,6 @@ #include "r8asm/r8asm_core.hh" -r8asm_cell_size CELL_SIZE = DEFAULT_CELL_SIZE; -r8asm_mem_size rot8_dataptr = 0; +r8asm_cell CELL_SIZE = DEFAULT_CELL_SIZE; +r8asm_mem rot8_dataptr = 0; std::map r8asm_labelmap = {{std::string("main"), 0}}; std::map r8asm_datamap = {