Merge pull request #177 from juollila/amigacpm

Add support for Amiga CP/M-68k target

Author: davidgiven

README.md

@@ -53,7 +53,7 @@ The following targets are supported. Adding more is easy.
 
   - PowerPC, on Linux.
 
-  - 68000, on Atari ST TOS (although most of the system calls aren't hooked up
+  - 68000, on Atari ST TOS and Amiga CP/M-68k (although most of the system calls aren't hooked up
 	yet so you can't do anything more than print stuff) and Linux m68k (if you
 	can still find a machine which will run this).
 
@@ -258,6 +258,10 @@ written by other people and are not covered by this license. This directory as
 a whole contains GPL software, which means that if you redistribute the entire
 directory, you must conform to the terms of the GPL.
 
+`third_party/amigacpm` contains a ld linker script for Amiga CP/M-68k,
+(https://github.com/juollila/cpm68k-amiga). The linker script is in the public
+domain.
+
 `third_party/lib6502` contains a hacked copy of the lib6502 library, which is ©
 2005 Ian Plumarta and is available under the terms of the MIT license. See
 `third_party/lib6502/COPYING.lib6502` for the full text.

build.py

@@ -34,5 +34,6 @@
     ]
     + (["dist/msdos"] if config.has_msdos else [])
     + (["dist/ataritos"] if config.has_ataritos else [])
+    + (["dist/amigacpm"] if config.has_amigacpm else [])
     + (["dist/bbct"] if config.has_bbct else []),
 )

config.py

@@ -18,6 +18,7 @@ def enable_if(command):
 has_qemu68k = enable_if("qemu-m68k")
 
 has_ataritos = has_gccataritos
+has_amigacpm = has_gccataritos
 has_msdos = has_nasm
 has_lx386 = has_gcc386
 has_lxthumb2 = has_gccthumb2

dist/amigacpm/build.py

@@ -0,0 +1,17 @@
+from build.ab import export
+from tools.build import tocpm
+
+tocpm(name="demosub", src="./demo.sub")
+
+export(
+    name="amigacpm",
+    items={
+        "bin/dist/amigacpm/mandel.cow": "examples/mandel.cow",
+        "bin/dist/amigacpm/cowgol.coh": "rt/amigacpm/cowgol.coh",
+        "bin/dist/amigacpm/common.coh": "rt/common.coh",
+        "bin/dist/amigacpm/cowgol.coo": "rt/amigacpm+cowgolcoo",
+        "bin/dist/amigacpm/cowfe.com": "src/cowfe+cowfe-for-32bita2-with-amigacpm",
+        "bin/dist/amigacpm/cowbe.com": "src/cowbe+cowbe-for-68000-with-amigacpm",
+        "bin/dist/amigacpm/cowlink.com": "src/cowlink+cowlink-for-amigacpm-with-amigacpm",
+    },
+)

doc/building.md

