removed some vm-> pointers

diff --git a/vm/alien.cpp b/vm/alien.cpp
index 23ca60bf6a8c494d59e8c7ecb1ec86f59eed66e3..bed24d1037d8fdb1e1e29657733027e6a0797871 100755 (executable)
--- a/vm/alien.cpp
+++ b/vm/alien.cpp
@@ -232,7 +232,7 @@ char *factorvm::unbox_alien()
 
 VM_C_API char *unbox_alien()
 {
-       printf("*PHIL unbox_alien\n");
+       printf("*PHIL unbox_alien\n");fflush(stdout);
        return vm->unbox_alien();
 }
 

diff --git a/vm/os-freebsd.cpp b/vm/os-freebsd.cpp
index d259658284bf649318f6765b57b9885b4226f48a..64c8ac19dabbf32ff4afe81b1c126b545ffad6bf 100644 (file)
--- a/vm/os-freebsd.cpp
+++ b/vm/os-freebsd.cpp
@@ -33,7 +33,7 @@ const char *vm_executable_path()
        if(strcmp(path, "unknown") == 0)
                return NULL;
 
-       return safe_strdup(path);
+       return vm->safe_strdup(path);
 }
 
 }

diff --git a/vm/os-genunix.cpp b/vm/os-genunix.cpp
index 29c3e79859dbada3061adc2cc053b200a22408e5..9e7804caf09656e9fecd2e0ea3736179a2636c84 100644 (file)
--- a/vm/os-genunix.cpp
+++ b/vm/os-genunix.cpp
@@ -31,7 +31,7 @@ const char *default_image_path()
        const char *iter = path;
        while(*iter) { len++; iter++; }
 
-       char *new_path = (char *)safe_malloc(PATH_MAX + SUFFIX_LEN + 1);
+       char *new_path = (char *)vm->safe_malloc(PATH_MAX + SUFFIX_LEN + 1);
        memcpy(new_path,path,len + 1);
        memcpy(new_path + len,SUFFIX,SUFFIX_LEN + 1);
        return new_path;

diff --git a/vm/os-linux.cpp b/vm/os-linux.cpp
index 2bc121ffc78e5db5fcb76fa47da01b6293f5abd8..62deb70f01e5dd75d8f42c913b46f05525935557 100644 (file)
--- a/vm/os-linux.cpp
+++ b/vm/os-linux.cpp
@@ -6,7 +6,7 @@ namespace factor
 /* Snarfed from SBCL linux-so.c. You must free() this yourself. */
 const char *vm_executable_path()
 {
-       char *path = (char *)safe_malloc(PATH_MAX + 1);
+       char *path = (char *)vm->safe_malloc(PATH_MAX + 1);
 
        int size = readlink("/proc/self/exe", path, PATH_MAX);
        if (size < 0)
@@ -17,7 +17,7 @@ const char *vm_executable_path()
        else
        {
                path[size] = '\0';
-               return safe_strdup(path);
+               return vm->safe_strdup(path);
        }
 }
 

diff --git a/vm/os-unix.cpp b/vm/os-unix.cpp
index 3785aeda72cc86b37329a5b66cf518549a2d75c6..67327e7d301c9a44c05e262f05dd1c982ac4b8b4 100644 (file)
--- a/vm/os-unix.cpp
+++ b/vm/os-unix.cpp
@@ -58,7 +58,7 @@ void ffi_dlclose(dll *dll)
 PRIMITIVE(existsp)
 {
        struct stat sb;
-       char *path = (char *)(untag_check<byte_array>(dpop()) + 1);
+       char *path = (char *)(vm->untag_check<byte_array>(dpop()) + 1);
        box_boolean(stat(path,&sb) >= 0);
 }
 
@@ -79,7 +79,7 @@ segment *alloc_segment(cell size)
        if(mprotect(array + pagesize + size,pagesize,PROT_NONE) == -1)
                fatal_error("Cannot protect high guard page",(cell)array);
 
-       segment *retval = (segment *)safe_malloc(sizeof(segment));
+       segment *retval = (segment *)vm->safe_malloc(sizeof(segment));
 
        retval->start = (cell)(array + pagesize);
        retval->size = size;

