Merge pull request #1 from hsoft/master

update from upstream

kernel/core.asm

@@ -27,34 +27,29 @@ addDE:
 noop:				; piggy backing on the first "ret" we have
 	ret
 
-; copy (DE) into DE, little endian style (addresses in z80 are always have
-; their LSB before their MSB)
-intoDE:
-	push	af
-	ld	a, (de)
-	inc	de
-	ex	af, af'
-	ld	a, (de)
-	ld	d, a
-	ex	af, af'
-	ld	e, a
-	pop	af
-	ret
-
+; copy (HL) into DE, then exchange the two, utilising the optimised HL instructions. 
+; ld must be done little endian, so least significant byte first.
 intoHL:
 	push 	de
-	ex	de, hl
-	call	intoDE
+	ld 	e, (hl)
+	inc 	hl
+	ld 	d, (hl)
 	ex 	de, hl
 	pop 	de
 	ret
 
+intoDE:
+	ex 	de, hl
+	call 	intoHL
+	ex 	de, hl		; de preserved by intoHL, so no push/pop needed
+	ret
+
 intoIX:
-	push	de
-	push	ix \ pop de
-	call	intoDE
-	push	de \ pop ix
-	pop	de
+	push 	ix
+	ex 	(sp), hl	;swap hl with ix, on the stack
+	call 	intoHL
+	ex 	(sp), hl	;restore hl from stack
+	pop 	ix
 	ret
 
 ; add the value of A into HL

tools/tests/zasm/runtests.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 

tools/zasm.sh

@@ -1,7 +1,11 @@
-#!/bin/sh
+#!/usr/bin/env bash
+
+# readlink -f doesn't work with macOS's implementation
+# so, if we can't get readlink -f to work, try python with a realpath implementation
+ABS_PATH=$(readlink -f "$0" || python -c "import sys, os; print(os.path.realpath('$0'))")
 
 # wrapper around ./emul/zasm/zasm that prepares includes CFS prior to call
-DIR=$(dirname $(readlink -f "$0"))
+DIR=$(dirname "${ABS_PATH}")
 ZASMBIN="${DIR}/emul/zasm/zasm"
 CFSPACK="${DIR}/cfspack/cfspack"
 INCCFS=$(mktemp)