converted box_* integer functions to use vm (x86 windows)

diff --git a/vm/alien.cpp b/vm/alien.cpp
index e2298630e1d96096a248f71e9348fb3f4362879d..6c83f87182174e86f363d63adbaff0b74d155b9c 100755 (executable)
--- a/vm/alien.cpp
+++ b/vm/alien.cpp
@@ -103,14 +103,12 @@ void *alien_pointer()
 #define DEFINE_ALIEN_ACCESSOR(name,type,boxer,to) \
        PRIMITIVE(alien_##name) \
        { \
-               factorvm *myvm = PRIMITIVE_GETVM(); \
-               myvm->boxer(*(type*)myvm->alien_pointer());     \
+               PRIMITIVE_GETVM()->boxer(*(type*)PRIMITIVE_GETVM()->alien_pointer());   \
        } \
        PRIMITIVE(set_alien_##name) \
        { \
-               factorvm *myvm = PRIMITIVE_GETVM(); \
-               type *ptr = (type *)myvm->alien_pointer(); \
-               type value = myvm->to(dpop()); \
+               type *ptr = (type *)PRIMITIVE_GETVM()->alien_pointer(); \
+               type value = PRIMITIVE_GETVM()->to(dpop()); \
                *ptr = value; \
        }
 

diff --git a/vm/cpu-x86.32.hpp b/vm/cpu-x86.32.hpp
index f9895cefbd714a978255458348d3d472ef1e56b9..351865f776183d8c1e1c005eb4e03815dda5aef7 100644 (file)
--- a/vm/cpu-x86.32.hpp
+++ b/vm/cpu-x86.32.hpp
@@ -7,8 +7,4 @@ register cell ds asm("esi");
 register cell rs asm("edi");
 
 #define VM_ASM_API VM_C_API __attribute__ ((regparm (2)))
-#undef VM_PTR
-#define VM_PTR myvm
-#undef ASSERTVM
-#define ASSERTVM() assert(vm==myvm)
 }