From 40dfa5c25584a38566380229b016e8d5e495507e Mon Sep 17 00:00:00 2001
From: Aryadev Chavali <aryadev@aryadevchavali.com>
Date: Sun, 15 Oct 2023 17:38:35 +0100
Subject: Split off instruction structure to its own file

---
 src/inst.h | 40 ++++++++++++++++++++++++++++++++++++++++
 src/main.c | 28 +++-------------------------
 2 files changed, 43 insertions(+), 25 deletions(-)
 create mode 100644 src/inst.h

diff --git a/src/inst.h b/src/inst.h
new file mode 100644
index 0000000..95baaf2
--- /dev/null
+++ b/src/inst.h
@@ -0,0 +1,40 @@
+/* Copyright (C) 2023 Aryadev Chavali
+
+ * You may distribute and modify this code under the terms of the
+ * GPLv2 license.  You should have received a copy of the GPLv2
+ * license with this file.  If not, please write to:
+ * aryadev@aryadevchavali.com.
+
+ * Created: 2023-10-15
+ * Author: Aryadev Chavali
+ * Description: Instructions and opcodes
+ */
+
+#ifndef INST_H
+#define INST_H
+
+#include "./base.h"
+
+typedef enum
+{
+  OP_PUSH_BYTE = 1,
+  OP_PUSH_WORD,
+  OP_PUSH_FLOAT,
+} op_t;
+
+typedef struct
+{
+  op_t opcode;
+  data_t operand;
+} inst_t;
+
+#define INST_BPUSH(BYTE) \
+  ((inst_t){.opcode = OP_PUSH_BYTE, .operand = DBYTE(BYTE)})
+
+#define INST_WPUSH(WORD) \
+  ((inst_t){.opcode = OP_PUSH_WORD, .operand = DWORD(WORD)})
+
+#define INST_FPUSH(FLOAT) \
+  ((inst_t){.opcode = OP_PUSH_FLOAT, .operand = DFLOAT(FLOAT)})
+
+#endif
diff --git a/src/main.c b/src/main.c
index 1283b8b..9b744b2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,28 +14,7 @@
 #include <string.h>
 
 #include "./base.h"
-
-typedef enum
-{
-  OP_PUSH_BYTE = 1,
-  OP_PUSH_WORD,
-  OP_PUSH_FLOAT,
-} op_t;
-
-typedef struct
-{
-  op_t opcode;
-  data_t operand;
-} inst_t;
-
-#define INST_BPUSH(BYTE) \
-  ((inst_t){.opcode = OP_PUSH_BYTE, .operand = DBYTE(BYTE)})
-
-#define INST_WPUSH(WORD) \
-  ((inst_t){.opcode = OP_PUSH_WORD, .operand = DWORD(WORD)})
-
-#define INST_FPUSH(FLOAT) \
-  ((inst_t){.opcode = OP_PUSH_FLOAT, .operand = DFLOAT(FLOAT)})
+#include "./inst.h"
 
 typedef struct
 {
@@ -135,8 +114,6 @@ f64 vm_pop_float(vm_t *vm)
   return f;
 }
 
-typedef void (*push_f)(vm_t *, data_t);
-
 void vm_execute(vm_t *vm)
 {
   struct Program *prog = &vm->program;
@@ -148,7 +125,8 @@ void vm_execute(vm_t *vm)
   // last 2 bits unless it's a push routine
   if ((instruction.opcode & 0b11) != 0)
   {
-    // Push routine
+    // Possible push routines
+    typedef void (*push_f)(vm_t *, data_t);
     const push_f routines[] = {[OP_PUSH_BYTE]  = vm_push_byte,
                                [OP_PUSH_WORD]  = vm_push_word,
                                [OP_PUSH_FLOAT] = vm_push_float};
-- 
cgit v1.2.3-13-gbd6f