birth-software/bloat-buster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #46 from birth-software/remove-warnings

Browse Source 
Remove warnings
This commit is contained in:
David 2024-09-05 21:38:22 +02:00 committed by GitHub
commit e9fd6efe50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 113 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
build/ build/
nest/ nest/
*.data *.data
perf.data*
project project
project.dSYM/ project.dSYM/

84
bootstrap/lib.h
View File

@ -50,13 +50,13 @@ typedef u32 Hash32;
typedef u64 Hash64; typedef u64 Hash64;
#define FOR_N(it, start, end) \ #define FOR_N(it, start, end) \
for (ptrdiff_t it = (start), end__ = (end); it < end__; ++it) for (u32 it = (start), end__ = (end); it < end__; ++it)
#define FOR_REV_N(it, start, end) \ #define FOR_REV_N(it, start, end) \
for (ptrdiff_t it = (end), start__ = (start); (it--) > start__;) for (u32 it = (end), start__ = (start); (it--) > start__;)
#define FOR_BIT(it, start, bits) \ #define FOR_BIT(it, start, bits) \
for (uint64_t _bits_ = (bits), it = (start); _bits_; _bits_ >>= 1, ++it) if (_bits_ & 1) for (typeof(bits) _bits_ = (bits), it = (start); _bits_; _bits_ >>= 1, ++it) if (_bits_ & 1)
#define FOREACH_SET(it, set) \ #define FOREACH_SET(it, set) \
FOR_N(_i, 0, ((set)->arr.capacity + 63) / 64) FOR_BIT(it, _i*64, (set)->arr.pointer[_i]) FOR_N(_i, 0, ((set)->arr.capacity + 63) / 64) FOR_BIT(it, _i*64, (set)->arr.pointer[_i])
@ -112,6 +112,9 @@ may_be_unused fn u16 cast_u32_to_u16(u32 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (u16)source; auto result = (u16)source;
return result; return result;
@ -125,6 +128,9 @@ may_be_unused fn s16 cast_u32_to_s16(u32 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (s16)source; auto result = (s16)source;
return result; return result;
@ -138,6 +144,9 @@ may_be_unused fn s32 cast_u32_to_s32(u32 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (s32)source; auto result = (s32)source;
return result; return result;
@ -151,6 +160,9 @@ may_be_unused fn u8 cast_u64_to_u8(u64 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (u8)source; auto result = (u8)source;
return result; return result;
@ -164,6 +176,9 @@ may_be_unused fn u16 cast_u64_to_u16(u64 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (u16)source; auto result = (u16)source;
return result; return result;
@ -177,6 +192,9 @@ may_be_unused fn u32 cast_u64_to_u32(u64 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (u32)source; auto result = (u32)source;
return result; return result;
@ -190,6 +208,9 @@ may_be_unused fn s32 cast_u64_to_s32(u64 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (s32)source; auto result = (s32)source;
return result; return result;
@ -203,6 +224,9 @@ may_be_unused fn s64 cast_u64_to_s64(u64 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (s64)source; auto result = (s64)source;
return result; return result;
@ -221,6 +245,9 @@ may_be_unused fn u8 cast_s32_to_u8(s32 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (u8)source; auto result = (u8)source;
return result; return result;
@ -239,6 +266,9 @@ may_be_unused fn u16 cast_s32_to_u16(s32 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (u16)source; auto result = (u16)source;
return result; return result;
@ -252,6 +282,9 @@ may_be_unused fn u32 cast_s32_to_u32(s32 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (u32)source; auto result = (u32)source;
return result; return result;
@ -265,11 +298,35 @@ may_be_unused fn u64 cast_s32_to_u64(s32 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (u64)source; auto result = (u64)source;
return result; return result;
} }
may_be_unused fn s16 cast_s32_to_s16(s32 source, const char* name, int line)
{
#if _DEBUG
if (source > INT16_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
}
if (source < INT16_MIN)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
}
#else
unused(name);
unused(line);
#endif
auto result = (s16)source;
return result;
}
may_be_unused fn u16 cast_s64_to_u16(s64 source, const char* name, int line) may_be_unused fn u16 cast_s64_to_u16(s64 source, const char* name, int line)
{ {
#if _DEBUG #if _DEBUG
@ -283,6 +340,9 @@ may_be_unused fn u16 cast_s64_to_u16(s64 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (u16)source; auto result = (u16)source;
return result; return result;
@ -296,6 +356,9 @@ may_be_unused fn u32 cast_s64_to_u32(s64 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (u32)source; auto result = (u32)source;
return result; return result;
@ -309,6 +372,9 @@ may_be_unused fn u64 cast_s64_to_u64(s64 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (u64)source; auto result = (u64)source;
return result; return result;
@ -328,6 +394,9 @@ may_be_unused fn s32 cast_s64_to_s32(s64 source, const char* name, int line)
print("Cast failed at {cstr}:{u32}\n", name, line); print("Cast failed at {cstr}:{u32}\n", name, line);
trap(); trap();
} }
#else
unused(name);
unused(line);
#endif #endif
auto result = (s32)source; auto result = (s32)source;
return result; return result;
@ -406,7 +475,7 @@ may_be_unused fn u64 round_up_to_next_power_of_2(u64 n)
may_be_unused fn u64 absolute_int(s64 n) may_be_unused fn u64 absolute_int(s64 n)
{ {
return n < 0 ? -n : n; return n < 0 ? cast(u64, s64, -n) : cast(u64, s64, n);
} }
#if LINK_LIBC == 0 #if LINK_LIBC == 0
@ -433,12 +502,12 @@ void* memmove(void* const dst, const void* const src, u64 n)
if (from == to || n == 0) if (from == to || n == 0)
return dst; return dst;
if (to > from && to-from < (int)n) { if (to > from && to-from < (s64)n) {
/* to overlaps with from */ /* to overlaps with from */
/* <from......> */ /* <from......> */
/* <to........> */ /* <to........> */
/* copy in reverse, to avoid overwriting from */ /* copy in reverse, to avoid overwriting from */
int i; u64 i;
for(i=n-1; i>=0; i--) for(i=n-1; i>=0; i--)
to[i] = from[i]; to[i] = from[i];
return dst; return dst;
@ -448,7 +517,7 @@ void* memmove(void* const dst, const void* const src, u64 n)
/* <from......> */ /* <from......> */
/* <to........> */ /* <to........> */
/* copy forwards, to avoid overwriting from */ /* copy forwards, to avoid overwriting from */
size_t i; u64 i;
for(i=0; i<n; i++) for(i=0; i<n; i++)
to[i] = from[i]; to[i] = from[i];
return dst; return dst;
@ -2671,6 +2740,7 @@ typedef struct StructName StructName
decl_vb(u8); decl_vb(u8);
decl_vbp(u8); decl_vbp(u8);
decl_vb(s32); decl_vb(s32);
decl_vb(u32);
fn void vb_generic_ensure_capacity(VirtualBuffer(u8)* vb, u32 item_size, u32 item_count) fn void vb_generic_ensure_capacity(VirtualBuffer(u8)* vb, u32 item_size, u32 item_count)
{ {

66
bootstrap/main.c
View File

@ -7171,7 +7171,7 @@ fn RegisterMaskIndex register_mask_meet(Thread* thread, RegisterMaskIndex a_inde
auto* a = thread_register_mask_get(thread, a_index); auto* a = thread_register_mask_get(thread, a_index);
auto* b = thread_register_mask_get(thread, b_index); auto* b = thread_register_mask_get(thread, b_index);
u64 may_spill = a->may_spill && b->may_spill; u32 may_spill = a->may_spill && b->may_spill;
if (!may_spill && a->class != b->class) if (!may_spill && a->class != b->class)
{ {
return empty_register_mask; return empty_register_mask;
@ -7225,6 +7225,8 @@ fn u8 interfere_in_block(Thread* thread, VirtualBuffer(BasicBlockIndex) schedule
other = right; other = right;
} }
unused(other);
block_index = scheduled.pointer[geti(phi)]; block_index = scheduled.pointer[geti(phi)];
block = &bb.pointer[geti(block_index)]; block = &bb.pointer[geti(block_index)];
if (bitset_get(&block->live_out, geti(phi))) if (bitset_get(&block->live_out, geti(phi)))
@ -7338,7 +7340,7 @@ fn u8 can_remat(Thread* thread, NodeIndex node_index)
} }
} }
fn f32 get_spill_cost(Thread* thread, VirtualRegister* virtual_register) may_be_unused fn f32 get_spill_cost(Thread* thread, VirtualRegister* virtual_register)
{ {
auto spill_cost = virtual_register->spill_cost; auto spill_cost = virtual_register->spill_cost;
if (__builtin_isnan(spill_cost)) if (__builtin_isnan(spill_cost))
@ -7548,7 +7550,7 @@ fn String gpr_to_string(GPR gpr)
} }
} }
fn u8 register_allocate(Thread* thread, VirtualBuffer(VirtualRegister) virtual_registers, VirtualBuffer(s32)* spills, Bitset* active, Bitset* future_active, VirtualBuffer(BasicBlockIndex) scheduled, VirtualBuffer(BasicBlock) bb, Slice(s32) order, u32 virtual_register_id, u32 in_use) fn u8 register_allocate(Thread* thread, VirtualBuffer(VirtualRegister) virtual_registers, VirtualBuffer(u32)* spills, Bitset* active, Bitset* future_active, VirtualBuffer(BasicBlockIndex) scheduled, VirtualBuffer(BasicBlock) bb, Slice(s32) order, u32 virtual_register_id, u32 in_use)
{ {
if (bitset_get(future_active, virtual_register_id)) if (bitset_get(future_active, virtual_register_id))
{ {
@ -7589,7 +7591,7 @@ fn u8 register_allocate(Thread* thread, VirtualBuffer(VirtualRegister) virtual_r
{ {
print("Interfere with active: {u32}\n", (s32)other->assigned); print("Interfere with active: {u32}\n", (s32)other->assigned);
in_use |= ((u32)1 << other->assigned); in_use |= ((u32)1 << other->assigned);
*vb_add(spills, 1) = i; *vb_add(spills, 1) = cast(u32, u64, i);
} }
} }
@ -7635,8 +7637,8 @@ fn u8 register_allocate(Thread* thread, VirtualBuffer(VirtualRegister) virtual_r
} }
else else
{ {
virtual_register->assigned = __builtin_ffsll(~in_use) - 1; virtual_register->assigned = cast(s16, s32, __builtin_ffsll(~in_use) - 1);
print("Register assigned: {s}\n", gpr_to_string(virtual_register->assigned)); print("Register assigned: {s}\n", gpr_to_string((GPR)virtual_register->assigned));
} }
bitset_set_value(active, virtual_register_id, 1); bitset_set_value(active, virtual_register_id, 1);
@ -7671,7 +7673,7 @@ struct MachineOperand
}; };
typedef struct MachineOperand MachineOperand; typedef struct MachineOperand MachineOperand;
fn MachineOperand operand_from_node(Thread* thread, VirtualBuffer(VirtualRegister) virtual_registers, u32* virtual_register_map, NodeIndex node_index) fn MachineOperand operand_from_node(VirtualBuffer(VirtualRegister) virtual_registers, u32* virtual_register_map, NodeIndex node_index)
{ {
assert(validi(node_index)); assert(validi(node_index));
auto virtual_register_id = virtual_register_map[geti(node_index)]; auto virtual_register_id = virtual_register_map[geti(node_index)];
@ -7833,7 +7835,7 @@ struct CodegenOptions
}; };
typedef struct CodegenOptions CodegenOptions; typedef struct CodegenOptions CodegenOptions;
fn BasicBlockIndex cfg_get_predicate_basic_block(Thread* restrict thread, CFGBuilder* restrict builder, FixedBlockMap* map, NodeIndex arg_node_index, u16 i) fn BasicBlockIndex cfg_get_predicate_basic_block(Thread* restrict thread, FixedBlockMap* map, NodeIndex arg_node_index, u16 i)
{ {
auto* arg_node = thread_node_get(thread, arg_node_index); auto* arg_node = thread_node_get(thread, arg_node_index);
auto arg_inputs = node_get_inputs(thread, arg_node); auto arg_inputs = node_get_inputs(thread, arg_node);
@ -7869,7 +7871,7 @@ fn void cfg_build(CFGBuilder* restrict builder, Thread* restrict thread, Functio
{ {
thread_worklist_push(thread, builder->worker, function->root); thread_worklist_push(thread, builder->worker, function->root);
for (u64 i = 0; i < thread_worklist_length(thread, builder->worker); i += 1) for (u32 i = 0; i < thread_worklist_length(thread, builder->worker); i += 1)
{ {
NodeIndex node_index = thread_worklist_get(thread, builder->worker, i); NodeIndex node_index = thread_worklist_get(thread, builder->worker, i);
Node* node = thread_node_get(thread, node_index); Node* node = thread_node_get(thread, node_index);
@ -8034,7 +8036,7 @@ fn void cfg_build(CFGBuilder* restrict builder, Thread* restrict thread, Functio
for (u32 i = 1; i < block_count; i += 1) for (u32 i = 1; i < block_count; i += 1)
{ {
auto basic_block_index = Index(BasicBlock, i); // auto basic_block_index = Index(BasicBlock, i);
auto* basic_block = &blocks[i]; auto* basic_block = &blocks[i];
auto new_immediate_dominator_index = invalidi(BasicBlock); auto new_immediate_dominator_index = invalidi(BasicBlock);
@ -8042,11 +8044,11 @@ fn void cfg_build(CFGBuilder* restrict builder, Thread* restrict thread, Functio
auto start_index = basic_block->start; auto start_index = basic_block->start;
auto* start_node = thread_node_get(thread, start_index); auto* start_node = thread_node_get(thread, start_index);
auto start_inputs = node_get_inputs(thread, start_node); // auto start_inputs = node_get_inputs(thread, start_node);
for (u16 j = 0; j < start_node->input_count; j += 1) for (u16 j = 0; j < start_node->input_count; j += 1)
{ {
auto predecessor_basic_block_index = cfg_get_predicate_basic_block(thread, builder, &builder->block_map, start_index, j); auto predecessor_basic_block_index = cfg_get_predicate_basic_block(thread, &builder->block_map, start_index, j);
if (validi(predecessor_basic_block_index)) if (validi(predecessor_basic_block_index))
{ {
auto* predecessor_basic_block = &blocks[geti(predecessor_basic_block_index)]; auto* predecessor_basic_block = &blocks[geti(predecessor_basic_block_index)];
@ -8315,7 +8317,7 @@ fn void cfg_global_schedule(CFGBuilder* restrict builder, Thread* restrict threa
} }
// Late schedule // Late schedule
for (u64 i = thread_worklist_length(thread, builder->worker); i > 0; i -= 1) for (u32 i = thread_worklist_length(thread, builder->worker); i > 0; i -= 1)
{ {
auto node_index = thread_worklist_get(thread, builder->worker, i - 1); auto node_index = thread_worklist_get(thread, builder->worker, i - 1);
auto* node = thread_node_get(thread, node_index); auto* node = thread_node_get(thread, node_index);
@ -8561,7 +8563,7 @@ fn void code_generation(Thread* restrict thread, CodegenOptions options, char**
u32 max_ins = 0; u32 max_ins = 0;
u32 virtual_register_count = 1; u32 virtual_register_count = 1;
auto* virtual_register_map = arena_allocate(thread->arena, u32, round_up_to_next_power_of_2( node_count + 16)); auto* virtual_register_map = arena_allocate(thread->arena, u32, round_up_to_next_power_of_2( node_count + 16));
VirtualBuffer(s32) spills = {}; VirtualBuffer(u32) spills = {};
for (u32 i = 0; i < builder->basic_blocks.length; i += 1) for (u32 i = 0; i < builder->basic_blocks.length; i += 1)
{ {
@ -8689,7 +8691,7 @@ fn void code_generation(Thread* restrict thread, CodegenOptions options, char**
auto mask = register_mask_intern(thread, (RegisterMask) { auto mask = register_mask_intern(thread, (RegisterMask) {
.class = class, .class = class,
.may_spill = 0, .may_spill = 0,
.mask = class == 0 ? i : ((u64)1 << i), .mask = class == 0 ? i : ((u32)1 << i),
}); });
*vb_add(&virtual_registers, 1) = (VirtualRegister) { *vb_add(&virtual_registers, 1) = (VirtualRegister) {
@ -8760,7 +8762,7 @@ fn void code_generation(Thread* restrict thread, CodegenOptions options, char**
if (fixed >= 0) if (fixed >= 0)
{ {
auto fixed_mask = ((u32)1 << fixed); // auto fixed_mask = ((u32)1 << fixed);
auto shared_edge = node_to_address(thread, input_index); auto shared_edge = node_to_address(thread, input_index);
if (shared_edge >= 0) if (shared_edge >= 0)
@ -8825,7 +8827,7 @@ fn void code_generation(Thread* restrict thread, CodegenOptions options, char**
assert(node->id == MACHINE_COPY); assert(node->id == MACHINE_COPY);
auto id = virtual_register_map[geti(node_index)]; auto id = virtual_register_map[geti(node_index)];
assert(id > 0); assert(id > 0);
auto mask_index = virtual_registers.pointer[id].mask; // auto mask_index = virtual_registers.pointer[id].mask;
auto inputs = node_get_inputs(thread, node); auto inputs = node_get_inputs(thread, node);
if (!interfere(thread, builder->scheduled, builder->basic_blocks, order, node_index, inputs.pointer[1])) if (!interfere(thread, builder->scheduled, builder->basic_blocks, order, node_index, inputs.pointer[1]))
@ -8887,7 +8889,7 @@ fn void code_generation(Thread* restrict thread, CodegenOptions options, char**
if (virtual_register_id > 0) if (virtual_register_id > 0)
{ {
auto* node = thread_node_get(thread, node_index); // auto* node = thread_node_get(thread, node_index);
auto mask_index = virtual_registers.pointer[virtual_register_id].mask; auto mask_index = virtual_registers.pointer[virtual_register_id].mask;
auto mask_pointer = thread_register_mask_get(thread, mask_index); auto mask_pointer = thread_register_mask_get(thread, mask_index);
@ -8931,6 +8933,7 @@ fn void code_generation(Thread* restrict thread, CodegenOptions options, char**
auto* other_basic_block = &builder->basic_blocks.pointer[k]; auto* other_basic_block = &builder->basic_blocks.pointer[k];
if (bitset_get(&other_basic_block->live_in, j)) if (bitset_get(&other_basic_block->live_in, j))
{ {
unused(pause);
todo(); todo();
} }
} }
@ -9080,7 +9083,7 @@ fn void code_generation(Thread* restrict thread, CodegenOptions options, char**
for (u32 i = 0; i < builder->basic_blocks.length; i += 1) for (u32 i = 0; i < builder->basic_blocks.length; i += 1)
{ {
auto* basic_block = &builder->basic_blocks.pointer[i]; auto* basic_block = &builder->basic_blocks.pointer[i];
auto basic_block_index = Index(BasicBlock, basic_block - builder->basic_blocks.pointer); auto basic_block_index = Index(BasicBlock, cast(u32, s64, basic_block - builder->basic_blocks.pointer));
auto first_node = thread_node_get(thread, basic_block->items.pointer[0]); auto first_node = thread_node_get(thread, basic_block->items.pointer[0]);
auto item_count = basic_block->items.length; auto item_count = basic_block->items.length;
u8 empty = 1; u8 empty = 1;
@ -9163,7 +9166,7 @@ fn void code_generation(Thread* restrict thread, CodegenOptions options, char**
auto* order = arena_allocate(thread->arena, s32, builder->basic_blocks.length); auto* order = arena_allocate(thread->arena, s32, builder->basic_blocks.length);
u32 order_index = 0; u32 order_index = 0;
for (u32 i = 0; i < builder->basic_blocks.length; i += 1) for (s32 i = 0; i < cast(s32, u32, builder->basic_blocks.length); i += 1)
{ {
auto* basic_block = &builder->basic_blocks.pointer[i]; auto* basic_block = &builder->basic_blocks.pointer[i];
if (basic_block->forward == i) if (basic_block->forward == i)
@ -9177,7 +9180,7 @@ fn void code_generation(Thread* restrict thread, CodegenOptions options, char**
} }
} }
for (u32 i = 0; i < builder->basic_blocks.length; i += 1) for (s32 i = 0; i < cast(s32, u32, builder->basic_blocks.length); i += 1)
{ {
auto* basic_block = &builder->basic_blocks.pointer[i]; auto* basic_block = &builder->basic_blocks.pointer[i];
if (basic_block->forward == i) if (basic_block->forward == i)
@ -9203,8 +9206,8 @@ fn void code_generation(Thread* restrict thread, CodegenOptions options, char**
{ {
auto node_index = basic_block->items.pointer[i]; auto node_index = basic_block->items.pointer[i];
auto* node = thread_node_get(thread, node_index); auto* node = thread_node_get(thread, node_index);
auto virtual_register_id = virtual_register_map[geti(node_index)]; // auto virtual_register_id = virtual_register_map[geti(node_index)];
auto* virtual_register = &virtual_registers.pointer[virtual_register_id]; // auto* virtual_register = &virtual_registers.pointer[virtual_register_id];
auto inputs = node_get_inputs(thread, node); auto inputs = node_get_inputs(thread, node);
auto fallthrough = INT32_MAX; auto fallthrough = INT32_MAX;
@ -9222,7 +9225,7 @@ fn void code_generation(Thread* restrict thread, CodegenOptions options, char**
case IR_INTEGER_CONSTANT: case IR_INTEGER_CONSTANT:
{ {
auto value = node->integer_constant.unsigned_value; auto value = node->integer_constant.unsigned_value;
GPR gpr = machine_operand_at(virtual_register_map, virtual_registers, node_index, REGISTER_CLASS_X86_64_GPR); auto gpr = (GPR)machine_operand_at(virtual_register_map, virtual_registers, node_index, REGISTER_CLASS_X86_64_GPR);
auto backend_type = type_pair_get_backend(node->type); auto backend_type = type_pair_get_backend(node->type);
if (backend_type == BACKEND_TYPE_INTEGER_32) if (backend_type == BACKEND_TYPE_INTEGER_32)
@ -9247,8 +9250,8 @@ fn void code_generation(Thread* restrict thread, CodegenOptions options, char**
} break; } break;
case MACHINE_MOVE: case MACHINE_MOVE:
{ {
auto destination = operand_from_node(thread, virtual_registers, virtual_register_map, node_index); auto destination = operand_from_node(virtual_registers, virtual_register_map, node_index);
auto source = operand_from_node(thread, virtual_registers, virtual_register_map, inputs.pointer[1]); auto source = operand_from_node(virtual_registers, virtual_register_map, inputs.pointer[1]);
if (!operand_equal(destination, source)) if (!operand_equal(destination, source))
{ {
todo(); todo();
@ -9355,7 +9358,7 @@ struct SchedPhi
typedef struct SchedPhi SchedPhi; typedef struct SchedPhi SchedPhi;
decl_vb(SchedPhi); decl_vb(SchedPhi);
fn void fill_phis(Thread* restrict thread, CFGBuilder* restrict builder, Function* restrict function, VirtualBuffer(SchedPhi)* sched_phis, Node* restrict successor_node, NodeIndex original_index) fn void fill_phis(Thread* restrict thread, VirtualBuffer(SchedPhi)* sched_phis, Node* restrict successor_node, NodeIndex original_index)
{ {
auto succesor_inputs = node_get_inputs(thread, successor_node); auto succesor_inputs = node_get_inputs(thread, successor_node);
u16 i; u16 i;
@ -9420,7 +9423,7 @@ fn void greedy_scheduler(Thread* restrict thread, CFGBuilder* restrict builder,
auto* successor_node = thread_node_get(thread, successor_index); auto* successor_node = thread_node_get(thread, successor_index);
if (successor_node->id == IR_REGION) if (successor_node->id == IR_REGION)
{ {
fill_phis(thread, builder, function, &phis, successor_node, end_index); fill_phis(thread, &phis, successor_node, end_index);
} }
} }
@ -9548,8 +9551,9 @@ fn void greedy_scheduler(Thread* restrict thread, CFGBuilder* restrict builder,
} }
} }
fn void print_reference_to_node(Thread* restrict thread, CFGBuilder* restrict builder, Function* restrict function, NodeIndex node_index, u8 def) fn void print_reference_to_node(Thread* restrict thread, NodeIndex node_index, u8 def)
{ {
unused(def);
auto* restrict node = thread_node_get(thread, node_index); auto* restrict node = thread_node_get(thread, node_index);
print("[#{u32} ({s})", geti(node_index), node_id_to_string(node->id)); print("[#{u32} ({s})", geti(node_index), node_id_to_string(node->id));
@ -9587,7 +9591,7 @@ fn void print_reference_to_node(Thread* restrict thread, CFGBuilder* restrict bu
fn void print_basic_block(Thread* restrict thread, CFGBuilder* restrict builder, Function* restrict function, BasicBlockIndex basic_block_index) fn void print_basic_block(Thread* restrict thread, CFGBuilder* restrict builder, Function* restrict function, BasicBlockIndex basic_block_index)
{ {
auto* restrict basic_block = &builder->basic_blocks.pointer[geti(basic_block_index)]; auto* restrict basic_block = &builder->basic_blocks.pointer[geti(basic_block_index)];
print_reference_to_node(thread, builder, function, basic_block->start, 1); print_reference_to_node(thread, basic_block->start, 1);
print("\n"); print("\n");
greedy_scheduler(thread, builder, function, basic_block_index); greedy_scheduler(thread, builder, function, basic_block_index);
@ -9638,7 +9642,7 @@ fn void print_basic_block(Thread* restrict thread, CFGBuilder* restrict builder,
{ {
print(", "); print(", ");
} }
print_reference_to_node(thread, builder, function, inputs.pointer[i], 0); print_reference_to_node(thread, inputs.pointer[i], 0);
} }
} }
else else