Changed #include's

diff --git a/util/ego/bo/Makefile b/util/ego/bo/Makefile
index cc0fb3c..f037501 100644 (file)
--- a/util/ego/bo/Makefile
+++ b/util/ego/bo/Makefile
@@ -1,11 +1,10 @@
-
 EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
 SHR=../share
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -66,7 +65,6 @@ depend:
 
 # the next lines are generated automatically
 # AUTOAUTOAUTOAUTOAUTOAUTO
-
 bo.o:  ../share/alloc.h
 bo.o:  ../share/aux.h
 bo.o:  ../share/debug.h
@@ -79,6 +77,3 @@ bo.o: ../share/lset.h
 bo.o:  ../share/map.h
 bo.o:  ../share/put.h
 bo.o:  ../share/types.h
-bo.o:  ../../../h/em_mnem.h
-bo.o:  ../../../h/em_pseu.h
-bo.o:  ../../../h/em_spec.h

diff --git a/util/ego/bo/bo.c b/util/ego/bo/bo.c
index 1951ac6..8992d13 100644 (file)
--- a/util/ego/bo/bo.c
+++ b/util/ego/bo/bo.c
@@ -10,6 +10,10 @@
 
 
 #include <stdio.h>
+#include <em_mnem.h>
+#include <em_pseu.h>
+#include <em_spec.h>
+#include <em_flag.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/global.h"
@@ -22,10 +26,6 @@
 #include "../share/aux.h"
 #include "../share/def.h"
 #include "../share/go.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_flag.h"
 
 extern char em_flag[];
 

diff --git a/util/ego/ca/Makefile b/util/ego/ca/Makefile
index cf3534a..d8cab70 100644 (file)
--- a/util/ego/ca/Makefile
+++ b/util/ego/ca/Makefile
@@ -1,11 +1,10 @@
-
 EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
 SHR=../share
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -65,7 +64,6 @@ depend:
 
 # the next lines are generated automatically
 # AUTOAUTOAUTOAUTOAUTOAUTO
-
 ca.o:  ../share/alloc.h
 ca.o:  ../share/debug.h
 ca.o:  ../share/files.h
@@ -76,11 +74,6 @@ ca.o:        ../share/map.h
 ca.o:  ../share/types.h
 ca.o:  ca.h
 ca.o:  ca_put.h
-ca_put.o:      ../../../h/em_flag.h
-ca_put.o:      ../../../h/em_mes.h
-ca_put.o:      ../../../h/em_mnem.h
-ca_put.o:      ../../../h/em_pseu.h
-ca_put.o:      ../../../h/em_spec.h
 ca_put.o:      ../share/alloc.h
 ca_put.o:      ../share/debug.h
 ca_put.o:      ../share/def.h

diff --git a/util/ego/ca/ca.c b/util/ego/ca/ca.c
index 3a7be6a..1c762dc 100644 (file)
--- a/util/ego/ca/ca.c
+++ b/util/ego/ca/ca.c
@@ -10,6 +10,8 @@
 
 
 #include <stdio.h>
+#include <em_pseu.h>
+#include <em_mes.h>
 #include "../share/types.h"
 #include "ca.h"
 #include "../share/debug.h"
@@ -19,8 +21,6 @@
 #include "../share/map.h"
 #include "../share/alloc.h"
 #include "../share/get.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_mes.h"
 #include "ca_put.h"
 
 

diff --git a/util/ego/ca/ca_put.c b/util/ego/ca/ca_put.c
index 973fa43..7f74a87 100644 (file)
--- a/util/ego/ca/ca_put.c
+++ b/util/ego/ca/ca_put.c
@@ -4,16 +4,16 @@
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
 #include <stdio.h>
+#include <em_spec.h>
+#include <em_pseu.h>
+#include <em_mnem.h>
+#include <em_flag.h>
+#include <em_mes.h>
 #include "../share/types.h"
 #include "ca.h"
 #include "../share/debug.h"
 #include "../share/def.h"
 #include "../share/map.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_flag.h"
-#include "../../../h/em_mes.h"
 #include "../share/alloc.h"
 
 #define outbyte(b) putc(b,outfile)

