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 2007/11/23 12:31:25 UTC
svn commit: r597644 - in /harmony/enhanced/drlvm/trunk/vm: include/
interpreter/src/ jitrino/src/codegenerator/ jitrino/src/codegenerator/ia32/
jitrino/src/codegenerator/ipf/ jitrino/src/codegenerator/ipf/include/
jitrino/src/jet/ jitrino/src/vm/ vmcor...
Author: varlax
Date: Fri Nov 23 03:31:22 2007
New Revision: 597644
URL: http://svn.apache.org/viewvc?rev=597644&view=rev
Log:
Cleaned obsolete stuff in JIT-VM interface
Modified:
harmony/enhanced/drlvm/trunk/vm/include/jit_import.h
harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/RuntimeInterface.h
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.h
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeInterface.h
harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.h
harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/JITInterface.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export_rt.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_intf_cpp.h
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dll_jit.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/include/jit_import.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/jit_import.h?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/jit_import.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/jit_import.h Fri Nov 23 03:31:22 2007
@@ -86,8 +86,6 @@
* callbacks to <code>JIT_recompiled_method_callback</code> will be made. It is a
* requirement that the method has not already been compiled by the given JIT;
* this means that multiple instances of a JIT may need to be active at the same time.
- *
- * @sa vm_clone_jit
*/
VMEXPORT void vm_recompile_method(JIT_Handle jit, Method_Handle method);
@@ -99,14 +97,6 @@
*/
VMEXPORT JIT_Result vm_compile_method(JIT_Handle jit, Method_Handle method);
-
-/**
- * Creates and returns a new instance of the given JIT. The new JIT's
- * implementation of <code>JIT_init_with_data</code> is invoked with the
- * <code>jit_data</code> argument.
- */
-
-VMEXPORT JIT_Handle vm_clone_jit(JIT_Handle jit, void *jit_data);
//@}
/** @name Exception-related compile-time functions
Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp Fri Nov 23 03:31:22 2007
@@ -40,13 +40,8 @@
EXPORT extern void JIT_unwind_stack_frame(JIT_Handle, Method_Handle, JitFrameContext *);
EXPORT extern void JIT_get_root_set_from_stack_frame(JIT_Handle, Method_Handle, GC_Enumeration_Handle, JitFrameContext *);
EXPORT extern void JIT_get_root_set_for_thread_dump(JIT_Handle, Method_Handle, GC_Enumeration_Handle, JitFrameContext *);
- EXPORT extern Boolean JIT_can_enumerate(JIT_Handle, Method_Handle, NativeCodePtr);
EXPORT extern void JIT_fix_handler_context(JIT_Handle, Method_Handle, JitFrameContext *);
EXPORT extern void * JIT_get_address_of_this(JIT_Handle, Method_Handle, const JitFrameContext *);
- EXPORT extern Boolean JIT_call_returns_a_reference(JIT_Handle, Method_Handle, const JitFrameContext *);
- EXPORT extern JIT_Result JIT_gen_method_info(JIT_Handle,Compile_Handle, Method_Handle, JIT_Flags);
- EXPORT extern JIT_Result JIT_compile_method(JIT_Handle,Compile_Handle, Method_Handle, JIT_Flags);
- EXPORT extern void JIT_init_with_data(JIT_Handle, void *);
EXPORT extern Boolean JIT_supports_compressed_references(JIT_Handle);
EXPORT extern void JIT_execute_method(JIT_Handle,jmethodID method, jvalue *return_value, jvalue *args);
}
@@ -54,12 +49,8 @@
EXPORT void JIT_unwind_stack_frame(JIT_Handle, Method_Handle, JitFrameContext *) { abort(); }
EXPORT void JIT_get_root_set_from_stack_frame(JIT_Handle, Method_Handle, GC_Enumeration_Handle, JitFrameContext *) { abort(); }
EXPORT void JIT_get_root_set_for_thread_dump(JIT_Handle, Method_Handle, GC_Enumeration_Handle, JitFrameContext *) {return;}
-EXPORT Boolean JIT_can_enumerate(JIT_Handle, Method_Handle, NativeCodePtr) { abort(); return true; }
EXPORT void JIT_fix_handler_context(JIT_Handle, Method_Handle, JitFrameContext *) { abort(); }
EXPORT void * JIT_get_address_of_this(JIT_Handle, Method_Handle, const JitFrameContext *) { abort(); return (void *)JIT_FAILURE;}
-EXPORT Boolean JIT_call_returns_a_reference(JIT_Handle, Method_Handle, const JitFrameContext *) { abort(); return true; }
-EXPORT JIT_Result JIT_gen_method_info(JIT_Handle,Compile_Handle, Method_Handle, JIT_Flags) { abort(); return JIT_FAILURE;}
-EXPORT void JIT_init_with_data(JIT_Handle, void *) { abort(); }
struct StackTraceFrame;
@@ -146,11 +137,6 @@
#else
return true;
#endif
-}
-
-EXPORT JIT_Result JIT_compile_method(JIT_Handle UNREF jh,Compile_Handle, Method_Handle, JIT_Flags) {
- fprintf(stderr, "interpreter: Compile a method\n");
- return JIT_FAILURE;
}
EXPORT JIT_Result JIT_compile_method_with_params(JIT_Handle UNREF jh,Compile_Handle, Method_Handle, OpenMethodExecutionParams) {
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/RuntimeInterface.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/RuntimeInterface.h?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/RuntimeInterface.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/RuntimeInterface.h Fri Nov 23 03:31:22 2007
@@ -39,8 +39,6 @@
virtual void getGCRootSet(MethodDesc* methodDesc, GCInterface* gcInterface,
const ::JitFrameContext* context, bool isFirst) = 0;
- virtual bool canEnumerate(MethodDesc* methodDesc, NativeCodePtr eip) = 0;
-
virtual void fixHandlerContext(MethodDesc* methodDesc, ::JitFrameContext* context, bool isFirst) = 0;
virtual void* getAddressOfThis(MethodDesc* methodDesc, const ::JitFrameContext* context, bool isFirst) = 0;
@@ -48,10 +46,6 @@
virtual bool getBcLocationForNative(MethodDesc* method, POINTER_SIZE_INT native_pc, uint16 *bc_pc) = 0;
virtual bool getNativeLocationForBc(MethodDesc* method, uint16 bc_pc, POINTER_SIZE_INT *native_pc) = 0;
-
-#ifdef USE_SECURITY_OBJECT
- virtual void* getAddressOfSecurityObject(MethodDesc* methodDesc, const ::JitFrameContext* context) = 0;
-#endif
virtual bool recompiledMethodEvent(MethodDesc * methodDesc, void * data) = 0;
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp Fri Nov 23 03:31:22 2007
@@ -558,12 +558,6 @@
}
}
-bool RuntimeInterface::canEnumerate(MethodDesc* methodDesc, NativeCodePtr eip) {
- assert(0);
- return FALSE;
-}
-
-
void InfoBlockWriter::runImpl() {
StackInfo * stackInfo = (StackInfo*)irManager->getInfo(STACK_INFO_KEY);
assert(stackInfo != NULL);
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.h?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.h Fri Nov 23 03:31:22 2007
@@ -47,15 +47,11 @@
virtual void getGCRootSet(MethodDesc* methodDesc, GCInterface* gcInterface,
const JitFrameContext* context, bool isFirst);
- virtual bool canEnumerate(MethodDesc* methodDesc, NativeCodePtr eip);
-
virtual void fixHandlerContext(MethodDesc* methodDesc, JitFrameContext* context, bool isFirst);
virtual void* getAddressOfThis(MethodDesc* methodDesc, const JitFrameContext* context, bool isFirst);
virtual bool isSOEArea(MethodDesc* methodDesc, const ::JitFrameContext* context, bool isFirst);
-
- virtual void* getAddressOfSecurityObject(MethodDesc* methodDesc, const JitFrameContext* context) { assert(0); return NULL; }
virtual bool recompiledMethodEvent(MethodDesc * methodDesc, void * data);
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp Fri Nov 23 03:31:22 2007
@@ -163,14 +163,6 @@
//----------------------------------------------------------------------------------------//
-bool RuntimeInterface::canEnumerate(MethodDesc *methodDesc, NativeCodePtr eip) {
-
- std::cout << "FIXME: IPF::RuntimeInterface::canEnumerate " << methodDesc->getName() << endl;
- return true;
-}
-
-//----------------------------------------------------------------------------------------//
-
void RuntimeInterface::fixHandlerContext(MethodDesc *methodDesc, JitFrameContext *context, bool isFirst) {
//std::cout << "FIXME: IPF::RuntimeInterface::fixHandlerContext " << methodDesc->getName() << endl;
}
@@ -184,16 +176,6 @@
// cout << "IPF::RuntimeInterface::getAddressOfThis" << endl;
assert(!methodDesc->isStatic());
return jitFrameContext->p_gr[G_INARG_BASE];
-}
-
-//----------------------------------------------------------------------------------------//
-
-void* RuntimeInterface::getAddressOfSecurityObject(MethodDesc *methodDesc,
- const ::JitFrameContext *jitFrameContext) {
-
- std::cout << "FIXME: IPF::RuntimeInterface::getAddressOfSecurityObject " << methodDesc->getName() << endl;
- assert(0);
- return NULL;
}
//----------------------------------------------------------------------------------------//
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeInterface.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeInterface.h?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeInterface.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeInterface.h Fri Nov 23 03:31:22 2007
@@ -35,13 +35,11 @@
class RuntimeInterface : public ::Jitrino::RuntimeInterface {
public:
void unwindStack(MethodDesc*, JitFrameContext*, bool) ;
- bool canEnumerate(MethodDesc*, NativeCodePtr);
void getGCRootSet(MethodDesc*, GCInterface*, const JitFrameContext*, bool);
uint32 getInlineDepth(InlineInfoPtr, uint32);
Method_Handle getInlinedMethod(InlineInfoPtr, uint32, uint32);
void fixHandlerContext(MethodDesc*, JitFrameContext*, bool);
void *getAddressOfThis(MethodDesc*, const JitFrameContext*, bool);
- void *getAddressOfSecurityObject(MethodDesc*, const JitFrameContext*);
bool recompiledMethodEvent(MethodDesc*, void*);
bool getBcLocationForNative(MethodDesc*, uint64, uint16*);
bool getNativeLocationForBc(MethodDesc*, uint16, uint64*);
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp Fri Nov 23 03:31:22 2007
@@ -505,14 +505,6 @@
return supported;
}
-JIT_Result compile(JIT_Handle jitHandle, Compile_Handle ch,
- Method_Handle method, JIT_Flags flags)
-{
- // this function is obsolete
- assert(false);
- return JIT_FAILURE;
-}
-
JIT_Result compile_with_params(JIT_Handle jit_handle, Compile_Handle ch,
Method_Handle method,
OpenMethodExecutionParams params)
@@ -784,17 +776,6 @@
}
-extern "C" JITEXPORT
-JIT_Result JIT_compile_method(JIT_Handle jit, Compile_Handle ch,
- Method_Handle method,
- JIT_Flags flags)
-{
- //Jitrino::CompilationContext ctx(jit, method);
- //return Jitrino::Jet::compile(jit, ch, method, flags);
- assert(false); // Obsolete
- return JIT_FAILURE;
-}
-
extern "C" JITEXPORT
JIT_Result JIT_compile_method_with_params(JIT_Handle jit,
Compile_Handle ch,
@@ -828,15 +809,6 @@
}
/**
- * Noop.
- */
-extern "C" JITEXPORT
-void JIT_init_with_data(JIT_Handle jit, void *jit_data)
-{
- // noop
-}
-
-/**
* @see get_exe_capabilities
*/
extern "C" JITEXPORT
@@ -845,14 +817,6 @@
return Jitrino::Jet::get_exe_capabilities();
}
-extern "C" JITEXPORT
-JIT_Result JIT_gen_method_info(JIT_Handle jit, Compile_Handle compilation,
- Method_Handle method, JIT_Flags flags)
-{
- assert(0);
- return JIT_FAILURE;
-}
-
/**
* Noop in Jitrino.JET.
@@ -955,55 +919,6 @@
return 0;
}
-extern "C" JITEXPORT
-Boolean JIT_can_enumerate(JIT_Handle jit, Method_Handle method,
- NativeCodePtr eip)
-{
- return false;
-}
-
-
-extern "C" JITEXPORT
-unsigned JIT_num_breakpoints(JIT_Handle jit, Method_Handle method, uint32 eip)
-{
- assert(false);
- return 0;
-}
-
-extern "C" JITEXPORT
-void JIT_get_breakpoints(JIT_Handle jit, Method_Handle method, uint32 *bp,
- ::JitFrameContext *context)
-{
- assert(false);
-}
-
-/**
- * @deprecated
- */
-extern "C" JITEXPORT
-Boolean JIT_call_returns_a_reference(JIT_Handle jit, Method_Handle method,
- const ::JitFrameContext *context)
-{
- assert(false);
- return false;
-}
-
-extern "C" JITEXPORT
-int32 JIT_get_break_point_offset(JIT_Handle jit, Compile_Handle compilation,
- Method_Handle meth, JIT_Flags flags,
- unsigned bc_location)
-{
- assert(false);
- return false;
-}
-
-extern "C" JITEXPORT
-void * JIT_get_address_of_var(JIT_Handle jit, ::JitFrameContext *context,
- Boolean is_first, unsigned var_no)
-{
- assert(false);
- return NULL;
-}
/**
* @returns \b Whether Jitrino.JET support compressed references on current
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.h?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.h Fri Nov 23 03:31:22 2007
@@ -222,14 +222,6 @@
/**
* @brief Performs compilation of the method.
- * @returns \b true if the method was compiled, \b false otherwise
- * @deprecated Use compile_with_params instead.
- */
-JIT_Result compile(JIT_Handle jit, Compile_Handle compile,
- Method_Handle method, JIT_Flags flags);
-
-/**
- * @brief Performs compilation of the method.
*
* Compiles the method with taking into account additional parameters
* (supposed to be use for JPDA purposes).
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/JITInterface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/JITInterface.cpp?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/JITInterface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/JITInterface.cpp Fri Nov 23 03:31:22 2007
@@ -162,25 +162,6 @@
} //opt does not support counters patching today.
}
-
-extern "C"
-JITEXPORT void
-JIT_gc_start(JIT_Handle jit)
-{
-}
-
-extern "C"
-JITEXPORT void
-JIT_gc_end(JIT_Handle jit)
-{
-}
-
-extern "C"
-JITEXPORT void
-JIT_gc_object_died(JIT_Handle jit, void *java_ref)
-{
-}
-
// Called if JIT registered itself to be notified when the class is extended
// Returns TRUE if any code was modified and FALSE otherwise.
extern "C"
@@ -225,25 +206,6 @@
extern "C"
JITEXPORT JIT_Result
-JIT_gen_method_info(JIT_Handle jit, Compile_Handle compilation,
- Method_Handle method, JIT_Flags flags)
-{
- assert(0);
- return JIT_FAILURE;
-}
-
-
-extern "C"
-JITEXPORT JIT_Result
-JIT_compile_method(JIT_Handle jitHandle, Compile_Handle compilation,
- Method_Handle method, JIT_Flags flags)
-{
- assert(0);
- return JIT_FAILURE;
-}
-
-extern "C"
-JITEXPORT JIT_Result
JIT_compile_method_with_params(JIT_Handle jit, Compile_Handle compilation,
Method_Handle method_handle,
OpenMethodExecutionParams compilation_params)
@@ -442,32 +404,6 @@
}
extern "C"
-JITEXPORT Boolean
-JIT_can_enumerate(JIT_Handle jit, Method_Handle method, NativeCodePtr eip)
-{
- MethodDesc methodDesc(method, jit);
- bool result = Jitrino::getRuntimeInterface()->canEnumerate(&methodDesc, eip);
- return (result ? TRUE : FALSE);
-}
-
-
-extern "C"
-JITEXPORT unsigned
-JIT_num_breakpoints(JIT_Handle jit, Method_Handle method, uint32 eip)
-{
- assert(0);
- return 0;
-}
-
-extern "C"
-JITEXPORT void
-JIT_get_breakpoints(JIT_Handle jit, Method_Handle method, uint32 *bp,
- ::JitFrameContext *context)
-{
- assert(0);
-}
-
-extern "C"
JITEXPORT void
JIT_fix_handler_context(JIT_Handle jit, Method_Handle method,
::JitFrameContext *context)
@@ -520,41 +456,6 @@
MethodDesc methodDesc(method, jit);
return Jitrino::getRuntimeInterface()->getAddressOfThis(&methodDesc, context,
context->is_ip_past == FALSE);
-}
-
-extern "C"
-JITEXPORT Boolean
-JIT_call_returns_a_reference(JIT_Handle jit, Method_Handle method,
- const ::JitFrameContext *context)
-{
- assert(0);
- return false;
-}
-
-extern "C"
-JITEXPORT int32
-JIT_get_break_point_offset(JIT_Handle jit, Compile_Handle compilation,
- Method_Handle meth, JIT_Flags flags,
- unsigned bc_location)
-{
- assert(0);
- return false;
-}
-
-extern "C"
-JITEXPORT void *
-JIT_get_address_of_var(JIT_Handle jit, ::JitFrameContext *context,
- Boolean is_first, unsigned var_no)
-{
- assert(0);
- return NULL;
-}
-
-extern "C"
-JITEXPORT void
-JIT_init_with_data(JIT_Handle jit, void *jit_data)
-{
- // Ignore the message contained in jit_data
}
extern "C"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h Fri Nov 23 03:31:22 2007
@@ -27,7 +27,6 @@
void vm_add_jit(JIT *jit);
void vm_delete_all_jits();
-void vm_initialize_all_jits();
/**
* Protect arguments from GC.
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h Fri Nov 23 03:31:22 2007
@@ -28,9 +28,6 @@
#include "jit_export_jpda.h"
#include <apr_dso.h>
-bool vm_is_a_jit_dll(const char *dll_filename);
-
-
class Dll_JIT: public JIT {
public:
@@ -42,7 +39,7 @@
~Dll_JIT() {
if (_deinit != NULL) _deinit(this);
if (pool != NULL) apr_pool_destroy(pool);
- //XXX Alexey Varlamov 20050808 - nobody unloads library itself
+ //the library itself is unloaded by the pool destructor
}
void
@@ -54,27 +51,6 @@
_next_command_line_argument(this, option, arg);
}
-
- JIT_Result
- gen_method_info(Compile_Handle compilation,
- Method_Handle method,
- JIT_Flags flags
- )
- {
- return _gen_method_info(this, compilation, method, flags);
- }
-
- JIT_Result
- compile_method(Compile_Handle compilation,
- Method_Handle method,
- JIT_Flags flags
- )
- {
- if (_compile_method == NULL)
- return JIT_FAILURE;
- return _compile_method(this, compilation, method, flags);
- }
-
JIT_Result
compile_method_with_params(Compile_Handle compilation,
Method_Handle method,
@@ -145,15 +121,6 @@
return 0;
}
- Boolean
- can_enumerate(Method_Handle method,
- NativeCodePtr eip
- )
- {
- return _can_enumerate(this, method, eip);
- }
-
-
void
fix_handler_context(Method_Handle method,
JitFrameContext* context
@@ -184,21 +151,6 @@
}
Boolean
- call_returns_a_reference(Method_Handle method,
- const JitFrameContext* context
- )
- {
- return _call_returns_a_reference(this, method, context);
- }
-
- void thread_recompile_methods()
- {
- _thread_recompile_methods();
- }
-
-
-
- Boolean
extended_class_callback(Class_Handle extended_class,
Class_Handle new_class,
void *callback_data)
@@ -239,15 +191,6 @@
return FALSE;
}
- Boolean code_block_relocated(Method_Handle method, int id, NativeCodePtr old_address, NativeCodePtr new_address)
- {
- if (_code_block_relocated != NULL)
- {
- return _code_block_relocated(this, method, id, old_address, new_address);
- }
- return FALSE;
- }
-
void
execute_method(jmethodID method, jvalue *return_value, jvalue *args) {
_execute_method(this, method, return_value, args);
@@ -301,20 +244,6 @@
);
JIT_Result
- (*_gen_method_info)(JIT_Handle jit,
- Compile_Handle compilation,
- Method_Handle method,
- JIT_Flags flags
- );
-
- JIT_Result
- (*_compile_method)(JIT_Handle jit,
- Compile_Handle compilation,
- Method_Handle method,
- JIT_Flags flags
- );
-
- JIT_Result
(*_compile_method_with_params)(JIT_Handle jit,
Compile_Handle compilation,
Method_Handle method,
@@ -359,19 +288,6 @@
uint32 offset,
uint32 inline_depth);
- Boolean
- (*_can_enumerate)(JIT_Handle jit,
- Method_Handle method,
- NativeCodePtr eip
- );
-
- void
- (*_get_breakpoints)(JIT_Handle jit,
- Method_Handle method,
- uint32 *bp,
- JitFrameContext *context
- );
-
void
(*_fix_handler_context)(JIT_Handle jit,
Method_Handle method,
@@ -389,20 +305,6 @@
Method_Handle method,
const JitFrameContext* context
);
-
- Boolean
- (*_call_returns_a_reference)(JIT_Handle jit,
- Method_Handle method,
- const JitFrameContext* context
- );
-
- Boolean
- (*_code_block_relocated)(JIT_Handle jit, Method_Handle method, int id, NativeCodePtr old_address, NativeCodePtr new_address);
-
-
- void *
- (*_thread_recompile_methods)();
-
Boolean
(*_extended_class_callback)(JIT_Handle jit,
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export.h?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export.h Fri Nov 23 03:31:22 2007
@@ -52,23 +52,6 @@
// Required functions.
////////////////////////////////////////////////////////
-//
-// Flags passed from the VM to the JIT.
-//
-// Max 32 bits, so that it fits in one word.
-typedef
-struct JIT_Flags {
-
- // The JIT should generate write barriers.
- Boolean insert_write_barriers : 1;
-
- // out of date flags -> to be removed
- unsigned opt_level : 4;
- Boolean dynamic_profile : 1;
-
-
-} JIT_Flags; //JIT_Flags
-
/**
* Elements of this struct correspond to certain requirements
* of how a managed method is executed (what it additionally does
@@ -183,24 +166,6 @@
} OpenMethodExecutionParams;
-
-
-
-
-// This function is deprecated.
-JITEXPORT JIT_Result
-JIT_gen_method_info(JIT_Handle jit,
- Compile_Handle compilation,
- Method_Handle method,
- JIT_Flags flags
- );
-
-JITEXPORT JIT_Result
-JIT_compile_method(JIT_Handle jit,
- Compile_Handle compilation,
- Method_Handle method,
- JIT_Flags flags
- );
/**
* Performs compilation of given method.
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export_rt.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export_rt.h?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export_rt.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export_rt.h Fri Nov 23 03:31:22 2007
@@ -237,12 +237,6 @@
uint32 offset,
uint32 inline_depth);
-JITEXPORT Boolean
-JIT_can_enumerate(JIT_Handle jit,
- Method_Handle method,
- NativeCodePtr eip
- );
-
JITEXPORT void
JIT_fix_handler_context(JIT_Handle jit,
Method_Handle method,
@@ -255,12 +249,6 @@
const JitFrameContext* context
);
-JITEXPORT Boolean
-JIT_call_returns_a_reference(JIT_Handle jit,
- Method_Handle method,
- const JitFrameContext* context
- );
-
// end stack unwinding
///////////////////////////////////////////////////////
@@ -278,10 +266,6 @@
// end compressed references
///////////////////////////////////////////////////////
-
-JITEXPORT Boolean
-JIT_code_block_relocated(JIT_Handle jit, Method_Handle method, int id, NativeCodePtr old_address, NativeCodePtr new_address);
-
#ifdef __cplusplus
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_intf_cpp.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_intf_cpp.h?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_intf_cpp.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_intf_cpp.h Fri Nov 23 03:31:22 2007
@@ -41,8 +41,6 @@
public:
- JIT_Flags jit_flags; // KEN fix later: if jit keeps jit_flags, there is no need to pass flags
-
//
// Gracefully terminate the JIT.
//
@@ -62,15 +60,6 @@
virtual void
next_command_line_argument(const char *, const char *) {};
-
- //
- // The VM call into JIT to compile a method to generate method info
- //
- virtual JIT_Result
- gen_method_info(Compile_Handle compilation, // in
- Method_Handle method, // in
- JIT_Flags flags // in
- ) = 0;
//
// The VM call into JIT to compile a method.
//
@@ -82,12 +71,6 @@
// - flags -- Currently unused.
//
virtual JIT_Result
- compile_method(Compile_Handle compilation, // in
- Method_Handle method, // in
- JIT_Flags flags // in
- ) = 0;
-
- virtual JIT_Result
compile_method_with_params(Compile_Handle compilation, // in
Method_Handle method, // in
OpenMethodExecutionParams flags // in
@@ -160,12 +143,6 @@
uint32 offset,
uint32 inline_depth) { return 0; }
- virtual Boolean
- can_enumerate(Method_Handle method,
- NativeCodePtr eip
- ) = 0;
-
-
//
// Called by the VM before control is transferred to an exception handler.
@@ -219,27 +196,6 @@
const JitFrameContext *context // in
) = 0;
-
-
- //
- // This function is called for a call site (ie with and eip pointing to
- // the instruction following a call).
- // Iff the function at this call site (be it a Java method or a runtime
- // support function) returns a reference, the result is TRUE.
- // This function is used during GC to decide if eax contains a reference
- // and if it should be enumerated as part of the root set.
- //
- virtual Boolean
- call_returns_a_reference(Method_Handle method, // in
- const JitFrameContext *context // in
- ) = 0;
-
- //
- // thread for triggering recompilation
- //
- virtual void
- thread_recompile_methods() = 0;
-
// Patch the direct call address to new target.
virtual void
rewrite_direct_call(int UNREF rewrite_type,
@@ -267,9 +223,6 @@
// during initialization in order to decide whether it should compress references.
virtual Boolean
supports_compressed_references() = 0;
-
- virtual Boolean
- code_block_relocated(Method_Handle method, int id, NativeCodePtr old_address, NativeCodePtr new_address) = 0;
/**
* Execute java method from VM.
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp Fri Nov 23 03:31:22 2007
@@ -2603,7 +2603,7 @@
// recompilation, the corresponding vtable entries will be updated, and the necessary
// callbacks to JIT_recompiled_method_callback will be made. It is a requirement that
// the method has not already been compiled by the given JIT; this means that multiple
-// instances of a JIT may need to be active at the same time. (See vm_clone_jit.)
+// instances of a JIT may need to be active at the same time.
void vm_recompile_method(JIT_Handle jit, Method_Handle method)
{
compile_do_compilation_jit((Method*) method, (JIT*) jit);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp Fri Nov 23 03:31:22 2007
@@ -981,7 +981,6 @@
}
JIT_Handle vm_load_jit(const char* file_name, apr_dso_handle_t** handle) {
- //if (vm_is_a_jit_dll(file_name)) {
Dll_JIT* jit = new Dll_JIT(file_name);
*handle = jit->get_lib_handle();
if(!*handle) {
@@ -990,9 +989,4 @@
}
vm_add_jit(jit);
return (JIT_Handle)jit;
-
- //}
- //printf("not a jit\n");
- //handle[0]=NULL;
- //return 0;
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp Fri Nov 23 03:31:22 2007
@@ -190,15 +190,6 @@
} //vm_delete_all_jits
-void vm_initialize_all_jits()
-{
- JIT **jit;
- for(jit = jit_compilers; *jit; jit++) {
- (*jit)->jit_flags.insert_write_barriers = (gc_requires_barriers());
- }
-} //vm_initialize_all_jits
-
-
// end JIT management
////////////////////////////////////////////////////////////////////////
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dll_jit.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dll_jit.cpp?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dll_jit.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dll_jit.cpp Fri Nov 23 03:31:22 2007
@@ -33,19 +33,12 @@
Dll_JIT::Dll_JIT(const char *dll_filename) :
_deinit(NULL),
_next_command_line_argument(NULL),
-_gen_method_info(NULL),
-_compile_method(NULL),
_compile_method_with_params(NULL),
_unwind_stack_frame(NULL),
_get_root_set_from_stack_frame(NULL),
_get_root_set_for_thread_dump(NULL),
-_can_enumerate(NULL),
-_get_breakpoints(NULL),
_fix_handler_context(NULL),
_get_address_of_this(NULL),
-_call_returns_a_reference(NULL),
-_code_block_relocated(NULL),
-_thread_recompile_methods(NULL),
_extended_class_callback(NULL),
_overridden_method_callback(NULL),
_recompiled_method_callback(NULL),
@@ -59,7 +52,6 @@
{
apr_status_t stat;
char buf[1024];
- memset((void *) &jit_flags, 0, sizeof(JIT_Flags));
apr_pool_create(&pool, 0);
assert(pool);
apr_dso_handle_t *handle;
@@ -119,10 +111,6 @@
GET_FUNCTION(fn, handle, "JIT_get_root_set_for_thread_dump");
_get_root_set_for_thread_dump = (void (*)(JIT_Handle, Method_Handle, GC_Enumeration_Handle, const JitFrameContext *)) fn;
-
- GET_FUNCTION(fn, handle, "JIT_can_enumerate");
- _can_enumerate = (Boolean (*)(JIT_Handle, Method_Handle, NativeCodePtr)) fn;
-
GET_FUNCTION(fn, handle, "JIT_fix_handler_context");
_fix_handler_context = (void (*)(JIT_Handle, Method_Handle, JitFrameContext *)) fn;
@@ -132,24 +120,12 @@
GET_OPTIONAL_FUNCTION(fn, handle, "JIT_is_soe_area");
_is_soe_area = (Boolean (*)(JIT_Handle, Method_Handle, const JitFrameContext *)) fn;
- GET_FUNCTION(fn, handle, "JIT_call_returns_a_reference");
- _call_returns_a_reference = (Boolean (*)(JIT_Handle, Method_Handle, const JitFrameContext *)) fn;
-
- GET_FUNCTION(fn, handle, "JIT_gen_method_info");
- _gen_method_info = (JIT_Result (*)(JIT_Handle, Compile_Handle, Method_Handle, JIT_Flags)) fn;
-
- GET_FUNCTION(fn, handle, "JIT_compile_method");
- _compile_method = (JIT_Result (*)(JIT_Handle, Compile_Handle, Method_Handle, JIT_Flags)) fn;
-
GET_FUNCTION(fn, handle, "JIT_compile_method_with_params");
_compile_method_with_params = (JIT_Result (*)(JIT_Handle, Compile_Handle, Method_Handle, OpenMethodExecutionParams)) fn;
GET_OPTIONAL_FUNCTION(fn, handle, "JIT_supports_compressed_references");
_supports_compressed_references = (Boolean (*)(JIT_Handle)) fn;
- GET_OPTIONAL_FUNCTION(fn, handle, "JIT_code_block_relocated");
- _code_block_relocated = (Boolean (*)(JIT_Handle, Method_Handle, int, NativeCodePtr, NativeCodePtr)) fn;
-
GET_OPTIONAL_FUNCTION(fn, handle, "JIT_execute_method");
_execute_method = (void(*)(JIT_Handle, jmethodID, jvalue*, jvalue*)) fn;
@@ -171,26 +147,3 @@
_execute_method = JIT_execute_method_default;
}
}
-
-
-bool vm_is_a_jit_dll(const char *dll_filename)
-{
- apr_pool_t *pp;
- apr_pool_create(&pp, 0);
- apr_dso_handle_t *handle;
- bool result = false;
- if (apr_dso_load(&handle, dll_filename, pp) == APR_SUCCESS)
- {
- apr_dso_handle_sym_t tmp;
- if (apr_dso_sym(&tmp, handle, "JIT_compile_method") == APR_SUCCESS) {
- result = true;
- }
- apr_dso_unload(handle);
- }
-
- apr_pool_destroy(pp);
-
- return result;
-
-}
-
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp?rev=597644&r1=597643&r2=597644&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp Fri Nov 23 03:31:22 2007
@@ -473,18 +473,3 @@
assert((int)stub_length >= (s - stub));
*(char **)h = s;
} //jit_inline_native_array_copy_general
-
-
-#if defined (__INTEL_COMPILER)
-#pragma warning ( push )
-#pragma warning (disable:869)
-#endif
-
-int find_inline_native_method(const char* UNREF clss_name, const char* UNREF method_name,JIT_Result (UNREF *&func)(Method& method, JIT_Flags flags))
-{
- return -1 ;
-} //find_inline_native_method
-
-#if defined (__INTEL_COMPILER)
-#pragma warning ( pop )
-#endif