You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by va...@apache.org on 2007/10/08 08:44:01 UTC
svn commit: r582726 - in /harmony/enhanced/drlvm/trunk/vm:
jitrino/src/jet/enc_ia32.cpp port/src/encoder/ia32_em64t/enc_defs.h
Author: varlax
Date: Sun Oct 7 23:44:00 2007
New Revision: 582726
URL: http://svn.apache.org/viewvc?rev=582726&view=rev
Log:
Applied HARMONY-3558 [drlvm][jit] drlvm crashes with large pages enabled
Modified:
harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc_ia32.cpp
harmony/enhanced/drlvm/trunk/vm/port/src/encoder/ia32_em64t/enc_defs.h
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc_ia32.cpp?rev=582726&r1=582725&r2=582726&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc_ia32.cpp Sun Oct 7 23:44:00 2007
@@ -834,9 +834,9 @@
EncoderBase::Operands args;
args.add(devirt(op0));
#ifdef _EM64T_
- args.add(EncoderBase::Operand(OpndSize_64, (::int_ptr)op1));
+ args.add(EncoderBase::Operand(OpndSize_64, (int_ptr)op1));
#else
- args.add(EncoderBase::Operand(OpndSize_32, (::int_ptr)op1));
+ args.add(EncoderBase::Operand(OpndSize_32, (int_ptr)op1));
#endif
ip(EncoderBase::encode(ip(), Mnemonic_MOV, args));
}
Modified: harmony/enhanced/drlvm/trunk/vm/port/src/encoder/ia32_em64t/enc_defs.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/encoder/ia32_em64t/enc_defs.h?rev=582726&r1=582725&r2=582726&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/encoder/ia32_em64t/enc_defs.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/encoder/ia32_em64t/enc_defs.h Sun Oct 7 23:44:00 2007
@@ -57,18 +57,11 @@
#else
#define REG_STACK RegName_ESP
#define REG_MAX RegName_EDI
- typedef long int_ptr;
#define MAX_REGS 8
#endif
ENCODER_NAMESPACE_START
-/**
- * 'int_ptr' is a signed integer type which has the
- * same size as a pointer on the target platform.
- * Luckily, the long type serves as desired.
- */
-typedef long int_ptr;
/**
* A number of bytes 'eaten' by an ordinary PUSH/POP.
*/