You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gs...@apache.org on 2008/03/07 12:31:09 UTC
svn commit: r634618 - in /harmony/enhanced/drlvm/trunk/vm/vmcore/src:
lil/ipf/ util/ipf/base/ util/linux/
Author: gshimansky
Date: Fri Mar 7 03:30:42 2008
New Revision: 634618
URL: http://svn.apache.org/viewvc?rev=634618&view=rev
Log:
Fixed VM compilation on IPF after move of method lookup to EM
Modified:
harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ipf.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp?rev=634618&r1=634617&r2=634618&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp Fri Mar 7 03:30:42 2008
@@ -35,7 +35,6 @@
#include "jit_intf_cpp.h"
#include "m2n.h"
#include "m2n_ipf_internal.h"
-#include "method_lookup.h"
#include "nogc.h"
#include "vm_ipf.h"
#include "vm_threads.h"
@@ -492,7 +491,11 @@
}
Global_Env *env = VM_Global_State::loader_env;
si->c.is_ip_past = TRUE;
- si->cci = env->vm_methods->find(si_get_ip(si));
+ Method_Handle m = env->em_interface->LookupCodeChunk(
+ si_get_ip(si), FALSE,
+ NULL, NULL, reinterpret_cast<void **>(&si->cci));
+ if (NULL == m)
+ si->cci = NULL;
si_unwind_bsp(si);
si_setup_stacked_registers(si);
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp?rev=634618&r1=634617&r2=634618&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp Fri Mar 7 03:30:42 2008
@@ -35,7 +35,6 @@
#include "open/types.h"
#include "Class.h"
#include "environment.h"
-#include "method_lookup.h"
#include "exceptions.h"
#include "open/gc.h"
#include "ini.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp?rev=634618&r1=634617&r2=634618&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp Fri Mar 7 03:30:42 2008
@@ -41,7 +41,6 @@
#include "open/types.h"
#include "Class.h"
#include "environment.h"
-#include "method_lookup.h"
#include "m2n.h"
#include "../m2n_ipf_internal.h"
#include "exceptions.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp?rev=634618&r1=634617&r2=634618&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp Fri Mar 7 03:30:42 2008
@@ -33,7 +33,6 @@
#include "jit_runtime_support.h"
#include "Class.h"
#include "environment.h"
-#include "method_lookup.h"
#include "m2n.h"
#include "../m2n_ipf_internal.h"
#include "object_layout.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp?rev=634618&r1=634617&r2=634618&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp Fri Mar 7 03:30:42 2008
@@ -49,7 +49,6 @@
#include "ini.h"
#include "nogc.h"
#include "compile.h"
-#include "method_lookup.h"
#include "exceptions.h"
#include "exceptions_jit.h"
#include "vm_strings.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ipf.cpp?rev=634618&r1=634617&r2=634618&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ipf.cpp Fri Mar 7 03:30:42 2008
@@ -47,7 +47,6 @@
#include <pthread.h>
#include <sys/time.h>
-#include "method_lookup.h"
#include "Class.h"
#include "environment.h"