You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/06/22 23:43:59 UTC
svn commit: r957042 [1/3] - in /harmony/enhanced/java/branches/mrh:
common_resources/depends/build/platform/
drlvm/modules/vm/src/main/native/em/unix/
drlvm/modules/vm/src/main/native/encoder/shared/x86/
drlvm/modules/vm/src/main/native/encoder/unix/ d...
Author: hindessm
Date: Tue Jun 22 21:43:55 2010
New Revision: 957042
URL: http://svn.apache.org/viewvc?rev=957042&view=rev
Log:
x86_64 build fixes.
Modified:
harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/em/unix/makefile
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/dec_base.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_base.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_base.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_defs.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_prvt.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_tabl.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.inl
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/makefile
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/shared/thread_native_tls.c
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/unix/makefile
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/shared/interpreter.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/makefile
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_arith.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_br.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_instr.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_meth.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_regs.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/csig.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc_ia32.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc_ia32.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/jdefs.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/jet.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/rt.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/rt_ia32.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/val.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/CodeSelectors.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/FastArrayFilling.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/inliner.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/PlatformDependant.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/mkernel.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/mkernel.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/translator/java/JavaByteCodeTranslator.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/vm/JITInterface.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/CodeGenerator_arch.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32APIMagics.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32BBPolling.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32BCMap.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32CFG.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32CallingConvention.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32CallingConvention.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32CgUtils.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32CodeEmitter.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32CodeGeneratorFlags.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32CodeLayout.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32CodeLayoutBottomUp.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32CodeLayoutTopDown.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32CodeSelector.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32ComplexAddrFormLoader.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32Constraint.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32Constraint.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32CopyExpansion.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32Encoder.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32Encoder.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32FastArrayFilling.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32GCMap.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32GCMap.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32GCSafePoints.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32GCSafePoints.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32IRConstants.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32IRManager.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32IRManager.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32Inst.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32Inst.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32InstCodeSelector.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32InstCodeSelector.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32InternalProfiler.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32InternalTrace.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32InternalTrace.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32Printer.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32Printer.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32RegAlloc2.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32RegAlloc3.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32SpillGen.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32StackInfo.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32StackInfo.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32StackLayout.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32Tls.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32Tls.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/RuntimeInterface_arch.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/makefile
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/port/unix/disasm/disasm.c
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/port/unix/makefile
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/port/unix/misc/sysinfo.c
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/port_ch/unix/makefile
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/port_ch/unix/thread/port_thread_tls_os.c
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/verifier/unix/makefile
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/class_support/Environment.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/exception/exceptions_jit.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/lil/m2n_internal.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/init/vm_init.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jit/jit_runtime_support.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jit/native_overrides.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_break_intf.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_capability.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_dasm.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_pop_frame.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_step.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/lil/lil_code_generator.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/stack/native_stack.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/util/signals.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/lil/include/lil_code_generator_arch.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/lil/m2n_internal.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/include/lil_code_generator_arch.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/m2n.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/m2n_internal.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/stack_iterator.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/compile.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/jit_lock_rt_support.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/jit_runtime_support.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/unix/makefile
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/unix/util/include/platform_lowlevel.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/makefile
harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/hycomp.h
harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/hythread.h
harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/platform_types.h
harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/rt_types.h
harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_atomic.h
harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_barriers.h
harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_general.h
harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/disasm/linux/disasm.c_notused
harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/disasm/win/disasm.c
harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/misc/win/sysinfo.c
harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/thread/win/port_thread_tls_os.c
harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/thread/win/thread_os.c
harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/jit_runtime_support_common.h
harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/jvmti_dasm.h
harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/thread_helpers.h
harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/version.h
Modified: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk Tue Jun 22 21:43:55 2010
@@ -14,6 +14,7 @@
# limitations under the License.
DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
+PLATFORM := -DPOINTER64 -fPIC # TOFIX drlvm hack
XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
OSLIBS += -ldl
HY_CAN_LINK_DEBUG = yes
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/em/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/em/unix/makefile?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/em/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/em/unix/makefile Tue Jun 22 21:43:55 2010
@@ -22,7 +22,7 @@ include $(HY_TARGET)/hdk/build/make/defi
VM_HOME=../../../../../../../vm/
DEFINES += \
- -DREFS_USE_UNCOMPRESSED -D_IA32_ -DPLATFORM_POSIX \
+ -DREFS_USE_UNCOMPRESSED -DPLATFORM_POSIX \
-D__SMP__ -DLINUX_TLS_OPT -D_LARGEFILE64_SOURCE
OPT += -fexceptions
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/dec_base.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/dec_base.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/dec_base.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/dec_base.cpp Tue Jun 22 21:43:55 2010
@@ -172,7 +172,7 @@ unsigned DecoderBase::decode(const void
return tmp.size;
}
-#ifdef _EM64T_
+#ifdef HYX86_64
#define EXTEND_REG(reg, flag) \
((NULL == rex || 0 == rex->flag) ? reg : (reg + 8))
#else
@@ -301,7 +301,7 @@ bool DecoderBase::decode_aux(const Encod
*pbuf += 4;
}
return true;
-#ifdef _EM64T_
+#ifdef HYX86_64
case OpcodeByteKind_io:
{
long long int ival = *(long long int*)*pbuf;
@@ -338,12 +338,12 @@ bool DecoderBase::try_mn(Mnemonic mn, co
char *opcode_ptr = const_cast<char *>(odesc.opcode);
int opcode_len = odesc.opcode_len;
Rex *prex = NULL;
-#ifdef _EM64T_
+#ifdef HYX86_64
Rex rex;
#endif
*pbuf = save_pbuf;
-#ifdef _EM64T_
+#ifdef HYX86_64
// Match REX prefixes
unsigned char rex_byte = (*pbuf)[0];
if ((rex_byte & 0xf0) == 0x40)
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_base.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_base.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_base.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_base.cpp Tue Jun 22 21:43:55 2010
@@ -122,7 +122,7 @@ char* EncoderBase::encode_aux(char* stre
else {
modrm.mod = 3; // 11
modrm.rm = getHWRegIndex(opnds[memidx].reg());
-#ifdef _EM64T_
+#ifdef HYX86_64
if (opnds[memidx].need_rex() && needs_rex_r(opnds[memidx].reg())) {
prex->b = 1;
}
@@ -130,7 +130,7 @@ char* EncoderBase::encode_aux(char* stre
++stream;
}
modrm.reg = getHWRegIndex(opnds[regidx].reg());
-#ifdef _EM64T_
+#ifdef HYX86_64
if (opnds[regidx].need_rex() && needs_rex_r(opnds[regidx].reg())) {
prex->r = 1;
}
@@ -156,7 +156,7 @@ char* EncoderBase::encode_aux(char* stre
else {
modrm.mod = 3; // 11
modrm.rm = getHWRegIndex(opnds[idx].reg());
-#ifdef _EM64T_
+#ifdef HYX86_64
if (opnds[idx].need_rex() && needs_rex_r(opnds[idx].reg())) {
prex->b = 1;
}
@@ -184,9 +184,9 @@ char* EncoderBase::encode_aux(char* stre
case OpcodeByteKind_ib>>8:
case OpcodeByteKind_iw>>8:
case OpcodeByteKind_id>>8:
-#ifdef _EM64T_
+#ifdef HYX86_64
case OpcodeByteKind_io>>8:
-#endif //_EM64T_
+#endif //HYX86_64
// ib, iw, id - A 1-byte (ib), 2-byte (iw), or 4-byte (id)
// immediate operand to the instruction that follows the
// opcode, ModR/M bytes or scale-indexing bytes. The opcode
@@ -208,7 +208,7 @@ char* EncoderBase::encode_aux(char* stre
*(unsigned*)stream = (unsigned)opnds[idx].imm();
stream += 4;
}
-#ifdef _EM64T_
+#ifdef HYX86_64
else {
assert(kind == OpcodeByteKind_io);
*(long long*)stream = (long long)opnds[idx].imm();
@@ -254,7 +254,7 @@ char* EncoderBase::encode_aux(char* stre
const unsigned lowByte = (byte & OpcodeByteKind_OpcodeMask);
*(unsigned char*)stream = (unsigned char)lowByte +
getHWRegIndex(opnds[*pargsCount].reg());
-#ifdef _EM64T_
+#ifdef HYX86_64
if (opnds[*pargsCount].need_rex() && needs_rex_r(opnds[*pargsCount].reg())) {
prex->b = 1;
}
@@ -288,7 +288,7 @@ char * EncoderBase::encode(char * stream
#endif
const OpcodeDesc * odesc = lookup(mn, opnds);
-#if !defined(_EM64T_)
+#if !defined(HYX86_64)
bool copy_opcode = true;
Rex *prex = NULL;
#else
@@ -460,7 +460,7 @@ char* EncoderBase::encodeModRM(char* str
// ... yes - only have disp
// On EM64T, the simply [disp] addressing means 'RIP-based' one -
// must have to use SIB to encode 'DS: based'
-#ifdef _EM64T_
+#ifdef HYX86_64
modrm.mod = 0; // 00 - ..
modrm.rm = 4; // 100 - have SIB
@@ -562,12 +562,12 @@ char* EncoderBase::encodeModRM(char* str
// the only reason we're here without index, is that we have {E|R}SP
// or R12 as a base. Another possible reason - EBP without a disp -
// is handled above by adding a fake disp8
-#ifdef _EM64T_
+#ifdef HYX86_64
assert(op.base() != RegName_Null && (equals(op.base(), REG_STACK) ||
equals(op.base(), RegName_R12)));
-#else // _EM64T_
+#else // HYX86_64
assert(op.base() != RegName_Null && equals(op.base(), REG_STACK));
-#endif //_EM64T_
+#endif //HYX86_64
sib.scale = 0; // SS = 00
sib.index = 4; // SS + index=100 means 'no index'
}
@@ -757,7 +757,7 @@ EncoderBase::lookup(Mnemonic mn, const O
assert(!odesc->last);
assert(odesc->roles.count == opnds.count());
assert(odesc->platf != OpcodeInfo::decoder);
-#if !defined(_EM64T_)
+#if !defined(HYX86_64)
// tuning was done for IA32 only, so no size restriction on EM64T
//assert(sizeof(OpcodeDesc)==128);
#endif
@@ -885,7 +885,7 @@ static const struct {
}
registers[] = {
-#ifdef _EM64T_
+#ifdef HYX86_64
{"RAX", RegName_RAX},
{"RBX", RegName_RBX},
{"RCX", RegName_RCX},
@@ -912,7 +912,7 @@ registers[] = {
{"EBP", RegName_EBP},
{"ESI", RegName_ESI},
{"EDI", RegName_EDI},
-#ifdef _EM64T_
+#ifdef HYX86_64
{"R8D", RegName_R8D},
{"R9D", RegName_R9D},
{"R10D", RegName_R10D},
@@ -936,7 +936,7 @@ registers[] = {
{"CL", RegName_CL},
{"DL", RegName_DL},
{"BL", RegName_BL},
-#if !defined(_EM64T_)
+#if !defined(HYX86_64)
{"AH", RegName_AH},
{"CH", RegName_CH},
{"DH", RegName_DH},
@@ -998,7 +998,7 @@ registers[] = {
{"XMM5", RegName_XMM5},
{"XMM6", RegName_XMM6},
{"XMM7", RegName_XMM7},
-#ifdef _EM64T_
+#ifdef HYX86_64
{"XMM8", RegName_XMM8},
{"XMM9", RegName_XMM9},
{"XMM10", RegName_XMM10},
@@ -1018,7 +1018,7 @@ registers[] = {
{"XMM5S", RegName_XMM5S},
{"XMM6S", RegName_XMM6S},
{"XMM7S", RegName_XMM7S},
-#ifdef _EM64T_
+#ifdef HYX86_64
{"XMM8S", RegName_XMM8S},
{"XMM9S", RegName_XMM9S},
{"XMM10S", RegName_XMM10S},
@@ -1037,7 +1037,7 @@ registers[] = {
{"XMM5D", RegName_XMM5D},
{"XMM6D", RegName_XMM6D},
{"XMM7D", RegName_XMM7D},
-#ifdef _EM64T_
+#ifdef HYX86_64
{"XMM8D", RegName_XMM8D},
{"XMM9D", RegName_XMM9D},
{"XMM10D", RegName_XMM10D},
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_base.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_base.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_base.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_base.h Tue Jun 22 21:43:55 2010
@@ -400,7 +400,7 @@ public:
*/
unsigned hash(void) const { return m_hash; }
//
-#ifdef _EM64T_
+#ifdef HYX86_64
bool need_rex(void) const { return m_need_rex; }
#else
bool need_rex(void) const { return false; }
@@ -475,7 +475,7 @@ public:
void hash_it(void)
{
m_hash = size_hash[m_size] | kind_hash[m_kind];
-#ifdef _EM64T_
+#ifdef HYX86_64
m_need_rex = false;
if (is_reg() && is_em64t_extra_reg(m_reg)) {
m_need_rex = true;
@@ -544,7 +544,7 @@ public:
m_operands[m_count++] = op;
m_need_rex = m_need_rex || op.m_need_rex;
}
-#ifdef _EM64T_
+#ifdef HYX86_64
bool need_rex(void) const { return m_need_rex; }
#else
bool need_rex(void) const { return false; }
@@ -584,7 +584,7 @@ private:
static char* encode_aux(char* stream, unsigned aux,
const Operands& opnds, const OpcodeDesc * odesc,
unsigned * pargsCount, Rex* prex);
-#ifdef _EM64T_
+#ifdef HYX86_64
/**
* @brief Returns true if the 'reg' argument represents one of the new
* EM64T registers - R8(D)-R15(D).
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_defs.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_defs.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_defs.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_defs.h Tue Jun 22 21:43:55 2010
@@ -40,7 +40,7 @@
#define COUNTOF(a) (sizeof(a)/sizeof(a[0]))
#endif
-#ifdef _EM64T_
+#ifdef HYX86_64
/**
* A stack pointer of default platform's size.
*/
@@ -166,7 +166,7 @@ enum RegName {
RegName_Null = 0,
-#ifdef _EM64T_
+#ifdef HYX86_64
/*
An index part of the RegName-s for RAX-RDI, EAX-ESI, AX-SI and AL-BH is
the same as the index used during instructions encoding. The same rule
@@ -191,7 +191,7 @@ enum RegName {
RegName_R13 = REGNAME(OpndKind_GPReg,OpndSize_64,13),
RegName_R14 = REGNAME(OpndKind_GPReg,OpndSize_64,14),
RegName_R15 = REGNAME(OpndKind_GPReg,OpndSize_64,15),
-#endif //~_EM64T_
+#endif //~HYX86_64
RegName_EAX=REGNAME(OpndKind_GPReg,OpndSize_32,0),
RegName_ECX=REGNAME(OpndKind_GPReg,OpndSize_32,1),
@@ -202,7 +202,7 @@ enum RegName {
RegName_ESI=REGNAME(OpndKind_GPReg,OpndSize_32,6),
RegName_EDI=REGNAME(OpndKind_GPReg,OpndSize_32,7),
-#ifdef _EM64T_
+#ifdef HYX86_64
RegName_R8D = REGNAME(OpndKind_GPReg,OpndSize_32,8),
RegName_R9D = REGNAME(OpndKind_GPReg,OpndSize_32,9),
RegName_R10D = REGNAME(OpndKind_GPReg,OpndSize_32,10),
@@ -211,7 +211,7 @@ enum RegName {
RegName_R13D = REGNAME(OpndKind_GPReg,OpndSize_32,13),
RegName_R14D = REGNAME(OpndKind_GPReg,OpndSize_32,14),
RegName_R15D = REGNAME(OpndKind_GPReg,OpndSize_32,15),
-#endif //~_EM64T_
+#endif //~HYX86_64
RegName_AX=REGNAME(OpndKind_GPReg,OpndSize_16,0),
RegName_CX=REGNAME(OpndKind_GPReg,OpndSize_16,1),
@@ -222,7 +222,7 @@ enum RegName {
RegName_SI=REGNAME(OpndKind_GPReg,OpndSize_16,6),
RegName_DI=REGNAME(OpndKind_GPReg,OpndSize_16,7),
-#ifdef _EM64T_
+#ifdef HYX86_64
RegName_R8S = REGNAME(OpndKind_GPReg,OpndSize_16,8),
RegName_R9S = REGNAME(OpndKind_GPReg,OpndSize_16,9),
RegName_R10S = REGNAME(OpndKind_GPReg,OpndSize_16,10),
@@ -231,7 +231,7 @@ enum RegName {
RegName_R13S = REGNAME(OpndKind_GPReg,OpndSize_16,13),
RegName_R14S = REGNAME(OpndKind_GPReg,OpndSize_16,14),
RegName_R15S = REGNAME(OpndKind_GPReg,OpndSize_16,15),
-#endif //~_EM64T_
+#endif //~HYX86_64
RegName_AL=REGNAME(OpndKind_GPReg,OpndSize_8,0),
RegName_CL=REGNAME(OpndKind_GPReg,OpndSize_8,1),
@@ -241,7 +241,7 @@ enum RegName {
// AH is not accessible on EM64T, instead encoded register is SPL, so decoded
// register will return incorrect enum
RegName_AH=REGNAME(OpndKind_GPReg,OpndSize_8,4),
-#if !defined(_EM64T_)
+#if !defined(HYX86_64)
RegName_CH=REGNAME(OpndKind_GPReg,OpndSize_8,5),
RegName_DH=REGNAME(OpndKind_GPReg,OpndSize_8,6),
RegName_BH=REGNAME(OpndKind_GPReg,OpndSize_8,7),
@@ -307,7 +307,7 @@ enum RegName {
RegName_XMM6=REGNAME(OpndKind_XMMReg,OpndSize_128,6),
RegName_XMM7=REGNAME(OpndKind_XMMReg,OpndSize_128,7),
-#ifdef _EM64T_
+#ifdef HYX86_64
RegName_XMM8 = REGNAME(OpndKind_XMMReg,OpndSize_128,0),
RegName_XMM9 = REGNAME(OpndKind_XMMReg,OpndSize_128,1),
RegName_XMM10 = REGNAME(OpndKind_XMMReg,OpndSize_128,2),
@@ -316,7 +316,7 @@ enum RegName {
RegName_XMM13 = REGNAME(OpndKind_XMMReg,OpndSize_128,5),
RegName_XMM14 = REGNAME(OpndKind_XMMReg,OpndSize_128,6),
RegName_XMM15 = REGNAME(OpndKind_XMMReg,OpndSize_128,7),
-#endif //~_EM64T_
+#endif //~HYX86_64
#endif // ~TESTING_ENCODER
@@ -328,7 +328,7 @@ enum RegName {
RegName_XMM5S=REGNAME(OpndKind_XMMReg,OpndSize_32,5),
RegName_XMM6S=REGNAME(OpndKind_XMMReg,OpndSize_32,6),
RegName_XMM7S=REGNAME(OpndKind_XMMReg,OpndSize_32,7),
-#ifdef _EM64T_
+#ifdef HYX86_64
RegName_XMM8S=REGNAME(OpndKind_XMMReg,OpndSize_32,8),
RegName_XMM9S=REGNAME(OpndKind_XMMReg,OpndSize_32,9),
RegName_XMM10S=REGNAME(OpndKind_XMMReg,OpndSize_32,10),
@@ -337,7 +337,7 @@ enum RegName {
RegName_XMM13S=REGNAME(OpndKind_XMMReg,OpndSize_32,13),
RegName_XMM14S=REGNAME(OpndKind_XMMReg,OpndSize_32,14),
RegName_XMM15S=REGNAME(OpndKind_XMMReg,OpndSize_32,15),
-#endif // ifdef _EM64T_
+#endif // ifdef HYX86_64
RegName_XMM0D=REGNAME(OpndKind_XMMReg,OpndSize_64,0),
RegName_XMM1D=REGNAME(OpndKind_XMMReg,OpndSize_64,1),
RegName_XMM2D=REGNAME(OpndKind_XMMReg,OpndSize_64,2),
@@ -346,7 +346,7 @@ enum RegName {
RegName_XMM5D=REGNAME(OpndKind_XMMReg,OpndSize_64,5),
RegName_XMM6D=REGNAME(OpndKind_XMMReg,OpndSize_64,6),
RegName_XMM7D=REGNAME(OpndKind_XMMReg,OpndSize_64,7),
-#ifdef _EM64T_
+#ifdef HYX86_64
RegName_XMM8D=REGNAME(OpndKind_XMMReg,OpndSize_64,8),
RegName_XMM9D=REGNAME(OpndKind_XMMReg,OpndSize_64,9),
RegName_XMM10D=REGNAME(OpndKind_XMMReg,OpndSize_64,10),
@@ -355,7 +355,7 @@ enum RegName {
RegName_XMM13D=REGNAME(OpndKind_XMMReg,OpndSize_64,13),
RegName_XMM14D=REGNAME(OpndKind_XMMReg,OpndSize_64,14),
RegName_XMM15D=REGNAME(OpndKind_XMMReg,OpndSize_64,15),
-#endif // ifdef _EM64T_
+#endif // ifdef HYX86_64
#ifdef _HAVE_MMX_
RegName_MMX0=REGNAME(OpndKind_MMXReg,OpndSize_64,0),
RegName_MMX1=REGNAME(OpndKind_MMXReg,OpndSize_64,1),
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_prvt.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_prvt.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_prvt.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_prvt.h Tue Jun 22 21:43:55 2010
@@ -42,7 +42,7 @@ enum OpcodeByteKind {
OpcodeByteKind_ib = 0x0400,
OpcodeByteKind_iw = 0x0500,
OpcodeByteKind_id = 0x0600,
-#ifdef _EM64T_
+#ifdef HYX86_64
OpcodeByteKind_io = 0x0700,
#endif
OpcodeByteKind_cb = 0x0800,
@@ -55,7 +55,7 @@ enum OpcodeByteKind {
OpcodeByteKind_rb = 0x0E00,
OpcodeByteKind_rw = 0x0F00,
OpcodeByteKind_rd = 0x1000,
-#ifdef _EM64T_
+#ifdef HYX86_64
OpcodeByteKind_ro = 0x1100,
//OpcodeByteKind_REX = 0x1200,
OpcodeByteKind_REX_W = 0x1300,
@@ -139,36 +139,36 @@ enum OpcodeByteKind {
#define AH {OpndKind_GPReg, OpndSize_8, RegName_AH}
#define AX {OpndKind_GPReg, OpndSize_16, RegName_AX}
#define EAX {OpndKind_GPReg, OpndSize_32, RegName_EAX}
-#ifdef _EM64T_
+#ifdef HYX86_64
#define RAX {OpndKind_GPReg, OpndSize_64, RegName_RAX }
#endif
#define CL {OpndKind_GPReg, OpndSize_8, RegName_CL}
#define ECX {OpndKind_GPReg, OpndSize_32, RegName_ECX}
-#ifdef _EM64T_
+#ifdef HYX86_64
#define RCX {OpndKind_GPReg, OpndSize_64, RegName_RCX}
#endif
#define DX {OpndKind_GPReg, OpndSize_16, RegName_DX}
#define EDX {OpndKind_GPReg, OpndSize_32, RegName_EDX}
-#ifdef _EM64T_
+#ifdef HYX86_64
#define RDX { OpndKind_GPReg, OpndSize_64, RegName_RDX }
#endif
#define ESI {OpndKind_GPReg, OpndSize_32, RegName_ESI}
-#ifdef _EM64T_
+#ifdef HYX86_64
#define RSI { OpndKind_GPReg, OpndSize_64, RegName_RSI }
#endif
#define EDI {OpndKind_GPReg, OpndSize_32, RegName_EDI}
-#ifdef _EM64T_
+#ifdef HYX86_64
#define RDI { OpndKind_GPReg, OpndSize_64, RegName_RDI }
#endif
#define r8 {OpndKind_GPReg, OpndSize_8, RegName_Null}
#define r16 {OpndKind_GPReg, OpndSize_16, RegName_Null}
#define r32 {OpndKind_GPReg, OpndSize_32, RegName_Null}
-#ifdef _EM64T_
+#ifdef HYX86_64
#define r64 { OpndKind_GPReg, OpndSize_64, RegName_Null }
#endif
@@ -183,14 +183,14 @@ enum OpcodeByteKind {
#define m16 {OpndKind_Mem, OpndSize_16, RegName_Null}
#define m32 {OpndKind_Mem, OpndSize_32, RegName_Null}
#define m64 {OpndKind_Mem, OpndSize_64, RegName_Null}
-#ifdef _EM64T_
+#ifdef HYX86_64
#define r_m64 { (OpndKind)(OpndKind_GPReg|OpndKind_Mem), OpndSize_64, RegName_Null }
#endif
#define imm8 {OpndKind_Imm, OpndSize_8, RegName_Null}
#define imm16 {OpndKind_Imm, OpndSize_16, RegName_Null}
#define imm32 {OpndKind_Imm, OpndSize_32, RegName_Null}
-#ifdef _EM64T_
+#ifdef HYX86_64
#define imm64 {OpndKind_Imm, OpndSize_64, RegName_Null }
#endif
@@ -199,7 +199,7 @@ enum OpcodeByteKind {
#define moff8 {OpndKind_Imm, OpndSize_32, RegName_Null}
#define moff16 {OpndKind_Imm, OpndSize_32, RegName_Null}
#define moff32 {OpndKind_Imm, OpndSize_32, RegName_Null}
-#ifdef _EM64T_
+#ifdef HYX86_64
#define moff64 {OpndKind_Imm, OpndSize_64, RegName_Null}
#endif
@@ -224,7 +224,7 @@ enum OpcodeByteKind {
#define fp32 {OpndKind_FPReg, OpndSize_32, RegName_Null}
#define fp64 {OpndKind_FPReg, OpndSize_64, RegName_Null}
-#ifdef _EM64T_
+#ifdef HYX86_64
#define io OpcodeByteKind_io
#define REX_W OpcodeByteKind_REX_W
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_tabl.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_tabl.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_tabl.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/enc_tabl.cpp Tue Jun 22 21:43:55 2010
@@ -28,9 +28,9 @@
// need to use EM64T-specifics - new registers, defines from enc_prvt, etc...
-#if !defined(_EM64T_)
+#if !defined(HYX86_64)
#define UNDEF_EM64T
- #define _EM64T_
+ #define HYX86_64
#endif
#define USE_ENCODER_DEFINES
@@ -38,7 +38,7 @@
#include "enc_defs.h"
#ifdef UNDEF_EM64T
- #undef _EM64T_
+ #undef HYX86_64
#endif
#if !defined(_HAVE_MMX_)
@@ -942,7 +942,7 @@ END_MNEMONIC()
BEGIN_MNEMONIC(IDIV, MF_AFFECTS_FLAGS, DU_DU_U)
BEGIN_OPCODES()
-#if !defined(_EM64T_)
+#if !defined(HYX86_64)
{OpcodeInfo::all, {0xF6, _7}, {AH, AL, r_m8}, DU_DU_U },
{OpcodeInfo::all, {Size16, 0xF7, _7}, {DX, AX, r_m16}, DU_DU_U },
#endif
@@ -1698,7 +1698,7 @@ void EncoderBase::buildMnemonicDesc(cons
break;
}
odesc.last = 0;
-#ifdef _EM64T_
+#ifdef HYX86_64
if (oinfo.platf == OpcodeInfo::ia32) { continue; }
if (oinfo.platf == OpcodeInfo::decoder32) { continue; }
#else
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.cpp Tue Jun 22 21:43:55 2010
@@ -35,7 +35,7 @@
-#ifdef _EM64T_
+#ifdef HYX86_64
R_Opnd rax_opnd(rax_reg);
R_Opnd rcx_opnd(rcx_reg);
@@ -75,7 +75,7 @@ R_Opnd ebp_opnd(ebp_reg);
R_Opnd esi_opnd(esi_reg);
R_Opnd edi_opnd(edi_reg);
-#endif //_EM64T_
+#endif //HYX86_64
XMM_Opnd xmm0_opnd(xmm0_reg);
XMM_Opnd xmm1_opnd(xmm1_reg);
@@ -95,7 +95,7 @@ extern const Mnemonic map_of_alu_opcode_
extern const Mnemonic map_of_shift_opcode_2_mnemonic[];
const RegName map_of_regno_2_regname [] = {
-#ifdef _EM64T_
+#ifdef HYX86_64
RegName_RAX, RegName_RBX, RegName_RCX, RegName_RDX,
RegName_RDI, RegName_RSI, RegName_RSP, RegName_RBP,
RegName_R8, RegName_R9, RegName_R10, RegName_R11,
@@ -111,7 +111,7 @@ const RegName map_of_regno_2_regname []
RegName_XMM0, RegName_XMM1, RegName_XMM2, RegName_XMM3,
RegName_XMM4, RegName_XMM5, RegName_XMM6, RegName_XMM7,
RegName_FS,
-#endif // _EM64T_
+#endif // HYX86_64
RegName_Null,
};
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.h Tue Jun 22 21:43:55 2010
@@ -22,7 +22,7 @@
* @brief Simple interface for generating processor instructions.
*
* The interface works for both IA32 and EM64T. By default, only IA32
- * capabilities are presented. To enable EM64T feature, the _EM64T_ macro
+ * capabilities are presented. To enable EM64T feature, the HYX86_64 macro
* must be defined (and, of course, a proper library version to be used).
*
* The interface is based on the original ia32.h encoder interface,
@@ -40,7 +40,7 @@
#include "enc_base.h"
#include "open/types.h"
-#ifdef _EM64T_
+#ifdef HYX86_64
// size of general-purpose value on the stack in bytes
#define GR_STACK_SIZE 8
// size of floating-point value on the stack in bytes
@@ -75,7 +75,7 @@ const int MAX_FR = 0;
#endif
enum Reg_No {
-#ifdef _EM64T_
+#ifdef HYX86_64
rax_reg = 0,rbx_reg, rcx_reg, rdx_reg,
rdi_reg, rsi_reg, rsp_reg, rbp_reg,
r8_reg, r9_reg, r10_reg, r11_reg,
@@ -85,7 +85,7 @@ enum Reg_No {
xmm8_reg, xmm9_reg, xmm10_reg, xmm11_reg,
xmm12_reg, xmm13_reg, xmm14_reg, xmm15_reg,
-#else // !defined(_EM64T_)
+#else // !defined(HYX86_64)
eax_reg = 0,ebx_reg, ecx_reg, edx_reg,
edi_reg, esi_reg, esp_reg, ebp_reg,
@@ -105,7 +105,7 @@ enum Opnd_Size {
size_32,
size_64,
n_size,
-#ifdef _EM64T_
+#ifdef HYX86_64
size_platf = size_64
#else
size_platf = size_32
@@ -217,7 +217,7 @@ class Imm_Opnd: public Opnd {
protected:
union {
-#ifdef _EM64T_
+#ifdef HYX86_64
int64 value;
unsigned char bytes[8];
#else
@@ -238,7 +238,7 @@ public:
}
Imm_Opnd(const Imm_Opnd& that): Opnd(Imm), value(that.value), size(that.size) {};
-#ifdef _EM64T_
+#ifdef HYX86_64
Imm_Opnd(Opnd_Size sz, int64 val): Opnd(Imm), value(val), size(sz) {
#ifndef NDEBUG
switch (size) {
@@ -392,7 +392,7 @@ private:
//
// operand structures for ia32 registers
//
-#ifdef _EM64T_
+#ifdef HYX86_64
extern R_Opnd rax_opnd;
extern R_Opnd rcx_opnd;
@@ -431,7 +431,7 @@ extern R_Opnd ebp_opnd;
extern R_Opnd esi_opnd;
extern R_Opnd edi_opnd;
-#endif // _EM64T_
+#endif // HYX86_64
extern XMM_Opnd xmm0_opnd;
extern XMM_Opnd xmm1_opnd;
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.inl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.inl?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.inl (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/shared/x86/encoder.inl Tue Jun 22 21:43:55 2010
@@ -114,7 +114,7 @@ ENCODER_DECLARE_EXPORT char * push(char
ENCODER_DECLARE_EXPORT char * push(char * stream, const Imm_Opnd & imm) {
EncoderBase::Operands args;
-#ifdef _EM64T_
+#ifdef HYX86_64
add_imm(args, imm);
#else
// we need this workaround to be compatible with the former ia32 encoder implementation
@@ -289,7 +289,7 @@ ENCODER_DECLARE_EXPORT char * imul(char
// divide instructions: div, idiv
ENCODER_DECLARE_EXPORT char * idiv(char * stream, const RM_Opnd & rm, Opnd_Size sz) {
EncoderBase::Operands args;
-#ifdef _EM64T_
+#ifdef HYX86_64
add_r(args, rdx_opnd, sz);
add_r(args, rax_opnd, sz);
#else
@@ -602,7 +602,7 @@ ENCODER_DECLARE_EXPORT char * jump(char
* destroyed).
*/
ENCODER_DECLARE_EXPORT char * jump(char * stream, char * target) {
-#ifdef _EM64T_
+#ifdef HYX86_64
int64 offset = target - stream;
// sub 2 bytes for the short version
offset -= 2;
@@ -698,7 +698,7 @@ ENCODER_DECLARE_EXPORT char * call(char
*/
ENCODER_DECLARE_EXPORT char * call(char * stream, const char * target)
{
-#ifdef _EM64T_
+#ifdef HYX86_64
int64 offset = target - stream;
if (fit32(offset)) {
offset -= 5; // sub 5 bytes for this instruction
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile Tue Jun 22 21:43:55 2010
@@ -22,11 +22,11 @@ include $(HY_TARGET)/hdk/build/make/defi
VM_HOME=../../../../../../../vm/
DEFINES += \
- -DREFS_USE_UNCOMPRESSED -D_IA32_ -DPLATFORM_POSIX \
+ -DREFS_USE_UNCOMPRESSED -DPLATFORM_POSIX \
-D__SMP__ -DLINUX_TLS_OPT -D_LARGEFILE64_SOURCE
INCLUDES := -I$(VM_HOME)port/include -I$(VM_HOME)include $(INCLUDES)
-PLATFORM =
+
OPT += -fno-exceptions -Wno-deprecated -g -O2
HDKINCLUDES = $(HY_HDK)/include/dec_base.h $(HY_HDK)/include/enc_base.h \
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/makefile?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/makefile Tue Jun 22 21:43:55 2010
@@ -22,7 +22,7 @@ include $(HY_TARGET)/hdk/build/make/defi
VM_HOME=../../../../../../../vm/
DEFINES += \
- -DREFS_USE_UNCOMPRESSED -D_IA32_ -DPLATFORM_POSIX \
+ -DREFS_USE_UNCOMPRESSED -DPLATFORM_POSIX \
-D__SMP__ -DLINUX_TLS_OPT -D_LARGEFILE64_SOURCE \
-DBUILDING_GC -DREFS_USE_COMPRESSED
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/shared/thread_native_tls.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/shared/thread_native_tls.c?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/shared/thread_native_tls.c (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/shared/thread_native_tls.c Tue Jun 22 21:43:55 2010
@@ -51,7 +51,7 @@ UDATA VMCALL hythread_uses_fast_tls(void
}
#if !defined(_WIN32) && defined(HYTHREAD_FAST_TLS)
- #if defined(_EM64T_)
+ #if defined(HYX86_64)
#define HYTHREAD_TLS_GET_VAR_OFFSET(var,offset) \
{ \
void* tmp1 = &var; \
@@ -62,7 +62,7 @@ UDATA VMCALL hythread_uses_fast_tls(void
//TODO: GCC-specific, need to add ICL
//#define HYTHREAD_TLS_GET_VAR_OFFSET(var,offset) \
// { void* tmp; __asm ("movq " #var "@GOTTPOFF(%%rip), %0" : "=r" (tmp)); offset = tmp; }
- #elif defined(_IA32_)
+ #elif defined(HYX86)
#define HYTHREAD_TLS_GET_VAR_OFFSET(var,offset) \
{ \
void* tmp1 = &var; \
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/unix/makefile?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/unix/makefile Tue Jun 22 21:43:55 2010
@@ -22,7 +22,7 @@ include $(HY_TARGET)/hdk/build/make/defi
VM_HOME=../../../../../../../vm/
DEFINES += \
- -DREFS_USE_UNCOMPRESSED -D_IA32_ -DPLATFORM_POSIX \
+ -DREFS_USE_UNCOMPRESSED -DPLATFORM_POSIX \
-D__SMP__ -DLINUX_TLS_OPT -D_LARGEFILE64_SOURCE \
-DAPR_DECLARE_EXPORT
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/shared/interpreter.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/shared/interpreter.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/shared/interpreter.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/shared/interpreter.cpp Tue Jun 22 21:43:55 2010
@@ -854,7 +854,7 @@ Opcode_LDIV(StackFrame& frame) {
arg1 = frame.stack.getLong(2);
frame.stack.pop(2);
-#ifdef _EM64T_
+#ifdef HYX86_64
if (arg1.i64 == -arg1.i64) {
if (arg0.i64 == -1) {
res.i64 = arg1.i64;
@@ -878,7 +878,7 @@ Opcode_LREM(StackFrame& frame) {
}
arg1 = frame.stack.getLong(2);
frame.stack.pop(2);
-#ifdef _EM64T_
+#ifdef HYX86_64
if (arg1.i64 == -arg1.i64) {
if (arg0.i64 == -1) {
res.i64 = 0l;
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/makefile?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/interpreter/unix/makefile Tue Jun 22 21:43:55 2010
@@ -22,7 +22,7 @@ include $(HY_TARGET)/hdk/build/make/defi
VM_HOME=../../../../../../../vm/
DEFINES += \
- -DREFS_USE_UNCOMPRESSED -D_IA32_ -DPLATFORM_POSIX \
+ -DREFS_USE_UNCOMPRESSED -DPLATFORM_POSIX \
-D__SMP__ -DLINUX_TLS_OPT -D_LARGEFILE64_SOURCE
OPT += -fexceptions
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg.cpp Tue Jun 22 21:43:55 2010
@@ -729,7 +729,7 @@ void CodeGen::gen_call_vm_restore(bool e
void CodeGen::gen_throw(Class_Handle exnClass, bool restore)
{
-#ifdef _EM64T_
+#ifdef HYX86_64
bool lazy = false;
#else
bool lazy = true;
@@ -737,7 +737,7 @@ void CodeGen::gen_throw(Class_Handle exn
BBState saveBB;
//TODO: Workaround for x86-64 stack should be aligned to half of 16
-#ifdef _EM64T_
+#ifdef HYX86_64
alu(alu_sub, sp, (unsigned)STACK_SLOT_SIZE);
alu(alu_and, sp, ~((unsigned)STACK_SLOT_SIZE));
alu(alu_add, sp, (unsigned)STACK_SLOT_SIZE);
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_arith.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_arith.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_arith.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_arith.cpp Tue Jun 22 21:43:55 2010
@@ -247,7 +247,7 @@ bool CodeGen::gen_a_generic(JavaByteCode
const Val& v2 = m_jframe->dip(0);
/* if (false )v2.
-#ifdef _IA32_
+#ifdef HYX86
// on IA32 can use address in a displacement
alu(to_alu(op), v1, ar_x, (int)v2.addr());
#else
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_br.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_br.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_br.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_br.cpp Tue Jun 22 21:43:55 2010
@@ -221,7 +221,7 @@ void Compiler::gen_switch(const JInst &
AR gr_tabl = valloc(jobj);
movp(gr_tabl, DATA_SWITCH_TABLE | m_curr_inst->pc, m_bbinfo->start);
-#ifdef _EM64T_
+#ifdef HYX86_64
// On EM64T, we operate with I_32 value in a register, but the
// register will be used as 64 bit in address form - have to extend
sx(Opnd(i64, val.reg()), Opnd(i32, val.reg()));
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_instr.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_instr.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_instr.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_instr.cpp Tue Jun 22 21:43:55 2010
@@ -43,7 +43,7 @@ void CodeGen::gen_prof_be(void)
return;
}
-#ifdef _IA32_
+#ifdef HYX86
AR addr = ar_x;
int off = (int)m_p_backedge_counter;
#else
@@ -126,7 +126,7 @@ void CodeGen::gen_modification_watchpoin
//JVMTI helper takes field handle, method handle, byte code location, pointer
//to reference for fields or NULL for statics, pointer to field value
-#ifndef _EM64T_
+#ifndef HYX86_64
// Workaround since do_mov do not put jlong on stack in gen_args on ia32
SYNC_FIRST(static const CallSig cs_ti_fmodif(CCONV_HELPERS, jvoid, jobj, jobj, i32, i32, jobj, jobj));
Val vlocation((jlong)m_pc);
@@ -164,7 +164,7 @@ void CodeGen::gen_modification_watchpoin
if (field_op) {
vobject = vstack(ref_depth);
}
-#ifndef _EM64T_
+#ifndef HYX86_64
// Workaround since do_mov do not put jlong on stack in gen_args on ia32
gen_args(cs_ti_fmodif, 0, &vfield, &vmeth, &vlocationHi, &vlocation, &vobject, &fieldValPtr);
#else
@@ -223,7 +223,7 @@ void CodeGen::gen_access_watchpoint(Java
//JVMTI helper takes field handle, method handle, byte code location, pointer
//to reference for fields or NULL for statics
-#ifndef _EM64T_
+#ifndef HYX86_64
// Workaround since do_mov do not put jlong on stack in gen_args on ia32
SYNC_FIRST(static const CallSig cs_ti_faccess(CCONV_HELPERS, jvoid, jobj, jobj, i32, i32, jobj));
Val vlocation((jlong)m_pc);
@@ -243,7 +243,7 @@ void CodeGen::gen_access_watchpoint(Java
vobject = vstack(0);
}
-#ifndef _EM64T_
+#ifndef HYX86_64
// Workaround since do_mov do not put jlong on stack in gen_args on ia32
gen_args(cs_ti_faccess, 0, &vfield, &vmeth, &vlocationHi, &vlocation, &vobject);
#else
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_meth.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_meth.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_meth.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_meth.cpp Tue Jun 22 21:43:55 2010
@@ -169,7 +169,7 @@ void Compiler::gen_prolog(void) {
push(idx);
}
//
-#ifdef _EM64T_
+#ifdef HYX86_64
mov(fill, (uint_ptr)0xDEADBEEFDEADBEEF);
#else
mov(fill, 0xDEADBEEF);
@@ -694,7 +694,7 @@ void Compiler::gen_return(const CallSig&
}
}
else if (is_big(retType)) {
-#ifdef _IA32_
+#ifdef HYX86
vswap(0);
vswap(1);
AR out_reg1 = cs.ret_reg(1);
@@ -949,7 +949,7 @@ void CodeGen::gen_invoke(JavaByteCodes o
gen_check_null(*thiz, false);
void * paddr = method_get_indirect_address(meth);
-#ifdef _IA32_
+#ifdef HYX86
Opnd ptr(jobj, ar_x, paddr);
#else
AR gr = valloc(jobj);
@@ -1020,7 +1020,7 @@ void CodeGen::gen_save_ret(const CallSig
zx2(Opnd(i32, ar), Opnd(jt,ar));
jt = i32;
}
-#ifdef _IA32_
+#ifdef HYX86
if(ar == fp0) {
// Cant use vstack_off right here, as the item is not yet pushed.
unsigned slot = m_jframe->size();
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_regs.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_regs.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_regs.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/cg_regs.cpp Tue Jun 22 21:43:55 2010
@@ -266,7 +266,7 @@ Val& CodeGen::vstack(unsigned depth, boo
//}
if (s.jt() == jobj) {
-#ifdef _EM64T_
+#ifdef HYX86_64
//TODO: it may be not always necessary to upload to register.
toReg = true;
#endif
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/csig.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/csig.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/csig.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/csig.h Tue Jun 22 21:43:55 2010
@@ -90,7 +90,7 @@ namespace Jet {
*/
#define CCONV_CDECL_IA32 (CCONV_CALLER_POPS | CCONV_MEM | CCONV_RETURN_FP_THROUGH_FPU)
-#ifdef _EM64T_
+#ifdef HYX86_64
/**
* @brief EM64T calling convention.
*/
@@ -127,7 +127,7 @@ namespace Jet {
*/
#define CCONV_MULTIANEWARRAY CCONV_CDECL_IA32
-#ifdef _EM64T_
+#ifdef HYX86_64
/**
* @brief On IA-32 it's CCONV_MANAGED_IA32, on EM64T it's CCONV_EM64T.
*/
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc.cpp Tue Jun 22 21:43:55 2010
@@ -330,7 +330,7 @@ void Encoder::call(bool check_stack, AR
const CallSig& cs, unsigned idx, ...)
{
//TODO: Add IA-64 check
-#ifdef _EM64T_
+#ifdef HYX86_64
if (check_stack) {
alu(alu_test, sp, 0x0F);
unsigned br_off = br(z, 0, 0, hint_none);
@@ -368,7 +368,7 @@ void Encoder::call_va(bool check_stack,
mov(Opnd(i32, sp, cs.off(i)), val);
}
else {
-#ifdef _EM64T_
+#ifdef HYX86_64
int_ptr val = va_arg(valist, int_ptr);
mov(Opnd(i64, sp, cs.off(i)), val);
#else
@@ -380,7 +380,7 @@ void Encoder::call_va(bool check_stack,
}
}
else if (jt==i64) {
-#ifdef _EM64T_
+#ifdef HYX86_64
int_ptr val = va_arg(valist, int_ptr);
mov(gr == gr_x ? Opnd(i64, sp, cs.off(i)) : Opnd(i64, gr), val);
#else
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc.h Tue Jun 22 21:43:55 2010
@@ -214,7 +214,7 @@ private:
*/
inline bool is_big(jtype jt)
{
-#if defined(_EM64T_) || defined(_IPF_)
+#if defined(HYX86_64) || defined(_IPF_)
return false;
#else
return jt==i64;
@@ -241,7 +241,7 @@ inline jtype jtmov(jtype jt)
*/
inline bool is_ia32(void)
{
-#if defined(_IA32_)
+#if defined(HYX86)
return true;
#else
return false;
@@ -264,7 +264,7 @@ inline bool fits32(jlong val)
*/
inline bool fits32(const void* addr)
{
-#ifdef _IA32_
+#ifdef HYX86
return true;
#else
return fits32((jlong)(int_ptr)addr);
@@ -295,7 +295,7 @@ enum AR {
//
// EAX, EBX, ECX, EDX, ESI, EDI,
gr0, gr1, gr2, gr3, gr4, gr5,
-#ifdef _EM64T_
+#ifdef HYX86_64
// R8, R9, R10, R11, R12, R13, R14, R15
gr6, gr7, gr8, gr9, gr10, gr11, gr12, gr13,
#endif
@@ -304,7 +304,7 @@ enum AR {
// Float-point registers
//
fr0, fr1, fr2, fr3, fr4, fr5, fr6, fr7,
-#ifdef _EM64T_
+#ifdef HYX86_64
fr8, fr9, fr10, fr11, fr12, fr13, fr14, fr15,
#endif
//
@@ -312,7 +312,7 @@ enum AR {
//
fp0, // top FPU stacked register
//
-#ifdef _EM64T_
+#ifdef HYX86_64
gr_num=15, /// not including sp
gr_total = 16, /// including sp
fr_num=16,
@@ -604,7 +604,7 @@ public:
m_base = base; m_index = index;
m_scale = scale; m_disp = disp;
}
-#ifdef _IA32_
+#ifdef HYX86
/**
* @brief Constructs memory operand, the given pointer is stored as
* displacement.
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc_ia32.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc_ia32.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc_ia32.cpp Tue Jun 22 21:43:55 2010
@@ -26,7 +26,7 @@
#include "enc_ia32.h"
#include "trace.h"
-#ifdef _IA32_
+#ifdef HYX86
#include "enc_prvt.h"
#endif
@@ -59,10 +59,10 @@ static OpndSize to_size(jtype jt)
static const RegName reg_map[] = {
RegName_EAX, RegName_EBX, RegName_ECX, RegName_EDX,
RegName_ESI, RegName_EDI,
-#ifdef _EM64T_
+#ifdef HYX86_64
RegName_R8D, RegName_R9D, RegName_R10D, RegName_R11D,
RegName_R12D, RegName_R13D, RegName_R14D, RegName_R15D,
-#endif //_EM64T_
+#endif //HYX86_64
RegName_EBP, RegName_ESP
};
@@ -83,7 +83,7 @@ RegName devirt(AR ar, jtype jt)
assert(idx<COUNTOF(reg_map));
reg = reg_map[idx];
-#if !defined(_EM64T_) && defined(_DEBUG)
+#if !defined(HYX86_64) && defined(_DEBUG)
// On IA32 can not encode the lower 8 bits of the following regs
if (equals(reg, RegName_EBP) || equals(reg, RegName_ESI) ||
equals(reg, RegName_EDI) || equals(reg, RegName_ESP)) {
@@ -92,7 +92,7 @@ RegName devirt(AR ar, jtype jt)
#endif
OpndSize sz;
if (jt == jvoid) {
-#ifdef _EM64T_
+#ifdef HYX86_64
sz = OpndSize_64;
#else
sz = OpndSize_32;
@@ -199,7 +199,7 @@ static void add_args_same_size(EncoderBa
}
AR get_cconv_fr(unsigned i, unsigned pos_in_args) {
-#ifdef _EM64T_
+#ifdef HYX86_64
#ifdef _WIN64
bool compact = false;
#else
@@ -223,7 +223,7 @@ AR get_cconv_fr(unsigned i, unsigned pos
}
AR get_cconv_gr(unsigned i, unsigned pos_in_args) {
-#ifdef _EM64T_
+#ifdef HYX86_64
#ifdef _WIN64
bool compact = false;
static const AR grs[] = {
@@ -305,7 +305,7 @@ static bool is_callee_save(RegName reg)
assert(getRegKind(reg)==OpndKind_GPReg);
if (equals(reg, RegName_EBX)) return true;
if (equals(reg, RegName_EBP)) return true;
-#ifdef _EM64T_
+#ifdef HYX86_64
#ifdef _WIN64
if (equals(reg, RegName_RDI)) return true;
if (equals(reg, RegName_RSI)) return true;
@@ -369,7 +369,7 @@ OpndSize to_sz(jtype jt)
if (jt == i32 || jt == flt32) return OpndSize_32;
if (jt == i16 || jt == u16) return OpndSize_16;
if (jt == i8) return OpndSize_8;
-#ifdef _IA32_
+#ifdef HYX86
if (jt == jobj) return OpndSize_32;
#else
if (jt == jobj) return OpndSize_64;
@@ -382,7 +382,7 @@ static void emu_fix_opnds(Encoder * enc,
Opnd& op0, Opnd& op1,
const Opnd& _op0, const Opnd& _op1)
{
-#ifdef _EM64T_
+#ifdef HYX86_64
// no op.
op0 = _op0;
op1 = _op1;
@@ -440,7 +440,7 @@ static void emu_unfix_opnds(Encoder * en
const Opnd& op0, const Opnd& op1,
const Opnd& _op0, const Opnd& _op1)
{
-#ifdef _EM64T_
+#ifdef HYX86_64
// no op.
if (true) return;
#endif
@@ -472,7 +472,7 @@ string Encoder::to_str_impl(AR ar)
return getRegNameString(reg);
}
-#if defined(_IA32_)
+#if defined(HYX86)
static int get_reg_idx(AR ar)
{
assert(is_gr(ar) && ar != ar_x);
@@ -541,11 +541,11 @@ static void do_reg(char* buf, const Opnd
((ModRM*)buf)->reg = getRegIndex(reg);
}
-#endif // ifdef _IA32_
+#endif // ifdef HYX86
void Encoder::mov_impl(const Opnd& _op0, const Opnd& _op1)
{
-#if defined(_IA32_)
+#if defined(HYX86)
//
// mov_impl() and its calls to add_arg() are the hottest methods on
// client startups, especially with the massive ones like Eclipse.
@@ -605,7 +605,7 @@ void Encoder::mov_impl(const Opnd& _op0,
assert(_op0.reg() != fp0 && _op1.reg() != fp0);
assert(is_f(_op0.jt()) == is_f(_op1.jt()));
-#ifdef _EM64T_
+#ifdef HYX86_64
// A special case on EM64T - emulation of 'mov mem64, imm64'
if (_op0.is_mem() && _op1.is_imm() &&
(_op1.jt() == i64 || _op1.jt() == jobj)) {
@@ -833,7 +833,7 @@ void Encoder::movp_impl(AR op0, const vo
{
EncoderBase::Operands args;
args.add(devirt(op0));
-#ifdef _EM64T_
+#ifdef HYX86_64
args.add(EncoderBase::Operand(OpndSize_64, (int_ptr)op1));
#else
args.add(EncoderBase::Operand(OpndSize_32, (int_ptr)op1));
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc_ia32.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc_ia32.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc_ia32.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/enc_ia32.h Tue Jun 22 21:43:55 2010
@@ -23,8 +23,8 @@
* @brief Encoder definitions specific for IA-32 and Intel 64 platforms.
*/
-#if !defined(__ENC_IA32_H_INCLUDED__)
-#define __ENC_IA32_H_INCLUDED__
+#if !defined(__ENCHYX86H_INCLUDED__)
+#define __ENCHYX86H_INCLUDED__
#include "enc.h"
@@ -55,4 +55,4 @@ extern const Opnd edx;
}
}; // ~namespace Jitrino::Jet
-#endif // __ENC_IA32_H_INCLUDED__
+#endif // __ENCHYX86H_INCLUDED__
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/jdefs.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/jdefs.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/jdefs.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/jdefs.h Tue Jun 22 21:43:55 2010
@@ -86,7 +86,7 @@
#else
// stdcall has no meaning on platforms other than Lin32
#undef stdcall__
- #if defined(_IA32_) && !defined(stdcall__)
+ #if defined(HYX86) && !defined(stdcall__)
#define stdcall__ __attribute__ ((__stdcall__))
#else
#define stdcall__
@@ -96,19 +96,19 @@
#endif
//
// gcc def on EM64T
-#if defined(__x86_64__) && !defined(_EM64T_)
- #define _EM64T_ 1
- #undef _IA32_
+#if defined(__x86_64__) && !defined(HYX86_64)
+ #define HYX86_64 1
+ #undef HYX86
#endif
-#if defined(__i386__) && !defined(_IA32_)
- #undef _EM64T_
- #define _IA32_ 1
+#if defined(__i386__) && !defined(HYX86)
+ #undef HYX86_64
+ #define HYX86 1
#endif
-#if !defined(_EM64T_) && !defined(_IPF_) && !defined(_IA32_)
+#if !defined(HYX86_64) && !defined(_IPF_) && !defined(HYX86)
// presuming we're working on ia-32
- #define _IA32_ 1
+ #define HYX86 1
#endif
@@ -553,7 +553,7 @@ enum jtype {
jtypes_count,
/// max number of types
num_jtypes = jtypes_count,
-#ifdef _EM64T_
+#ifdef HYX86_64
iplatf=i64,
#else
/// platform-native size for integer (fits into general-purpose register)
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/jet.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/jet.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/jet.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/jet.cpp Tue Jun 22 21:43:55 2010
@@ -177,7 +177,7 @@ void cleanup(void)
bool supports_compresed_refs(void)
{
-#if defined(_EM64T_) || defined(_IPF_)
+#if defined(HYX86_64) || defined(_IPF_)
return true;
#else
return false;
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/rt.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/rt.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/rt.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/rt.cpp Tue Jun 22 21:43:55 2010
@@ -58,7 +58,7 @@ static const unsigned bp_bytes = word_no
static const unsigned bp_mask = 1<<bit_no(bp_idx);
static const int bp_spill_off = ((StackFrame*)NULL)->spill(bp);
-#ifdef _IA32_
+#ifdef HYX86
//
static AR ebx = virt(RegName_EBX);
static const unsigned ebx_idx = ar_idx(ebx);
@@ -78,7 +78,7 @@ static const unsigned edi_bytes = word_n
static const unsigned edi_mask = 1<<bit_no(edi_idx);
static const int edi_spill_off = ((StackFrame*)NULL)->spill(edi);
//
-#endif // _IA32_
+#endif // HYX86
/**
@@ -178,7 +178,7 @@ void rt_unwind(JIT_Handle jit, Method_Ha
UNSAFE_REGION_END
#endif
-#if defined(_EM64T_) || defined(_IPF_)
+#if defined(HYX86_64) || defined(_IPF_)
// Common version for all platforms but IA32
for (unsigned i=0; i<gr_num; i++) {
AR ar = _gr(i);
@@ -564,7 +564,7 @@ void rt_native2bc(JIT_Handle jit, Method
if (!tst(map, var_num)) {
return EXE_ERROR_TYPE_MISMATCH;
}
-#ifdef _EM64T_
+#ifdef HYX86_64
case VM_DATA_TYPE_STRING:
var_ptr_to_64 = (uint64*)value_ptr;
*var_ptr_to_64 = *(uint64*)(ebp + frame.local(var_num));
@@ -601,7 +601,7 @@ void rt_native2bc(JIT_Handle jit, Method
case VM_DATA_TYPE_INT64:
case VM_DATA_TYPE_UINT64:
case VM_DATA_TYPE_F8:
-#ifdef _EM64T_
+#ifdef HYX86_64
case VM_DATA_TYPE_ARRAY:
case VM_DATA_TYPE_CLASS:
case VM_DATA_TYPE_STRING:
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/rt_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/rt_ia32.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/rt_ia32.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/rt_ia32.cpp Tue Jun 22 21:43:55 2010
@@ -31,7 +31,7 @@ namespace Jet {
void *** devirt(AR gr, const JitFrameContext * jfc)
{
-#ifdef _EM64T_
+#ifdef HYX86_64
if (gr==gr_x) return (void***)&jfc->p_rip;
if (gr == sp) return (void***)&jfc->rsp;
if (gr == bp) return (void***)&jfc->p_rbp;
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/val.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/val.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/val.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/val.h Tue Jun 22 21:43:55 2010
@@ -131,7 +131,7 @@ public:
m_base = base; m_index = index;
m_scale = scale; m_disp = disp;
}
-#ifdef _IA32_
+#ifdef HYX86
/**
* Special-purpose ctor, only exists on IA-32.
*
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/CodeSelectors.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/CodeSelectors.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/CodeSelectors.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/CodeSelectors.cpp Tue Jun 22 21:43:55 2010
@@ -932,7 +932,7 @@ void _BlockCodeSelector::genInstCode(Ins
if (!genConsts) break;
ConstInst* constInst = (ConstInst*)inst;
switch (inst->getType()) {
-#ifdef _IA32_
+#ifdef HYX86
case Type::UIntPtr:
case Type::IntPtr:
case Type::UnmanagedPtr:
@@ -940,7 +940,7 @@ void _BlockCodeSelector::genInstCode(Ins
case Type::Int32:
cgInst = instructionCallback.ldc_i4(constInst->getValue().i4);
break;
-#ifdef _EM64T_
+#ifdef HYX86_64
case Type::UIntPtr:
case Type::IntPtr:
case Type::UnmanagedPtr:
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/FastArrayFilling.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/FastArrayFilling.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/FastArrayFilling.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/FastArrayFilling.cpp Tue Jun 22 21:43:55 2010
@@ -279,7 +279,7 @@ FastArrayFillPass::_run(IRManager& irMan
inEdge = startNode->getInEdges().front();
//get a new constant
-#ifdef _EM64T_
+#ifdef HYX86_64
int64 val = (int64)((ConstInst*)constValue->getInst())->getValue().i8;
#else
I_32 val = (I_32)((ConstInst*)constValue->getInst())->getValue().i4;
@@ -290,7 +290,7 @@ FastArrayFillPass::_run(IRManager& irMan
case Type::UInt8:
val |= (val << 8);
val |= (val << 16);
-#ifdef _EM64T_
+#ifdef HYX86_64
val |= (val << 32);
#endif
break;
@@ -298,19 +298,19 @@ FastArrayFillPass::_run(IRManager& irMan
case Type::UInt16:
case Type::Char:
val |= (val << 16);
-#ifdef _EM64T_
+#ifdef HYX86_64
val |= (val << 32);
#endif
break;
case Type::Int32:
case Type::UInt32:
-#ifdef _EM64T_
+#ifdef HYX86_64
val |= (val << 32);
break;
#endif
case Type::UIntPtr:
case Type::IntPtr:
-#ifdef _EM64T_
+#ifdef HYX86_64
case Type::UInt64:
case Type::Int64:
#endif
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/inliner.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/inliner.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/inliner.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/inliner.cpp Tue Jun 22 21:43:55 2010
@@ -112,7 +112,7 @@ Inliner::Inliner(SessionAction* argSourc
_inlineMaxNodeThreshold = irm.getOptimizerFlags().hir_node_threshold * irm.getOptimizerFlags().inline_node_quota / 100;
_inlineSkipExceptionPath = argSource->getBoolArg("skip_exception_path", INLINE_SKIP_EXCEPTION_PATH);
-#if defined (_EM64T_) || defined (_IPF_)
+#if defined (HYX86_64) || defined (_IPF_)
_inlineSkipApiMagicMethods = false;
#else
_inlineSkipApiMagicMethods = argSource->getBoolArg("skip_api_magics", true);
@@ -128,7 +128,7 @@ Inliner::Inliner(SessionAction* argSourc
#else
//is_accepted will return 'true' for these methods by skip table-> no inlining will be done
Method_Table::Decision des = Method_Table::mt_accepted;
-#ifndef _EM64T_ // not tested
+#ifndef HYX86_64 // not tested
_inlineSkipMethodTable->add_method_record("java/lang/Integer", "numberOfLeadingZeros", "(I)I", des, false);
_inlineSkipMethodTable->add_method_record("java/lang/Integer", "numberOfTrailingZeros", "(I)I", des, false);
_inlineSkipMethodTable->add_method_record("java/lang/Long", "numberOfLeadingZeros", "(J)I", des, false);
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/PlatformDependant.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/PlatformDependant.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/PlatformDependant.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/PlatformDependant.h Tue Jun 22 21:43:55 2010
@@ -55,7 +55,7 @@
#endif
#define cdecl_ __attribute__ ((__cdecl__))
-#ifdef _EM64T_
+#ifdef HYX86_64
#define stdcall__
#else
#define stdcall__ __attribute__ ((__stdcall__))
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/mkernel.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/mkernel.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/mkernel.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/mkernel.cpp Tue Jun 22 21:43:55 2010
@@ -193,11 +193,11 @@ unsigned Runtime::init_num_cpus(void)
#endif
}
-#if defined(_EM64T_)
+#if defined(HYX86_64)
bool CPUID::isSSE2Supported() {
return true;
}
-#elif defined(_IA32_) //older IA-32
+#elif defined(HYX86) //older IA-32
bool CPUID::isSSE2Supported() {
/*
* cpuid instruction:
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/mkernel.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/mkernel.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/mkernel.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/mkernel.h Tue Jun 22 21:43:55 2010
@@ -602,7 +602,7 @@ private:
class CPUID {
CPUID(){}
public:
-#if defined(_IA32_) || defined(_EM64T_)
+#if defined(HYX86) || defined(HYX86_64)
/** SSE2 is an extension of the IA-32 architecture, since 2000. */
static bool isSSE2Supported();
#endif
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/translator/java/JavaByteCodeTranslator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/translator/java/JavaByteCodeTranslator.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/translator/java/JavaByteCodeTranslator.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/translator/java/JavaByteCodeTranslator.cpp Tue Jun 22 21:43:55 2010
@@ -67,7 +67,7 @@ static Type* convertVMMagicType2HIR(Type
|| matchType(name, "org/vmmagic/unboxed/AddressArray")
|| matchType(name, "org/vmmagic/unboxed/ObjectReferenceArray"))
{
-#ifdef _EM64T_
+#ifdef HYX86_64
return tm.getArrayType(tm.getInt64Type(), false);
#else
return tm.getArrayType(tm.getInt32Type(), false);
@@ -740,7 +740,7 @@ JavaByteCodeTranslator::getstatic(U_32 c
case Type::Double: constVal=irBuilder.genLdConstant(*(double*)fieldAddr);break;
case Type::Boolean: constVal=irBuilder.genLdConstant(*(bool*)fieldAddr);break;
case Type::UnmanagedPtr: assert(fieldIsMagic);
-#ifdef _IA32_
+#ifdef HYX86
constVal=irBuilder.genLdConstant(*(I_32*)fieldAddr);
#else
assert(sizeof(void*)==8);
@@ -2757,7 +2757,7 @@ bool JavaByteCodeTranslator::genVMMagic(
else if (!strcmp(mname, "nullReference")) { loadConst = true; theConst = 0;}
if (loadConst) {
ConstInst::ConstValue v;
-#ifdef _EM64T_
+#ifdef HYX86_64
v.i8 = theConst;
#else
v.i4 = theConst;
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/vm/JITInterface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/vm/JITInterface.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/vm/JITInterface.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/vm/JITInterface.cpp Tue Jun 22 21:43:55 2010
@@ -420,7 +420,7 @@ extern "C"
JITEXPORT Boolean
JIT_supports_compressed_references(JIT_Handle jit)
{
-#ifdef _EM64T_
+#ifdef HYX86_64
return true;
#else
return false;
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/CodeGenerator_arch.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/CodeGenerator_arch.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/CodeGenerator_arch.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/CodeGenerator_arch.h Tue Jun 22 21:43:55 2010
@@ -18,8 +18,8 @@
* @author Vyacheslav P. Shakin
*/
-#ifndef _IA32_CODE_GENERATOR_
-#define _IA32_CODE_GENERATOR_
+#ifndef HYX86CODE_GENERATOR_
+#define HYX86CODE_GENERATOR_
#include "CodeGenIntfc.h"
#include "Ia32IRManager.h"
@@ -55,4 +55,4 @@ public:
}} // namespace Ia32
-#endif // _IA32_CODE_GENERATOR
+#endif // HYX86CODE_GENERATOR
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32APIMagics.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32APIMagics.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32APIMagics.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86/codegenerator/Ia32APIMagics.cpp Tue Jun 22 21:43:55 2010
@@ -113,7 +113,7 @@ DECLARE_HELPER_INLINER(Float_intBitsToFl
void APIMagicsHandlerSession::runImpl() {
CompilationContext* cc = getCompilationContext();
MemoryManager tmpMM("Inline API methods");
-#ifndef _EM64T_
+#ifndef HYX86_64
bool mathAsMagic = getBoolArg("magic_math", true);
#endif
//finding all api magic calls
@@ -137,7 +137,7 @@ void APIMagicsHandlerSession::runImpl()
continue;
};
if( ri->getKind() == Opnd::RuntimeInfo::Kind_MethodDirectAddr ){
-#ifndef _EM64T_
+#ifndef HYX86_64
MethodDesc * md = (MethodDesc*)ri->getValue(0);
const char* className = md->getParentType()->getName();
const char* methodName = md->getName();
@@ -362,7 +362,7 @@ void Integer_numberOfTrailingZeros_Handl
}
void Long_numberOfLeadingZeros_Handler_x_J_x_I::run() {
-#ifdef _EM64T_
+#ifdef HYX86_64
return;
#else
// bsr r1,hi
@@ -419,7 +419,7 @@ void Long_numberOfLeadingZeros_Handler_x
}
void Long_numberOfTrailingZeros_Handler_x_J_x_I::run() {
-#ifdef _EM64T_
+#ifdef HYX86_64
return;
#else
@@ -495,7 +495,7 @@ void System_arraycopyDirect_Handler::run
callInst->unlink();
-#ifdef _EM64T_
+#ifdef HYX86_64
RegName counterRegName = RegName_RCX;
RegName srcAddrRegName = RegName_RSI;
RegName dstAddrRegName = RegName_RDI;
@@ -587,7 +587,7 @@ void String_compareTo_Handler_x_String_x
Opnd* valForCounter = getCallSrc(callInst, 6);
Opnd* res = getCallDst(callInst);
-#ifdef _EM64T_
+#ifdef HYX86_64
RegName counterRegName = RegName_RCX;
RegName thisAddrRegName = RegName_RSI;
RegName trgtAddrRegName = RegName_RDI;
@@ -681,7 +681,7 @@ void String_regionMatches_Handler_x_I_x_
Opnd* valForCounter = getCallSrc(callInst, 4);
Opnd* res = getCallDst(callInst);
-#ifdef _EM64T_
+#ifdef HYX86_64
RegName counterRegName = RegName_RCX;
RegName thisAddrRegName = RegName_RSI;
RegName trgtAddrRegName = RegName_RDI;
@@ -752,7 +752,7 @@ void String_indexOf_Handler_x_String_x_I
Opnd* start = getCallSrc(callInst, 6);
Opnd* res = getCallDst(callInst);
-#ifdef _EM64T_
+#ifdef HYX86_64
Type* counterType = irm->getTypeManager().getInt64Type();
Constraint regConstr(OpndKind_GPReg, OpndSize_64);
#else
@@ -938,7 +938,7 @@ void APIMagicHandler::convertIntToInt(O
dstType == irm->getTypeManager().getIntPtrType()));
if(srcType != dstType) {
-#ifdef _EM64T_
+#ifdef HYX86_64
node->appendInst(irm->newInstEx(Mnemonic_MOVZX, 1, dst, src));
#else
node->appendInst(irm->newCopyPseudoInst(Mnemonic_MOV, dst, src));
@@ -966,7 +966,7 @@ Opnd* APIMagicHandler::addElemIndexWith
}
// TypeManager& typeManager = typeManager;
-#ifdef _EM64T_
+#ifdef HYX86_64
Type * offType = typeManager.getInt64Type();
#else
Type * offType = typeManager.getInt32Type();