You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by va...@apache.org on 2008/03/13 05:53:04 UTC

svn commit: r636627 - in /harmony/enhanced/drlvm/trunk/vm: include/ vmcore/include/ vmcore/src/util/em64t/base/ vmcore/src/util/ia32/base/

Author: varlax
Date: Wed Mar 12 21:53:02 2008
New Revision: 636627

URL: http://svn.apache.org/viewvc?rev=636627&view=rev
Log:
Moved vmcore-specific headers out of general include dir

Added:
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/internal_jit_intf.h
      - copied unchanged from r635806, harmony/enhanced/drlvm/trunk/vm/include/internal_jit_intf.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/slot.h
      - copied unchanged from r635806, harmony/enhanced/drlvm/trunk/vm/include/slot.h
Removed:
    harmony/enhanced/drlvm/trunk/vm/include/internal_jit_intf.h
    harmony/enhanced/drlvm/trunk/vm/include/slot.h
Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp?rev=636627&r1=636626&r2=636627&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp Wed Mar 12 21:53:02 2008
@@ -41,6 +41,7 @@
 #include "object_handles.h"
 #include "Class.h"
 #include "jit_runtime_support.h"
+#include "internal_jit_intf.h"
 
 #include "mon_enter_exit.h"
 #include "exceptions.h"
@@ -56,8 +57,6 @@
 char * gen_convert_managed_to_unmanaged_null_em64t(char * ss,
                                                   const R_Opnd & input_param1);
 #define INPUT_ARG_OFFSET 8
-char * gen_setup_j2n_frame(char * s);
-char * gen_pop_j2n_frame(char * s);
 
 
 // patch_addr_null_arg_ptr is the address of a variable holding the

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp?rev=636627&r1=636626&r2=636627&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp Wed Mar 12 21:53:02 2008
@@ -225,7 +225,7 @@
     return addr;
 } //getaddress__setup_java_to_native_frame
 
-VMEXPORT char *gen_setup_j2n_frame(char *s)
+char *gen_setup_j2n_frame(char *s)
 {
     s = call(s, (char *)getaddress__setup_java_to_native_frame() );
     return s;
@@ -278,7 +278,7 @@
     return addr;
 } //getaddress__pop_java_to_native_frame
 
-VMEXPORT char *gen_pop_j2n_frame(char *s)
+char *gen_pop_j2n_frame(char *s)
 {
     s = call(s, (char *)getaddress__pop_java_to_native_frame() );
     return s;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp?rev=636627&r1=636626&r2=636627&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp Wed Mar 12 21:53:02 2008
@@ -43,6 +43,7 @@
 #include "object_handles.h"
 #include "Class.h"
 #include "jit_runtime_support.h"
+#include "internal_jit_intf.h"
 
 #include "dump.h"
 #include "vm_stats.h"
@@ -52,9 +53,6 @@
                                                   unsigned stack_pointer_offset);
 
 #define INPUT_ARG_OFFSET 4
-char * gen_setup_j2n_frame(char * s);
-char * gen_pop_j2n_frame(char * s);
-
 
 
 // patch_addr_null_arg_ptr is the address of a variable holding the

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp?rev=636627&r1=636626&r2=636627&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp Wed Mar 12 21:53:02 2008
@@ -900,7 +900,7 @@
 } //getaddress__setup_java_to_native_frame
 
 
-VMEXPORT char *gen_setup_j2n_frame(char *s)
+char *gen_setup_j2n_frame(char *s)
 {
     s = call(s, (char *)getaddress__setup_java_to_native_frame() );
     return s;
@@ -941,7 +941,7 @@
 } //getaddress__pop_java_to_native_frame
 
 
-VMEXPORT char *gen_pop_j2n_frame(char *s)
+char *gen_pop_j2n_frame(char *s)
 {
     s = call(s, (char *)getaddress__pop_java_to_native_frame() );
     return s;