merged cricon.c+crfcon.c+crucon.c into crxcon.c

diff --git a/modules/src/em_code/.distr b/modules/src/em_code/.distr
index bccd171..1698452 100644 (file)
--- a/modules/src/em_code/.distr
+++ b/modules/src/em_code/.distr
@@ -12,12 +12,10 @@ convert.c
 crcst.c
 crdlb.c
 crdnam.c
-crfcon.c
-cricon.c
+crxcon.c
 crilb.c
 crpnam.c
 crscon.c
-crucon.c
 cst.c
 dfdlb.c
 dfdnam.c

diff --git a/modules/src/em_code/Makefile b/modules/src/em_code/Makefile
index e4e9c72..69d6899 100644 (file)
--- a/modules/src/em_code/Makefile
+++ b/modules/src/em_code/Makefile
@@ -7,8 +7,8 @@ AR = ar
 SUF = o
 LIBSUF = a
 SRC =  bhcst.c bhdlb.c bhdnam.c bhfcon.c bhicon.c bhilb.c bhpnam.c bhucon.c \
-       crcst.c crdlb.c crdnam.c crfcon.c cricon.c crilb.c crpnam.c crscon.c \
-       crucon.c cst.c dfdlb.c dfdnam.c dfilb.c dlb.c dnam.c end.c endarg.c \
+       crcst.c crdlb.c crdnam.c crxcon.c crilb.c crpnam.c crscon.c \
+       cst.c dfdlb.c dfdnam.c dfilb.c dlb.c dnam.c end.c endarg.c \
        exc.c fcon.c getid.c icon.c ilb.c insert.c internerr.c \
        msend.c op.c opcst.c opdlb.c opdnam.c opilb.c opnarg.c oppnam.c pnam.c \
        pro.c pronarg.c msstart.c psdlb.c psdnam.c pspnam.c scon.c ucon.c \
@@ -57,7 +57,7 @@ opr:
                make pr | opr
 
 clean:
-               rm -f *.$(SUF) *.$(LIBSUF) em_code.3
+               rm -f *.$(SUF) *.$(LIBSUF) em_code.3 em_codeEK.h
 
 lintlib:       make.sh
                lint -I. -I../../h -I../../../h -Ceme -DREADABLE_EM $(SRC)

diff --git a/modules/src/em_code/crxcon.c b/modules/src/em_code/crxcon.c
new file mode 100644 (file)
index 0000000..88e168b
--- /dev/null
+++ b/modules/src/em_code/crxcon.c
@@ -0,0 +1,15 @@
+#include "em_private.h"
+
+/* $Header$ */
+
+CC_crxcon(op, spec, v, s)
+       char *v;
+       arith s;
+{
+       /*      CON or ROM with argument ICON(v,z)
+       */
+       PS(op);
+       WCON(spec, v, s);
+       CEND();
+       NL();
+}

diff --git a/modules/src/em_code/em.c b/modules/src/em_code/em.c
index eebdef1..1357f27 100644 (file)
--- a/modules/src/em_code/em.c
+++ b/modules/src/em_code/em.c
@@ -88,7 +88,9 @@ C_putbyte(c)
        Xputbyte(c);
 }
 
+#ifdef BIGMACHINE
 #define C_putbyte Xputbyte
+#endif
 
 C_init(w, p)
        arith w, p;

diff --git a/modules/src/em_code/em.nogen b/modules/src/em_code/em.nogen
index 3b089b4..1b17ec1 100644 (file)
--- a/modules/src/em_code/em.nogen
+++ b/modules/src/em_code/em.nogen
@@ -42,9 +42,9 @@
 #define C_hol_pnam(n,s,i)      CC_bhpnam(ps_hol,n,s,i)
 
 #define C_con_cst(v)   CC_crcst(ps_con,v)
-#define C_con_icon(v,s)        CC_cricon(ps_con,v,s)
-#define C_con_ucon(v,s)        CC_crucon(ps_con,v,s)
-#define C_con_fcon(v,s)        CC_crfcon(ps_con,v,s)
+#define C_con_icon(v,s)        CC_crxcon(ps_con,sp_icon,v,s)
+#define C_con_ucon(v,s)        CC_crxcon(ps_con,sp_ucon,v,s)
+#define C_con_fcon(v,s)        CC_crxcon(ps_con,sp_fcon,v,s)
 #define C_con_scon(v,s)        CC_crscon(ps_con,v,s)
 #define C_con_dnam(v,s)        CC_crdnam(ps_con,v,s)
 #define C_con_dlb(v,s) CC_crdlb(ps_con,v,s)
@@ -52,9 +52,9 @@
 #define C_con_pnam(v)  CC_crpnam(ps_con,v)
 
 #define C_rom_cst(v)   CC_crcst(ps_rom,v)
-#define C_rom_icon(v,s)        CC_cricon(ps_rom,v,s)
-#define C_rom_ucon(v,s)        CC_crucon(ps_rom,v,s)
-#define C_rom_fcon(v,s)        CC_crfcon(ps_rom,v,s)
+#define C_rom_icon(v,s)        CC_crxcon(ps_rom,sp_icon,v,s)
+#define C_rom_ucon(v,s)        CC_crxcon(ps_rom,sp_ucon,v,s)
+#define C_rom_fcon(v,s)        CC_crxcon(ps_rom,sp_fcon,v,s)
 #define C_rom_scon(v,s)        CC_crscon(ps_rom,v,s)
 #define C_rom_dnam(v,s)        CC_crdnam(ps_rom,v,s)
 #define C_rom_dlb(v,s) CC_crdlb(ps_rom,v,s)
@@ -83,3 +83,7 @@
 #ifndef op_lol
 #include <em_mnem.h>
 #endif
+
+#ifndef sp_icon
+#include <em_spec.h>
+#endif