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/02/27 05:42:47 UTC
svn commit: r512134 - in
/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator: CodeGenIntfc.h
ia32/Ia32InstCodeSelector.cpp ia32/Ia32InstCodeSelector.h
Author: varlax
Date: Mon Feb 26 20:42:47 2007
New Revision: 512134
URL: http://svn.apache.org/viewvc?view=rev&rev=512134
Log:
Fixed HARMONY-3222 [drlvm][jit] assertion fires with DaCapo eclipse (jitrino built in debug)
Tested on SLES9@ia32
Modified:
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/CodeGenIntfc.h
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.h
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/CodeGenIntfc.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/CodeGenIntfc.h?view=diff&rev=512134&r1=512133&r2=512134
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/CodeGenIntfc.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/CodeGenIntfc.h Mon Feb 26 20:42:47 2007
@@ -286,8 +286,8 @@
virtual CG_OpndHandle* callvmhelper(uint32 numArgs, CG_OpndHandle** args, Type* retType,
CompilationInterface::RuntimeHelperId callId, InlineInfo* ii = NULL) = 0;
- virtual CG_OpndHandle* ldc_i4(uint32 val) = 0;
- virtual CG_OpndHandle* ldc_i8(uint64 val) = 0;
+ virtual CG_OpndHandle* ldc_i4(int32 val) = 0;
+ virtual CG_OpndHandle* ldc_i8(int64 val) = 0;
virtual CG_OpndHandle* ldc_s(float val) = 0;
virtual CG_OpndHandle* ldc_d(double val) = 0;
virtual CG_OpndHandle* ldnull(bool compressed) = 0;
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp?view=diff&rev=512134&r1=512133&r2=512134
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp Mon Feb 26 20:42:47 2007
@@ -1431,7 +1431,7 @@
//_______________________________________________________________________________________________________________
// Load 32-bit integer constant
-CG_OpndHandle* InstCodeSelector::ldc_i4(uint32 val)
+CG_OpndHandle* InstCodeSelector::ldc_i4(int32 val)
{
return irManager.newImmOpnd(typeManager.getInt32Type(), val);
}
@@ -1439,7 +1439,7 @@
//_______________________________________________________________________________________________________________
// Load 64-bit integer constant
-CG_OpndHandle* InstCodeSelector::ldc_i8(uint64 val)
+CG_OpndHandle* InstCodeSelector::ldc_i8(int64 val)
{
#ifndef _EM64T_
return irManager.newImmOpnd(typeManager.getInt64Type(), val);
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.h?view=diff&rev=512134&r1=512133&r2=512134
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.h Mon Feb 26 20:42:47 2007
@@ -123,8 +123,8 @@
CG_OpndHandle* convToUPtr(PtrType * dstType, CG_OpndHandle* src);
- CG_OpndHandle* ldc_i4(uint32 val);
- CG_OpndHandle* ldc_i8(uint64 val);
+ CG_OpndHandle* ldc_i4(int32 val);
+ CG_OpndHandle* ldc_i8(int64 val);
CG_OpndHandle* ldc_s(float val);
CG_OpndHandle* ldc_d(double val);
CG_OpndHandle* ldnull(bool compressed);