harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r468691 - in /incubator/harmony/enhanced/drlvm/trunk/vm: jitrino/src/jet/magics.cpp port/src/lil/em64t/pim/stack_iterator_em64t.cpp vmcore/include/version_svn_tag.h
Date Sat, 28 Oct 2006 13:34:29 GMT
Author: geirm
Date: Sat Oct 28 06:34:29 2006
New Revision: 468691

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

Fix DRLVM build for EM64T

Builds and passes expected tests on Ubuntu 6 x86

Someone needs to test on EM64T



Modified:
    incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/magics.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/magics.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/magics.cpp?view=diff&rev=468691&r1=468690&r2=468691
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/magics.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/magics.cpp Sat Oct 28 06:34:29
2006
@@ -54,7 +54,9 @@
     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 @@
     c->vpop(); 
     c->vpush(after);
 }
+#endif //not em64t
 
 bool Compiler::gen_magic(void)
 {

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=468691&r1=468690&r2=468691
==============================================================================
--- 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 Oct 28 06:34:29 2006
@@ -21,6 +21,7 @@
 
 #include <string.h>
 
+#include "environment.h"
 #include "stack_iterator.h"
 #include "vm_threads.h"
 #include "method_lookup.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h?view=diff&rev=468691&r1=468690&r2=468691
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h Sat Oct 28
06:34:29 2006
@@ -18,6 +18,6 @@
 #ifndef _VERSION_SVN_TAG_
 #define _VERSION_SVN_TAG_
 
-#define VERSION_SVN_TAG  "467316"
+#define VERSION_SVN_TAG  "468686"
 
 #endif // _VERSION_SVN_TAG_



Mime
View raw message