Merged branch subtype-trunk into default.

[cacao.git] / src / vm / jit / executionstate.c

diff --git a/src/vm/jit/executionstate.c b/src/vm/jit/executionstate.c
index f9a7e1de1301f1e183409a4b570e23358c879982..2a7958deac3b2af7435d49cc681d3e32e694d865 100644 (file)
--- a/src/vm/jit/executionstate.c
+++ b/src/vm/jit/executionstate.c
@@ -30,12 +30,12 @@
 
 #include "md-abi.h"
 
+#include "vm/descriptor.hpp"
+#include "vm/os.hpp"
+
 #include "vm/jit/abi.h"
 #include "vm/jit/executionstate.h"
 
-#include "vmcore/descriptor.h"
-#include "vmcore/system.h"
-
 
 /* executionstate_sanity_check *************************************************
 
@@ -66,13 +66,13 @@ void executionstate_sanity_check(void *context)
 
        /* keep a copy of (a prefix of) the context for reference */
 
-       system_memcpy(&reference, context, MINIMUM_CONTEXT_SIZE);
+       os_memcpy(&reference, context, MINIMUM_CONTEXT_SIZE);
 
        /* different poisons */
 
-       system_memset(&es1, 0xc9, sizeof(executionstate_t));
-       system_memset(&es2, 0xb5, sizeof(executionstate_t));
-       system_memset(&es3, 0x6f, sizeof(executionstate_t));
+       os_memset(&es1, 0xc9, sizeof(executionstate_t));
+       os_memset(&es2, 0xb5, sizeof(executionstate_t));
+       os_memset(&es3, 0x6f, sizeof(executionstate_t));
 
        md_executionstate_read(&es1, context);
 
@@ -173,7 +173,7 @@ void executionstate_println(executionstate_t *es)
 # if SIZEOF_VOID_P == 8
                printf("%-3s = %016lx", abi_registers_integer_name[i], es->intregs[i]);
 # else
-               printf("%-3s = %08x", abi_registers_integer_name[i], es->intregs[i]);
+               printf("%-3s = %08x", abi_registers_integer_name[i], (unsigned) es->intregs[i]);
 # endif
                if (i%4 == 3)
                        printf("\n");
@@ -221,11 +221,7 @@ void executionstate_println(executionstate_t *es)
                        if (i%4 == 0)
                                printf("\n\t\t");
                        printf("M%02d%c", i, (i >= slots) ? '(' : ' ');
-#ifdef HAS_4BYTE_STACKSLOT
-                       printf("%08lx",(unsigned long)*sp++);
-#else
                        printf("%016llx",(unsigned long long)*sp++);
-#endif
                        printf("%c", (i >= slots) ? ')' : ' ');
                }
                printf("\n");