xenia/fox32os
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: Prefix an FXF binary with * to not suspend the shell

Browse Source
This commit is contained in:
Ry 2022-10-16 18:47:11 -07:00
parent 6de1a5f6df
commit cc40cce81b
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/shell/commands/help.asm
View File

@ -24,4 +24,7 @@ shell_help_text:
data.str "type the name of an FXF binary to launch" data.8 10 data.str "type the name of an FXF binary to launch" data.8 10
data.str "it as a new task; the shell will suspend" data.8 10 data.str "it as a new task; the shell will suspend" data.8 10
data.str "until the launched task ends" data.8 10 data.str "until the launched task ends" data.8 10
data.8 10
data.str "prefix the name of an FXF binary with *" data.8 10
data.str "to launch it without suspending" data.8 10
data.8 0 data.8 0

14
kernel/shell/launch.asm
View File

@ -2,7 +2,7 @@
; launch an FXF binary from a shell entry ; launch an FXF binary from a shell entry
; inputs: ; inputs:
; r0-r3: shell arguments ; r0: pointer to FXF binary name
; outputs: ; outputs:
; none, does not return if task started successfully ; none, does not return if task started successfully
; returns if FXF file not found ; returns if FXF file not found
@ -15,6 +15,14 @@ launch_fxf:
call copy_memory_bytes call copy_memory_bytes
pop r0 pop r0
; if the name was prefixed with a '*' character then
; clear a flag to have the shell return control immediately
cmp.8 [r0], '*'
ifnz mov.8 [launch_fxf_yield_should_suspend], 1
ifnz jmp launch_fxf_no_prefix
inc r0
mov.8 [launch_fxf_yield_should_suspend], 0
launch_fxf_no_prefix:
; copy the name into the launch_fxf_name buffer ; copy the name into the launch_fxf_name buffer
mov r1, launch_fxf_name mov r1, launch_fxf_name
mov r31, 8 mov r31, 8
@ -86,6 +94,8 @@ launch_fxf_name_loop_done:
; loop until the launched task ends ; loop until the launched task ends
launch_fxf_yield_loop: launch_fxf_yield_loop:
cmp.8 [launch_fxf_yield_should_suspend], 0
ifz jmp shell_task_return
movz.8 r0, [launch_fxf_task_id] movz.8 r0, [launch_fxf_task_id]
call is_task_id_used call is_task_id_used
ifz jmp shell_task_return ifz jmp shell_task_return
@ -104,4 +114,6 @@ launch_fxf_task_id: data.8 0
launch_fxf_binary_ptr: data.32 0 launch_fxf_binary_ptr: data.32 0
launch_fxf_stack_ptr: data.32 0 launch_fxf_stack_ptr: data.32 0
launch_fxf_yield_should_suspend: data.8 0
out_of_memory_string: data.str "failed to allocate for new task!" data.8 10 data.8 0 out_of_memory_string: data.str "failed to allocate for new task!" data.8 10 data.8 0