From 78b9b99ab3d1351cb28c7385698819a3a1d6354a Mon Sep 17 00:00:00 2001
From: able <abl3theabove@gmail.com>
Date: Fri, 8 Mar 2024 05:23:47 -0600
Subject: [PATCH] modularization

---
 .gitignore                      |  3 +-
 Makefile                        |  2 +-
 example.S => examples/example.S |  0
 run.sh                          |  2 +-
 src/args.c                      | 41 +++++++++++++++++
 src/bytevec.c                   | 35 +++++++++++++++
 src/hbas.c                      | 79 +--------------------------------
 7 files changed, 82 insertions(+), 80 deletions(-)
 rename example.S => examples/example.S (100%)
 create mode 100644 src/args.c
 create mode 100644 src/bytevec.c

diff --git a/.gitignore b/.gitignore
index 89675ce..b448513 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 hbas
-*.hbf
\ No newline at end of file
+*.hbf
+build/*
diff --git a/Makefile b/Makefile
index 5b7b14a..932107e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ CFLAGS = -Wall -Wextra -Wpedantic -std=c17 -O3
 .PHONY: clean
 
 hbas: src/hbas.c
-	${CC} ${CFLAGS} ${CFLAGS_EXTRA} src/hbas.c -o hbas
+	${CC} ${CFLAGS} ${CFLAGS_EXTRA} src/hbas.c -o build/hbas
 
 example: hbas example.S
 	./hbas < example.S > example
diff --git a/example.S b/examples/example.S
similarity index 100%
rename from example.S
rename to examples/example.S
diff --git a/run.sh b/run.sh
index e5e8659..0ac3fb3 100755
--- a/run.sh
+++ b/run.sh
@@ -1,2 +1,2 @@
 make CC=clang
-./hbas < example.S > example.hbf
+./build/hbas < examples/example.S > build/example.hbf
diff --git a/src/args.c b/src/args.c
new file mode 100644
index 0000000..f126ab8
--- /dev/null
+++ b/src/args.c
@@ -0,0 +1,41 @@
+typedef struct ArgMeta_s
+{
+    char chr;
+    uint8_t size;
+    // This is a bitset of acceptable overflow states,
+    // where accept signed = 1, accept unsigned = 2.
+    // 1 -> signed, 2 -> unsigned, 3 -> whatever
+    uint8_t sign;
+    uint8_t rel;
+} ArgMeta;
+const ArgMeta ARGS[] = {
+    {'R', 1, 2, 0},
+    {'1', 1, 3, 0},
+    {'b', 1, 1, 0},
+    {'B', 1, 2, 0},
+    {'2', 2, 3, 0},
+    {'o', 2, 1, 1},
+    {'h', 2, 1, 0},
+    {'H', 2, 2, 0},
+    {'4', 4, 3, 0},
+    {'w', 4, 1, 0},
+    {'O', 4, 1, 1},
+    {'W', 4, 2, 0},
+    {'8', 8, 3, 0},
+    {'d', 8, 1, 0},
+    {'D', 8, 2, 0},
+    {0},
+};
+const size_t NARGS = sizeof(ARGS) / sizeof(ARGS[0]);
+ArgMeta arg_meta(char arg)
+{
+    for (size_t ii = 0; ii < NARGS; ii += 1)
+    {
+        ArgMeta meta = ARGS[ii];
+        if (meta.chr == arg)
+        {
+            return meta;
+        }
+    }
+    return ARGS[NARGS - 1];
+}
diff --git a/src/bytevec.c b/src/bytevec.c
new file mode 100644
index 0000000..2df7718
--- /dev/null
+++ b/src/bytevec.c
@@ -0,0 +1,35 @@
+
+typedef struct ByteVec_s
+{
+    char *buf;
+    size_t cap;
+    size_t len;
+} ByteVec;
+
+AsmError ensure_push(ByteVec *vec, size_t el_size, size_t extra)
+{
+    if (vec->len + extra < vec->len)
+    {
+        return ErrOutOfMemory;
+    }
+    while (vec->len + extra > vec->cap)
+    {
+        if ((~(size_t)0) / 2 < vec->cap)
+        {
+            return ErrOutOfMemory;
+        }
+        vec->cap *= 2;
+        // multiply overflow
+        if ((~(size_t)0) / el_size < vec->cap)
+        {
+            return ErrOutOfMemory;
+        }
+        vec->buf = realloc(vec->buf, el_size * vec->cap);
+        if (vec->buf == NULL)
+        {
+            vec->cap = 0;
+            return ErrOutOfMemory;
+        }
+    }
+    return 0;
+}
diff --git a/src/hbas.c b/src/hbas.c
index 4fd08a6..d187d26 100644
--- a/src/hbas.c
+++ b/src/hbas.c
@@ -25,6 +25,7 @@ SOFTWARE.
 #include <string.h>
 #include <stdint.h>
 
+#include "args.c"
 #include "op.h"
 #include "error.h"
 #include "instructions.c"
@@ -32,6 +33,7 @@ SOFTWARE.
 #include "register.c"
 #include "token.c"
 #include "einfo.h"
+#include "bytevec.c"
 
 void hd(char *data, size_t len)
 {
@@ -46,83 +48,6 @@ void hd(char *data, size_t len)
     printf("\n");
 }
 
-typedef struct ArgMeta_s
-{
-    char chr;
-    uint8_t size;
-    // This is a bitset of acceptable overflow states,
-    // where accept signed = 1, accept unsigned = 2.
-    // 1 -> signed, 2 -> unsigned, 3 -> whatever
-    uint8_t sign;
-    uint8_t rel;
-} ArgMeta;
-const ArgMeta ARGS[] = {
-    {'R', 1, 2, 0},
-    {'1', 1, 3, 0},
-    {'b', 1, 1, 0},
-    {'B', 1, 2, 0},
-    {'2', 2, 3, 0},
-    {'o', 2, 1, 1},
-    {'h', 2, 1, 0},
-    {'H', 2, 2, 0},
-    {'4', 4, 3, 0},
-    {'w', 4, 1, 0},
-    {'O', 4, 1, 1},
-    {'W', 4, 2, 0},
-    {'8', 8, 3, 0},
-    {'d', 8, 1, 0},
-    {'D', 8, 2, 0},
-    {0},
-};
-const size_t NARGS = sizeof(ARGS) / sizeof(ARGS[0]);
-ArgMeta arg_meta(char arg)
-{
-    for (size_t ii = 0; ii < NARGS; ii += 1)
-    {
-        ArgMeta meta = ARGS[ii];
-        if (meta.chr == arg)
-        {
-            return meta;
-        }
-    }
-    return ARGS[NARGS - 1];
-}
-
-typedef struct ByteVec_s
-{
-    char *buf;
-    size_t cap;
-    size_t len;
-} ByteVec;
-
-AsmError ensure_push(ByteVec *vec, size_t el_size, size_t extra)
-{
-    if (vec->len + extra < vec->len)
-    {
-        return ErrOutOfMemory;
-    }
-    while (vec->len + extra > vec->cap)
-    {
-        if ((~(size_t)0) / 2 < vec->cap)
-        {
-            return ErrOutOfMemory;
-        }
-        vec->cap *= 2;
-        // multiply overflow
-        if ((~(size_t)0) / el_size < vec->cap)
-        {
-            return ErrOutOfMemory;
-        }
-        vec->buf = realloc(vec->buf, el_size * vec->cap);
-        if (vec->buf == NULL)
-        {
-            vec->cap = 0;
-            return ErrOutOfMemory;
-        }
-    }
-    return 0;
-}
-
 #define MIN_SIZE 4096
 
 int slurp(FILE *fd, ByteVec *out)