harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r449250 - in /incubator/harmony/enhanced/drlvm/trunk/vm: port/src/lil/em64t/pim/ vmcore/src/jvmti/ vmcore/src/util/em64t/base/ vmcore/src/util/linux/
Date Sat, 23 Sep 2006 14:23:59 GMT
Author: geirm
Date: Sat Sep 23 07:23:58 2006
New Revision: 449250

URL: http://svn.apache.org/viewvc?view=rev&rev=449250
Log:
HARMONY-1551

DRLVM][JVMTI] Fix build of JVMTI on EM64T.

        - Put usage of IA32 registers into ifdef.
        - Add include of missed header file. 

Ubuntu 6 - smoke, c-unit


Modified:
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/m2n_em64t.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_dasm.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_em64t.cpp

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/m2n_em64t.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/m2n_em64t.cpp?view=diff&rev=449250&r1=449249&r2=449250
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/m2n_em64t.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/m2n_em64t.cpp Sat Sep
23 07:23:58 2006
@@ -363,3 +363,15 @@
     }
     return buf;
 }
+
+// returns pointer to the registers used for jvmti PopFrame
+Registers* get_pop_frame_registers(M2nFrame* m2nf) {
+    // Empty implementation
+    return NULL;
+}
+
+// sets pointer to the registers used for jvmti PopFrame
+void set_pop_frame_registers(M2nFrame* m2nf, Registers* regs) {
+    // Empty implementation
+}
+

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp?view=diff&rev=449250&r1=449249&r2=449250
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp
Sat Sep 23 07:23:58 2006
@@ -367,6 +367,12 @@
     regs->r11 = *si->jit_frame_context.p_r11;
 }
 
+void si_set_callbak(StackIterator* si, NativeCodePtr* callback) {
+    si->jit_frame_context.rsp = si->jit_frame_context.rsp - 4;
+    *((uint64*) si->jit_frame_context.rsp) = *(si->jit_frame_context.p_rip);
+    si->jit_frame_context.p_rip = ((uint64*)callback);
+}
+
 void si_reload_registers() {
     // Nothing to do
 }

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_dasm.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_dasm.cpp?view=diff&rev=449250&r1=449249&r2=449250
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_dasm.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_dasm.cpp Sat Sep 23 07:23:58
2006
@@ -66,6 +66,27 @@
     }
 }
 
+#ifdef _IPF_
+static const char* get_reg_value(
+    InstructionDisassembler::Register reg,
+    const Registers* pcontext)
+{
+    assert(0);
+    return NULL;
+}
+
+#elif defined _EM64T_
+
+static const char* get_reg_value(
+    InstructionDisassembler::Register reg,
+    const Registers* pcontext)
+{
+    assert(0);
+    return NULL;
+}
+
+#else // _IA32_
+
 static const char* get_reg_value(
     InstructionDisassembler::Register reg,
     const Registers* pcontext)
@@ -85,6 +106,7 @@
     return NULL;
 }
 
+#endif // _IA32_
 
 void InstructionDisassembler::disasm(const NativeCodePtr addr, 
                                      InstructionDisassembler * pidi)

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp?view=diff&rev=449250&r1=449249&r2=449250
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
Sat Sep 23 07:23:58 2006
@@ -22,6 +22,8 @@
 
 #include <assert.h>
 
+#include "environment.h"
+
 #include "open/hythread_ext.h"
 #include "lil.h"
 #include "lil_code_generator.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_em64t.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_em64t.cpp?view=diff&rev=449250&r1=449249&r2=449250
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_em64t.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_em64t.cpp Sat
Sep 23 07:23:58 2006
@@ -103,6 +103,9 @@
     uc->uc_mcontext.gregs[REG_RSP] = regs->rsp;
 }
 
+void asm_jvmti_exception_catch_callback() {
+    assert(0);
+}
 static void throw_from_sigcontext(ucontext_t *uc, Class* exc_clss)
 {
     Registers regs;



Mime
View raw message