Add min/max functionality to random utility, start implementing retur…

…n forwarding

bos.inc

@@ -525,6 +525,10 @@ namespace bos
 ?sys_ExecContinue                := $226E4
 ?fs_IsOSBackupPresent            := $226E8
 ?util_SHA256                     := $226EC
+?str_FromByte                    := $226F0
+?str_FromInt                     := $226F4
+?str_FromLong                    := $226F8
+?str_ToInt                       := $226FC
 ; end of jump table
 ;-------------------------------------------------------------------------------
 ; OS memory areas and misc defines

bos.src

@@ -188,6 +188,10 @@
 	public _sys_ExecContinue
 	public _fs_IsOSBackupPresent
 	public _util_SHA256
+	public _str_FromByte
+	public _str_FromInt
+	public _str_FromLong
+	public _str_ToInt
 _boot_os                         := $20108
 _handle_interrupt                := $2010C
 _HandleInstruction               := $20110
@@ -376,6 +380,10 @@ _sys_ExecBegin                   := $226E0
 _sys_ExecContinue                := $226E4
 _fs_IsOSBackupPresent            := $226E8
 _util_SHA256                     := $226EC
+_str_FromByte                    := $226F0
+_str_FromInt                     := $226F4
+_str_FromLong                    := $226F8
+_str_ToInt                       := $226FC
 
 public ram_executable
 public ram_executable_at

src/data/adrive/src/fs/bin/include/bos.inc

@@ -525,6 +525,10 @@ namespace bos
 ?sys_ExecContinue                := $226E4
 ?fs_IsOSBackupPresent            := $226E8
 ?util_SHA256                     := $226EC
+?str_FromByte                    := $226F0
+?str_FromInt                     := $226F4
+?str_FromLong                    := $226F8
+?str_ToInt                       := $226FC
 ; end of jump table
 ;-------------------------------------------------------------------------------
 ; OS memory areas and misc defines

src/data/adrive/src/fs/bin/random.asm

@@ -3,6 +3,65 @@
 	jr random_main
 	db "FEX",0
 random_main:
+	ld hl,-8
+	call ti._frameset
+	call bos.sys_Random32
+	ld (ix-4),hl
+	ld (ix-1),e
+	ld a,(ix+6)
+	dec a
+	jr z,.no_args
+	dec a
+	jr z,.one_arg
+	dec a
+	jr nz,.info
+.two_args:
+	call osrt.argv_1
+	push hl
+	call bos.str_ToInt
+	pop bc
+	ld (ix-8),hl
+	call osrt.argv_2
+	push hl
+	call bos.str_ToInt
+	pop bc
+	ld bc,(ix-8)
+	xor a,a
+	sbc hl,bc
+	push hl
+	pop bc
+	ld hl,(ix-4)
+	ld e,(ix-1)
+	call ti._lremu
+	ld bc,(ix-8)
+	add hl,bc
+	ld e,a
+	jr .no_args
+.one_arg:
+	call osrt.argv_1
+	push hl
+	call bos.str_ToInt
+	ex (sp),hl
+	pop bc
+	ld hl,(ix-4)
+	ld e,(ix-1)
+	call ti._lremu
+	jr .no_args
+.no_args:
 	ld a,mReturnLong or mReturnNotError
 	ld (bos.return_code_flags),a
-	jp bos.sys_Random32
+.done:
+	ld sp,ix
+	pop ix
+	ret
+
+.info:
+	ld hl,.info_str
+	call bos.gui_PrintLine
+	jr .done
+
+.info_str:
+	db "random",$A
+	db "random (max)",$A
+	db "random (min) (max)"
+	db 0

src/data/adrive/src/fs/lib/include/bos.inc

@@ -525,6 +525,10 @@ namespace bos
 ?sys_ExecContinue                := $226E4
 ?fs_IsOSBackupPresent            := $226E8
 ?util_SHA256                     := $226EC
