VM: Refactor contexts to Factor style

[factor.git] / vm / contexts.hpp

diff --git a/vm/contexts.hpp b/vm/contexts.hpp
index 79b4c9fd307e7d2ccb4a76a9600f1b2c1a8c62b5..62d6f26833b318536a67f5c2bf36019ac4ec4be5 100644 (file)
--- a/vm/contexts.hpp
+++ b/vm/contexts.hpp
@@ -1,5 +1,4 @@
-namespace factor
-{
+namespace factor {
 
 // Context object count and identifiers must be kept in sync with:
 //   core/kernel/kernel.factor
@@ -7,78 +6,70 @@ namespace factor
 static const cell context_object_count = 10;
 
 enum context_object {
-       OBJ_NAMESTACK,
-       OBJ_CATCHSTACK,
-       OBJ_CONTEXT,
-       OBJ_IN_CALLBACK_P,
+  OBJ_NAMESTACK,
+  OBJ_CATCHSTACK,
+  OBJ_CONTEXT,
+  OBJ_IN_CALLBACK_P,
 };
 
 static const cell stack_reserved = 1024;
 
 struct context {
 
-       // First 4 fields accessed directly by compiler. See basis/vm/vm.factor
-
-       /* Factor callstack pointers */
-       void *callstack_top;
-       void *callstack_bottom;
-
-       /* current datastack top pointer */
-       cell datastack;
-
-       /* current retain stack top pointer */
-       cell retainstack;
-
-       /* C callstack pointer */
-       cell callstack_save;
-
-       segment *datastack_seg;
-       segment *retainstack_seg;
-       segment *callstack_seg;
-
-       /* context-specific special objects, accessed by context-object and
-       set-context-object primitives */
-       cell context_objects[context_object_count];
-
-       context(cell datastack_size, cell retainstack_size, cell callstack_size);
-       ~context();
-
-       void reset_datastack();
-       void reset_retainstack();
-       void reset_callstack();
-       void reset_context_objects();
-       void reset();
-       void fix_stacks();
-       void scrub_stacks(gc_info *info, cell index);
-
-       cell peek()
-       {
-               return *(cell *)datastack;
-       }
-
-       void replace(cell tagged)
-       {
-               *(cell *)datastack = tagged;
-       }
-
-       cell pop()
-       {
-               cell value = peek();
-               datastack -= sizeof(cell);
-               return value;
-       }
-
-       void push(cell tagged)
-       {
-               datastack += sizeof(cell);
-               replace(tagged);
-       }
+  // First 4 fields accessed directly by compiler. See basis/vm/vm.factor
+
+  /* Factor callstack pointers */
+  void* callstack_top;
+  void* callstack_bottom;
+
+  /* current datastack top pointer */
+  cell datastack;
+
+  /* current retain stack top pointer */
+  cell retainstack;
+
+  /* C callstack pointer */
+  cell callstack_save;
+
+  segment* datastack_seg;
+  segment* retainstack_seg;
+  segment* callstack_seg;
+
+  /* context-specific special objects, accessed by context-object and
+     set-context-object primitives */
+  cell context_objects[context_object_count];
+
+  context(cell datastack_size, cell retainstack_size, cell callstack_size);
+  ~context();
+
+  void reset_datastack();
+  void reset_retainstack();
+  void reset_callstack();
+  void reset_context_objects();
+  void reset();
+  void fix_stacks();
+  void scrub_stacks(gc_info* info, cell index);
+
+  cell peek() { return *(cell*)datastack; }
+
+  void replace(cell tagged) { *(cell*)datastack = tagged; }
+
+  cell pop() {
+    cell value = peek();
+    datastack -= sizeof(cell);
+    return value;
+  }
+
+  void push(cell tagged) {
+    datastack += sizeof(cell);
+    replace(tagged);
+  }
 };
 
-VM_C_API context *new_context(factor_vm *parent);
-VM_C_API void delete_context(factor_vm *parent, context *old_context);
-VM_C_API void reset_context(factor_vm *parent, context *ctx);
-VM_C_API cell begin_callback(factor_vm *parent, cell quot);
-VM_C_API void end_callback(factor_vm *parent);
+VM_C_API context* new_context(factor_vm* parent);
+VM_C_API void delete_context(factor_vm* parent, context* old_context);
+VM_C_API void reset_context(factor_vm* parent, context* ctx);
+VM_C_API cell begin_callback(factor_vm* parent, cell quot);
+VM_C_API void end_callback(factor_vm* parent);
 
 }