From 2f3cd4d23d21aa231e5c7ae17ed1cdb265323369 Mon Sep 17 00:00:00 2001 From: Phil Dawes Date: Sun, 23 Aug 2009 21:04:19 +0100 Subject: [PATCH] removed some vm-> pointers --- vm/alien.cpp | 2 +- vm/os-freebsd.cpp | 2 +- vm/os-genunix.cpp | 2 +- vm/os-linux.cpp | 4 ++-- vm/os-unix.cpp | 4 ++-- vm/os-unix.hpp | 2 +- vm/quotations.cpp | 2 +- vm/tagged.hpp | 11 ----------- vm/utilities.cpp | 13 ------------- vm/utilities.hpp | 3 --- 10 files changed, 9 insertions(+), 36 deletions(-) diff --git a/vm/alien.cpp b/vm/alien.cpp index 23ca60bf6a..bed24d1037 100755 --- 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 d259658284..64c8ac19da 100644 --- 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 29c3e79859..9e7804caf0 100644 --- 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 2bc121ffc7..62deb70f01 100644 --- 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 3785aeda72..67327e7d30 100644 --- 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(dpop()) + 1); + char *path = (char *)(vm->untag_check(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 8aff18364e..52dc1bfd6e 100644 --- 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 7b03ada175..b28fb1d3a1 100755 --- a/vm/quotations.cpp +++ b/vm/quotations.cpp @@ -92,7 +92,7 @@ bool quotation_jit::stack_frame_p() switch(tagged(obj).type()) { case WORD_TYPE: - if(untag(obj)->subprimitive == F) + if(myvm->untag(obj)->subprimitive == F) return true; break; case QUOTATION_TYPE: diff --git a/vm/tagged.hpp b/vm/tagged.hpp index b73f3aeb7a..2bf058212f 100755 --- a/vm/tagged.hpp +++ b/vm/tagged.hpp @@ -64,20 +64,9 @@ template TYPE *factorvm::untag_check(cell value) return tagged(value).untag_check(this); } -template TYPE *untag_check(cell value) -{ - return vm->untag_check(value); -} - template TYPE *factorvm::untag(cell value) { return tagged(value).untagged(); } -template TYPE *untag(cell value) -{ - return vm->untag(value); -} - - } diff --git a/vm/utilities.cpp b/vm/utilities.cpp index a1e3f30e00..4f4da9a1bc 100755 --- 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 bc7f7d918a..412ef35bb4 100755 --- 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); } -- 2.34.1