usr: oasm: Add log.c

Signed-off-by: Ian Moffett <ian@osmora.org>

3 files changed, 99 insertions, 5 deletions

diff --git a/usr.bin/oasm/include/oasm/state.h b/usr.bin/oasm/include/oasm/state.h
index d4688c2..5f58144 100644
--- a/usr.bin/oasm/include/oasm/state.h
+++ b/usr.bin/oasm/include/oasm/state.h
@@ -35,8 +35,19 @@
 #include <unistd.h>
 #include <oasm/lex.h>
 
+/*
+ * OASM state:
+ *
+ * @filename: Filname of unit we are parsing
+ * @in_fd: Input file descriptor
+ * @out_fd: Resulting binary output file descriptor
+ * @line: Current line number
+ * @last: Last token
+ */
 struct oasm_state {
+    char *filename;
     int in_fd;
+    int out_fd;
     off_t line;
     tt_t last;
 };
diff --git a/usr.bin/oasm/log.c b/usr.bin/oasm/log.c
new file mode 100644
index 0000000..c408865
--- /dev/null
+++ b/usr.bin/oasm/log.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <oasm/log.h>
+#include <oasm/state.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+/* TODO FIXME: Use stdarg.h */
+#define __va_start(ap, fmt)  __builtin_va_start(ap, fmt)
+#define __va_end(ap)  __builtin_va_end(ap)
+
+extern struct oasm_state g_state;
+
+void
+oasm_debug(const char *fmt, ...)
+{
+    char buf[512];
+    va_list ap;
+    int ret;
+
+    __va_start(ap, fmt);
+    ret = vsnprintf(buf, sizeof(buf), fmt, ap);
+    printf("[debug]: %s\033[0m", buf);
+    printf("\033[0m");
+    __va_end(ap);
+}
+
+void
+oasm_err(const char *fmt, ...)
+{
+    char buf[512];
+    va_list ap;
+    int ret;
+
+    __va_start(ap, fmt);
+    ret = vsnprintf(buf, sizeof(buf), fmt, ap);
+    printf(ERROR_COLOR "error: %s\033[0m", buf);
+    printf("%s: line %d\n", g_state.filename, g_state.line);
+    __va_end(ap);
+}
+
+void
+oasm_warn(const char *fmt, ...)
+{
+    char buf[512];
+    va_list ap;
+    int ret;
+
+    __va_start(ap, fmt);
+    ret = vsnprintf(buf, sizeof(buf), fmt, ap);
+    printf(WARN_COLOR "warning: %s\033[0m", buf);
+    printf("line %d\n", g_state.filename, g_state.line);
+    __va_end(ap);
+}
diff --git a/usr.bin/oasm/oasm.c b/usr.bin/oasm/oasm.c
index 670a5f4..844f004 100644
--- a/usr.bin/oasm/oasm.c
+++ b/usr.bin/oasm/oasm.c
@@ -35,11 +35,12 @@
 #define OASM_DBG
 #include <oasm/log.h>
 
-static struct oasm_state state;
+struct oasm_state g_state;
 
 static void
 oasm_start(struct oasm_state *state)
 {
+    state->line = 1;
     parse_enter(state);
 }
 
@@ -51,13 +52,14 @@ main(int argc, char **argv)
         return -1;
     }
 
-    state.in_fd = open(argv[1], O_RDONLY);
-    if (state.in_fd < 0) {
+    g_state.in_fd = open(argv[1], O_RDONLY);
+    if (g_state.in_fd < 0) {
         printf("could not open \"%s\"\n", argv[1]);
         return -1;
     }
 
-    oasm_start(&state);
-    close(state.in_fd);
+    g_state.filename = argv[1];
+    oasm_start(&g_state);
+    close(g_state.in_fd);
     return 0;
 }