Updated to the version 0.1 of Prime Mover (which involves some syntax changes).

2006-10-15 00:28:12 +00:00
parent 708a83ef22
commit dbe10d2c19
34 changed files with 299 additions and 222 deletions
--- a/mach/6500/libem/pmfile
+++ b/mach/6500/libem/pmfile
@@ -3,101 +3,96 @@

 local d = ROOTDIR.."mach/6500/libem/"

-proto_libem = aal {
+libem_6500 = acklibrary {
 	outputs = {"%U%/libem-%ARCH%.a"},
+
+	ackfile (d.."adi4.s"),
+	ackfile (d.."cmi.s"),
+	ackfile (d.."cmi4.s"),
+	ackfile (d.."sbi4.s"),
+	ackfile (d.."addsub.s"),
+	ackfile (d.."cmu4.s"),
+	ackfile (d.."dum_float.s"),
+	ackfile (d.."dvi4.s"),
+	ackfile (d.."dvu4.s"),
+	ackfile (d.."lar.s"),
+	ackfile (d.."lol.s"),
+	ackfile (d.."los.s"),
+	ackfile (d.."loil.s"),
+	ackfile (d.."loi1.s"),
+	ackfile (d.."loi.s"),
+	ackfile (d.."mli4.s"),
+	ackfile (d.."mlu.s"),
+	ackfile (d.."mlu4.s"),
+	ackfile (d.."mul4.s"),
+	ackfile (d.."rmi.s"),
+	ackfile (d.."rmi4.s"),
+	ackfile (d.."div4.s"),
+	ackfile (d.."rmu.s"),
+	ackfile (d.."dvi.s"),
+	ackfile (d.."rmu4.s"),
+	ackfile (d.."duv4.s"),
+	ackfile (d.."ngi4.s"),
+	ackfile (d.."rtt.s"),
+	ackfile (d.."ret.s"),
+	ackfile (d.."sar.s"),
+	ackfile (d.."aar.s"),
+	ackfile (d.."adi.s"),
+	ackfile (d.."sbi.s"),
+	ackfile (d.."mli.s"),
+	ackfile (d.."ngi.s"),
+	ackfile (d.."set.s"),
+	ackfile (d.."zer.s"),
+	ackfile (d.."stl.s"),
+	ackfile (d.."sts.s"),
+	ackfile (d.."sdl.s"),
+	ackfile (d.."sti.s"),
+	ackfile (d.."stil.s"),
+	ackfile (d.."blm.s"),
+	ackfile (d.."sti1.s"),
+	ackfile (d.."test2.s"),
+	ackfile (d.."testFFh.s"),
+	ackfile (d.."trap.s"),
+	ackfile (d.."ldi.s"),
+	ackfile (d.."data.s"),
+	ackfile (d.."zri.s"),
+	ackfile (d.."locaddr.s"),
+	ackfile (d.."and.s"),
+	ackfile (d.."asp.s"),
+	ackfile (d.."cii.s"),
+	ackfile (d.."cms.s"),
+	ackfile (d.."cmu.s"),
+	ackfile (d.."com.s"),
+	ackfile (d.."csa.s"),
+	ackfile (d.."csb.s"),
+	ackfile (d.."dup.s"),
+	ackfile (d.."dvu.s"),
+	ackfile (d.."exg.s"),
+	ackfile (d.."exg2.s"),
+	ackfile (d.."gto.s"),
+	ackfile (d.."indir.s"),
+	ackfile (d.."inn.s"),
+	ackfile (d.."ior.s"),
+	ackfile (d.."lcs.s"),
+	ackfile (d.."lxa1.s"),
+	ackfile (d.."lxa2.s"),
+	ackfile (d.."lxl.s"),
+	ackfile (d.."pro.s"),
+	ackfile (d.."rol.s"),
+	ackfile (d.."rol4.s"),
+	ackfile (d.."ror.s"),
+	ackfile (d.."ror4.s"),
+	ackfile (d.."sli.s"),
+	ackfile (d.."sli4.s"),
+	ackfile (d.."sri.s"),
+	ackfile (d.."sri4.s"),
+	ackfile (d.."teq.s"),
+	ackfile (d.."tge.s"),
+	ackfile (d.."tgt.s"),
+	ackfile (d.."tle.s"),
+	ackfile (d.."tlt.s"),
+	ackfile (d.."tne.s"),
+	ackfile (d.."xor.s"),
+
 	install = pm.install("%BINDIR%lib/%ARCH%/tail_em"),
-
-	as (d.."adi4.s"),
-	as (d.."cmi.s"),
-	as (d.."cmi4.s"),
-	as (d.."sbi4.s"),
-	as (d.."addsub.s"),
-	as (d.."cmu4.s"),
-	as (d.."dum_float.s"),
-	as (d.."dvi4.s"),
-	as (d.."dvu4.s"),
-	as (d.."lar.s"),
-	as (d.."lol.s"),
-	as (d.."los.s"),
-	as (d.."loil.s"),
-	as (d.."loi1.s"),
-	as (d.."loi.s"),
-	as (d.."mli4.s"),
-	as (d.."mlu.s"),
-	as (d.."mlu4.s"),
-	as (d.."mul4.s"),
-	as (d.."rmi.s"),
-	as (d.."rmi4.s"),
-	as (d.."div4.s"),
-	as (d.."rmu.s"),
-	as (d.."dvi.s"),
-	as (d.."rmu4.s"),
-	as (d.."duv4.s"),
-	as (d.."ngi4.s"),
-	as (d.."rtt.s"),
-	as (d.."ret.s"),
-	as (d.."sar.s"),
-	as (d.."aar.s"),
-	as (d.."adi.s"),
-	as (d.."sbi.s"),
-	as (d.."mli.s"),
-	as (d.."ngi.s"),
-	as (d.."set.s"),
-	as (d.."zer.s"),
-	as (d.."stl.s"),
-	as (d.."sts.s"),
-	as (d.."sdl.s"),
-	as (d.."sti.s"),
-	as (d.."stil.s"),
-	as (d.."blm.s"),
-	as (d.."sti1.s"),
-	as (d.."test2.s"),
-	as (d.."testFFh.s"),
-	as (d.."trap.s"),
-	as (d.."ldi.s"),
-	as (d.."data.s"),
-	as (d.."zri.s"),
-	as (d.."locaddr.s"),
-	as (d.."and.s"),
-	as (d.."asp.s"),
-	as (d.."cii.s"),
-	as (d.."cms.s"),
-	as (d.."cmu.s"),
-	as (d.."com.s"),
-	as (d.."csa.s"),
-	as (d.."csb.s"),
-	as (d.."dup.s"),
-	as (d.."dvu.s"),
-	as (d.."exg.s"),
-	as (d.."exg2.s"),
-	as (d.."gto.s"),
-	as (d.."indir.s"),
-	as (d.."inn.s"),
-	as (d.."ior.s"),
-	as (d.."lcs.s"),
-	as (d.."lxa1.s"),
-	as (d.."lxa2.s"),
-	as (d.."lxl.s"),
-	as (d.."pro.s"),
-	as (d.."rol.s"),
-	as (d.."rol4.s"),
-	as (d.."ror.s"),
-	as (d.."ror4.s"),
-	as (d.."sli.s"),
-	as (d.."sli4.s"),
-	as (d.."sri.s"),
-	as (d.."sri4.s"),
-	as (d.."teq.s"),
-	as (d.."tge.s"),
-	as (d.."tgt.s"),
-	as (d.."tle.s"),
-	as (d.."tlt.s"),
-	as (d.."tne.s"),
-	as (d.."xor.s"),
 }
-
-- Revision history
-- $Log$
-- Revision 1.1  2006-07-20 23:18:18  dtrg
-- First version in CVS.
--
--- a/mach/6500/pmfile
+++ b/mach/6500/pmfile
@@ -4,7 +4,7 @@
 local d = ROOTDIR.."mach/6500/"

 include (d.."dl/pmfile")
--include (d.."libem/pmfile")
+include (d.."libem/pmfile")

 mach_6500 = group {
 	ARCH = "6500",
@@ -16,8 +16,18 @@ mach_6500 = group {
 	install = pm.install("%ROOTDIR%/lib/%ARCH%/descr", "%BINDIR%%PLATIND%/%ARCH%/descr")
 }

+support_6500 = group {
+	ARCH = "6500",
+	OPTIMISATION = "-O",
+
+	libem_6500,
+}
+
 -- Revision history
 -- $Log$
-- Revision 1.1  2006-07-20 23:18:18  dtrg
+-- Revision 1.2  2006-10-15 00:28:12  dtrg
+-- Updated to the version 0.1 of Prime Mover (which involves some syntax changes).
+--
+-- Revision 1.1  2006/07/20 23:18:18  dtrg
 -- First version in CVS.
 --
--- a/mach/proto/as/pmfile
+++ b/mach/proto/as/pmfile
@@ -8,7 +8,7 @@ local parser = yacc {
 		outputs = {"%U%-%I%.y"},
 		command = {
 			"cd %out[1]:dirname% && "..
-			  "%BINDIR%%PLATDEP%/cpp -P -I%ROOTDIR%mach/%ARCH%/as -I"..d.." %CINCLUDES% %in[1]% > %out[1]%"
+			  "%BINDIR%%PLATDEP%/cpp -P -I%ROOTDIR%mach/%ARCH%/as -I"..d.." %CINCLUDES:cincludes% %in[1]% > %out[1]%"
 		},
 		
 		file (d.."comm2.y"),
@@ -45,7 +45,10 @@ proto_as = cprogram {

 -- Revision history
 -- $Log$
-- Revision 1.2  2006-07-30 23:41:16  dtrg
+-- Revision 1.3  2006-10-15 00:28:12  dtrg
+-- Updated to the version 0.1 of Prime Mover (which involves some syntax changes).
+--
+-- Revision 1.2  2006/07/30 23:41:16  dtrg
 -- Broke dependency on tool_cpp in order to speed up the build.
 --
 -- Revision 1.1  2006/07/20 23:18:19  dtrg
--- a/mach/proto/cg/pmfile
+++ b/mach/proto/cg/pmfile
@@ -51,47 +51,10 @@ proto_cg = cprogram {
 	install = pm.install("%BINDIR%%PLATDEP%/%ARCH%/cg")
 }

--[[
-# genmakefile
-# This genmakefile doesn't have a real comment yet.
-#
-# $Source$
-# $State$
-
-codegenerator() {
-	push
-		addinclude $SRCDIR/src/arch/$1/cg
-		addinclude $OBJDIR/src/arch/$1/cg
-		addincludeq src/arch/proto/cg
-
-		hostcdyn src/arch/$1/cg/tables.c
-		
-		hostprogram $DESTDIR/lib/$1/cg $OBJS \
-			$DESTDIR/lib/libem_data.a \
-			$DESTDIR/lib/libflt_arith.a
-
-cat <<EOF
-$OBJDIR/src/arch/$1/cg/tables.c: \
-		$SRCDIR/src/arch/$1/cg/table \
-		$DESTDIR/bin/cpp \
-		$DESTDIR/bin/cgg
-	@echo HOSTCGG $SRCDIR/src/arch/$1/cg/table
-	@mkdir -p \$(dir \$@)
-	@(cd $OBJDIR/src/arch/$1/cg && $DESTDIR/bin/cpp -P -I$SRCDIR/src/arch/$1/cg $SRCDIR/src/arch/$1/cg/table | \
-		$DESTDIR/bin/cgg) > /dev/null
-EOF
-	pop
-}
-
-# Revision history
-# $Log$
-# Revision 1.1  2006-07-20 23:18:19  dtrg
-# First version in CVS.
-#
--]]
-
 -- Revision history
 -- $Log$
-- Revision 1.1  2006-07-20 23:18:19  dtrg
-- First version in CVS.
+-- Revision 1.2  2006-10-15 00:28:12  dtrg
+-- Updated to the version 0.1 of Prime Mover (which involves some syntax changes).
 --
+-- Revision 1.1  2006/07/20 23:18:19  dtrg
+-- First version in CVS.
--- a/mach/proto/top/pmfile
+++ b/mach/proto/top/pmfile
@@ -17,9 +17,9 @@ local cfile_with_tables = cfile {
 proto_top = cprogram {
 	CINCLUDES = {
 		PARENT,
-		"-Imach/%ARCH%/ncg",
-		"-Imach",
-		"-I"..d
+		"mach/%ARCH%/ncg",
+		"mach",
+		d
 	},
 			
 	cfile_with_tables (d.."queue.c"),
@@ -33,7 +33,10 @@ proto_top = cprogram {

 -- Revision history
 -- $Log$
-- Revision 1.1  2006-07-22 12:31:19  dtrg
+-- Revision 1.2  2006-10-15 00:28:12  dtrg
+-- Updated to the version 0.1 of Prime Mover (which involves some syntax changes).
+--
+-- Revision 1.1  2006/07/22 12:31:19  dtrg
 -- Added support for the top target peephole optimiser.
 --
 -- Revision 1.1  2006/07/20 23:18:18  dtrg