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 2008/03/18 09:09:49 UTC
svn commit: r638257 - in /harmony/enhanced/drlvm/trunk/vm:
include/open/hycomp.h vmcore/src/util/ipf/base/compile_ipf.cpp
vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
vmcore/src/util/ipf/include/Code_Emitter.h
Author: varlax
Date: Tue Mar 18 01:09:47 2008
New Revision: 638257
URL: http://svn.apache.org/viewvc?rev=638257&view=rev
Log:
Fixed IA64 compilation
Modified:
harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_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/ipf/include/Code_Emitter.h
Modified: harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h?rev=638257&r1=638256&r2=638257&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h Tue Mar 18 01:09:47 2008
@@ -238,7 +238,8 @@
#define CLEAR_U64(u64) (u64 = (U_64)0)
#define LOW_LONG(l) (*((U_32 *) &(l)))
#define HIGH_LONG(l) (*(((U_32 *) &(l)) + 1))
-#define I8(x) ((I_8) (x))
+//conflicts with many IPF-related names
+//#define I8(x) ((I_8) (x))
#define I8P(x) ((I_8 *) (x))
#define U16(x) ((U_16) (x))
#define I16(x) ((I_16) (x))
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=638257&r1=638256&r2=638257&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 Tue Mar 18 01:09:47 2008
@@ -39,6 +39,7 @@
#include "cxxlog.h"
#include "open/types.h"
+#include "open/vm_type_access.h"
#include "Class.h"
#include "environment.h"
#include "m2n.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=638257&r1=638256&r2=638257&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 Tue Mar 18 01:09:47 2008
@@ -73,6 +73,7 @@
#include "dump.h"
#include "vm_stats.h"
+#include "internal_jit_intf.h"
void gen_convert_managed_to_unmanaged_null_ipf(Emitter_Handle emitter,
unsigned reg);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Code_Emitter.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Code_Emitter.h?rev=638257&r1=638256&r2=638257&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Code_Emitter.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Code_Emitter.h Tue Mar 18 01:09:47 2008
@@ -29,6 +29,7 @@
#include "open/types.h"
#include "Emitter_IR.h"
#include "log_macro.h"
+#include "vm_java_support.h"
typedef Encoder_Instr_IR Instr_IR;
typedef Encoder_Bundle_IR Bundle_IR;