From 7e0c59d59a873b19e14d649b7e850b1a8808e606 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Mon, 9 Oct 1989 14:15:51 +0000
Subject: [PATCH] some fixes

---
 mach/i86/ce/EM_table |  5 +++++
 mach/i86/ce/Makefile | 11 ++++++-----
 mach/i86/ce/as.c     | 10 +++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/mach/i86/ce/EM_table b/mach/i86/ce/EM_table
index db6bc9fd3..f8f946abe 100644
--- a/mach/i86/ce/EM_table
+++ b/mach/i86/ce/EM_table
@@ -413,6 +413,11 @@ C_dvf
 			"add sp,8".
   default	==>	arg_error("C_dvf", $1).
 
+C_ngf
+  $1 == 4	==>	"call .ngf4".
+  $1 == 8	==>	"call .ngf8".
+  default	==>	arg_error("C_ngf", $1).
+
 C_fif
   $1 == 4	==>	C_lor((arith)1);
 			"call .fif4";
diff --git a/mach/i86/ce/Makefile b/mach/i86/ce/Makefile
index 3679439df..b08bc0fda 100644
--- a/mach/i86/ce/Makefile
+++ b/mach/i86/ce/Makefile
@@ -1,14 +1,15 @@
 EMHOME = ../../..
 CEG = $(EMHOME)/lib/ceg/util
+OBJ = obj
 
 all:
-	make -f $(CEG)/make_obj
+	make -f $(CEG)/make_asobj "OBJ="$(OBJ)
 
 install:
-	make -f $(CEG)/make_obj install
+	make -f $(CEG)/make_asobj "OBJ="$(OBJ) install
 
 cmp:
-	-make -f $(CEG)/make_obj cmp
+	-make -f $(CEG)/make_asobj "OBJ="$(OBJ) cmp
 
 pr:
 	@pr Makefile EM_table mach.h mach.c as_table as.h as.c
@@ -18,8 +19,8 @@ opr:
 
 # total cleanup
 clean:
-	make -f $(CEG)/make_obj clean
+	make -f $(CEG)/make_asobj "OBJ="$(OBJ) clean
 
 # only remove ce, ceg, and back directories
 dclean:
-	make -f $(CEG)/make_obj dclean
+	make -f $(CEG)/make_asobj "OBJ="$(OBJ) dclean
diff --git a/mach/i86/ce/as.c b/mach/i86/ce/as.c
index 9d7d1dc85..b340e6088 100644
--- a/mach/i86/ce/as.c
+++ b/mach/i86/ce/as.c
@@ -68,11 +68,11 @@ struct t_operand *op;
  *	expr(reg)	->	IS_MEM
  */
 {
-	char *ptr, *index();
+	char *ptr, *strindex();
 
 	op->type = UNKNOWN;
 	if ( *last( str) == RIGHT) {
-		ptr = index( str, LEFT);
+		ptr = strindex( str, LEFT);
 		*last( str) = '\0';
 		*ptr = '\0';
 		if ( is_reg( ptr+1, op)) {
@@ -184,10 +184,10 @@ set_label( str, op)
 char *str;
 struct t_operand *op;
 {
-	char *ptr, *index(), *sprint();
+	char *ptr, *strindex(), *sprint();
 	static char buf[256];
 
-	ptr = index( str, '+');
+	ptr = strindex( str, '+');
 
 	if ( ptr == 0)
 		op->off = "0";
@@ -204,7 +204,7 @@ struct t_operand *op;
 	}
 	else {
 		op->type = IS_LABEL;
-		if ( index( str, DOLLAR) != 0)
+		if ( strindex( str, DOLLAR) != 0)
 			op->lab = str;
 		else 
 			/* nood oplossing */
-- 
2.34.1