diff --git a/util/ego/cf/Makefile b/util/ego/cf/Makefile
index 8c8f9bd..4a6236b 100644 (file)
--- a/util/ego/cf/Makefile
+++ b/util/ego/cf/Makefile
@@ -1,11 +1,10 @@
-
 EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
 SHR=../share
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -67,10 +66,10 @@ depend:
 
 # the next lines are generated automatically
 # AUTOAUTOAUTOAUTOAUTOAUTO
-cf.o:  ../../../h/em_mnem.h
 cf.o:  ../share/alloc.h
 cf.o:  ../share/cset.h
 cf.o:  ../share/debug.h
+cf.o:  ../share/def.h
 cf.o:  ../share/files.h
 cf.o:  ../share/get.h
 cf.o:  ../share/global.h
@@ -88,14 +87,11 @@ cf_idom.o:  ../share/lset.h
 cf_idom.o:     ../share/types.h
 cf_idom.o:     cf.h
 cf_loop.o:     ../share/alloc.h
+cf_loop.o:     ../share/aux.h
 cf_loop.o:     ../share/debug.h
 cf_loop.o:     ../share/lset.h
 cf_loop.o:     ../share/types.h
 cf_loop.o:     cf.h
-cf_succ.o:     ../../../h/em_flag.h
-cf_succ.o:     ../../../h/em_mnem.h
-cf_succ.o:     ../../../h/em_pseu.h
-cf_succ.o:     ../../../h/em_spec.h
 cf_succ.o:     ../share/cset.h
 cf_succ.o:     ../share/debug.h
 cf_succ.o:     ../share/def.h

diff --git a/util/ego/cf/cf.c b/util/ego/cf/cf.c
index eabdb95..4876fa5 100644 (file)
--- a/util/ego/cf/cf.c
+++ b/util/ego/cf/cf.c
@@ -9,6 +9,11 @@
  */
 
 #include <stdio.h>
+#include <em_mnem.h>
+#include <em_pseu.h>
+#include <em_spec.h>
+#include <em_flag.h>
+#include <em_mes.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/map.h"
@@ -19,11 +24,6 @@
 #include "../share/cset.h"
 #include "../share/get.h"
 #include "../share/put.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_flag.h"
-#include "../../../h/em_mes.h"
 #include "../share/def.h"
 #include "cf.h"
 #include "cf_succ.h"

diff --git a/util/ego/cf/cf_succ.c b/util/ego/cf/cf_succ.c
index 21176c4..c2bb7ac 100644 (file)
--- a/util/ego/cf/cf_succ.c
+++ b/util/ego/cf/cf_succ.c
@@ -10,16 +10,16 @@
 
 
 #include <stdio.h>
+#include <em_spec.h>
+#include <em_pseu.h>
+#include <em_flag.h>
+#include <em_mnem.h>
 #include "../share/types.h"
 #include "../share/def.h"
 #include "../share/debug.h"
 #include "../share/global.h"
 #include "../share/lset.h"
 #include "../share/cset.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_flag.h"
-#include "../../../h/em_mnem.h"
 #include "cf.h"
 #include "../share/map.h"
 

diff --git a/util/ego/cj/Makefile b/util/ego/cj/Makefile
index eff3e58..30e5c02 100644 (file)
--- a/util/ego/cj/Makefile
+++ b/util/ego/cj/Makefile
@@ -1,11 +1,10 @@
-
 EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
 SHR=../share
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -66,9 +65,6 @@ depend:
 
 # the next lines are generated automatically
 # AUTOAUTOAUTOAUTOAUTOAUTO
-
-cj.o:  ../../../h/em_mnem.h
-cj.o:  ../../../h/em_spec.h
 cj.o:  ../share/alloc.h
 cj.o:  ../share/aux.h
 cj.o:  ../share/debug.h

diff --git a/util/ego/cj/cj.c b/util/ego/cj/cj.c
index 12f8976..9191daf 100644 (file)
--- a/util/ego/cj/cj.c
+++ b/util/ego/cj/cj.c
@@ -10,6 +10,8 @@
  */
 
 #include <stdio.h>
