test

orix-software · Dec 6, 2023 · f0999f9 · f0999f9
1 parent a4b4b79
commit f0999f9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 31 deletions.
diff --git a/src/commands/banks.asm b/src/commands/banks.asm
@@ -22,29 +22,17 @@
     XMAINARGS = $2C
     XGETARGV  = $2E
 
-
-
     lda     #$01
     sta     bank_all_banks_display
 
     lda     #$00 ; return args with cut
     BRK_KERNEL XMAINARGS
 
     initmainargs bank_save_argvlow, bank_save_argc, 0
-
-
     cpx     #$01
     beq     @jmp_displays_all_banks
 
-
     getmainarg #1, (bank_save_argvlow)
-
-    ; ldx     #$01
-    ; lda     bank_save_argvlow
-    ; ldy     bank_save_argvhigh
-
-    ; BRK_KERNEL XGETARGV
-
     sta     ptr3
     sty     ptr3+1
 
@@ -483,7 +471,6 @@ str_kernel_reserved:
     .byte "Kernel reserved",$0D,$0A,$00
 .endproc
 
-
 ;unsigned char twil_get_registers_from_id_bank(unsigned char bank);
 .proc _twil_get_registers_from_id_bank
     cmp     #$00

diff --git a/src/commands/basic11.asm b/src/commands/basic11.asm
@@ -806,6 +806,7 @@ copy_bufedt:
     initmainargs basic11_ptr1, basic11_ptr4, 1
 
     ldy     #$00
+
 @copy_bufedt:
     lda     (basic11_ptr1),y
     beq     @end_copy_bufedt

diff --git a/src/commands/cat.asm b/src/commands/cat.asm
@@ -9,23 +9,12 @@
     XMAINARGS = $2C
     XGETARGV =  $2E
 
-    lda     #$00 ; return args with cut
-    BRK_KERNEL XMAINARGS
-
-    sta     cat_save_argvlow
-    sty     cat_save_argvhigh
-    stx     cat_save_argc
-
+    initmainargs cat_save_argvlow, cat_save_argc, 0
     cpx     #$01
     beq     @print_usage
 
 
-    ldx     #$01 ; get arg
-    lda     cat_save_argvlow
-    ldy     cat_save_argvhigh
-    BRK_KERNEL XGETARGV
-
-
+    getmainarg #1, (cat_save_argvlow)
     sta     cat_save_ptr_arg
     sty     cat_save_ptr_arg+1
 

diff --git a/src/commands/cd.asm b/src/commands/cd.asm
@@ -9,13 +9,14 @@
     cd_path_2         := userzp+6
 
     ; Let's malloc
-    MALLOC(KERNEL_MAX_PATH_LENGTH)
+    malloc #KERNEL_MAX_PATH_LENGTH
     cmp     #NULL
     bne     @not_null_1
     cpy     #NULL
     bne     @not_null_1
     print   str_oom
     rts
+
 @not_null_1:
     sta     cd_path
     sty     cd_path+1
@@ -38,9 +39,11 @@
     inc     cd_argv1_ptr
     bne     @skip30
     inc     cd_argv1_ptr+1
+
 @skip30:
     iny
     bne     @get_first_arg
+
 @found_eos:
     mfree(cd_path)
     rts

diff --git a/src/commands/cp.asm b/src/commands/cp.asm
@@ -116,7 +116,6 @@ continue2:
     jmp     @copy_finished
 
 @continue_to_write:
-
     fwrite (MALLOC_PTR1), (cp_mv_fp_dest_nb_bytes), 1, cp_mv_fp_dest
     jmp     @loop_until_eof
 
@@ -128,9 +127,11 @@ continue2:
     lda     cp_tmp
     beq     @out
 
-    lda     cp_mv_rm_save_argv_ptr2
-    ldx     cp_mv_rm_save_argv_ptr2+1
-    BRK_KERNEL XRM
+    unlink cp_mv_rm_save_argv_ptr2
+
+    ; lda     cp_mv_rm_save_argv_ptr2
+    ; ldx     cp_mv_rm_save_argv_ptr2+1
+    ; BRK_KERNEL XRM
     ; now remove file
 
 @out:

diff --git a/tests/unit-tests/commands.sub b/tests/unit-tests/commands.sub
@@ -29,4 +29,9 @@ setfont
 #twil
 uname
 viewhrs
+
+cp started started.cop
+cp started testmv
+cp testmv.mv
+
 touch stopped