From d086881c189d3f841a7a817decdbf40aecd19d6c Mon Sep 17 00:00:00 2001 From: Pavel Afremov Date: Wed, 25 Oct 2006 17:10:54 +0400 Subject: [PATCH] HARMONY-1822 [DRLVM][EM64T] Fix DRL VM build on EM64T. Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s a fix for HARMONY-1582 and HARMONY-1677. Fix consist in add missed include .h file into stack_iterator_em64t.cpp and exclude define unused on EM64T functions in magics.cpp. --- vm/jitrino/src/jet/magics.cpp | 5 ++++- vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/vm/jitrino/src/jet/magics.cpp b/vm/jitrino/src/jet/magics.cpp old mode 100644 new mode 100755 index 5aeac4a..d1126d2 --- a/vm/jitrino/src/jet/magics.cpp +++ b/vm/jitrino/src/jet/magics.cpp @@ -54,7 +54,9 @@ bool is_magic(Method_Handle m) return is_magic(klass); } - +#ifdef _EM64T_ +// sizeof_jt & vstack_replace_top_opnd aren't used on EM64T +#else static size_t sizeof_jt(jtype jt) { static size_t sizes[] = { 1, //i8, @@ -83,6 +85,7 @@ static void vstack_replace_top_opnd(Comp c->vpop(); c->vpush(after); } +#endif //not em64t bool Compiler::gen_magic(void) { diff --git a/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp b/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp old mode 100644 new mode 100755 index fad2660..bd453e4 --- a/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp +++ b/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp @@ -21,6 +21,7 @@ #include +#include "environment.h" #include "stack_iterator.h" #include "vm_threads.h" #include "method_lookup.h" -- 1.4.1