You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ml...@apache.org on 2008/03/19 12:52:29 UTC
svn commit: r638801 - in
/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier:
recompute.cpp recompute.h write_attr.cpp
Author: mloenko
Date: Wed Mar 19 04:52:21 2008
New Revision: 638801
URL: http://svn.apache.org/viewvc?rev=638801&view=rev
Log:
fix compiler warnings
Modified:
harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.h
harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/write_attr.cpp
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=638801&r1=638800&r2=638801&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 Wed Mar 19 04:52:21 2008
@@ -101,6 +101,7 @@
return tcr;
}
entryNo++;
+ assert(instr == head->instr);
writeStackMapFrame(head->instr);
/////////////////////////////////
@@ -430,7 +431,7 @@
int valid_arc_found = is_direct_arc(adjacent) ?
knownly_assignable(sm_this->value, sm2->value, adjacent->type == CT_ARRAY2REF) :
- knownly_assignable(sm2->value, sm_this->value, adjacent->type == CTX_REVERSED_ARRAY2REF);
+ knownly_assignable(sm2->value, sm_this->value, (int)adjacent->type == (int)CTX_REVERSED_ARRAY2REF);
if( valid_arc_found ) {
//stackmap has a superclass in a branch target ==> this arc is OK, check next one
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.h?rev=638801&r1=638800&r2=638801&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.h Wed Mar 19 04:52:21 2008
@@ -401,7 +401,7 @@
}
int is_reversed_arc(Constraint *c) {
- return c->type == CTX_REVERSED_GENERIC || c->type == CTX_REVERSED_ARRAY2REF;
+ return (ConstraintType_Ex)c->type == CTX_REVERSED_GENERIC || (ConstraintType_Ex)c->type == CTX_REVERSED_ARRAY2REF;
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/write_attr.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/write_attr.cpp?rev=638801&r1=638800&r2=638801&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/write_attr.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/write_attr.cpp Wed Mar 19 04:52:21 2008
@@ -37,7 +37,7 @@
void vf_Context_5e::writeStackMapFrame( Address instr )
{
- assert(instr != -1 || 1 + lastInstr < instr );
+ assert(instr < m_code_length || 1 + lastInstr < instr );
uint32 offset = lastInstr == -1 ? instr : instr - lastInstr - 1;
lastInstr = instr;