cleaning and prototypes

4 files changed, 13 insertions, 6 deletions

diff --git a/regress/sys/arch/sparc64/emul-popc/reg/Makefile b/regress/sys/arch/sparc64/emul-popc/reg/Makefile
index 15e9bf115c9..fcf8315857b 100644
--- a/regress/sys/arch/sparc64/emul-popc/reg/Makefile
+++ b/regress/sys/arch/sparc64/emul-popc/reg/Makefile
@@ -1,6 +1,5 @@
-#	$OpenBSD: Makefile,v 1.1 2003/07/10 15:19:55 jason Exp $
+#	$OpenBSD: Makefile,v 1.2 2003/07/12 04:22:02 jason Exp $
 
 PROG=	reg
-SRCS=	reg.c
 
 .include <bsd.regress.mk>
diff --git a/regress/sys/arch/sparc64/emul-popc/reg/reg.c b/regress/sys/arch/sparc64/emul-popc/reg/reg.c
index 3c684f48878..f252f1cfd99 100644
--- a/regress/sys/arch/sparc64/emul-popc/reg/reg.c
+++ b/regress/sys/arch/sparc64/emul-popc/reg/reg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.c,v 1.1 2003/07/10 15:19:55 jason Exp $	*/
+/*	$OpenBSD: reg.c,v 1.2 2003/07/12 04:22:02 jason Exp $	*/
 
 /*
  * Copyright (c) 2003 Jason L. Wright (jason@thought.net)
@@ -28,6 +28,12 @@
 #include <sys/types.h>
 #include <stdio.h>
 
+int64_t asm_popc(int64_t);
+int64_t c_popc(int64_t);
+int test_it(int64_t);
+int test_ones(void);
+int main(void);
+
 int64_t
 asm_popc(int64_t v)
 {
diff --git a/regress/sys/arch/sparc64/emul-popc/simm/Makefile b/regress/sys/arch/sparc64/emul-popc/simm/Makefile
index 193a2cfa7a7..31919d51869 100644
--- a/regress/sys/arch/sparc64/emul-popc/simm/Makefile
+++ b/regress/sys/arch/sparc64/emul-popc/simm/Makefile
@@ -1,10 +1,11 @@
-#	$OpenBSD: Makefile,v 1.3 2003/07/12 04:07:05 jason Exp $
+#	$OpenBSD: Makefile,v 1.4 2003/07/12 04:22:02 jason Exp $
 
 # -O2 breaks this
-CFLAGS=-g
+CFLAGS=-O0
 PROG=	simm13
 SRCS=simm13.c simm13_asm.S
 REGRESS_TARGETS=simm13_check
+CLEANFILES+=simm13.c simm13_asm.S
 
 simm13.c: genc.pl
 	perl ${.CURDIR}/genc.pl > $@
diff --git a/regress/sys/arch/sparc64/emul-popc/simm/genc.pl b/regress/sys/arch/sparc64/emul-popc/simm/genc.pl
index 07873b13cff..67838a19fc2 100644
--- a/regress/sys/arch/sparc64/emul-popc/simm/genc.pl
+++ b/regress/sys/arch/sparc64/emul-popc/simm/genc.pl
@@ -1,5 +1,5 @@
 #!/bin/perl
-#	$OpenBSD: genc.pl,v 1.3 2003/07/10 15:21:12 jason Exp $
+#	$OpenBSD: genc.pl,v 1.4 2003/07/12 04:22:02 jason Exp $
 #
 # Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 # All rights reserved.
@@ -58,4 +58,5 @@ for ($i = $lo; $i <= $hi; $i++) {
 	}
 	print "());\n";
 }
+print "\treturn (0);\n";
 print "}\n";