diff --git a/include/r8veritas.hh b/include/r8veritas.hh index 2a8eb19..0791034 100644 --- a/include/r8veritas.hh +++ b/include/r8veritas.hh @@ -1,24 +1,25 @@ #ifndef R8VERITAS #define R8VERITAS -#include #include #include -#include #include +#include #include #include #define CELL_SIZE 5 #define CELL_SIZE_BITWIDTH std::bit_width(unsigned(CELL_SIZE)) -#define INS_SIZE (1 + CELL_SIZE) -#define INS_BYTECODE_SIZE (1 + CELL_SIZE + CELL_SIZE_BITWIDTH) +#define INS_SIZE (CELL_SIZE + 1) +// mask and bytecode +#define INS_BYTECODE_SIZE (CELL_SIZE + 1 + CELL_SIZE_BITWIDTH) +// mask,bytecode and sacrifice namespace r8veritas { // using cell = std::bitset; -using cell = uint16_t; -using stat = std::array; +using cell = size_t; +using stat = std::array; using truthtable = std::pair; using op = std::function; using index = size_t; @@ -32,8 +33,8 @@ enum ins_opcode { using ins_body = std::bitset; using ins_bytecode = std::bitset; */ -using ins_body = uint16_t; -using ins_bytecode = uint16_t; +using ins_body = size_t; +using ins_bytecode = size_t; using ins = struct ins { r8veritas::ins_body bc; r8veritas::index sacrifice; @@ -42,6 +43,25 @@ using ins = struct ins { } }; +static const std::set all_ins = + []() -> std::set { + std::set s; + for (r8veritas::index sacrifice_it = 0; sacrifice_it < CELL_SIZE; + sacrifice_it++) { + for (r8veritas::index bc_it = 0; bc_it < (1 << INS_SIZE); bc_it++) { + auto tmp = bc_it & (~(1 << (sacrifice_it + 1))); + // sacrifice shouldn't be operated, + // which means that bit in bc's mask can't be 1. + // so here I forcely change it to 0, + // and use set to ensure it won't duplicate. + // for here's the initialization part,it's acceptable + s.insert({((!tmp) ? 1 : tmp), sacrifice_it}); + // both bc == 0b0 and bc == 0b1 mean erasing sacrifice,so here I skip 0b0 + } + } + return s; +}(); + } // namespace r8veritas inline r8veritas::stat generate_empty_stat() { @@ -69,8 +89,7 @@ template <> struct hash> { // Yep,magic again. size_t operator()(const pair &p) const { - size_t h = - hash{}(p.first) + 0x9e3779b9 + (h << 6) + (h >> 2); + size_t h = hash{}(p.first) + 0x9e3779b9; h ^= hash{}(p.second) + 0x9e3779b9 + (h << 6) + (h >> 2); return h; diff --git a/src/r8veritas.cc b/src/r8veritas.cc index 7722199..38201ac 100644 --- a/src/r8veritas.cc +++ b/src/r8veritas.cc @@ -41,7 +41,7 @@ r8veritas::stat operate_ins(const r8veritas::stat &last_stat, } } visited_stat.insert_or_assign(key, next_stat); - visited_op.insert_or_assign(next_stat, key); + visited_op.insert_or_assign(next_stat, std::move(key)); return (next_stat); } diff --git a/tests/r8_test.cc b/tests/r8_test.cc index 7ad2cb7..689e3e2 100644 --- a/tests/r8_test.cc +++ b/tests/r8_test.cc @@ -9,23 +9,9 @@ r8veritas::cell func_and(r8veritas::cell inp) { int main() { auto tab = generate_truthtable(func_and); - r8veritas::ins i = {0, 2}; - for (r8veritas::index i = 0; i < (1 << CELL_SIZE); i++) { - if (!(i % 4)) - std::cout << std::endl; - std::cout << std::bitset(tab.first[i]).to_string() << " "; + for (auto i : r8veritas::all_ins) { + std::cout << std::bitset(i.bc).to_string() << "," << i.sacrifice + << ";"; } - std::cout << std::endl; - r8veritas::ins ins = {0b010, 2}; - - tab.second = operate_ins(tab.first, ins); - tab.second = operate_ins(tab.first, ins); - - for (r8veritas::index i = 0; i < (1 << CELL_SIZE); i++) { - if (!(i % 4)) - std::cout << std::endl; - std::cout << std::bitset(tab.second[i]).to_string() << " "; - } - std::cout << std::endl; return (0); }