refactoring

Author: fabiosvm

cli/main.c

@@ -249,14 +249,14 @@ static inline int run_bytecode(HkClosure *cl, ParsedArgs *parsedArgs)
   int exitCode = EXIT_FAILURE;
   if (hk_vm_is_ok(&vm))
   {
-    HkValue result = vm.stackSlots[vm.stackTop];
+    HkValue result = hk_stack_get(&vm.vstk, 0);
     exitCode = hk_is_int(result) ? (int) hk_as_number(result) : EXIT_SUCCESS;
     hk_vm_pop(&vm);
     goto end;
   }
   if (hk_vm_is_exit(&vm))
   {
-    HkValue result = vm.stackSlots[vm.stackTop];
+    HkValue result = hk_stack_get(&vm.vstk, 0);
     hk_assert(hk_is_int(result), "exit code must be an integer");
     exitCode = (int) hk_as_number(result);
     hk_vm_pop(&vm);

core/json.c

@@ -122,7 +122,7 @@ static inline HkValue json_to_value(HkVM *vm, cJSON *json)
         json_field = json_field->next;
       }
       hk_vm_construct(vm, length);
-      HkInstance *inst = hk_as_instance(vm->stackSlots[vm->stackTop]);
+      HkInstance *inst = hk_as_instance(hk_stack_get(&vm->vstk, 0));
       hk_incr_ref(inst);
       hk_vm_pop(vm);
       hk_decr_ref(inst);

include/hook.h

@@ -20,6 +20,7 @@
 #include "hook/iterator.h"
 #include "hook/memory.h"
 #include "hook/range.h"
+#include "hook/stack.h"
 #include "hook/string.h"
 #include "hook/struct.h"
 #include "hook/userdata.h"

include/hook/stack.h

@@ -0,0 +1,59 @@
+// 
+// stack.h
+// 
+// Copyright 2021 The Hook Programming Language Authors.
+// 
+// This file is part of the Hook project.
+// For detailed license information, please refer to the LICENSE file
+// located in the root directory of this project.
+//
+
+#ifndef HK_STACK_H
+#define HK_STACK_H
+
+#include "memory.h"
+
+#define HkStack(T) \
+  struct { \
+    T *base; \
+    T *top; \
+    T *limit; \
+  }
+
+#define hk_stack_init(stk, sz) \
+  do { \
+    size_t _size = sizeof(*(stk)->base) * (sz); \
+    void *base = hk_allocate(_size); \
+    (stk)->base = base; \
+    (stk)->top = &(stk)->base[-1]; \
+    (stk)->limit = &(stk)->base[(sz) - 1]; \
+  } while (0)
+
+#define hk_stack_deinit(stk) \
+  do { \
+    hk_free((stk)->base); \
+  } while (0)
+
+#define hk_stack_is_empty(stk) ((stk)->top == &(stk)->base[-1])
+
+#define hk_stack_is_full(stk) ((stk)->top == (stk)->limit)
+
+#define hk_stack_get(stk, i) ((stk)->top[- (i)])
+
+#define hk_stack_set(stk, i, d) \
+  do { \
+    (stk)->top[- (i)] = (d); \
+  } while (0)
+
+#define hk_stack_push(stk, d) \
+  do { \
+    ++(stk)->top; \
+    (stk)->top[0] = (d); \
+  } while (0)
+
+#define hk_stack_pop(stk) \
+  do { \
+    --(stk)->top; \
+  } while (0)
+
+#endif // HK_STACK_H

include/hook/vm.h

@@ -13,13 +13,14 @@
 
 #include "callable.h"
 #include "range.h"
+#include "stack.h"
 #include "struct.h"
 #include "userdata.h"
 
 #define HK_VM_FLAG_NONE     0x00
 #define HK_VM_FLAG_NO_TRACE 0x01
 
-#define HK_STACK_MIN_CAPACITY (1 << 8)
+#define HK_VM_STACK_DEFAULT_SIZE (1 << 10)
 
 #define hk_vm_is_no_trace(s) ((s)->flags & HK_VM_FLAG_NO_TRACE)
 
@@ -42,14 +43,12 @@ typedef enum
 
 typedef struct HkVM
 {
-  int          stackEnd;
-  int          stackTop;
-  HkValue      *stackSlots;
-  int          flags;
-  HkSateStatus status;
+  HkStack(HkValue) vstk;
+  int              flags;
+  HkSateStatus     status;
 } HkVM;
 
-void hk_vm_init(HkVM *vm, int minCapacity);
+void hk_vm_init(HkVM *vm, int size);
 void hk_vm_deinit(HkVM *vm);
 void hk_vm_runtime_error(HkVM *vm, const char *fmt, ...);
 void hk_vm_check_argument_type(HkVM *vm, HkValue *args, int index, HkType type);

src/array.c

@@ -8,9 +8,9 @@
 // located in the root directory of this project.
 //
 
-#include <hook/array.h>
-#include <hook/memory.h>
-#include <hook/utils.h>
+#include "hook/array.h"
+#include "hook/memory.h"
+#include "hook/utils.h"
 
 typedef struct
 {

src/builtin.c

@@ -14,9 +14,9 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <hook/iterable.h>
-#include <hook/struct.h>
-#include <hook/utils.h>
+#include "hook/iterable.h"
+#include "hook/struct.h"
+#include "hook/utils.h"
 
 #ifdef _WIN32
   #include <Windows.h>

src/builtin.h

@@ -11,7 +11,7 @@
 #ifndef BUILTIN_H
 #define BUILTIN_H
 
-#include <hook/vm.h>
+#include "hook/vm.h"
 
 void load_globals(HkVM *vm);
 int num_globals(void);

src/callable.c

@@ -8,9 +8,9 @@
 // located in the root directory of this project.
 //
 
-#include <hook/callable.h>
-#include <hook/memory.h>
-#include <hook/utils.h>
+#include "hook/callable.h"
+#include "hook/memory.h"
+#include "hook/utils.h"
 
 #define MIN_CAPACITY (1 << 3)
 

src/chunk.c

@@ -8,9 +8,9 @@
 // located in the root directory of this project.
 //
 
-#include <hook/chunk.h>
-#include <hook/memory.h>
-#include <hook/utils.h>
+#include "hook/chunk.h"
+#include "hook/memory.h"
+#include "hook/utils.h"
 
 #define MIN_CAPACITY (1 << 3)