+?str_FromByte                    := $226F0
+?str_FromInt                     := $226F4
+?str_FromLong                    := $226F8
+?str_ToInt                       := $226FC
 ; end of jump table
 ;-------------------------------------------------------------------------------
 ; OS memory areas and misc defines

src/data/buildno.txt

@@ -1 +1 @@
-1.19.1214 alpha
+1.19.1314 alpha

src/include/bos.inc

@@ -525,6 +525,10 @@ namespace bos
 ?sys_ExecContinue                := $226E4
 ?fs_IsOSBackupPresent            := $226E8
 ?util_SHA256                     := $226EC
+?str_FromByte                    := $226F0
+?str_FromInt                     := $226F4
+?str_FromLong                    := $226F8
+?str_ToInt                       := $226FC
 ; end of jump table
 ;-------------------------------------------------------------------------------
 ; OS memory areas and misc defines

src/str.inc

@@ -7,4 +7,7 @@ include 'str/set.asm'
 include 'str/toupper.asm'
 include 'str/upper.asm'
 include 'str/HexToInt.asm'
-
+include 'str/ToInt.asm'
+include 'str/FromByte.asm'
+include 'str/FromInt.asm'
+include 'str/FromLong.asm'

src/str/FromByte.asm

@@ -0,0 +1,14 @@
+;@DOES Convert num to a base-10 string.
+;@INPUT char *str_FromByte(char *dest, uint8_t num);
+str_FromByte:
+	pop bc,de,hl
+	push hl,de,bc
+	push de,de
+	ex (sp),iy
+	ld a,l
+	or a,a
+	sbc hl,hl
+	ld l,a
+	xor a,a
+	ld e,a
+	jr str_FromLong.long_to_str_100

src/str/FromInt.asm

@@ -0,0 +1,10 @@
+;@DOES Convert num to a base-10 string.
+;@INPUT char *str_FromInt(char *dest, unsigned int num);
+str_FromInt:
+	pop bc,de,hl
+	push hl,de,bc
+	push de,de
+	ex (sp),iy
+	xor a,a
+	ld e,a
+	jr str_FromLong.long_to_str_10m

src/str/FromLong.asm

@@ -0,0 +1,64 @@
+;@DOES Convert num to a base-10 string.
+;@INPUT char *str_FromLong(char *dest, uint32_t num);
+str_FromLong:
+	push iy
+	ld iy,0
+	add iy,sp
+	ld hl,(iy+9)
+	ld a,(iy+12)
+	ld iy,(iy+6)
+	pop bc
+	push iy,bc
+	ld e,1000000000 shr 24
+	ld bc,1000000000 and $FFFFFF
+	call .num_to_str_aqu
+	ld e,100000000 shr 24
+	ld bc,100000000 and $FFFFFF
+	call .num_to_str_aqu
+	ld e,0
+.long_to_str_10m:
+	ld bc,10000000
+	call .num_to_str_aqu
+	ld bc,1000000
+	call .num_to_str_aqu
+	ld bc,100000
+	call .num_to_str_aqu
+.long_to_str_10k:
+	ld bc,10000
+	call .num_to_str_aqu
+	ld bc,1000
+	call .num_to_str_aqu
+.long_to_str_100:
+	ld bc,100
+	call .num_to_str_aqu
+	ld c,10
+	call .num_to_str_aqu
+	ld c,1
+	call .num_to_str_aqu
+	ld (iy),0
+	pop iy,hl
+.skip_zeroes_loop:
+	ld a,(hl)
+	or a,a
+	jr z,.return_single_zero
+	cp a,'0'
+	ret nz
+	inc hl
+	jr .skip_zeroes_loop
+.return_single_zero:
+	dec hl
+	ret
+
+.num_to_str_aqu:
+	ld d,'0'-1
+.num_to_str_aqu.loop:
+	inc d
+	or a,a
+	sbc hl,bc
+	sbc a,e
+	jr nc,.num_to_str_aqu.loop
+	add hl,bc
+	adc a,e
+	ld (iy),d
+	inc iy
+	ret