Refine the source_t structure and its functions for general use

Originally, source_t was defined as a structure to store the text of
source files, implemented as a dynamic array. However, these changes
rename this structure and its related functions to make them more
generic. They are no longer limited to storing source code but
suitable for any variable-length character data.

The structure is now renamed to strbuf_t, and can be used to create
growable buffers of characters.

Author: DrXiao

src/defs.h

@@ -351,7 +351,7 @@ typedef struct {
 
 typedef struct basic_block basic_block_t;
 
-/* Definition of a dynamic array structure for sources in src/globals.c
+/* Definition of a growable buffer for a mutable null-terminated string
  * size:     Current number of elements in the array
  * capacity: Number of elements that can be stored without resizing
  * elements: Pointer to the array of characters
@@ -360,7 +360,7 @@ typedef struct {
     int size;
     int capacity;
     char *elements;
-} source_t;
+} strbuf_t;
 
 /* phase-2 IR definition */
 struct ph2_ir {

src/globals.c

@@ -64,7 +64,7 @@ int elf_offset = 0;
 
 regfile_t REGS[REG_CNT];
 
-source_t *SOURCE;
+strbuf_t *SOURCE;
 
 hashmap_t *INCLUSION_MAP;
 
@@ -905,9 +905,9 @@ void add_insn(block_t *block,
     bb->insn_list.tail = n;
 }
 
-source_t *source_create(int init_capacity)
+strbuf_t *strbuf_create(int init_capacity)
 {
-    source_t *array = malloc(sizeof(source_t));
+    strbuf_t *array = malloc(sizeof(strbuf_t));
     if (!array)
         return NULL;
 
@@ -922,7 +922,7 @@ source_t *source_create(int init_capacity)
     return array;
 }
 
-bool source_extend(source_t *src, int len)
+bool strbuf_extend(strbuf_t *src, int len)
 {
     int new_size = src->size + len;
 
@@ -947,9 +947,9 @@ bool source_extend(source_t *src, int len)
     return true;
 }
 
-bool source_push(source_t *src, char value)
+bool strbuf_putc(strbuf_t *src, char value)
 {
-    if (!source_extend(src, 1))
+    if (!strbuf_extend(src, 1))
         return false;
 
     src->elements[src->size] = value;
@@ -958,11 +958,11 @@ bool source_push(source_t *src, char value)
     return true;
 }
 
-bool source_push_str(source_t *src, char *value)
+bool strbuf_puts(strbuf_t *src, char *value)
 {
     int len = strlen(value);
 
-    if (!source_extend(src, len))
+    if (!strbuf_extend(src, len))
         return false;
 
     strncpy(src->elements + src->size, value, len);
@@ -971,7 +971,7 @@ bool source_push_str(source_t *src, char *value)
     return true;
 }
 
-void source_free(source_t *src)
+void strbuf_free(strbuf_t *src)
 {
     if (!src)
         return;
@@ -998,7 +998,7 @@ void global_init()
     INSN_ARENA = arena_init(DEFAULT_ARENA_SIZE);
     BB_ARENA = arena_init(DEFAULT_ARENA_SIZE);
     PH2_IR_FLATTEN = malloc(MAX_IR_INSTR * sizeof(ph2_ir_t *));
-    SOURCE = source_create(MAX_SOURCE);
+    SOURCE = strbuf_create(MAX_SOURCE);
     INCLUSION_MAP = hashmap_create(DEFAULT_INCLUSIONS_SIZE);
     ALIASES_MAP = hashmap_create(MAX_ALIASES);
     CONSTANTS_MAP = hashmap_create(MAX_CONSTANTS);
@@ -1026,7 +1026,7 @@ void global_release()
     arena_free(INSN_ARENA);
     arena_free(BB_ARENA);
     free(PH2_IR_FLATTEN);
-    source_free(SOURCE);
+    strbuf_free(SOURCE);
     hashmap_free(INCLUSION_MAP);
     hashmap_free(ALIASES_MAP);
     hashmap_free(CONSTANTS_MAP);

src/parser_c.c

@@ -3422,7 +3422,7 @@ void load_source_file(char *file)
             snprintf(path + c + 1, inclusion_path_len, "%s", buffer + 10);
             load_source_file(path);
         } else {
-            source_push_str(SOURCE, buffer);
+            strbuf_puts(SOURCE, buffer);
         }
     }
 

tools/inliner.c

@@ -20,20 +20,20 @@
 #define MAX_LINE_LEN 200
 #define DEFAULT_SOURCE_SIZE 65536
 
-#define write_char(c) source_push(SOURCE, c)
-#define write_str(s) source_push_str(SOURCE, s)
+#define write_char(c) strbuf_putc(SOURCE, c)
+#define write_str(s) strbuf_puts(SOURCE, s)
 
 typedef struct {
     int size;
     int capacity;
     char *elements;
-} source_t;
+} strbuf_t;
 
-source_t *SOURCE;
+strbuf_t *SOURCE;
 
-source_t *source_create(int init_capacity)
+strbuf_t *strbuf_create(int init_capacity)
 {
-    source_t *array = malloc(sizeof(source_t));
+    strbuf_t *array = malloc(sizeof(strbuf_t));
     if (!array)
         return NULL;
 
@@ -48,7 +48,7 @@ source_t *source_create(int init_capacity)
     return array;
 }
 
-bool source_extend(source_t *src, int len)
+bool strbuf_extend(strbuf_t *src, int len)
 {
     int new_size = src->size + len;
 
@@ -73,9 +73,9 @@ bool source_extend(source_t *src, int len)
     return true;
 }
 
-bool source_push(source_t *src, char value)
+bool strbuf_putc(strbuf_t *src, char value)
 {
-    if (!source_extend(src, 1))
+    if (!strbuf_extend(src, 1))
         return false;
 
     src->elements[src->size] = value;
@@ -84,11 +84,11 @@ bool source_push(source_t *src, char value)
     return true;
 }
 
-bool source_push_str(source_t *src, char *value)
+bool strbuf_puts(strbuf_t *src, char *value)
 {
     int len = strlen(value);
 
-    if (!source_extend(src, len))
+    if (!strbuf_extend(src, len))
         return false;
 
     strncpy(src->elements + src->size, value, len);
@@ -97,7 +97,7 @@ bool source_push_str(source_t *src, char *value)
     return true;
 }
 
-void source_free(source_t *src)
+void strbuf_free(strbuf_t *src)
 {
     if (!src)
         return;
@@ -152,7 +152,7 @@ int main(int argc, char *argv[])
         return -1;
     }
 
-    SOURCE = source_create(DEFAULT_SOURCE_SIZE);
+    SOURCE = strbuf_create(DEFAULT_SOURCE_SIZE);
 
     write_str("/* Created by tools/inliner - DO NOT EDIT. */\n");
 
@@ -167,14 +167,14 @@ int main(int argc, char *argv[])
      *   __c("}\n");
      */
     write_str("void __c(char *src) {\n");
-    write_str("    source_push_str(SOURCE, src);\n");
+    write_str("    strbuf_puts(SOURCE, src);\n");
     write_str("}\n");
 
     write_str("void libc_generate() {\n");
     load_from(argv[1]);
     write_str("}\n");
     save_to(argv[2]);
-    source_free(SOURCE);
+    strbuf_free(SOURCE);
 
     return 0;
 }