implemented (short)shiftRightJam64 and propagateNanF64UI in asm

Author: ZERICO2005

src/softfloat/include/primitives.h

@@ -48,7 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 | into the least-significant bit of the shifted value by setting the least-
 | significant bit to 1.  This shifted-and-jammed value is returned.
 *----------------------------------------------------------------------------*/
-#if defined INLINE_LEVEL && (2 <= INLINE_LEVEL)
+#if 0 && defined INLINE_LEVEL && (2 <= INLINE_LEVEL)
 INLINE
 uint64_t softfloat_shortShiftRightJam64( uint64_t a, uint_fast8_t dist )
     { return a>>dist | ((a & (((uint_fast64_t) 1<<dist) - 1)) != 0); }
@@ -88,7 +88,7 @@ uint32_t softfloat_shiftRightJam32( uint32_t a, uint_fast16_t dist );
 | greater than 64, the result will be either 0 or 1, depending on whether 'a'
 | is zero or nonzero.
 *----------------------------------------------------------------------------*/
-#if defined INLINE_LEVEL && (3 <= INLINE_LEVEL)
+#if 0 && defined INLINE_LEVEL && (3 <= INLINE_LEVEL)
 INLINE uint64_t softfloat_shiftRightJam64( uint64_t a, uint_fast32_t dist )
 {
     return

src/softfloat/s_propagateNaNF64UI.c

@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =============================================================================*/
 
+#if 0
+
 #include <stdbool.h>
 #include <stdint.h>
 #include "platform.h"
@@ -61,3 +63,4 @@ uint_fast64_t
 
 }
 
+#endif

src/softfloat/s_propagateNaNF64UI.src

@@ -0,0 +1,38 @@
+	assume	adl=1
+
+	section	.text
+
+	public	_softfloat_propagateNaNF64UI
+
+; at least one of the arguments is NaN
+; returns x if it is NaN, otherwise returns y
+_softfloat_propagateNaNF64UI:
+	call	__frameset0
+	ld	hl, (ix + 12)	; BC
+	push	hl
+	ld	hl, (ix + 9)	; UDE
+	push	hl
+	ld	hl, (ix + 6)	; UHL
+	push	hl
+	call	__isnanl
+	ld	sp, ix
+	rrca
+	jr	c, .x_is_NaN
+	lea	ix, ix + 9	; y is NaN
+.x_is_NaN:
+	ld	bc, (ix + 12)	; (ix + 21)
+	bit	3, c	; test quiet bit
+	jr	nz, .quiet
+	; raise signal
+	set	3, c	; set quiet bit
+	ld	hl, ___fe_cur_env
+	set	4, (hl)	; FE_INVALID
+.quiet:
+	ld	de, (ix + 9)	; (ix + 18)
+	ld	hl, (ix + 6)	; (ix + 15)
+	pop	ix
+	ret
+
+	extern	__isnanl
+	extern	__frameset0
+	extern	___fe_cur_env

src/softfloat/s_shiftRightJam64.c

@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =============================================================================*/
 
+#if 0
+
 #include <stdint.h>
 #include "platform.h"
 
@@ -49,3 +51,4 @@ uint64_t softfloat_shiftRightJam64( uint64_t a, uint_fast32_t dist )
 
 #endif
 
+#endif

src/softfloat/s_shiftRightJam64.src

@@ -0,0 +1,75 @@
+	assume	adl = 1
+
+	section	.text
+
+	public	_softfloat_shortShiftRightJam64
+
+	; shift amount is [1, 63]
+_softfloat_shortShiftRightJam64:
+	xor	a, a
+	ld	iy, -1
+	add	iy, sp
+	ld	l, (iy + 13)	; shift amount
+;	scf	; disables jr nc, .overflow_shift
+	jr	_softfloat_shiftRightJam64.hijack
+
+	section	.text
+
+	public	_softfloat_shiftRightJam64
+
+	; shift amount is non-zero
+_softfloat_shiftRightJam64:
+	ld	iy, -1
+	lea	bc, iy + 63 + 1
+	add	iy, sp
+	ld	a, (iy + 16)	; shift amount hi8
+	or	a, a
+	jr	nz, .overflow
+	ld	hl, (iy + 13)	; shift amount lo24
+	sbc	hl, bc
+	add	hl, bc
+.overflow:
+	private	_softfloat_shiftRightJam64.hijack
+.hijack:
+	ld	de, (iy + 7)
+	ld	bc, (iy + 10)
+	jr	nc, .overflow_shift
+	push	hl	; >> shift
+	sub	a, l	; A = 0 - L
+	and	a, $3F
+	ld	l, a
+	push	hl	; << shift
+	ld	hl, (iy + 4)
+	call	__llshl
+	xor	a, a
+	call	__llcmpzero
+	jr	z, .no_round
+	inc	a	; ld a, 1
+.no_round:
+	pop	hl	; SP -= 3
+	ld	hl, (iy + 4)
+	ld	de, (iy + 7)
+	ld	bc, (iy + 10)
+	call	__llshru
+	or	a, l
+	ld	l, a
+	pop	af	; reset SP
+	ret
+
+.overflow_shift:
+	; A is zero here
+	ld	hl, (iy + 4)
+	call	__llcmpzero
+	ret	z
+	xor	a, a
+	sbc	hl, hl
+	ex	de, hl
+	sbc	hl, hl
+	ld	b, a
+	ld	c, a
+	inc	hl
+	ret
+
+	extern	__llcmpzero
+	extern	__llshl
+	extern	__llshru

src/softfloat/s_shortShiftRightJam64.c

@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =============================================================================*/
 
+#if 0
+
 #include <stdint.h>
 #include "platform.h"
 
@@ -48,3 +50,4 @@ uint64_t softfloat_shortShiftRightJam64( uint64_t a, uint_fast8_t dist )
 
 #endif
 
+#endif