[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnet/codegen cg_decls.tc,1.44,1.45 cg_misc.t
|
From: |
Gopal.V <address@hidden> |
|
Subject: |
[Dotgnu-pnet-commits] CVS: pnet/codegen cg_decls.tc,1.44,1.45 cg_misc.tc,1.44,1.45 cg_nodes.tc,1.73,1.74 cg_stmt.tc,1.34,1.35 jv_stmt.tc,1.18,1.19 |
|
Date: |
Sat, 28 Dec 2002 12:17:04 -0500 |
Update of /cvsroot/dotgnu-pnet/pnet/codegen
In directory subversions:/tmp/cvs-serv2834/codegen
Modified Files:
cg_decls.tc cg_misc.tc cg_nodes.tc cg_stmt.tc jv_stmt.tc
Log Message:
Add an "info" parameter to ILNode_EndsInReturnImpl
Index: cg_decls.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/cg_decls.tc,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** cg_decls.tc 21 Dec 2002 10:48:51 -0000 1.44
--- cg_decls.tc 28 Dec 2002 17:17:02 -0000 1.45
***************
*** 701,705 ****
/* Add an explicit return instruction if the body
didn't */
outputLabel = 0;
! if(!ILNodeEndsInFlowChange(node->body))
{
if(info->returnLabel != ILLabel_Undefined &&
--- 701,705 ----
/* Add an explicit return instruction if the body
didn't */
outputLabel = 0;
! if(!ILNodeEndsInFlowChange(node->body,info))
{
if(info->returnLabel != ILLabel_Undefined &&
***************
*** 737,741 ****
/* Add an explicit return instruction if the body
didn't */
outputLabel = 0;
! if(!ILNodeEndsInFlowChange(node->body))
{
if(info->returnLabel != ILLabel_Undefined &&
--- 737,741 ----
/* Add an explicit return instruction if the body
didn't */
outputLabel = 0;
! if(!ILNodeEndsInFlowChange(node->body,info))
{
if(info->returnLabel != ILLabel_Undefined &&
Index: cg_misc.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/cg_misc.tc,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** cg_misc.tc 29 Nov 2002 21:58:12 -0000 1.44
--- cg_misc.tc 28 Dec 2002 17:17:02 -0000 1.45
***************
*** 2696,2700 ****
if(node->expr)
{
! return ILNode_EndsInReturnImpl(node->expr);
}
else
--- 2696,2700 ----
if(node->expr)
{
! return ILNode_EndsInReturnImpl(node->expr,info);
}
else
Index: cg_nodes.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/cg_nodes.tc,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** cg_nodes.tc 29 Nov 2002 21:58:12 -0000 1.73
--- cg_nodes.tc 28 Dec 2002 17:17:02 -0000 1.74
***************
*** 980,984 ****
%operation %virtual void ILNode_GenRef
(ILNode_LValue *node, ILGenInfo *info);
! %operation %virtual int ILNode_EndsInReturnImpl(ILNode *node);
--- 980,984 ----
%operation %virtual void ILNode_GenRef
(ILNode_LValue *node, ILGenInfo *info);
! %operation %virtual int ILNode_EndsInReturnImpl(ILNode *node, ILGenInfo
*info);
Index: cg_stmt.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/cg_stmt.tc,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** cg_stmt.tc 20 Dec 2002 16:32:51 -0000 1.34
--- cg_stmt.tc 28 Dec 2002 17:17:02 -0000 1.35
***************
*** 162,166 ****
* Determine if a statement list ends in a flow control change statement.
*/
! int ILNodeEndsInFlowChange(ILNode *stmt);
/*
--- 162,166 ----
* Determine if a statement list ends in a flow control change statement.
*/
! int ILNodeEndsInFlowChange(ILNode *stmt,ILGenInfo *genInfo);
/*
***************
*** 323,331 ****
}
! int ILNodeEndsInFlowChange(ILNode *stmt)
{
if(stmt)
{
! int flags = ILNode_EndsInReturnImpl(stmt);
if((flags & (IL_ENDS_IN_RETURN |
IL_ENDS_IN_BREAK |
--- 323,331 ----
}
! int ILNodeEndsInFlowChange(ILNode *stmt,ILGenInfo *genInfo)
{
if(stmt)
{
! int flags = ILNode_EndsInReturnImpl(stmt,genInfo);
if((flags & (IL_ENDS_IN_RETURN |
IL_ENDS_IN_BREAK |
***************
*** 395,399 ****
while((child = ILNode_ListIter_Next(&iter)) != 0)
{
! flags2 = ILNode_EndsInReturnImpl(child);
if((flags2 & IL_ENDS_IN_EMPTY) == 0)
{
--- 395,399 ----
while((child = ILNode_ListIter_Next(&iter)) != 0)
{
! flags2 = ILNode_EndsInReturnImpl(child,info);
if((flags2 & IL_ENDS_IN_EMPTY) == 0)
{
***************
*** 450,454 ****
ILNode_GenElse(node->expr, info, &label1);
ILNode_GenDiscard(node->thenClause, info);
! if(!ILNodeEndsInFlowChange(node->thenClause))
{
ILGenJump(info, IL_OP_BR, &label2);
--- 450,454 ----
ILNode_GenElse(node->expr, info, &label1);
ILNode_GenDiscard(node->thenClause, info);
! if(!ILNodeEndsInFlowChange(node->thenClause,info))
{
ILGenJump(info, IL_OP_BR, &label2);
***************
*** 468,472 ****
if(node->thenClause)
{
! flags1 = ILNode_EndsInReturnImpl(node->thenClause);
}
else
--- 468,472 ----
if(node->thenClause)
{
! flags1 = ILNode_EndsInReturnImpl(node->thenClause,info);
}
else
***************
*** 476,480 ****
if(node->elseClause)
{
! flags2 = ILNode_EndsInReturnImpl(node->elseClause);
}
else
--- 476,480 ----
if(node->elseClause)
{
! flags2 = ILNode_EndsInReturnImpl(node->elseClause,info);
}
else
***************
*** 559,563 ****
if(node->stmt)
{
! flags = ILNode_EndsInReturnImpl(node->stmt);
if((flags & IL_ENDS_IN_CONTAINED_BREAK) != 0)
{
--- 559,563 ----
if(node->stmt)
{
! flags = ILNode_EndsInReturnImpl(node->stmt,info);
if((flags & IL_ENDS_IN_CONTAINED_BREAK) != 0)
{
***************
*** 1534,1538 ****
if(node->stmt)
{
! return ILNode_EndsInReturnImpl(node->stmt);
}
else
--- 1534,1538 ----
if(node->stmt)
{
! return ILNode_EndsInReturnImpl(node->stmt,info);
}
else
***************
*** 1866,1870 ****
if(node->body)
{
! flags = ILNode_EndsInReturnImpl(node->body);
}
else
--- 1866,1870 ----
if(node->body)
{
! flags = ILNode_EndsInReturnImpl(node->body,info);
}
else
***************
*** 1877,1881 ****
if(section->stmt)
{
! sflags = ILNode_EndsInReturnImpl(section->stmt);
}
else
--- 1877,1881 ----
if(section->stmt)
{
! sflags =
ILNode_EndsInReturnImpl(section->stmt,info);
}
else
***************
*** 2005,2009 ****
/* Jump to the end of the "try" statement */
! if(!ILNodeEndsInFlowChange(node->stmt))
{
ILGenJump(info, IL_OP_LEAVE, &label);
--- 2005,2009 ----
/* Jump to the end of the "try" statement */
! if(!ILNodeEndsInFlowChange(node->stmt,info))
{
ILGenJump(info, IL_OP_LEAVE, &label);
***************
*** 2025,2029 ****
{
ILNode_GenDiscard(clause, info);
! if(!ILNodeEndsInFlowChange(clause))
{
ILGenJump(info, IL_OP_LEAVE, &label);
--- 2025,2029 ----
{
ILNode_GenDiscard(clause, info);
! if(!ILNodeEndsInFlowChange(clause,info))
{
ILGenJump(info, IL_OP_LEAVE, &label);
***************
*** 2066,2070 ****
if(node->stmt)
{
! flags = ILNode_EndsInReturnImpl(node->stmt);
}
else
--- 2066,2070 ----
if(node->stmt)
{
! flags = ILNode_EndsInReturnImpl(node->stmt,info);
}
else
***************
*** 2081,2085 ****
while((clause = ILNode_ListIter_Next(&iter)) != 0)
{
! cflags = ILNode_EndsInReturnImpl(clause);
if((cflags & (IL_ENDS_IN_RETURN |
IL_ENDS_IN_BREAK |
--- 2081,2085 ----
while((clause = ILNode_ListIter_Next(&iter)) != 0)
{
! cflags = ILNode_EndsInReturnImpl(clause,info);
if((cflags & (IL_ENDS_IN_RETURN |
IL_ENDS_IN_BREAK |
***************
*** 2153,2157 ****
if(node->stmt)
{
! return ILNode_EndsInReturnImpl(node->stmt);
}
else
--- 2153,2157 ----
if(node->stmt)
{
! return ILNode_EndsInReturnImpl(node->stmt,info);
}
else
***************
*** 2173,2177 ****
if(info->asmOutput)
{
! if(!ILNodeEndsInFlowChange(node->stmt))
{
ILGenSimple(info, IL_OP_ENDFINALLY);
--- 2173,2177 ----
if(info->asmOutput)
{
! if(!ILNodeEndsInFlowChange(node->stmt,info))
{
ILGenSimple(info, IL_OP_ENDFINALLY);
***************
*** 2188,2192 ****
if(node->stmt)
{
! return ILNode_EndsInReturnImpl(node->stmt);
}
else
--- 2188,2192 ----
if(node->stmt)
{
! return ILNode_EndsInReturnImpl(node->stmt,info);
}
else
***************
*** 2227,2231 ****
}
ILNode_GenDiscard(node->stmt, info);
! if(!ILNodeEndsInFlowChange(node->stmt))
{
ILGenJump(info, IL_OP_LEAVE, &endLabel);
--- 2227,2231 ----
}
ILNode_GenDiscard(node->stmt, info);
! if(!ILNodeEndsInFlowChange(node->stmt,info))
{
ILGenJump(info, IL_OP_LEAVE, &endLabel);
***************
*** 2266,2270 ****
if(node->stmt)
{
! return ILNode_EndsInReturnImpl(node->stmt);
}
else
--- 2266,2270 ----
if(node->stmt)
{
! return ILNode_EndsInReturnImpl(node->stmt,info);
}
else
***************
*** 2313,2317 ****
if(node->stmt)
{
! return ILNode_EndsInReturnImpl(node->stmt);
}
else
--- 2313,2317 ----
if(node->stmt)
{
! return ILNode_EndsInReturnImpl(node->stmt,info);
}
else
Index: jv_stmt.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/jv_stmt.tc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** jv_stmt.tc 20 Oct 2002 20:38:28 -0000 1.18
--- jv_stmt.tc 28 Dec 2002 17:17:02 -0000 1.19
***************
*** 91,95 ****
JavaGenElse(node->expr, info, &label1);
JavaGenDiscard(node->thenClause, info);
! if(!ILNodeEndsInFlowChange(node->thenClause))
{
JavaGenJump(info, JAVA_OP_GOTO, &label2);
--- 91,95 ----
JavaGenElse(node->expr, info, &label1);
JavaGenDiscard(node->thenClause, info);
! if(!ILNodeEndsInFlowChange(node->thenClause,info))
{
JavaGenJump(info, JAVA_OP_GOTO, &label2);
***************
*** 1487,1491 ****
/* Jump to the end of the "try" statement */
! if(!ILNodeEndsInFlowChange(node->stmt))
{
if(node->finallyClause)
--- 1487,1491 ----
/* Jump to the end of the "try" statement */
! if(!ILNodeEndsInFlowChange(node->stmt,info))
{
if(node->finallyClause)
***************
*** 1511,1515 ****
{
JavaGenDiscard(clause, info);
! if(!ILNodeEndsInFlowChange(clause))
{
if(node->finallyClause)
--- 1511,1515 ----
{
JavaGenDiscard(clause, info);
! if(!ILNodeEndsInFlowChange(clause,info))
{
if(node->finallyClause)
***************
*** 1643,1647 ****
/* If the clause falls through, then output a "ret" instruction */
! if(!ILNodeEndsInFlowChange(node->stmt))
{
JavaGenRet(info, varNum);
--- 1643,1647 ----
/* If the clause falls through, then output a "ret" instruction */
! if(!ILNodeEndsInFlowChange(node->stmt,info))
{
JavaGenRet(info, varNum);
***************
*** 1679,1683 ****
}
JavaGenDiscard(node->stmt, info);
! if(!ILNodeEndsInFlowChange(node->stmt))
{
/* We can short-cut the finally processing, by doing the exit
here */
--- 1679,1683 ----
}
JavaGenDiscard(node->stmt, info);
! if(!ILNodeEndsInFlowChange(node->stmt,info))
{
/* We can short-cut the finally processing, by doing the exit
here */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnet/codegen cg_decls.tc,1.44,1.45 cg_misc.tc,1.44,1.45 cg_nodes.tc,1.73,1.74 cg_stmt.tc,1.34,1.35 jv_stmt.tc,1.18,1.19,
Gopal.V <address@hidden> <=