+#include <em_mnem.h>
+#include <em_spec.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/global.h"
@@ -23,8 +25,6 @@
 #include "../share/def.h"
 #include "../share/stack_chg.h"
 #include "../share/go.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_spec.h"
 
 
 /* Cross jumping performs optimzations like:

diff --git a/util/ego/cs/Makefile b/util/ego/cs/Makefile
index 2839012..523012e 100644 (file)
--- a/util/ego/cs/Makefile
+++ b/util/ego/cs/Makefile
@@ -1,11 +1,10 @@
-
 EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
 SHR=../share
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -75,6 +74,7 @@ depend:
 # AUTOAUTOAUTOAUTOAUTOAUTO
 cs.o:  ../share/debug.h
 cs.o:  ../share/go.h
+cs.o:  ../share/lset.h
 cs.o:  ../share/types.h
 cs.o:  cs.h
 cs.o:  cs_aux.h
@@ -95,7 +95,6 @@ cs_aux.o:     ../share/lset.h
 cs_aux.o:      ../share/types.h
 cs_aux.o:      cs.h
 cs_aux.o:      cs_entity.h
-cs_avail.o:    ../../../h/em_mnem.h
 cs_avail.o:    ../share/aux.h
 cs_avail.o:    ../share/debug.h
 cs_avail.o:    ../share/global.h
@@ -104,8 +103,8 @@ cs_avail.o: ../share/types.h
 cs_avail.o:    cs.h
 cs_avail.o:    cs_alloc.h
 cs_avail.o:    cs_aux.h
+cs_avail.o:    cs_debug.h
 cs_avail.o:    cs_getent.h
-cs_debug.o:    ../../../h/em_spec.h
 cs_debug.o:    ../share/debug.h
 cs_debug.o:    ../share/lset.h
 cs_debug.o:    ../share/types.h
@@ -113,8 +112,6 @@ cs_debug.o: cs.h
 cs_debug.o:    cs_aux.h
 cs_debug.o:    cs_avail.h
 cs_debug.o:    cs_entity.h
-cs_elim.o:     ../../../h/em_mnem.h
-cs_elim.o:     ../../../h/em_reg.h
 cs_elim.o:     ../share/alloc.h
 cs_elim.o:     ../share/aux.h
 cs_elim.o:     ../share/debug.h
@@ -133,8 +130,8 @@ cs_entity.o:        ../share/global.h
 cs_entity.o:   ../share/lset.h
 cs_entity.o:   ../share/types.h
 cs_entity.o:   cs.h
+cs_entity.o:   cs_alloc.h
 cs_entity.o:   cs_aux.h
-cs_getent.o:   ../../../h/em_mnem.h
 cs_getent.o:   ../share/aux.h
 cs_getent.o:   ../share/debug.h
 cs_getent.o:   ../share/global.h
@@ -143,30 +140,24 @@ cs_getent.o:      cs.h
 cs_getent.o:   cs_aux.h
 cs_getent.o:   cs_entity.h
 cs_getent.o:   cs_stack.h
-cs_kill.o:     ../../../h/em_mnem.h
 cs_kill.o:     ../share/aux.h
 cs_kill.o:     ../share/cset.h
 cs_kill.o:     ../share/debug.h
 cs_kill.o:     ../share/global.h
 cs_kill.o:     ../share/lset.h
+cs_kill.o:     ../share/map.h
 cs_kill.o:     ../share/types.h
 cs_kill.o:     cs.h
 cs_kill.o:     cs_aux.h
 cs_kill.o:     cs_avail.h
 cs_kill.o:     cs_debug.h
 cs_kill.o:     cs_entity.h
-cs_partit.o:   ../../../h/em_mnem.h
-cs_partit.o:   ../../../h/em_pseu.h
-cs_partit.o:   ../../../h/em_reg.h
-cs_partit.o:   ../../../h/em_spec.h
 cs_partit.o:   ../share/aux.h
 cs_partit.o:   ../share/debug.h
 cs_partit.o:   ../share/global.h
 cs_partit.o:   ../share/types.h
 cs_partit.o:   cs.h
 cs_partit.o:   cs_stack.h
-cs_profit.o:   ../../../h/em_mnem.h
-cs_profit.o:   ../../../h/em_spec.h
 cs_profit.o:   ../share/aux.h
 cs_profit.o:   ../share/cset.h
 cs_profit.o:   ../share/debug.h
@@ -176,6 +167,7 @@ cs_profit.o:        ../share/types.h
 cs_profit.o:   cs.h
 cs_profit.o:   cs_aux.h
 cs_profit.o:   cs_avail.h
+cs_profit.o:   cs_debug.h
 cs_profit.o:   cs_partit.h
 cs_stack.o:    ../share/aux.h
 cs_stack.o:    ../share/debug.h
@@ -183,10 +175,6 @@ cs_stack.o:        ../share/global.h
 cs_stack.o:    ../share/types.h
 cs_stack.o:    cs.h
 cs_stack.o:    cs_aux.h
-cs_valno.o:    ../share/debug.h
-cs_valno.o:    ../share/types.h
-cs_valno.o:    cs.h
-cs_vnm.o:      ../../../h/em_mnem.h
 cs_vnm.o:      ../share/aux.h
 cs_vnm.o:      ../share/debug.h
 cs_vnm.o:      ../share/global.h

diff --git a/util/ego/cs/cs_avail.c b/util/ego/cs/cs_avail.c
index fbf62ed..768ddb6 100644 (file)
--- a/util/ego/cs/cs_avail.c
+++ b/util/ego/cs/cs_avail.c
@@ -8,7 +8,7 @@
  * O F   A V A I L A B L E   E X P R E S S I O N S
  */
 
