* src/vm/jit/codegen-common.cpp (codegen_start_native_call) [__MIPS__],

[cacao.git] / src / vm / jit / codegen-common.cpp

diff --git a/src/vm/jit/codegen-common.cpp b/src/vm/jit/codegen-common.cpp
index 3bf4591eb6c540e681b2e3626aa30e8219ede2f8..d6334aeb2216e228b074ba1fa88dab8139e0bab3 100644 (file)
--- a/src/vm/jit/codegen-common.cpp
+++ b/src/vm/jit/codegen-common.cpp
@@ -51,21 +51,21 @@
 #include "md.h"
 #include "md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/avl.h"
 #include "toolbox/list.hpp"
-#include "toolbox/logging.h"
+#include "toolbox/logging.hpp"
 
 #include "native/llni.h"
-#include "native/localref.h"
-#include "native/native.h"
+#include "native/localref.hpp"
+#include "native/native.hpp"
 
 #include "threads/thread.hpp"
 
 #include "vm/jit/builtin.hpp"
 #include "vm/exceptions.hpp"
-#include "vm/method.h"
+#include "vm/method.hpp"
 #include "vm/options.h"
 #include "vm/string.hpp"
 
@@ -104,7 +104,7 @@
 #include <vmlog_cacao.h>
 #endif
 
-#include "show.h"
+#include "show.hpp"
 
 
 /* codegen_init ****************************************************************
@@ -136,7 +136,13 @@ void codegen_setup(jitdata *jd)
 
        /* initialize members */
 
-       cd->flags        = 0;
+       // Set flags as requested.
+       if (opt_AlwaysEmitLongBranches) {
+               cd->flags = CODEGENDATA_FLAG_LONGBRANCHES;
+       }
+       else {
+               cd->flags = 0;
+       }
 
        cd->mcodebase    = (u1*) DumpMemory::allocate(MCODEINITSIZE);
        cd->mcodeend     = cd->mcodebase + MCODEINITSIZE;
@@ -748,6 +754,12 @@ java_handle_t *codegen_start_native_call(u1 *sp, u1 *pv)
        /* MIPS always uses 8 bytes to store the RA */
        datasp    = sp + framesize - 8;
        javasp    = sp + framesize;
+# if SIZEOF_VOID_P == 8
+       arg_regs  = (uint64_t *) sp;
+# else
+       arg_regs  = (uint64_t *) (sp + 5 * 8);
+# endif
+       arg_stack = (uint64_t *) javasp;
 #elif defined(__S390__)
        datasp    = sp + framesize - 8;
        javasp    = sp + framesize;
@@ -787,7 +799,7 @@ java_handle_t *codegen_start_native_call(u1 *sp, u1 *pv)
 #endif
 
 #if !defined(NDEBUG)
-# if defined(__ALPHA__) || defined(__I386__) || defined(__M68K__) || defined(__POWERPC__) || defined(__POWERPC64__) || defined(__S390__) || defined(__X86_64__)
+# if defined(__ALPHA__) || defined(__I386__) || defined(__M68K__) || defined(__MIPS__) || defined(__POWERPC__) || defined(__POWERPC64__) || defined(__S390__) || defined(__X86_64__)
        /* print the call-trace if necesarry */
        /* BEFORE: filling the local reference table */
 
@@ -859,6 +871,11 @@ java_object_t *codegen_finish_native_call(u1 *sp, u1 *pv)
 #elif defined(__MIPS__)
        /* MIPS always uses 8 bytes to store the RA */
        datasp   = sp + framesize - 8;
+# if SIZEOF_VOID_P == 8
+       ret_regs = (uint64_t *) sp;
+# else
+       ret_regs = (uint64_t *) (sp + 1 * 8);
+# endif
 #elif defined(__S390__)
        datasp   = sp + framesize - 8;
        ret_regs = (uint64_t *) (sp + 96);
@@ -912,7 +929,7 @@ java_object_t *codegen_finish_native_call(u1 *sp, u1 *pv)
 #endif
 
 #if !defined(NDEBUG)
-# if defined(__ALPHA__) || defined(__I386__) || defined(__M68K__) || defined(__POWERPC__) || defined(__POWERPC64__) || defined(__S390__) || defined(__X86_64__)
+# if defined(__ALPHA__) || defined(__I386__) || defined(__M68K__) || defined(__MIPS__) || defined(__POWERPC__) || defined(__POWERPC64__) || defined(__S390__) || defined(__X86_64__)
        /* print the call-trace if necesarry */
        /* AFTER: unwrapping the return value */