minor fixes

lang/cem/cemcom/Makefile

@@ -9,11 +9,13 @@ CID = $(EMHOME)/bin/cid
 
 # Libraries and EM interface definitions
 SYSLIB = $(EMHOME)/modules/lib/libsystem.a
-EMKLIB = $(EMHOME)/modules/lib/libemk.a
+EMKLIB = $(EMHOME)/modules/lib/libemk.a $(EMHOME)/lib/em_data.a
+EMOLIB = $(EMHOME)/modules/lib/libemopt.a
 EMELIB = $(EMHOME)/modules/lib/libeme.a $(EMHOME)/lib/em_data.a
 STRLIB = $(EMHOME)/modules/lib/libstring.a
 PRTLIB = $(EMHOME)/modules/lib/libprint.a
 EMMESLIB = $(EMHOME)/modules/lib/libem_mes.a
+EMMESOLIB = $(EMHOME)/modules/lib/libem_mesO.a
 INPLIB = $(EMHOME)/modules/lib/libinput.a
 ALLOCLIB = $(EMHOME)/modules/lib/liballoc.a
 MALLOC = $(EMHOME)/modules/lib/malloc.o
@@ -21,6 +23,8 @@ LIBS = $(INPLIB) $(EMMESLIB) $(EMKLIB) $(PRTLIB) $(STRLIB) \
 	$(ALLOCLIB) $(MALLOC) $(SYSLIB)
 ELIBS = $(INPLIB) $(EMMESLIB) $(EMELIB) $(PRTLIB) $(STRLIB) \
 	$(ALLOCLIB) $(MALLOC) $(SYSLIB)
+OLIBS = $(INPLIB) $(EMMESOLIB) $(EMOLIB) $(EMKLIB) $(PRTLIB) $(STRLIB) \
+	$(ALLOCLIB) $(MALLOC) $(SYSLIB)
 LIB_INCLUDES = -I$(EMHOME)/modules/h -I$(EMHOME)/modules/pkg
 EM_INCLUDES = -I$(EMHOME)/h
 SYSLLIB = $(EMHOME)/modules/lib/llib-lsystem.ln
@@ -118,11 +122,19 @@ Emain:	Cfiles
 	sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make "EMHOME="$(EMHOME) $(CURRDIR)/emain ; else EMHOME=$(EMHOME); export EMHOME; ./Resolve emain ; fi'
 	@rm -f nmclash.o a.out
 
+Omain:	Cfiles
+	rm -f *.o
+	sh -c 'if $(CC) nmclash.c > /dev/null 2>&1 ; then make "EMHOME="$(EMHOME) "COPTIONS="-DPEEPHOLE $(CURRDIR)/omain ; else EMHOME=$(EMHOME); export EMHOME; ./Resolve omain ; fi'
+	@rm -f nmclash.o a.out *.o
+
 install:	Main
 	rm -f $(EMHOME)/lib/em_cemcom $(EMHOME)/man/em_cemcom.6
 	cp $(CURRDIR)/main $(EMHOME)/lib/em_cemcom
 	cp $(CURRDIR)/cemcom.1 $(EMHOME)/man/em_cemcom.6
 
+Oinstall:	Omain
+	cp $(CURRDIR)/omain $(EMHOME)/lib/em_cemcomO
+
 cmp:	Main
 	-cmp $(CURRDIR)/main $(EMHOME)/lib/em_cemcom
 	-cmp $(CURRDIR)/cemcom.1 $(EMHOME)/man/em_cemcom.6
@@ -205,6 +217,10 @@ $(CURRDIR)/emain:	$(OBJ) $(CURRDIR)/makefile
 	$(CC) $(COPTIONS) $(LDFLAGS) $(OBJ) $(ELIBS) -o $(CURRDIR)/emain 
 	size $(CURRDIR)/emain
 
+$(CURRDIR)/omain:	$(OBJ) $(CURRDIR)/makefile
+	$(CC) $(COPTIONS) $(LDFLAGS) $(OBJ) $(OLIBS) -o $(CURRDIR)/omain 
+	size $(CURRDIR)/omain
+
 Xlint:
 	lint $(CDEFS) $(LINTFLAGS) $(SRC)
 

lang/cem/cemcom/util.c

@@ -31,8 +31,8 @@ static int	loc_id;
 #endif USE_TMP
 
 #ifdef PEEPHOLE
-#undef REGCOUNTING
+#undef REGCOUNT
-#define REGCOUNTING 1
+#define REGCOUNT 1
 #endif
 
 extern char options[];
@@ -192,7 +192,7 @@ LoadLocal(off, sz)
 	register struct localvar *p = find_reg(off);
 
 #ifdef USE_TMP
-#ifdef REGCOUNTING
+#ifdef REGCOUNT
 	if (p) p->t_count++;
 #endif
 #endif
@@ -211,7 +211,7 @@ StoreLocal(off, sz)
 	register struct localvar *p = find_reg(off);
 
 #ifdef USE_TMP
-#ifdef REGCOUNTING
+#ifdef REGCOUNT
 	if (p) p->t_count++;
 #endif
 #endif