Merge branch 'three-eight' of linux.cs.tufts.edu:/r/c--/papers/dfopt into three-eight
authorNorman Ramsey <nr@cs.tufts.edu>
Fri, 30 Apr 2010 19:29:44 +0000 (15:29 -0400)
committerNorman Ramsey <nr@cs.tufts.edu>
Fri, 30 Apr 2010 19:29:44 +0000 (15:29 -0400)
commit5cc371a96462746eb90ab1fe586f536524e5ed00
treef414b3b2a4069fd4e2c98b947e4e11236de1bcd0
parent735e2b1d788c1e8ff60884bbb24d0be40c1bd8c2
parent09b9457b5c23d4bf9c9afaa863ee0aa71082fa24
Merge branch 'three-eight' of linux.cs.tufts.edu:/r/c--/papers/dfopt into three-eight

Conflicts:

src/Compiler/Hoopl/Dataflow.hs
src/Compiler/Hoopl/Fuel.hs
src/Compiler/Hoopl/MkGraph.hs
src/hoopl.cabal

expunged 'allUniques'; need to provide a simple instance of HooplMonad.
src/Compiler/Hoopl.hs
src/Compiler/Hoopl/Dataflow.hs
src/Compiler/Hoopl/Fuel.hs
src/Compiler/Hoopl/Label.hs
src/Compiler/Hoopl/MkGraph.hs
src/Compiler/Hoopl/Unique.hs
src/Compiler/Hoopl/XUtil.hs
src/hoopl.cabal