harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r957042 [3/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...
Date Tue, 22 Jun 2010 21:43:59 GMT
Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/exception/exceptions_jit.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/exception/exceptions_jit.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/exception/exceptions_jit.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/exception/exceptions_jit.cpp Tue Jun 22 21:43:55 2010
@@ -776,7 +776,7 @@ NativeCodePtr exn_get_rth_throw()
 
 static void rth_throw_lazy(Method * exn_constr)
 {
-#if defined(_IPF_) || defined(_EM64T_)
+#if defined(_IPF_) || defined(HYX86_64)
     LDIE(61, "Lazy exceptions are not supported on this platform");
 #else
     U_8 *args = (U_8 *) (m2n_get_args(m2n_get_last_frame()) + 1);   // +1 to skip constructor

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/lil/m2n_internal.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/lil/m2n_internal.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/lil/m2n_internal.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/lil/m2n_internal.h Tue Jun 22 21:43:55 2010
@@ -153,7 +153,7 @@ NativeCodePtr m2n_gen_flush_and_call();
 
 #define M2N_EXTRA_SAVES_SPACE 400
 
-#ifdef _EM64T_
+#ifdef HYX86_64
 #error Should not be included!
 #endif
 

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/init/vm_init.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/init/vm_init.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/init/vm_init.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/init/vm_init.cpp Tue Jun 22 21:43:55 2010
@@ -369,7 +369,7 @@ static jint populate_jni_nio() {
     }
     
     apr_dso_handle_sym_t gdba, gdbc, ndb;
-#if defined WIN32 && !defined _EM64T_
+#if defined WIN32 && !defined HYX86_64
 #define GET_DIRECT_BUFFER_ADDRESS "_GetDirectBufferAddress@8"
 #define GET_DIRECT_BUFFER_CAPACITY "_GetDirectBufferCapacity@8"
 #define NEW_DIRECT_BYTE_BUFFER "_NewDirectByteBuffer@16"

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jit/jit_runtime_support.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jit/jit_runtime_support.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jit/jit_runtime_support.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jit/jit_runtime_support.cpp Tue Jun 22 21:43:55 2010
@@ -1642,9 +1642,9 @@ static NativeCodePtr rth_get_lil_instanc
 
 //end of lazy resolution helpers
 //////////////////////////////////////////////////////////////////////////
-#if (defined PLATFORM_POSIX) && (defined _IA32_)
+#if (defined PLATFORM_POSIX) && (defined HYX86)
 ManagedObject* __attribute__ ((__stdcall__)) rth_struct_Class_to_java_lang_Class(Class *clss) {
-#elif defined _IA32_
+#elif defined HYX86
 ManagedObject* __stdcall rth_struct_Class_to_java_lang_Class(Class *clss) {
 #else
 ManagedObject* rth_struct_Class_to_java_lang_Class(Class *clss) {

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jit/native_overrides.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jit/native_overrides.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jit/native_overrides.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jit/native_overrides.cpp Tue Jun 22 21:43:55 2010
@@ -191,7 +191,7 @@ LilCodeStub* nso_array_copy(LilCodeStub*
 
 // The following override is only for IA32
 
-#ifdef _IA32_
+#ifdef HYX86
 
 #include "encoder.h"
 
@@ -391,7 +391,7 @@ typedef struct
 // Local NSO table for filling up env-local lookup table
 NSOLocalItem local_NSO_table[] = 
 {
-#ifdef _IA32_
+#ifdef HYX86
     {nso_char_array_copy,
 #else
     {nso_array_copy,

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_break_intf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_break_intf.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_break_intf.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_break_intf.cpp Tue Jun 22 21:43:55 2010
@@ -40,7 +40,7 @@
 #include "port_crash_handler.h"
 #include "open/vm_class_info.h"
 
-#if (defined _IA32_) || (defined _EM64T_)
+#if (defined HYX86) || (defined HYX86_64)
 
 #include "encoder.h"
 // Forward declarations
@@ -549,9 +549,9 @@ VMBreakPoints::remove_thread_local_break
 
 static char *gen_push(char *code_addr, POINTER_SIZE_INT value)
 {
-#ifdef _IA32_
+#ifdef HYX86
     return push(code_addr, Imm_Opnd(size_32, value));
-#elif defined _EM64T_
+#elif defined HYX86_64
     I_32 high = (I_32)((U_32)(value >> 32));
     I_32 low = (I_32)((U_32)value);
     code_addr = alu(code_addr, sub_opc, rsp_opnd, Imm_Opnd(size_8, 8));
@@ -565,9 +565,9 @@ static char *gen_push(char *code_addr, P
 
 static char *gen_jump(char *code_addr, char *target_addr)
 {
-#ifdef _IA32_
+#ifdef HYX86
     return jump(code_addr, target_addr);
-#elif defined _EM64T_
+#elif defined HYX86_64
     code_addr = gen_push(code_addr, (POINTER_SIZE_INT)target_addr);
     return ret(code_addr);
 #else
@@ -594,7 +594,7 @@ VMBreakPoints::find_thread_local_break(V
 void
 VMBreakPoints::process_native_breakpoint(Registers* regs)
 {
-#if (defined _IA32_) || (defined _EM64T_)
+#if (defined HYX86) || (defined HYX86_64)
     // When we get here we know already that breakpoint occurred in JITted code,
     // JVMTI handles it, and registers context is saved for us in TLS
     VM_thread *vm_thread = p_TLS_vmthread;
@@ -1221,7 +1221,7 @@ VMBreakInterface::find_reference(VMBreak
 //////////////////////////////////////////////////////////////////////////////
 // Helper functions
 
-#if (defined _IA32_) || (defined _EM64T_)
+#if (defined HYX86) || (defined HYX86_64)
 static inline ConditionCode
 get_condition_code(InstructionDisassembler::CondJumpType jump_type)
 {
@@ -1270,7 +1270,7 @@ static bool set_jit_mode_breakpoint(VMBr
 
 static bool set_native_breakpoint(VMBreakPoint* bp)
 {
-#if (defined _IA32_) || (defined _EM64T_)
+#if (defined HYX86) || (defined HYX86_64)
     assert(bp);
     assert(bp->addr);
 

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_capability.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_capability.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_capability.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_capability.cpp Tue Jun 22 21:43:55 2010
@@ -67,7 +67,7 @@ static const jvmtiCapabilities jvmti_sup
     1  // can_generate_object_free_events
 };
 
-#if (defined _EM64T_) || (defined _IPF_)
+#if (defined HYX86_64) || (defined _IPF_)
 
 static const jvmtiCapabilities jvmti_supported_jit_capabilities =
 {

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_dasm.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_dasm.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_dasm.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_dasm.cpp Tue Jun 22 21:43:55 2010
@@ -24,7 +24,7 @@
 
 // FIXME: Highly platform specific, should be renamed to jvmti_dasm_x86.cpp
 //        or go to arch specific directory.
-#if (defined _IA32_) || (defined _EM64T_)
+#if (defined HYX86) || (defined HYX86_64)
 
 #include "jvmti_dasm.h"
 #include "dec_base.h"
@@ -32,7 +32,7 @@
 static InstructionDisassembler::Register convertRegName2Register(RegName reg)
 {
     switch(reg) {
-#ifdef _IA32_
+#ifdef HYX86
     case RegName_Null:  return InstructionDisassembler::DISASM_REG_NONE;
     case RegName_EAX:   return InstructionDisassembler::DISASM_REG_EAX;
     case RegName_EBX:   return InstructionDisassembler::DISASM_REG_EBX;
@@ -42,7 +42,7 @@ static InstructionDisassembler::Register
     case RegName_EDI:   return InstructionDisassembler::DISASM_REG_EDI;
     case RegName_EBP:   return InstructionDisassembler::DISASM_REG_EBP;
     case RegName_ESP:   return InstructionDisassembler::DISASM_REG_ESP;
-#elif defined(_EM64T_)
+#elif defined(HYX86_64)
     case RegName_Null:  return InstructionDisassembler::DISASM_REG_NONE;
     case RegName_RAX:   return InstructionDisassembler::DISASM_REG_RAX;
     case RegName_RBX:   return InstructionDisassembler::DISASM_REG_RBX;
@@ -100,7 +100,7 @@ const char* InstructionDisassembler::get
     return NULL;
 }
 
-#elif defined _EM64T_
+#elif defined HYX86_64
 
 const char* InstructionDisassembler::get_reg_value(
     Register reg,
@@ -129,7 +129,7 @@ const char* InstructionDisassembler::get
     return NULL;
 }
 
-#else // _IA32_
+#else // HYX86
 
 const char* InstructionDisassembler::get_reg_value(
     Register reg,
@@ -150,7 +150,7 @@ const char* InstructionDisassembler::get
     return NULL;
 }
 
-#endif // _IA32_
+#endif // HYX86
 
 void InstructionDisassembler::disasm(const NativeCodePtr addr, 
                                      InstructionDisassembler * pidi)
@@ -235,14 +235,14 @@ InstructionDisassembler::get_target_addr
         // can't happen for INDIRECT_xxx.
         assert(false);
         return NULL;
-#ifdef _IA32_
+#ifdef HYX86
     case RET:
         {
         const char* sp_value = get_reg_value(DISASM_REG_ESP, pcontext);
         const char* retAddr = *(char**)sp_value;
         return (NativeCodePtr)retAddr;
         }
-#endif // _IA32_
+#endif // HYX86
     default:
         // This method should not be called for non-branch instructions.
         assert(false);

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_pop_frame.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_pop_frame.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_pop_frame.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_pop_frame.cpp Tue Jun 22 21:43:55 2010
@@ -141,7 +141,7 @@ void jvmti_jit_do_pop_frame(){
     assert(0);
 }
 
-#else // _IA32_ & _EM64T_
+#else // HYX86 & HYX86_64
 
 // requires stack iterator and buffer to save intermediate information
 static void jvmti_jit_prepare_pop_frame(StackIterator* si, U_32* buf) {
@@ -319,7 +319,7 @@ void jvmti_jit_do_pop_frame() {
     CTRACE(("PopFrame transfer control to: %p",  (void*)si_get_ip(si) ));
     si_transfer_control(si);
 }
-#endif // _IA32_
+#endif // HYX86
 
 void jvmti_safe_point()
 {

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_step.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_step.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_step.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/jvmti/jvmti_step.cpp Tue Jun 22 21:43:55 2010
@@ -59,7 +59,7 @@ jvmti_GetWordValue( const unsigned char 
 NativeCodePtr static get_ip_for_invoke_call_ip(VM_thread* thread,
     unsigned location, unsigned next_location)
 {
-#if (defined _IA32_) || (defined _EM64T_)
+#if (defined HYX86) || (defined HYX86_64)
     ASSERT_NO_INTERPRETER;
 
     // create stack iterator from native
@@ -497,7 +497,7 @@ jvmti_set_single_step_breakpoints_for_me
 static void jvmti_start_single_step_in_virtual_method(DebugUtilsTI *ti, const VMBreakPoint* bp,
     const POINTER_SIZE_INT data, const unsigned char bytecode)
 {
-#if (defined _IA32_) || (defined _EM64T_)
+#if (defined HYX86) || (defined HYX86_64)
     VM_thread *vm_thread = p_TLS_vmthread;
     assert(vm_thread);
     jvmti_thread_t jvmti_thread = &vm_thread->jvmti_thread;
@@ -795,7 +795,7 @@ jvmtiError jvmti_get_next_bytecodes_from
     unsigned *count,
     bool invoked_frame)
 {
-#if (defined _IA32_) || (defined _EM64T_)
+#if (defined HYX86) || (defined HYX86_64)
     ASSERT_NO_INTERPRETER;
     VMBreakPoints *vm_brpt = VM_Global_State::loader_env->TI->vm_brpt;
 

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/lil/lil_code_generator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/lil/lil_code_generator.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/lil/lil_code_generator.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/lil/lil_code_generator.cpp Tue Jun 22 21:43:55 2010
@@ -26,9 +26,9 @@
 
 LilCodeGenerator* LilCodeGenerator::get_platform()
 {
-#ifdef _IA32_
+#ifdef HYX86
     static LilCodeGeneratorIa32 cg;
-#elif _EM64T_
+#elif HYX86_64
     static LilCodeGeneratorEM64T cg;
 #elif _IPF_
     static LilCodeGeneratorIpf cg;

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/stack/native_stack.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/stack/native_stack.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/stack/native_stack.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/stack/native_stack.cpp Tue Jun 22 21:43:55 2010
@@ -94,7 +94,7 @@ static void native_fill_frame_info(Regis
 
 #if defined(_IPF_)
     // Nothing
-#elif defined(_EM64T_)
+#elif defined(HYX86_64)
     frame->ip = (void*)regs->rip;
     frame->frame = (void*)regs->rbp;
     frame->stack = (void*)regs->rsp;
@@ -109,7 +109,7 @@ static void native_get_regs_from_jit_con
 {
 #if defined(_IPF_)
     // Nothing
-#elif defined(_EM64T_)
+#elif defined(HYX86_64)
     regs->rsp = jfc->rsp;
     regs->rip = *jfc->p_rip;
     regs->rbp = (jfc->p_rbp) ? *jfc->p_rbp : regs->rbp;

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/util/signals.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/util/signals.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/util/signals.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/util/signals.cpp Tue Jun 22 21:43:55 2010
@@ -29,9 +29,9 @@
 
 #ifdef PLATFORM_POSIX
 
-#if defined(_EM64T_)
+#if defined(HYX86_64)
 #define RESTORE_STACK_SIZE 0x0400
-#elif defined (_IA32_)
+#elif defined (HYX86)
 #define RESTORE_STACK_SIZE 0x0100
 #else // IPF
 #define RESTORE_STACK_SIZE 0x0200

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/lil/include/lil_code_generator_arch.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/lil/include/lil_code_generator_arch.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/lil/include/lil_code_generator_arch.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/lil/include/lil_code_generator_arch.h Tue Jun 22 21:43:55 2010
@@ -19,8 +19,8 @@
  */  
 
 
-#ifndef _LIL_CODE_GENERATOR_IA32_
-#define _LIL_CODE_GENERATOR_IA32_
+#ifndef _LIL_CODE_GENERATORHYX86
+#define _LIL_CODE_GENERATORHYX86
 
 #include "lil.h"
 #include "lil_code_generator.h"
@@ -34,4 +34,4 @@ class LilCodeGeneratorIa32 : public LilC
     NativeCodePtr compile_main(LilCodeStub* , size_t*, PoolManager*);
 };
 
-#endif // _LIL_CODE_GENERATOR_IA32_
+#endif // _LIL_CODE_GENERATORHYX86

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/lil/m2n_internal.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/lil/m2n_internal.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/lil/m2n_internal.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/lil/m2n_internal.h Tue Jun 22 21:43:55 2010
@@ -19,8 +19,8 @@
  */  
 
 
-#ifndef _M2N_IA32_INTERNAL_H_
-#define _M2N_IA32_INTERNAL_H_
+#ifndef _M2NHYX86INTERNAL_H_
+#define _M2NHYX86INTERNAL_H_
 
 // This file describes the internal IPF interface of m2n frames.
 // It can be used by stubs to generate code to push and pop m2n frames, to update object handles fields, and 
@@ -85,7 +85,7 @@ char* m2n_gen_pop_m2n(char* buf, bool ha
 //   p_lm2nf==1
 //   regs is present
 
-#ifdef _EM64T_
+#ifdef HYX86_64
 #error Wrong header file.
 #endif
 
@@ -104,4 +104,4 @@ struct M2nFrame {
     Registers*           regs; // This is only for M2nFrames for suspended managed code (as against ones that call stubs and prepare jvmtiPopFrame)
 };
 
-#endif //!_M2N_IA32_INTERNAL_H_
+#endif //!_M2NHYX86INTERNAL_H_

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/include/lil_code_generator_arch.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/include/lil_code_generator_arch.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/include/lil_code_generator_arch.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/include/lil_code_generator_arch.h Tue Jun 22 21:43:55 2010
@@ -48,8 +48,8 @@
  *    r10-r11 are used for lil standard places (sp0-sp1)
  */
 
-#ifndef _LIL_CODE_GENERATOR_EM64T_
-#define _LIL_CODE_GENERATOR_EM64T_
+#ifndef _LIL_CODE_GENERATORHYX86_64
+#define _LIL_CODE_GENERATORHYX86_64
 
 #include "lil.h"
 #include "lil_code_generator.h"
@@ -738,4 +738,4 @@ class LilCodeGeneratorEM64T : public Lil
     NativeCodePtr compile_main(LilCodeStub* , size_t*, PoolManager*);
 };
 
-#endif // _LIL_CODE_GENERATOR_EM64T_
+#endif // _LIL_CODE_GENERATORHYX86_64

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/m2n.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/m2n.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/m2n.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/m2n.cpp Tue Jun 22 21:43:55 2010
@@ -30,8 +30,8 @@
 
 #include "m2n.h"
 #include "encoder.h"
-#include "m2n_em64t_internal.h"
-#include "lil_code_generator_em64t.h"
+#include "m2n_internal.h"
+#include "lil_code_generator_arch.h"
 
 /*    Generic Interface    */
 

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/m2n_internal.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/m2n_internal.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/m2n_internal.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/m2n_internal.h Tue Jun 22 21:43:55 2010
@@ -19,8 +19,8 @@
  * @author Evgueni Brevnov
  */  
 
-#ifndef _M2N_EM64T_INTERNAL_H_
-#define _M2N_EM64T_INTERNAL_H_
+#ifndef _M2NHYX86_64INTERNAL_H_
+#define _M2NHYX86_64INTERNAL_H_
 
 // This file describes the internal EM64T interface of m2n frames.
 // It can be used by stubs to generate code to push and pop m2n frames, to update object handles fields, and 
@@ -129,4 +129,4 @@ unsigned m2n_pop_m2n_size(bool handles, 
 // returns top of the specified frame on the stack (it should point to return ip)
 void * m2n_get_frame_base(M2nFrame *);
 
-#endif // _M2N_EM64T_INTERNAL_H_
+#endif // _M2NHYX86_64INTERNAL_H_

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/stack_iterator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/stack_iterator.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/stack_iterator.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/lil/stack_iterator.cpp Tue Jun 22 21:43:55 2010
@@ -27,7 +27,7 @@
 #include "jit_intf_cpp.h"
 #include "encoder.h"
 #include "m2n.h"
-#include "m2n_em64t_internal.h"
+#include "m2n_internal.h"
 #include "nogc.h"
 #include "interpreter.h" // for ASSERT_NO_INTERPRETER
 #include "cci.h"

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/compile.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/compile.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/compile.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/compile.cpp Tue Jun 22 21:43:55 2010
@@ -33,7 +33,7 @@
 
 #include "nogc.h"
 #include "m2n.h"
-#include "../m2n_em64t_internal.h"
+#include "m2n_internal.h"
 #include "exceptions.h"
 #include "exceptions_jit.h"
 

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/jit_lock_rt_support.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/jit_lock_rt_support.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/jit_lock_rt_support.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/jit_lock_rt_support.cpp Tue Jun 22 21:43:55 2010
@@ -34,7 +34,7 @@
 #include "exceptions_jit.h"
 #include "lil.h"
 #include "lil_code_generator.h"
-#include "../m2n_em64t_internal.h"
+#include "m2n_internal.h"
 #include "object_handles.h"
 #include "Class.h"
 #include "jit_runtime_support.h"

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/jit_runtime_support.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/jit_runtime_support.cpp?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/jit_runtime_support.cpp (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86_64/util/jit_runtime_support.cpp Tue Jun 22 21:43:55 2010
@@ -33,7 +33,7 @@
 #include "lil_code_generator.h"
 #include "jit_runtime_support.h"
 #include "m2n.h"
-#include "../m2n_em64t_internal.h"
+#include "m2n_internal.h"
 
 #include "vm_stats.h"
 #include "dump.h"

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/unix/makefile?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/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 -DBUILDING_VM
 

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/unix/util/include/platform_lowlevel.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/unix/util/include/platform_lowlevel.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/unix/util/include/platform_lowlevel.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/unix/util/include/platform_lowlevel.h Tue Jun 22 21:43:55 2010
@@ -29,7 +29,7 @@ extern "C" {
 #endif
 
 #define __fastcall
-#if defined(_IPF_) || defined(_EM64T_)
+#if defined(_IPF_) || defined(HYX86_64)
 #define __stdcall
 #else
 #define __stdcall  __attribute__ ((__stdcall__))

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/makefile?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmi/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/vm/include/open/hycomp.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/hycomp.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/hycomp.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/hycomp.h Tue Jun 22 21:43:55 2010
@@ -78,7 +78,7 @@
  * </ul>
  */
 #if defined(LINUX) || defined(FREEBSD)
-#if defined(_EM64T_) || defined(_IPF_)
+#if defined(HYX86_64) || defined(_IPF_)
 typedef long int I_64;
 typedef unsigned long int U_64;
 #else

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/hythread.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/hythread.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/hythread.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/hythread.h Tue Jun 22 21:43:55 2010
@@ -479,7 +479,7 @@ typedef struct HyThread_public {
 
 #if defined (_WIN32)
 #   define HYTHREAD_FAST_TLS_ATTRIBUTE
-#   if defined(_IA32_)
+#   if defined(HYX86)
 #       define HYTHREAD_FAST_TLS (1)
         // FIXME suggested to drop FS14_TLS_USE in favor of common HYTHREAD_FAST_TLS
 #       define FS14_TLS_USE
@@ -489,7 +489,7 @@ typedef struct HyThread_public {
 #elif defined(__linux__)
     // some kind of nix - the threads internals are known for IA32/Intel64
     // kernels, will use slow way on other HWs (TODO: add IPF support)
-#   if defined(_IA32_) || defined(_EM64T_)
+#   if defined(HYX86) || defined(HYX86_64)
 #       define HYTHREAD_FAST_TLS (1)
 #       define HYTHREAD_FAST_TLS_ATTRIBUTE __attribute__((tls_model("initial-exec")))
 #   endif

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/platform_types.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/platform_types.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/platform_types.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/platform_types.h Tue Jun 22 21:43:55 2010
@@ -164,7 +164,7 @@ struct Registers {
 
 #else  // !_IPF_
 
-#ifdef _EM64T_
+#ifdef HYX86_64
 
 struct Registers {
     uint64 rsp;
@@ -198,7 +198,7 @@ struct Registers {
 #endif
 }; //Registers
 
-#else // ! _EM64T_
+#else // ! HYX86_64
 
 struct Registers {
     U_32 eax;
@@ -221,7 +221,7 @@ struct Registers {
 #endif
 }; //Registers
 
-#endif // _EM64T_
+#endif // HYX86_64
 
 #endif //!_IPF_
 

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/rt_types.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/rt_types.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/rt_types.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/include/open/rt_types.h Tue Jun 22 21:43:55 2010
@@ -172,7 +172,7 @@ typedef struct OpenMethodExecutionParams
         uint64 ar_lc;
     } JitFrameContext; //JitFrameContext
 
-#elif defined _EM64T_
+#elif defined HYX86_64
 
     typedef
     struct JitFrameContext {
@@ -204,7 +204,7 @@ typedef struct OpenMethodExecutionParams
         Boolean is_ip_past;
     } JitFrameContext;
 
-#else // "_IA32_"
+#else // "HYX86"
 
     typedef
     struct JitFrameContext {
@@ -228,7 +228,7 @@ typedef struct OpenMethodExecutionParams
         Boolean is_ip_past;
     } JitFrameContext;
 
-#endif // "_IA32_"
+#endif // "HYX86"
 
     // end Frame Contexts for JITs
     ///////////////////////////////////////////////////////

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_atomic.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_atomic.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_atomic.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_atomic.h Tue Jun 22 21:43:55 2010
@@ -146,7 +146,7 @@ PORT_INLINE void * port_atomic_casptr(vo
     return InterlockedCompareExchangePointer((volatile PVOID *) data, value, (PVOID) comp);
 }
 
-#elif defined(_EM64T_) && defined (_WIN64)
+#elif defined(HYX86_64) && defined (_WIN64)
 
 #pragma intrinsic(_InterlockedCompareExchange16)
 #pragma intrinsic(_InterlockedCompareExchange64)
@@ -173,7 +173,7 @@ PORT_INLINE void * port_atomic_casptr(vo
 #elif defined (PLATFORM_POSIX)  
 
 PORT_INLINE U_8 port_atomic_cas8(volatile U_8 * data , U_8 value, U_8 comp) {
-#if defined(_IA32_) || defined(_EM64T_)
+#if defined(HYX86) || defined(HYX86_64)
     __asm__ __volatile__(
         "lock cmpxchgb %1, (%2)"
         :"=a"(comp)
@@ -187,7 +187,7 @@ PORT_INLINE U_8 port_atomic_cas8(volatil
 
 PORT_INLINE uint16 port_atomic_cas16(volatile uint16 * data , uint16 value, uint16 comp) {
     uint16 ret;
-#if defined(_IA32_) || defined(_EM64T_)
+#if defined(HYX86) || defined(HYX86_64)
     __asm__ __volatile__(
         "lock cmpxchgw %w1, %2"
         :"=a"(ret)
@@ -201,7 +201,7 @@ PORT_INLINE uint16 port_atomic_cas16(vol
 }
 
 PORT_INLINE uint64 port_atomic_cas64(volatile uint64 * data , uint64 value, uint64 comp) {
-#if defined(_IA32_)
+#if defined(HYX86)
     __asm__ __volatile__(
         "push %%ebx;\n\t"
         "lea %0, %%esi;\n\t"
@@ -221,7 +221,7 @@ PORT_INLINE uint64 port_atomic_cas64(vol
         :"%eax", "%ecx", "%edx", "%esi", "memory" /* clobbers */
     );
     return comp;
-#elif defined(_EM64T_) // defined(_IA32_)
+#elif defined(HYX86_64) // defined(HYX86)
     __asm__ __volatile__(
         "lock cmpxchgq %1, (%2)"
         :"=a"(comp) /* outputs */
@@ -234,7 +234,7 @@ PORT_INLINE uint64 port_atomic_cas64(vol
 }
 
 PORT_INLINE void * port_atomic_casptr(volatile void ** data, void * value, const void * comp) {
-#if defined(_IA32_)
+#if defined(HYX86)
     U_32 Exchange = (U_32)value;
     U_32 Comperand = (U_32)comp;
     __asm__ __volatile__(
@@ -244,7 +244,7 @@ PORT_INLINE void * port_atomic_casptr(vo
         );
     return (void*)Comperand;
 
-#elif defined(_EM64T_) // defined(_IA32_)
+#elif defined(HYX86_64) // defined(HYX86)
     uint64 Exchange = (uint64)value;
     uint64 Comperand = (uint64)comp;
     __asm__(
@@ -254,7 +254,7 @@ PORT_INLINE void * port_atomic_casptr(vo
         );
     return (void *)Comperand;
 
-#else // defined(_EM64T_)
+#else // defined(HYX86_64)
     ABORT("Not supported");
 #endif
 }

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_barriers.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_barriers.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_barriers.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_barriers.h Tue Jun 22 21:43:55 2010
@@ -59,7 +59,7 @@ void port_write_barrier(void);
 #if !defined(_IPF_)
 PORT_INLINE void port_rw_barrier(void)
 {
-#if defined(_EM64T_)
+#if defined(HYX86_64)
     asm volatile ("mfence" : : : "memory");
 #else /* General x86 case */
     /*
@@ -113,7 +113,7 @@ PORT_INLINE void port_write_barrier(void
 
 PORT_INLINE void port_rw_barrier(void)
 {
-#ifdef _EM64T_
+#ifdef HYX86_64
     /* if x86_64/x64/EM64T, then use an mfence to flush memory caches */
     _mm_mfence();
 #else

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_general.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_general.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_general.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/port/include/port_general.h Tue Jun 22 21:43:55 2010
@@ -57,15 +57,15 @@
 
 #endif /* __cplusplus */
 
-#ifdef _IA32_
+#ifdef HYX86
 #ifdef WIN32
 #define PORT_CDECL __cdecl
 #else /* !WIN32 */
 #define PORT_CDECL __attribute__ ((cdecl))
 #endif /* WIN32 */
-#else /* _IA32_ */
+#else /* HYX86 */
 #define PORT_CDECL
-#endif /* _IA32_ */
+#endif /* HYX86 */
 
 
 #endif /* _PORT_GENERAL_H_ */

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/disasm/linux/disasm.c_notused
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/disasm/linux/disasm.c_notused?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/disasm/linux/disasm.c_notused (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/disasm/linux/disasm.c_notused Tue Jun 22 21:43:55 2010
@@ -31,14 +31,14 @@
 #include <apr_portable.h>
 
 // this is mostly imperical data 
-#if defined(_IA32_)
+#if defined(HYX86)
     #define ADDR_SIZE       16
     #define MNEMONIC_SIZE   15
     #define BYTES_PER_LINE  2
     #define BYTES_TOTAL     100
     //BYTES_SIZE = BYTES_PER_LINE * 3
     #define BYTES_SIZE      6
-#elif defined(_EM64T_)
+#elif defined(HYX86_64)
     #define ADDR_SIZE       24
     #define MNEMONIC_SIZE   20
     #define BYTES_PER_LINE  2
@@ -82,7 +82,7 @@ static disassembler_ftype bfd_decoder = 
 static init_disassemble_info_t bfd_init_info = NULL;
 static disassemble_init_for_target_t bfd_init_target = NULL;
 
-#if defined(_IA32_) || defined(_EM64T_) || defined(_IPF_)
+#if defined(HYX86) || defined(HYX86_64) || defined(_IPF_)
 
 /*    Memory reading routines    */
 
@@ -90,9 +90,9 @@ static int disasm_read_memory(bfd_vma sr
                               bfd_byte * buffer,
                               unsigned int n,
                               struct disassemble_info * info) {
-#if defined(_IA32_)
+#if defined(HYX86)
     memcpy(buffer, (void *)(apr_uint32_t)src, n);
-#elif defined(_EM64T_) || defined(_IPF_)
+#elif defined(HYX86_64) || defined(_IPF_)
     memcpy(buffer, (void *)src, n);
 #endif
     return 0;
@@ -101,9 +101,9 @@ static int disasm_read_memory(bfd_vma sr
 /*    Address printing routines    */
 
 static void disasm_print_adress_default(bfd_vma memaddr, struct disassemble_info * info) {
-#if defined(_IA32_)
+#if defined(HYX86)
     info->fprintf_func(info->stream, "0x%08X", (apr_int32_t)memaddr);
-#elif defined(_EM64T_) || defined(_IPF_)
+#elif defined(HYX86_64) || defined(_IPF_)
     apr_uint64_t addr = (apr_uint64_t)memaddr;
     apr_uint32_t hi = (apr_uint32_t)((addr >> 32) & UINT_MAX);
     apr_uint32_t lo = (apr_uint32_t)(addr & UINT_MAX);
@@ -171,7 +171,7 @@ static void disasm_print(port_disassembl
     // iterate over the code buffer
     while (len > 0) {
         int bytes_read = 1;
-#if defined(_IA32_)
+#if defined(HYX86)
         // print instruction address
         if (disassembler->port_info.print_addr) {
             disassembler->bfd_info.print_address_func((bfd_vma)(apr_uint32_t)code,
@@ -182,7 +182,7 @@ static void disasm_print(port_disassembl
         if (disassembler->port_info.print_mnemonic) {
             bytes_read = bfd_decoder((bfd_vma)(apr_uint32_t)code, &disassembler->bfd_info);
         }
-#elif defined(_EM64T_) || defined(_IPF_)
+#elif defined(HYX86_64) || defined(_IPF_)
         // print instruction address
         if (disassembler->port_info.print_addr) {
             disassembler->bfd_info.print_address_func((bfd_vma)code,
@@ -215,18 +215,18 @@ static void disasm_print(port_disassembl
     }
 }
 
-#endif // defined(_IA32_) || defined(_EM64T_) || defined(_IPF_)
+#endif // defined(HYX86) || defined(HYX86_64) || defined(_IPF_)
 
 /*    Public Interface    */
 
 APR_DECLARE(apr_status_t) port_disasm_initialize() {
-#if defined(_IA32_) || defined(_EM64T_) || defined(_IPF_)
+#if defined(HYX86) || defined(HYX86_64) || defined(_IPF_)
     static apr_status_t stat = APR_EINIT;
     const char * BFD_LIB_NAME = "libbfd.so";
     const char * OPCODES_LIB_NAME = "libopcodes.so";
     const char * BFD_INIT_INFO_NAME = "init_disassemble_info";
     const char * BFD_INIT_TARGET_NAME = "disassemble_init_for_target";
-#if defined (_IA32_) || defined(_EM64T_)
+#if defined (HYX86) || defined(HYX86_64)
     const char * BFD_PRINT_INSN_NAME = "print_insn_i386_intel";
 #elif defined(_IPF_)
     const char * BFD_PRINT_INSN_NAME = "print_insn_ia64";
@@ -306,7 +306,7 @@ APR_DECLARE(apr_status_t) port_disasm_in
 
 APR_DECLARE(apr_status_t) port_disassembler_create(port_disassembler_t ** disassembler,
                                                    apr_pool_t * pool) {
-#if defined(_IA32_) || defined(_EM64T_) || defined(_IPF_)
+#if defined(HYX86) || defined(HYX86_64) || defined(_IPF_)
     apr_status_t status;
     
     if ((status = port_disasm_initialize()) != APR_SUCCESS) {
@@ -326,10 +326,10 @@ APR_DECLARE(apr_status_t) port_disassemb
     (*disassembler)->bfd_info.read_memory_func = disasm_read_memory;
     (*disassembler)->bfd_info.print_address_func = disasm_print_adress_default;
 
-#if defined(_IA32_)
+#if defined(HYX86)
     (*disassembler)->bfd_info.arch = bfd_arch_i386;
     (*disassembler)->bfd_info.mach = bfd_mach_i386_i386_intel_syntax;
-#elif defined(_EM64T_)
+#elif defined(HYX86_64)
     (*disassembler)->bfd_info.arch = bfd_arch_i386;
     (*disassembler)->bfd_info.mach = bfd_mach_x86_64_intel_syntax;
 #elif defined(_IPF_)
@@ -357,7 +357,7 @@ APR_DECLARE(apr_status_t) port_disassemb
 APR_DECLARE(apr_status_t) port_disasm_set_info(port_disassembler_t * disassembler,
                                                const port_disasm_info_t new_info,
                                                port_disasm_info_t * old_info) {
-#if defined(_IA32_) || defined(_EM64T_) || defined(_IPF_)
+#if defined(HYX86) || defined(HYX86_64) || defined(_IPF_)
     if (old_info != NULL) {
         *old_info = disassembler->port_info;
     }
@@ -382,7 +382,7 @@ APR_DECLARE(apr_status_t) port_disasm(po
                                       const char * code, 
                                       unsigned int len,
                                       char ** disasm_code) {
-#if defined(_IA32_) || defined(_EM64T_) || defined(_IPF_)    
+#if defined(HYX86) || defined(HYX86_64) || defined(_IPF_)    
     // check if nothing should be printed
     if (disassembler->line_size == 0) {
         *disasm_code = NULL;
@@ -419,7 +419,7 @@ APR_DECLARE(apr_status_t) port_disasm_to
                                               const char * code,
                                               unsigned int len,
                                               apr_file_t * thefile) {
-#if defined(_IA32_) || defined(_EM64T_) || defined(_IPF_)
+#if defined(HYX86) || defined(HYX86_64) || defined(_IPF_)
     // check if nothing should be printed
     if (disassembler->line_size == 0) {
         return APR_SUCCESS;

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/disasm/win/disasm.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/disasm/win/disasm.c?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/disasm/win/disasm.c (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/disasm/win/disasm.c Tue Jun 22 21:43:55 2010
@@ -30,7 +30,7 @@
 #include "port_disasm.h"
 
 // this is mostly imperical data 
-#if defined(_IA32_)
+#if defined(HYX86)
     #define ADDR_SIZE       16
     #define MNEMONIC_SIZE   15
     #define BYTES_PER_LINE  2
@@ -60,7 +60,7 @@ struct port_disassembler_t {
     apr_size_t num_bytes_used;
 };
 
-#if defined(_IA32_)
+#if defined(HYX86)
 
 /*    General printing routines    */
 
@@ -148,12 +148,12 @@ static void disasm_print(port_disassembl
 #endif
     }
 }
-#endif // defined(_IA32_)
+#endif // defined(HYX86)
 
 /*    Public Interface    */
 
 APR_DECLARE(apr_status_t) port_disasm_initialize() {
-#if defined(_IA32_)
+#if defined(HYX86)
     return APR_SUCCESS;
 #else
     return APR_ENOTIMPL;
@@ -162,7 +162,7 @@ APR_DECLARE(apr_status_t) port_disasm_in
 
 APR_DECLARE(apr_status_t) port_disassembler_create(port_disassembler_t ** disassembler,
                                                    apr_pool_t * pool) {
-#if defined(_IA32_)
+#if defined(HYX86)
     apr_status_t status;
     port_disasm_info_t info = {1, 0, 1};
     
@@ -193,7 +193,7 @@ APR_DECLARE(apr_status_t) port_disassemb
 APR_DECLARE(apr_status_t) port_disasm_set_info(port_disassembler_t * disassembler,
                                                const port_disasm_info_t new_info,
                                                port_disasm_info_t * old_info) {
-#if defined(_IA32_)
+#if defined(HYX86)
     if (old_info != NULL) {
         *old_info = disassembler->port_info;
     }
@@ -218,7 +218,7 @@ APR_DECLARE(apr_status_t) port_disasm(po
                                       const char * code, 
                                       unsigned int len,
                                       char ** disasm_code) {
-#if defined(_IA32_)    
+#if defined(HYX86)    
     // check if nothing should be printed
     if (disassembler->line_size == 0) {
         *disasm_code = NULL;
@@ -255,7 +255,7 @@ APR_DECLARE(apr_status_t) port_disasm_to
                                               const char * code,
                                               unsigned int len,
                                               apr_file_t * thefile) {
-#if defined(_IA32_)
+#if defined(HYX86)
     // check if nothing should be printed
     if (disassembler->line_size == 0) {
         return APR_SUCCESS;

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/misc/win/sysinfo.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/misc/win/sysinfo.c?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/misc/win/sysinfo.c (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/misc/win/sysinfo.c Tue Jun 22 21:43:55 2010
@@ -99,7 +99,7 @@ APR_DECLARE(apr_status_t) port_OS_name_v
 APR_DECLARE(const char *) port_CPU_architecture(void){
 #if defined(_IPF_)
 	return "ia64";
-#elif defined (_EM64T_)
+#elif defined (HYX86_64)
     return "x86_64";
 #else
     return "x86";

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/thread/win/port_thread_tls_os.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/thread/win/port_thread_tls_os.c?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/thread/win/port_thread_tls_os.c (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/thread/win/port_thread_tls_os.c Tue Jun 22 21:43:55 2010
@@ -30,7 +30,7 @@ static port_shared_data_t g_port_shared_
 
 #define MEM_PROTECT_SIZE 0x100
 
-#ifdef _EM64T_
+#ifdef HYX86_64
 #define GUARD_STACK_SIZE (64*1024)
 #else /* IA-32 */
 #define GUARD_STACK_SIZE (find_guard_page_size())

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/thread/win/thread_os.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/thread/win/thread_os.c?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/thread/win/thread_os.c (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/port/src/thread/win/thread_os.c Tue Jun 22 21:43:55 2010
@@ -145,7 +145,7 @@ static int set_guard_page(port_tls_data_
         (!set && !tlsdata->guard_page_set))
         return 0; // Already in needed state
 
-#ifdef _EM64T_
+#ifdef HYX86_64
     /* Windows x86_64 protects both guard page and guard stack area
        specified by SetThreadStackGuarantee() with PAGE_GUARD flag */
     guard_addr = tlsdata->guard_stack_addr;
@@ -230,14 +230,14 @@ size_t port_thread_get_effective_stack_s
 
 static int setup_stack(port_tls_data_t* tlsdata)
 {
-#ifdef _EM64T_
+#ifdef HYX86_64
     ULONG guard_stack_size_param;
 #endif
 
     if (!port_shared_data)
         return -1;
 
-#ifdef _EM64T_
+#ifdef HYX86_64
     /* this code in future should be used on both platforms x86-32 and x86-64 */
     guard_stack_size_param = (ULONG)PSD->guard_stack_size;
 

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/jit_runtime_support_common.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/jit_runtime_support_common.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/jit_runtime_support_common.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/jit_runtime_support_common.h Tue Jun 22 21:43:55 2010
@@ -45,7 +45,7 @@
 #define STACK_ALIGN16         (0x00000010)
 
 
-#ifdef _EM64T_
+#ifdef HYX86_64
     #define MANAGED_STACK_ALIGNMENT STACK_ALIGN_HALF16
 #else
     // Use 16-byte stack pointer alignment to avoid perf penalty on SSE usage in JITted code. 

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/jvmti_dasm.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/jvmti_dasm.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/jvmti_dasm.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/jvmti_dasm.h Tue Jun 22 21:43:55 2010
@@ -50,10 +50,10 @@ public:
      */
     enum Register {
         DISASM_REG_NONE,
-#ifdef _IA32_
+#ifdef HYX86
         DISASM_REG_EAX, DISASM_REG_EBX, DISASM_REG_ECX, DISASM_REG_EDX,
         DISASM_REG_ESI, DISASM_REG_EDI, DISASM_REG_EBP, DISASM_REG_ESP
-#elif defined _EM64T_
+#elif defined HYX86_64
         DISASM_REG_RAX, DISASM_REG_RBX, DISASM_REG_RCX, DISASM_REG_RDX,
         DISASM_REG_RSI, DISASM_REG_RDI, DISASM_REG_RSP, DISASM_REG_RBP,
         DISASM_REG_R8 , DISASM_REG_R9 , DISASM_REG_R10, DISASM_REG_R11,

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/thread_helpers.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/thread_helpers.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/thread_helpers.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/thread_helpers.h Tue Jun 22 21:43:55 2010
@@ -36,7 +36,7 @@ extern "C"
 #endif /* __cplusplus */
 fast_tls_func* get_tls_helper(hythread_tls_key_t key);
 
-#if (defined _IA32_) || (defined _EM64T_)
+#if (defined HYX86) || (defined HYX86_64)
 
 #include "encoder.h"
 
@@ -53,6 +53,6 @@ char* gen_monitorexit_slow_path_helper(c
 }
 #endif
 
-#endif /* (defined _IA32_) || (defined _EM64T_) */
+#endif /* (defined HYX86) || (defined HYX86_64) */
 
 #endif  /* OPEN_THREAD_NATIVE_H */

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/version.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/version.h?rev=957042&r1=957041&r2=957042&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/version.h (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/version.h Tue Jun 22 21:43:55 2010
@@ -49,7 +49,7 @@
 
 #if defined(_IPF_)
 #define VERSION_ARCH "ipf"
-#elif defined(_EM64T_)
+#elif defined(HYX86_64)
 #define VERSION_ARCH "em64t"
 #else
 #define VERSION_ARCH "ia32"



Mime
View raw message