-#include "../../../h/em_mnem.h"
+#include <em_mnem.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/aux.h"

diff --git a/util/ego/cs/cs_debug.c b/util/ego/cs/cs_debug.c
index 2f732f3..da4d4e0 100644 (file)
--- a/util/ego/cs/cs_debug.c
+++ b/util/ego/cs/cs_debug.c
@@ -4,7 +4,7 @@
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
 #include <stdio.h>
-#include "../../../h/em_spec.h"
+#include <em_spec.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/lset.h"

diff --git a/util/ego/cs/cs_elim.c b/util/ego/cs/cs_elim.c
index f63fe02..0448161 100644 (file)
--- a/util/ego/cs/cs_elim.c
+++ b/util/ego/cs/cs_elim.c
@@ -3,8 +3,8 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include "../../../h/em_reg.h"
-#include "../../../h/em_mnem.h"
+#include <em_reg.h>
+#include <em_mnem.h>
 #include "../share/types.h"
 #include "../share/alloc.h"
 #include "../share/lset.h"

diff --git a/util/ego/cs/cs_getent.c b/util/ego/cs/cs_getent.c
index e4f7f93..2783838 100644 (file)
--- a/util/ego/cs/cs_getent.c
+++ b/util/ego/cs/cs_getent.c
@@ -3,7 +3,7 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include "../../../h/em_mnem.h"
+#include <em_mnem.h>
 #include "../share/types.h"
 #include "../share/aux.h"
 #include "../share/debug.h"

diff --git a/util/ego/cs/cs_kill.c b/util/ego/cs/cs_kill.c
index 331f877..b82869d 100644 (file)
--- a/util/ego/cs/cs_kill.c
+++ b/util/ego/cs/cs_kill.c
@@ -3,7 +3,7 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#include "../../../h/em_mnem.h"
+#include <em_mnem.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/global.h"

diff --git a/util/ego/cs/cs_partit.c b/util/ego/cs/cs_partit.c
index bd9e6dc..256b661 100644 (file)
--- a/util/ego/cs/cs_partit.c
+++ b/util/ego/cs/cs_partit.c
@@ -5,10 +5,10 @@
  */
 /* Functions to partition the huge set of EM-instructions. */
 
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_reg.h"
-#include "../../../h/em_spec.h"
+#include <em_mnem.h>
+#include <em_pseu.h>
+#include <em_reg.h>
+#include <em_spec.h>
 #include "../share/types.h"
 #include "../share/aux.h"
 #include "../share/debug.h"

