Merge pull request #274 from sysprog21/hotfix

Fix self-hosting compilation errors

Author: jserv

src/arch-lower.c

@@ -17,6 +17,10 @@
 void arm_lower(void)
 {
     for (func_t *func = FUNC_LIST.head; func; func = func->next) {
+        /* Skip function declarations without bodies */
+        if (!func->bbs)
+            continue;
+
         for (basic_block_t *bb = func->bbs; bb; bb = bb->rpo_next) {
             for (ph2_ir_t *insn = bb->ph2_ir_list.head; insn;
                  insn = insn->next) {
@@ -37,6 +41,10 @@ void arm_lower(void)
 void riscv_lower(void)
 {
     for (func_t *func = FUNC_LIST.head; func; func = func->next) {
+        /* Skip function declarations without bodies */
+        if (!func->bbs)
+            continue;
+
         for (basic_block_t *bb = func->bbs; bb; bb = bb->rpo_next) {
             for (ph2_ir_t *insn = bb->ph2_ir_list.head; insn;
                  insn = insn->next) {

src/arm-codegen.c

@@ -151,6 +151,10 @@ void cfg_flatten(void)
     elf_offset += 32; /* 6 insns for main call + 2 for exit */
 
     for (func = FUNC_LIST.head; func; func = func->next) {
+        /* Skip function declarations without bodies */
+        if (!func->bbs)
+            continue;
+
         /* reserve stack */
         ph2_ir_t *flatten_ir = add_ph2_ir(OP_define);
         flatten_ir->src0 = func->stack_size;

src/defs.h

@@ -25,7 +25,7 @@
 #define MAX_BB_DOM_SUCC 64
 #define MAX_BB_RDOM_SUCC 256
 #define MAX_GLOBAL_IR 256
-#define MAX_SOURCE 524288
+#define MAX_SOURCE 1048576
 #define MAX_CODE 262144
 #define MAX_DATA 262144
 #define MAX_SYMTAB 65536

src/globals.c

@@ -91,16 +91,19 @@ strbuf_t *SOURCE;
 hashmap_t *INCLUSION_MAP;
 
 /* ELF sections */
-strbuf_t *elf_code, *elf_data;
+strbuf_t *elf_code;
+strbuf_t *elf_data;
 strbuf_t *elf_rodata;
 strbuf_t *elf_header;
 strbuf_t *elf_symtab;
 strbuf_t *elf_strtab;
 strbuf_t *elf_section;
 int elf_header_len = 0x54; /* ELF fixed: 0x34 + 1 * 0x20 */
-int elf_code_start, elf_data_start;
+int elf_code_start;
+int elf_data_start;
 int elf_rodata_start;
-int elf_bss_start, elf_bss_size;
+int elf_bss_start;
+int elf_bss_size;
 
 /* Create a new arena block with given capacity.
  * @capacity: The capacity of the arena block. Must be positive.
@@ -347,7 +350,8 @@ bb_traversal_args_t *arena_alloc_traversal_args(void)
 
 void arena_free(arena_t *arena)
 {
-    arena_block_t *block = arena->head, *next;
+    arena_block_t *block = arena->head;
+    arena_block_t *next;
 
     while (block) {
         next = block->next;
@@ -472,7 +476,9 @@ void hashmap_rehash(hashmap_t *map)
     }
 
     for (int i = 0; i < old_cap; i++) {
-        hashmap_node_t *cur = old_buckets[i], *next, *target_cur;
+        hashmap_node_t *cur = old_buckets[i];
+        hashmap_node_t *next;
+        hashmap_node_t *target_cur;
 
         while (cur) {
             next = cur->next;
@@ -1649,6 +1655,10 @@ void dump_insn(void)
     printf("==<START OF INSN DUMP>==\n");
 
     for (func_t *func = FUNC_LIST.head; func; func = func->next) {
+        /* Skip function declarations without bodies */
+        if (!func->bbs)
+            continue;
+
         bool at_func_start = true;
 
         printf("def %s", func->return_def.type->type_name);

src/main.c

@@ -49,7 +49,8 @@
 int main(int argc, char *argv[])
 {
     bool libc = true;
-    char *out = NULL, *in = NULL;
+    char *out = NULL;
+    char *in = NULL;
 
     for (int i = 1; i < argc; i++) {
         if (!strcmp(argv[i], "--dump-ir"))

src/peephole.c

@@ -878,6 +878,10 @@ bool triple_pattern_optimization(ph2_ir_t *ph2_ir)
 void peephole(void)
 {
     for (func_t *func = FUNC_LIST.head; func; func = func->next) {
+        /* Skip function declarations without bodies */
+        if (!func->bbs)
+            continue;
+
         /* Local peephole optimizations on post-register-allocation IR */
         for (basic_block_t *bb = func->bbs; bb; bb = bb->rpo_next) {
             for (ph2_ir_t *ir = bb->ph2_ir_list.head; ir; ir = ir->next) {

src/reg-alloc.c

@@ -521,6 +521,10 @@ void reg_alloc(void)
     }
 
     for (func_t *func = FUNC_LIST.head; func; func = func->next) {
+        /* Skip function declarations without bodies */
+        if (!func->bbs)
+            continue;
+
         func->visited++;
 
         if (!strcmp(func->return_def.var_name, "main"))

src/riscv-codegen.c

@@ -127,6 +127,10 @@ void cfg_flatten(void)
     elf_offset += 24;
 
     for (func = FUNC_LIST.head; func; func = func->next) {
+        /* Skip function declarations without bodies */
+        if (!func->bbs)
+            continue;
+
         /* reserve stack */
         ph2_ir_t *flatten_ir = add_ph2_ir(OP_define);
         flatten_ir->src0 = func->stack_size;