@@ -113,6 +113,17 @@ $ ./helloworld
 Hello, world!
 ```
 
+Building of Amiga CP/M-68k binary uses m68k-atari-mint binutis and a custom `amigacpm.ld` linker
+script. To run the cross compiler to generate a Amiga CP/M-68k binary, do: 
+
+```
+$ bin/cowfe-for-32bita2-with-nncgen -Irt/ -Irt/amigacpm/ examples/helloworld.cow helloworld.cob
+$ bin/cowbe-for-68000-with-nncgen helloworld.cob helloworld.coo
+$ bin/cowlink-for-amigacpm-with-nncgen .obj/rt/amigacpm/+cowgolcoo/cowgol.coo helloworld.coo -o helloworld.s
+$ m68k-atari-mint-as helloworld.s -o helloworld.o 
+$ m68k-atari-mint-ld -T third_party/amigacpm/amigacpm.ld -o hello.68k helloworld.o
+```
+
 cowfe and cowbe
 ---------------
 

rt/amigacpm/argv.coh

@@ -0,0 +1,48 @@
+var argv_pointer: [uint8];
+
+sub ArgvInit() is
+	argv_pointer := 0x481 as [uint8];
+	[argv_pointer + [0x480 as [uint8]] as intptr] := 0;
+end sub;
+
+# Returns null is there's no next argument.
+sub ArgvNext(): (arg: [uint8]) is
+	# No more arguments?
+
+	if argv_pointer == nil then
+		arg := argv_pointer;
+		return;
+	end if;
+
+	# Skip leading whitespace.
+
+	var c: uint8;
+	loop
+		c := [argv_pointer];
+		if c != ' ' then
+			break;
+		end if;
+		argv_pointer := argv_pointer + 1;
+	end loop;
+
+	arg := argv_pointer;
+
+	# Skip to end of word and terminate.
+
+	loop
+		c := [argv_pointer];
+		if (c == ' ') or (c == '\n') or (c == 0) then
+			break;
+		end if;
+		argv_pointer := argv_pointer + 1;
+	end loop;
+	[argv_pointer] := 0;
+
+	if c == ' ' then
+		argv_pointer := argv_pointer + 1;
+	else
+		argv_pointer := 0 as [uint8];
+	end if;
+end sub;
+
+

rt/amigacpm/build.py

@@ -0,0 +1,3 @@
+from src.build import cowwrap
+
+cowwrap(name="cowgolcoo", src="rt/common-68000/cowgol.cos")

rt/amigacpm/cowgol.coh

@@ -0,0 +1,54 @@
+var LOMEM: [uint8];
+@asm "move.l #LOMEM, (", LOMEM, ")";
+
+var HIMEM: [uint8];
+@asm "move.l #HIMEM, (", HIMEM, ")";
+
+sub Exit() is
+	@asm "move.w #0, %d0"; # BDOS system reset
+	@asm "trap #2";
+end sub;
+
+sub ExitWithError() is
+	@asm "move.w #0, %d0"; # BDOS system reset
+	@asm "trap #2";
+end sub;
+
+sub AlignUp(in: intptr): (out: intptr) is
+	out := in;
+end sub;
+
+sub get_char(): (c: uint8) is
+	@asm "move.w #1, %d0"; # BDOS console input
+	@asm "trap #2";
+	@asm "move.b %d0, (", c ,")";
+end sub;
+
+sub print_char(c: uint8) is
+	if c == 10 then
+		@asm "move.w #13, %d1";
+		@asm "move.w #2, %d0"; # BDOS console output
+		@asm "trap #2";
+	end if;
+
+	@asm "move.b (", c, "), %d1";
+	@asm "and.w #255, %d1";
+	@asm "move.w #2, %d0"; # BDOS console output
+	@asm "trap #2";
+end sub;
+
+sub MemSet(buf: [uint8], byte: uint8, len: intptr) is
+	var bufend := buf + len;
+	loop
+		if buf == bufend then
+			return;
+		end if;
+		[buf] := byte;
+		buf := buf + 1;
+	end loop;
+end sub;
+
+include "common.coh";
+
+
+

rt/amigacpm/file.coh

@@ -0,0 +1,214 @@
+# vim: ts=4 sw=4 et
+
+record CpmFCB is
+	dr: uint8;
+	f: uint8[11];
+	ex: uint8;
+	s1: uint8;
+	s2: uint8;
+	rc: uint8;
+	d: uint32[4];   # aligns also CpmFCB to even address
+	cr: uint8;
+	r: uint8[3];
+end record;
+
+record FCB is
+	bufferptr: uint8; # byte just read
+	dirty: uint8;
+	cpm: CpmFCB;
+	buffer: uint8[128];
+end record;
+
+sub fcb_set_record(fcb: [FCB], recordno: uint32) is
+	recordno := recordno & 0x3ffff;
+	fcb.cpm.r[0] := ((recordno >> 16) & 0x3) as uint8;
+	fcb.cpm.r[1] := ((recordno >> 8) & 0xff) as uint8;
+	fcb.cpm.r[2] := (recordno & 0xff) as uint8;
+end sub;
+
+sub fcb_get_record(fcb: [FCB]): (recordno: uint32) is
+	var r0 := (fcb.cpm.r[0] as uint32) << 16;
+	var r1 := (fcb.cpm.r[1] as uint32) << 8;
+	var r2 := fcb.cpm.r[2] as uint32;
+	recordno := (r0 + r1 + r2) & 0x3ffff;
+end sub;
+
+sub file_i_init(fcb: [FCB], filename: [uint8]) is
+	sub fill(dest: [uint8], src: [uint8], len: uint8): (srcout: [uint8]) is
+		loop
+			var c := [src];
+			if (c < 32) or (c == '.') then
+				c := ' ';
+			elseif (c == '*') then
+				c := '?';
+			else
+				src := src + 1;
+			end if;
+			if (c >= 'a') and (c <= 'z') then
+				c := c - ('a' - 'A');
+			end if;
+			[dest] := c;
+			dest := dest + 1;
+
+			len := len - 1;
+			if len == 0 then
+				break;
+			end if;
+		end loop;
+		srcout := src;
+	end sub;
+
+	MemSet(fcb as [uint8], 0, @bytesof FCB);
+	MemSet(&fcb.cpm.f[0] as [uint8], ' ', 11);
+	filename := fill(&fcb.cpm.f[0], filename, 8);
+
+	var c: uint8;
+	loop
+		c := [filename];
+		if (c < 32) or (c == '.') then
+			break;
+		end if;
+		filename := filename + 1;
+	end loop;
+
+	if c == '.' then
+		filename := fill(&fcb.cpm.f[8], filename+1, 3);
+	end if;
+
+	fcb_set_record(fcb, 0x3ffff);
+	fcb.bufferptr := 127;
+end sub;
+
+sub fcb_i_gbpb(fcb: [FCB], c: uint16) is
+	var cpmfcb := &fcb.cpm;
+	var dma := &fcb.buffer[0];
+
+	@asm "move.w #26, %d0";	# BDOS set dma
+	@asm "move.l (", dma, "), %d1";
+	@asm "trap #2";
+
+	@asm "move.w (", c, "), %d0"; # BDOS call defined in c
+	@asm "move.l (", cpmfcb, "), %d1";
+	@asm "trap #2";
+end sub;
+
+sub fcb_i_blockin(fcb: [FCB]) is
+	MemSet(&fcb.buffer[0], 0, 128);
+	fcb_i_gbpb(fcb, 33); # READ RANDOM
+	fcb.dirty := 0;
+end sub;
+
+sub fcb_i_blockout(fcb: [FCB]) is
+	if fcb.dirty != 0 then
+		fcb_i_gbpb(fcb, 34); # WRITE RANDOM
+		fcb.dirty := 0;
+	end if;
+end sub;
+
+sub fcb_i_changeblock(fcb: [FCB], newblock: uint32) is
+	if newblock != fcb_get_record(fcb) then
+		fcb_i_blockout(fcb);
+		fcb_set_record(fcb, newblock);
+		fcb_i_blockin(fcb);
+	end if;
+end sub;
+
+sub fcb_convert_return_code_to_error(rc: uint8): (errno: uint8) is
+	if rc == 0xff then
+		errno := 1;
+	else
+		errno := 0;
+	end if;
+end sub;
+
+sub FCBOpenIn(fcb: [FCB], filename: [uint8]): (errno: uint8) is
+	file_i_init(fcb, filename);
+	var cpmfcb := &fcb.cpm;
+
+	@asm "move.w #15, %d0"; # BDOS open file
+	@asm "move.l (", cpmfcb, "), %d1";
+	@asm "trap #2";
+	@asm "move.b %d0, (", errno, ")";
+	errno := fcb_convert_return_code_to_error(errno);
+end sub;
+
+sub FCBOpenUp(fcb: [FCB], filename: [uint8]): (errno: uint8) is
+	(errno) := FCBOpenIn(fcb, filename);
+end sub;
+
+sub FCBOpenOut(fcb: [FCB], filename: [uint8]): (errno: uint8) is
+	file_i_init(fcb, filename);
+	var cpmfcb := &fcb.cpm;
+
+	@asm "move.w #19, %d0"; # BDOS delete file
+	@asm "move.l (", cpmfcb, "), %d1";
+	@asm "trap #2";
+
+	@asm "move.w #22, %d0"; # BDOS make file
+	@asm "move.l (", cpmfcb, "), %d1";
+	@asm "trap #2";
+	@asm "move.b %d0, (", errno, ")";
+	errno := fcb_convert_return_code_to_error(errno);
+end sub;
+	
+sub FCBClose(fcb: [FCB]): (errno: uint8) is
+	fcb_i_blockout(fcb);
+	var cpmfcb := &fcb.cpm;
+
+	@asm "move.w #16, %d0"; # BDOS close file
+	@asm "move.l (", cpmfcb, "), %d1";
+	@asm "trap #2";
+	@asm "move.b %d0, (", errno, ")";
+	errno := fcb_convert_return_code_to_error(errno);
+end sub;
+
+sub FCBSeek(fcb: [FCB], pos: uint32) is
+	pos := pos - 1; # seek to *previous* character
+	var newblock := (pos >> 7) as uint32;
+	var newptr := (pos as uint8) & 127;
+	fcb_i_changeblock(fcb, newblock);
+	fcb.bufferptr := newptr;
+end sub;
+
+sub FCBPos(fcb: [FCB]): (pos: uint32) is
+	pos := ((fcb_get_record(fcb)  << 7) | (fcb.bufferptr as uint32)) + 1;
+end sub;
+
+sub FCBExt(fcb: [FCB]): (len: uint32) is
+	var oldblock := fcb_get_record(fcb);
+	var cpmfcb := &fcb.cpm;
+
+	@asm "move.w #16, %d0"; # BDOS close file
+	@asm "move.l (", cpmfcb, "), %d1";
+	@asm "trap #2";
+
+
+	@asm "move.w #35, %d0"; # BDOS compute file size
+	@asm "move.l (", cpmfcb, "), %d1";
+	@asm "trap #2";
+
+	len := fcb_get_record(fcb) << 7;
+	fcb_set_record(fcb, oldblock);
+end sub;
+
+sub fcb_i_nextchar(fcb: [FCB]) is
+	fcb.bufferptr := fcb.bufferptr + 1;
+	if fcb.bufferptr == 128 then
+		fcb_i_changeblock(fcb, fcb_get_record(fcb) + 1);
+		fcb.bufferptr := 0;
+	end if;
+end sub;
+
+sub FCBGetChar(fcb: [FCB]): (c: uint8) is
+	fcb_i_nextchar(fcb);
+	c := fcb.buffer[fcb.bufferptr];
+end sub;
+
+sub FCBPutChar(fcb: [FCB], c: uint8) is
+	fcb_i_nextchar(fcb);
+	fcb.buffer[fcb.bufferptr] := c;
+	fcb.dirty := 1;
+end sub;
+
+include "common-file.coh";
+