summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2011-03-15 20:33:26 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2011-03-15 20:33:26 +0000
commitab37e77c21e85ab537e4606f51db141d2ec682d8 (patch)
treedaaad4f1e4b61f723bd3651521fbc5986cb89a18
parent61e48a53720f5bddd59dab30bed3d813ad896ee5 (diff)
downloadgcc-ab37e77c21e85ab537e4606f51db141d2ec682d8.tar.gz
2011-03-15 Basile Starynkevitch <basile@starynkevitch.net>
* melt/xtramelt-ana-base.melt (loop_body_tuple): More, and avoid having twice nested curbb variable. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@171018 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog.MELT5
-rw-r--r--gcc/melt/xtramelt-ana-base.melt13
2 files changed, 14 insertions, 4 deletions
diff --git a/gcc/ChangeLog.MELT b/gcc/ChangeLog.MELT
index 7b37dce4d50..0ca824341cc 100644
--- a/gcc/ChangeLog.MELT
+++ b/gcc/ChangeLog.MELT
@@ -1,6 +1,11 @@
2011-03-15 Basile Starynkevitch <basile@starynkevitch.net>
+ * melt/xtramelt-ana-base.melt (loop_body_tuple): More, and avoid
+ having twice nested curbb variable.
+
+2011-03-15 Basile Starynkevitch <basile@starynkevitch.net>
+
* melt-runtime.c (melt_dbgshortbacktrace): Use PTR_UNION_TYPE for
dladdr of a function pointer.
(meltgc_register_pass): Commented #warning for incomplete
diff --git a/gcc/melt/xtramelt-ana-base.melt b/gcc/melt/xtramelt-ana-base.melt
index 9d75e9710cc..2a28667625f 100644
--- a/gcc/melt/xtramelt-ana-base.melt
+++ b/gcc/melt/xtramelt-ana-base.melt
@@ -256,18 +256,21 @@
$LOOPNBNODES = $LO?($LO -> num_nodes):0 ; }#
)
(let ( (tupbody (make_multiple discr loopnbnodes))
- (curbb ())
)
(if (null tupbody) (return))
;; first, fill the tuple with empty basic block boxes
(foreach_long_upto
(0 (-i loopnbnodes 1))
(:long ix)
+ (debuglong "loop_body_tuple ix" ix)
(let ( (curbb (make_basicblock discr_basic_block (null_basicblock)))
)
- (multiple_put_nth tupbody ix curbb)
+ (debug_msg curbb "loop_body_tuple curbb")
+ (multiple_put_nth tupbody ix curbb)
))
(debug_msg tupbody "loop_body_tuple empty tupbody")
+ (let ( (ourbb ())
+ )
;; retrieve the malloc-ed array of basic blocks and use it to fill the tuple
;; then free it
(code_chunk
@@ -279,14 +282,16 @@
for ($FILLBBBOXESCHUNK#_ix = 0 ;
$FILLBBBOXESCHUNK#_ix < $LOOPNBNODES ;
$FILLBBBOXESCHUNK#_ix++) {
- $CURBB = melt_multiple_nth ($TUPBODY, $FILLBBBOXESCHUNK#_ix) ;
+ $OURBB = melt_multiple_nth ($TUPBODY, $FILLBBBOXESCHUNK#_ix) ;
meltgc_basicblock_updatebox
- ($CURBB,
+ ($OURBB,
$FILLBBBOXESCHUNK#_bbtab[$FILLBBBOXESCHUNK#_ix]) ;
}
free ($FILLBBBOXESCHUNK#_bbtab), $FILLBBBOXESCHUNK#_bbtab=0 ;
+ $OURBB = (melt_ptr_t)0;
/*end $FILLBBBOXESCHUNK*/
}#)
+ )
(debug_msg tupbody "loop_body_tuple return tupbody")
(return tupbody)
))))