vm: re-organize context structure

diff --git a/basis/vm/vm.factor b/basis/vm/vm.factor
index b0f2c945f7701eb1c783d270e7cdd78e51d1d793..b4c5734810482dbba47e48e07ffd38fcf3757bd6 100644 (file)
--- a/basis/vm/vm.factor
+++ b/basis/vm/vm.factor
@@ -11,10 +11,10 @@ STRUCT: context
 { datastack cell }
 { retainstack cell }
 { callstack-save cell }
-{ context-objects cell[10] }
 { datastack-region void* }
 { retainstack-region void* }
-{ callstack-region void* } ;
+{ callstack-region void* }
+{ context-objects cell[10] } ;
 
 : context-field-offset ( field -- offset ) context offset-of ; inline
 

diff --git a/vm/contexts.hpp b/vm/contexts.hpp
index 85338ca91d657624711078aa9e5d6d90d28a4807..582fab173f9bc7a0c7b3c89c161d50ba5b10fca0 100644 (file)
--- a/vm/contexts.hpp
+++ b/vm/contexts.hpp
@@ -28,14 +28,14 @@ struct context {
        /* C callstack pointer */
        cell callstack_save;
 
-       /* context-specific special objects, accessed by context-object and
-       set-context-object primitives */
-       cell context_objects[context_object_count];
-
        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();