harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r601233 - in /harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32: Ia32RuntimeInterface.cpp Ia32StackInfo.cpp
Date Wed, 05 Dec 2007 07:36:17 GMT
Author: varlax
Date: Tue Dec  4 23:36:10 2007
New Revision: 601233

URL: http://svn.apache.org/viewvc?rev=601233&view=rev
Log:
Corrected idle asserts

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp?rev=601233&r1=601232&r2=601233&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp
Tue Dec  4 23:36:10 2007
@@ -47,8 +47,9 @@
 #endif
     StackInfo stackInfo;
     stackInfo.read(methodDesc, eip, isFirst);
+    assert(eip >= (POINTER_SIZE_INT)methodDesc->getCodeBlockAddress(0));
     POINTER_SIZE_INT eipOffset = eip - (POINTER_SIZE_INT)methodDesc->getCodeBlockAddress(0);
-    assert(fit32(eipOffset) && eipOffset >= 0);
+    assert(fit32(eipOffset));
     return eipOffset<=stackInfo.getSOECheckAreaOffset();
 }
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp?rev=601233&r1=601232&r2=601233&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp Tue Dec
 4 23:36:10 2007
@@ -179,8 +179,9 @@
         calleeSaveRegsMask = entry->info.calleeSaveRegs;
         stackDepth = entry->info.stackDepth;
     }else{
+        assert(eip >= (POINTER_SIZE_INT)pMethodDesc->getCodeBlockAddress(0));
         POINTER_SIZE_INT eipOffset = eip - (POINTER_SIZE_INT)pMethodDesc->getCodeBlockAddress(0);
-        assert(fit32(eipOffset) && eipOffset >= 0);
+        assert(fit32(eipOffset));
         if (eipOffset <= soeCheckAreaOffset) {
             stackDepth = 0; //0 depth -> stack overflow error
         } else {



Mime
View raw message