diff --git a/util/ego/cs/cs_profit.c b/util/ego/cs/cs_profit.c
index 68c3a31..0161cd1 100644 (file)
--- a/util/ego/cs/cs_profit.c
+++ b/util/ego/cs/cs_profit.c
@@ -4,8 +4,8 @@
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
 #include <stdio.h>
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_spec.h"
+#include <em_mnem.h>
+#include <em_spec.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/global.h"

diff --git a/util/ego/cs/cs_vnm.c b/util/ego/cs/cs_vnm.c
index 9d3f21f..62bc139 100644 (file)
--- a/util/ego/cs/cs_vnm.c
+++ b/util/ego/cs/cs_vnm.c
@@ -6,7 +6,7 @@
 
 /* V A L U E N U M B E R I N G   M E T H O D */
 
-#include "../../../h/em_mnem.h"
+#include <em_mnem.h>
 #include "../share/types.h"
 #include "../share/global.h"
 #include "../share/debug.h"

diff --git a/util/ego/descr/Makefile b/util/ego/descr/Makefile
index 3b73049..ca4d3b6 100644 (file)
--- a/util/ego/descr/Makefile
+++ b/util/ego/descr/Makefile
@@ -5,7 +5,7 @@ SHARE=../share
 CPP=$(EMLIB)/cpp
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 

diff --git a/util/ego/descr/m68020.descr b/util/ego/descr/m68020.descr
index cabf2f5..c3d3412 100644 (file)
--- a/util/ego/descr/m68020.descr
+++ b/util/ego/descr/m68020.descr
@@ -22,7 +22,7 @@ register score parameters:
                        default ->      (0,0)
                general,pointer
                        (1 size)
-                       default ->      (2,2)
+                       default ->      (1,2)
        constant:
                (3 sizes)
                in_0_8 ->       (-1,-1)
@@ -33,10 +33,10 @@ register score parameters:
                default ->      (-1,-1)
        address of global variable:
                (1 size)
-               default ->      (4,4)
+               default ->      (1,4)
        address of procedure:
                (1 size)
-               default ->      (4,4)
+               default ->      (1,4)
 
 opening cost parameters:
        local variable:

diff --git a/util/ego/descr/m68k2.descr b/util/ego/descr/m68k2.descr
index 8a60deb..852c8b9 100644 (file)
--- a/util/ego/descr/m68k2.descr
+++ b/util/ego/descr/m68k2.descr
@@ -14,7 +14,7 @@ register score parameters:
                        default ->      (6,3)
                general,general
                        (1 size)
-                       default ->      (4,2)
+                       default ->      (1,2)
        address of local variable:
                (2 cases)
                pointer,pointer
@@ -32,10 +32,10 @@ register score parameters:
                default ->      (-1,-1)
        address of global variable:
                (1 size)
-               default ->      (4,4)
+               default ->      (1,4)
        address of procedure:
                (1 size)
-               default ->      (2,4)
+               default ->      (1,4)
 
 opening cost parameters:
        local variable:
@@ -56,7 +56,7 @@ opening cost parameters:
                        general ->      (4,2)
        constant:
                (1 size)
-               default ->      (4,4)
+               default ->      (1000,1000)
        double constant:
                (1 size)
                default ->      (1000,1000)

diff --git a/util/ego/descr/m68k4.descr b/util/ego/descr/m68k4.descr
index 8a0b4b4..92a3681 100644 (file)
--- a/util/ego/descr/m68k4.descr
+++ b/util/ego/descr/m68k4.descr
@@ -14,7 +14,7 @@ register score parameters:
                        default ->      (6,4)
                general,general
                        (1 size)
-                       default ->      (4,2)
+                       default ->      (1,2)
        address of local variable:
                (2 cases)
                pointer,pointer
@@ -33,10 +33,10 @@ register score parameters:
                default ->      (-1,-1)
        address of global variable:
                (1 size)
-               default ->      (4,4)
+               default ->      (1,4)
        address of procedure:
                (1 size)
-               default ->      (4,4)
+               default ->      (1,4)
 
 opening cost parameters:
        local variable:

