Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@harmony.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r653200 - in
 /harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363:
 java5/stackmap_5.h x_verifier/recompute.cpp
Date: Sun, 04 May 2008 11:32:51 -0000
To: commits@harmony.apache.org
From: mcfirst@apache.org
Message-Id: <20080504113251.D5ED323889C1@eris.apache.org>

Author: mcfirst
Date: Sun May  4 04:32:51 2008
New Revision: 653200

URL: http://svn.apache.org/viewvc?rev=653200&view=rev
Log:
Applying the patch from HARMONY-5794 [drlvm][verifier-ext] Problem with compilation of verifier-ext.a on Linux

Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java5/stackmap_5.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java5/stackmap_5.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java5/stackmap_5.h?rev=653200&r1=653199&r2=653200&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java5/stackmap_5.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java5/stackmap_5.h Sun May  4 04:32:51 2008
@@ -40,8 +40,7 @@
     IncomingType *nxt;
 
     //value of the verification type recorded as int
-    //TODO: don't remember why it's 'int' rather than 'SmConstant'
-    int value;
+    _SmConstant value;
 
     //simple next in the list
     IncomingType *next() {
@@ -161,7 +160,7 @@
 
         in->nxt = value == SM_BOGUS ? 0 : incoming;
         //in->type = CT_INCOMING_VALUE;
-        in->value = value.c;
+        in->value = value;
 
         incoming = in;
 
@@ -219,7 +218,7 @@
 struct WorkmapElement_5 {
     //value. two low bits a used to store flags
     union {
-        _SmConstant const_val;      //either a constant (known-type)
+        _SmConstant const_val;        //either a constant (known-type)
         StackmapElement_5 *var_ptr;   //or a variable (sub-definite type)
     };
 
@@ -242,7 +241,7 @@
     //when we need to compae to some unmergable type we don;t need to interate thru the list
     //also used to assert that an IncomingValue constraint exists
     SmConstant getAnyPossibleValue() {
-        SmConstant ret = isVariable() ? getVariable()->getAnyIncomingValue() : const_val;
+        SmConstant ret = isVariable() ? getVariable()->getAnyIncomingValue() : (SmConstant) const_val;
         assert(ret != SM_NONE);
         return ret;
     }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.cpp?rev=653200&r1=653199&r2=653200&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.cpp Sun May  4 04:32:51 2008
@@ -259,7 +259,7 @@
         //(we don't record expected values for constants that was the risk)
         
         //otherwise: nobody cares
-        el->firstIncoming()->value = SM_BOGUS;
+        el->firstIncoming()->value.c = SM_BOGUS;
         el->firstIncoming()->nxt = 0;
         return VF_OK;
     }
@@ -283,7 +283,7 @@
             ((StackmapElement_Ex*)el)->removeIncoming(inc);
         } else if( !SmConstant(inc->value).isReference() ) {
             //we can merge objects only: all other types produce SM_BOGUS
-            el->firstIncoming()->value = SM_BOGUS;
+            el->firstIncoming()->value.c = SM_BOGUS;
             el->firstIncoming()->nxt = 0;
             return VF_OK;
         } else {
@@ -312,7 +312,7 @@
 
         //if all dimensions are the same but there is an object or interface there
         //we also can calculate
-        el->firstIncoming()->value = get_object_array(min_arr_dims).c;
+        el->firstIncoming()->value = get_object_array(min_arr_dims);
         el->firstIncoming()->nxt = 0;
         return VF_OK;
     }
@@ -321,7 +321,7 @@
         //there is a mix of arrays of primitive and other arrays of the same dimensions
         assert(min_arr_dims);
         //reduce dimensions by one and create array ob objects
-        el->firstIncoming()->value = get_object_array(min_arr_dims - 1).c;
+        el->firstIncoming()->value = get_object_array(min_arr_dims - 1);
         el->firstIncoming()->nxt = 0;
         return VF_OK;
     }