diff --git a/vm/os-unix.hpp b/vm/os-unix.hpp
index 8aff18364e18bdefb5f0ac73bea5c82bc5022922..52dc1bfd6ede9fcd72e5c6b635dc6d82c78bc75d 100644 (file)
--- a/vm/os-unix.hpp
+++ b/vm/os-unix.hpp
@@ -40,7 +40,7 @@ typedef char symbol_char;
 #define OPEN_READ(path) fopen(path,"rb")
 #define OPEN_WRITE(path) fopen(path,"wb")
 
-#define print_native_string(string) print_string(string)
+#define print_native_string(string) vm->print_string(string)
 
 void start_thread(void *(*start_routine)(void *));
 

diff --git a/vm/quotations.cpp b/vm/quotations.cpp
index 7b03ada175734b1d974ae0139891b7dc19972874..b28fb1d3a1fc71b91dd3a8fdc496b5107e57f8c8 100755 (executable)
--- a/vm/quotations.cpp
+++ b/vm/quotations.cpp
@@ -92,7 +92,7 @@ bool quotation_jit::stack_frame_p()
                switch(tagged<object>(obj).type())
                {
                case WORD_TYPE:
-                       if(untag<word>(obj)->subprimitive == F)
+                       if(myvm->untag<word>(obj)->subprimitive == F)
                                return true;
                        break;
                case QUOTATION_TYPE:

diff --git a/vm/tagged.hpp b/vm/tagged.hpp
index b73f3aeb7a5992ad1d09cdd16abdb118db686086..2bf058212f70c20018224e409d64d550c32047f2 100755 (executable)
--- a/vm/tagged.hpp
+++ b/vm/tagged.hpp
@@ -64,20 +64,9 @@ template <typename TYPE> TYPE *factorvm::untag_check(cell value)
        return tagged<TYPE>(value).untag_check(this);
 }
 
-template <typename TYPE> TYPE *untag_check(cell value)
-{
-       return vm->untag_check<TYPE>(value);
-}
-
 template <typename TYPE> TYPE *factorvm::untag(cell value)
 {
        return tagged<TYPE>(value).untagged();
 }
 
-template <typename TYPE> TYPE *untag(cell value)
-{
-       return vm->untag<TYPE>(value);
-}
-
-
 }

diff --git a/vm/utilities.cpp b/vm/utilities.cpp
index a1e3f30e005085f9ead88ae9032059d7e7e72d66..4f4da9a1bc70d0d50ff6fc28d6333df52495bffd 100755 (executable)
--- a/vm/utilities.cpp
+++ b/vm/utilities.cpp
@@ -11,11 +11,6 @@ void *factorvm::safe_malloc(size_t size)
        return ptr;
 }
 
-void *safe_malloc(size_t size)
-{
-       return vm->safe_malloc(size);
-}
-
 vm_char *factorvm::safe_strdup(const vm_char *str)
 {
        vm_char *ptr = STRDUP(str);
@@ -23,10 +18,6 @@ vm_char *factorvm::safe_strdup(const vm_char *str)
        return ptr;
 }
 
-vm_char *safe_strdup(const vm_char *str)
-{
-       return vm->safe_strdup(str);
-}
 
 /* We don't use printf directly, because format directives are not portable.
 Instead we define the common cases here. */
@@ -40,10 +31,6 @@ void factorvm::print_string(const char *str)
        fputs(str,stdout);
 }
 
-void print_string(const char *str)
-{
-       return vm->print_string(str);
-}
 
 void factorvm::print_cell(cell x)
 {

diff --git a/vm/utilities.hpp b/vm/utilities.hpp
index bc7f7d918af8183f20df424e4359a7a8c7569390..412ef35bb4403ee39e5aa0ef975114ad79a07a9b 100755 (executable)
--- a/vm/utilities.hpp
+++ b/vm/utilities.hpp
@@ -1,7 +1,4 @@
 namespace factor
 {
-void *safe_malloc(size_t size);
-vm_char *safe_strdup(const vm_char *str);
-void print_string(const char *str);
 
 }