diff --git a/util/ego/em_ego/em_ego.c b/util/ego/em_ego/em_ego.c
index 7a8599a..cfdb4dd 100644 (file)
--- a/util/ego/em_ego/em_ego.c
+++ b/util/ego/em_ego/em_ego.c
@@ -46,9 +46,11 @@ extern char  *mktemp();
 extern char    *strcpy(), *strcat();
 extern char    *strrindex();
 
-static char    ddump[128];             /* data label dump file */
-static char    pdump[128];             /* procedure name dump file */
-static char    tmpbufs[NTEMPS*2][128];
+static char    ddump[128] = TMP_DIR;   /* data label dump file */
+static char    pdump[128] = TMP_DIR;   /* procedure name dump file */
+static char    tmpbufs[NTEMPS*2][128] = {
+  TMP_DIR
+};
 
 static int O2phases[] = {              /* Passes for -O2 */
   CJ, BO, SP, 0
@@ -77,7 +79,6 @@ static int    nphase_args;
 
 static char    *opt_dir;
 static char    *prog_name;
-static char    *tmp_dir = TMP_DIR;
 
 static void
 cleanup()
@@ -292,8 +293,7 @@ main(argc, argv)
                case 't':
                        if (argv[0][2] == '\0') {
                                keeptemps = 1;
-                               tmp_dir = ".";
-                               continue;
+                               /* no continue; IL also needs this */
                        }
                        break;
                case 'O':
@@ -307,6 +307,7 @@ main(argc, argv)
                case 'I':
                        if (! strcmp(&argv[0][1], "IL")) {
                                add_uphase(IL);
+                               add_uphase(CF);
                                continue;
                        }
                        break;
@@ -374,14 +375,16 @@ main(argc, argv)
        fatal("no correct -P flag given");
   }
 
-  (void) strcpy(ddump, tmp_dir);
+  if (keeptemps) {
+       (void) strcpy(ddump, ".");
+       (void) strcpy(pdump, ".");
+       (void) strcpy(tmpbufs[0], ".");
+  }
   (void) strcat(ddump, "/ego.dd.XXXXXX");
   (void) mktemp(ddump);
-  (void) strcpy(pdump, tmp_dir);
   (void) strcat(pdump, "/ego.pd.XXXXXX");
   (void) mktemp(pdump);
 
