Little fixes

Author: RealNeGate

common/new_hash_map.h

@@ -229,12 +229,10 @@ void* nl_hashset_put2(NL_HashSet* restrict hs, void* ptr, NL_HashFunc hash, NL_C
     size_t first = h & mask, i = first;
 
     do {
-        if (hs->data[i] == NULL) {
+        if (hs->data[i] == NULL || hs->data[i] == NL_HASHSET_TOMB) {
             hs->count++;
             hs->data[i] = ptr;
             return NULL;
-        } else if (hs->data[i] == NL_HASHSET_TOMB) {
-            // go past it
         } else if (hs->data[i] == ptr || cmp(hs->data[i], ptr)) {
             return hs->data[i];
         }

cuik_c/expr_fold.h

@@ -202,13 +202,13 @@ static ptrdiff_t const_eval_subexpr(Cuik_Parser* restrict parser, TokenStream* t
     // try binary operators
     if (s->op >= EXPR_PLUS && s->op <= EXPR_CMPLT) {
         Cuik_ConstVal rhs, lhs;
+        Cuik_Type* ty = types ? cuik_canonical_type(types[i]) : NULL;
 
         i = const_eval_subexpr(parser, tokens, types, exprs, i - 1, &rhs);
         if (i == CONST_ERROR) return i;
         i = const_eval_subexpr(parser, tokens, types, exprs, i, &lhs);
         if (i == CONST_ERROR) return i;
 
-        Cuik_Type* ty = types ? cuik_canonical_type(types[i]) : NULL;
         if (ty && cuik_type_is_float(ty)) {
             if (lhs.tag == CUIK_CONST_INT) { lhs.tag = CUIK_CONST_FLOAT; lhs.f = lhs.i; }
             if (rhs.tag == CUIK_CONST_INT) { rhs.tag = CUIK_CONST_FLOAT; rhs.f = rhs.i; }

meta/dsl.lua

@@ -30,15 +30,14 @@ local function lexer(str)
     local i = 1
     return function()
         -- skip whitespace
-        ::loop::
-        if ch_class[str:byte(i)] == "ws" then
-            i = i + 1
-            goto loop
-        elseif str:byte(i) == 35 then -- hash are comments
-            while str:byte(i) ~= 10 do
+        while ch_class[str:byte(i)] == "ws" or str:byte(i) == 35 do
+            if ch_class[str:byte(i)] == "ws" then
                 i = i + 1
+            elseif str:byte(i) == 35 then -- hash are comments
+                while str:byte(i) ~= 10 do
+                    i = i + 1
+                end
             end
-            goto loop
         end
 
         if i > #str then

tb/codegen.h

@@ -249,7 +249,6 @@ size_t tb__insert_before(Ctx* ctx, TB_Function* f, TB_Node* n, TB_Node* before_n
 size_t tb__insert_after(Ctx* ctx, TB_Function* f, TB_Node* n, TB_Node* before_n);
 VReg* tb__set_node_vreg(Ctx* ctx, TB_Node* n);
 int tb__reg_width_from_dt(int reg_class, TB_DataType dt);
-void rematerialize(Ctx* ctx, int* fixed_vregs, TB_Node* n, bool kill_node);
 
 static bool tb__reg_mask_less(Ctx* ctx, RegMask* a, RegMask* b) {
     return a == b ? false : tb__reg_mask_meet(ctx, a, b) != a;

tb/opt/optimizer.c

@@ -1393,6 +1393,8 @@ bool tb_opt(TB_Function* f, TB_Worklist* ws, bool preserve_types) {
             tb_compact_nodes(f, ws);
             size_t new = tb_arena_current_size(&f->arena);
             TB_OPTDEBUG(PASSES)(printf("    * Node GC: %.f KiB => %.f KiB\n", old / 1024.0, new / 1024.0));
+
+            tb_print_dumb(f);
         }
 
         // currently only rotating loops

tb/opt/peep_int.h

@@ -135,7 +135,7 @@ static Lattice* value_arith_raw(TB_Function* f, TB_NodeTypeEnum type, TB_DataTyp
             uint64_t u = amin & bmin & ~min;
             uint64_t v = ~(amax | bmax) & max;
             // just checking the sign bits
-            if ((u | v) & imin) {
+            if ((((u | v) >> (bits - 1)) & 1) != 0) {
                 overflow = true;
                 min = imin, max = imax;
             }
@@ -150,7 +150,7 @@ static Lattice* value_arith_raw(TB_Function* f, TB_NodeTypeEnum type, TB_DataTyp
             uint64_t u = ~(amin ^ bmax) | ~(amin ^ min);
             uint64_t v = ~(amax ^ bmin) | ~(amax ^ max);
 
-            if (((u & v) & imin) == 0) {
+            if ((((u & v) >> (bits - 1)) & 1) == 0) {
                 overflow = true;
                 min = imin, max = imax;
             }
@@ -182,7 +182,7 @@ static Lattice* value_arith_raw(TB_Function* f, TB_NodeTypeEnum type, TB_DataTyp
 
     if (n != NULL && !overflow) {
         // no signed overflow?
-        TB_NODE_GET_EXTRA_T(n, TB_NodeBinopInt)->ab |= TB_ARITHMATIC_NSW;
+        // TB_NODE_GET_EXTRA_T(n, TB_NodeBinopInt)->ab |= TB_ARITHMATIC_NSW;
     }
 
     // sign extend our integers now

tb/tb_internal.h

@@ -23,8 +23,8 @@
 ////////////////////////////////
 #define TB_OPTDEBUG_STATS     0
 #define TB_OPTDEBUG_PASSES    0
-#define TB_OPTDEBUG_PEEP      0
-#define TB_OPTDEBUG_SCCP      0
+#define TB_OPTDEBUG_PEEP      1
+#define TB_OPTDEBUG_SCCP      1
 #define TB_OPTDEBUG_LOOP      0
 #define TB_OPTDEBUG_SROA      0
 #define TB_OPTDEBUG_GCM       0