-  (void) strcpy(tmpbufs[0], tmp_dir);
   (void) strcat(tmpbufs[0], "/ego.A.BB.XXXXXX");
   (void) mktemp(tmpbufs[0]);
   for (i = 2*NTEMPS-1; i >= 1; i--) {

diff --git a/util/ego/ic/Makefile b/util/ego/ic/Makefile
index 4369e27..15ad00e 100644 (file)
--- a/util/ego/ic/Makefile
+++ b/util/ego/ic/Makefile
@@ -2,8 +2,9 @@ EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
 SHR=../share
+
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -63,10 +64,6 @@ depend:
 
 # the next lines are generated automatically
 # AUTOAUTOAUTOAUTOAUTOAUTO
-ic.o:  ../../../h/em_flag.h
-ic.o:  ../../../h/em_mes.h
-ic.o:  ../../../h/em_pseu.h
-ic.o:  ../../../h/em_spec.h
 ic.o:  ../share/alloc.h
 ic.o:  ../share/aux.h
 ic.o:  ../share/debug.h
@@ -81,9 +78,6 @@ ic.o: ic_aux.h
 ic.o:  ic_io.h
 ic.o:  ic_lib.h
 ic.o:  ic_lookup.h
-ic_aux.o:      ../../../h/em_mnem.h
-ic_aux.o:      ../../../h/em_pseu.h
-ic_aux.o:      ../../../h/em_spec.h
 ic_aux.o:      ../share/alloc.h
 ic_aux.o:      ../share/aux.h
 ic_aux.o:      ../share/debug.h
@@ -94,17 +88,12 @@ ic_aux.o:   ic.h
 ic_aux.o:      ic_aux.h
 ic_aux.o:      ic_io.h
 ic_aux.o:      ic_lookup.h
-ic_io.o:       ../../../h/em_pseu.h
-ic_io.o:       ../../../h/em_spec.h
 ic_io.o:       ../share/alloc.h
 ic_io.o:       ../share/debug.h
 ic_io.o:       ../share/types.h
 ic_io.o:       ic.h
 ic_io.o:       ic_io.h
 ic_io.o:       ic_lookup.h
-ic_lib.o:      ../../../h/em_mes.h
-ic_lib.o:      ../../../h/em_pseu.h
-ic_lib.o:      ../../../h/em_spec.h
 ic_lib.o:      ../share/debug.h
 ic_lib.o:      ../share/files.h
 ic_lib.o:      ../share/global.h
@@ -113,7 +102,6 @@ ic_lib.o:   ic.h
 ic_lib.o:      ic_io.h
 ic_lib.o:      ic_lib.h
 ic_lib.o:      ic_lookup.h
-ic_lookup.o:   ../../../h/em_spec.h
 ic_lookup.o:   ../share/alloc.h
 ic_lookup.o:   ../share/debug.h
 ic_lookup.o:   ../share/map.h

diff --git a/util/ego/ic/ic.c b/util/ego/ic/ic.c
index 8576cb3..6da9261 100644 (file)
--- a/util/ego/ic/ic.c
+++ b/util/ego/ic/ic.c
@@ -9,14 +9,14 @@
  */
 
 #include <stdio.h>
+#include <em_spec.h>
+#include <em_pseu.h>
+#include <em_flag.h>
+#include <em_mes.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/def.h"
 #include "../share/map.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_flag.h"
-#include "../../../h/em_mes.h"
 #include "ic.h"
 #include "ic_lookup.h"
 #include "ic_aux.h"

diff --git a/util/ego/ic/ic_aux.c b/util/ego/ic/ic_aux.c
index 39a06b0..ae13cbb 100644 (file)
--- a/util/ego/ic/ic_aux.c
+++ b/util/ego/ic/ic_aux.c
@@ -10,14 +10,14 @@
 
 
 
+#include <em_pseu.h>
+#include <em_spec.h>
+#include <em_mnem.h>
 #include "../share/types.h"
 #include "../share/global.h"
 #include "../share/debug.h"
 #include "../share/def.h"
 #include "../share/aux.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_mnem.h"
 #include "ic.h"
 #include "ic_io.h"
 #include "ic_lookup.h"

diff --git a/util/ego/ic/ic_io.c b/util/ego/ic/ic_io.c
index 81d4b79..2effff5 100644 (file)
--- a/util/ego/ic/ic_io.c
+++ b/util/ego/ic/ic_io.c
@@ -11,11 +11,11 @@
 
 
 #include <stdio.h>
+#include <em_pseu.h>
+#include <em_spec.h>
+#include <arch.h>
 #include "../share/types.h"
 #include "../share/debug.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/arch.h"
 #include "ic.h"
 #include "ic_lookup.h"
 #include "../share/alloc.h"

diff --git a/util/ego/ic/ic_lib.c b/util/ego/ic/ic_lib.c
index 3505a9d..3fc086b 100644 (file)
--- a/util/ego/ic/ic_lib.c
+++ b/util/ego/ic/ic_lib.c
@@ -10,12 +10,12 @@
 
 
 #include <stdio.h>
+#include <em_spec.h>
+#include <em_pseu.h>
+#include <em_mes.h>
+#include <arch.h>
 #include "../share/types.h"
 #include "../share/debug.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_mes.h"
-#include "../../../h/arch.h"
 #include "ic.h"
 #include "ic_lookup.h"
 #include "ic_io.h"

diff --git a/util/ego/ic/ic_lookup.c b/util/ego/ic/ic_lookup.c
index 53c04a8..21bc8a9 100644 (file)
--- a/util/ego/ic/ic_lookup.c
+++ b/util/ego/ic/ic_lookup.c
@@ -10,10 +10,10 @@
 
 
 #include <stdio.h>
+#include <em_spec.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/map.h"
-#include "../../../h/em_spec.h"
 #include "ic.h"
 #include "ic_lookup.h"
 #include "../share/alloc.h"