Merge pull request #4 from nihirash/file_api_fixing

File API fixing

Author: nihirash

.github/workflows/release.yml

@@ -28,6 +28,7 @@ jobs:
                 prerelease: false
                 release_name: CI build ${{ steps.version.outputs.version }}
                 tag_name: ${{ steps.version.outputs.version }}
+                body_path: CHANGELOG.md
               env:
                 GITHUB_TOKEN: ${{ github.token }}
 

CHANGELOG.md

@@ -0,0 +1,15 @@
+# Changelog
+
+## 2024.04.02
+
+ * File leak fixed
+
+ * Compute file size call implemented
+
+ * More correct error handling(allows Turbo Pascal execution)
+
+## 2024.04.27
+
+ * First public build(system version call returns version 2.9)
+
+ * Basic console and file operations implemented(Mike's Enhanced Small C Compiler works, Microsoft Basic, Tasty Basic, Zork and many other utils working)

Makefile

@@ -9,7 +9,7 @@ $(BINARY): $(EDOS) $(SOURCES) .version
 	(cd src && ez80asm -i zinc.asm ../$(BINARY))
 
 $(EDOS): $(SOURCES)
-	(cd src/edos && ez80asm -i edos.asm)
+	(cd src/edos && ez80asm -i -l edos.asm)
 
 .version:
 	date '+%Y.%m.%d' >.version

src/config.asm

@@ -22,7 +22,7 @@ ZINC_EXIT:  equ ZINC_BASE + 4
 ;; By changing this value you can change used memory page for CP/M application
 EDOS_BASE:  equ $A0000
 ;; Origin address for EDOS(BDOS equivalent in ZINC)
-EDOS_ORG:   equ EDOS_BASE + $f000
+EDOS_ORG:   equ EDOS_BASE + $F500
 ;; TPA area starts here
 EDOS_TPA:   equ EDOS_BASE + $100
 

src/edos/buffers.asm

@@ -34,7 +34,8 @@ ffs_attr:   ds  1
 ffs_name:   ds  13
 ffs_lfn:    ds  256
 
-    ds 16
-bios_stack:
     ds 32
+bios_stack:
+
+    ds 64
 stack:

src/edos/core.asm

@@ -20,11 +20,12 @@ LF:         equ $0A
 CR:         equ $0D
     
     include "mos.asm"
-    jp entrypoint
+entrypoint:
+    jp edos
     jp init
 
 ;; "BDOS" entrypoint - routing functions 
-entrypoint:
+edos:
     ld a, c
     ld (fun), a
     cp NFUNC
@@ -34,6 +35,8 @@ entrypoint:
     ld (user_stk), sp
     ld sp, stack
     ei
+    push ix
+    push iy
 
     ld hl, bdos_return
     push hl
@@ -58,6 +61,8 @@ entrypoint:
 
 bdos_return:
     di
+    pop iy 
+    pop ix
     ld sp, (user_stk)
     ei
     ret
@@ -66,9 +71,11 @@ fun_table:
     dw bye                  ; 00  Reset
     dw console_in           ; 01  Console in
     dw console_out          ; 02  Console out
+
     dw trace                ; 03  Aux read
     dw trace                ; 04  Aux write
     dw do_nothing           ; 05  Printer write
+
     dw raw_io               ; 06  Raw IO
     dw get_io_byte          ; 07  Get IO Byte
     dw set_io_byte          ; 08  Set IO Byte
@@ -98,13 +105,13 @@ fun_table:
     dw do_nothing           ; 32  Get user area
     dw fread_rnd            ; 33  Random read
     dw fwrite_rnd           ; 34  Random write
-    dw trace                ; 35  Compute file size
+    dw calc_size            ; 35  Compute file size
     dw trace                ; 36  Update random access pointer
     dw do_nothing           ; 37  reset selected disks
-    dw do_nothing           ; 38  not used in CP/M 2.2
-    dw do_nothing           ; 39  not used in CP/M 2.2
+    dw trace                ; 38  not used in CP/M 2.2
+    dw trace                ; 39  not used in CP/M 2.2
     dw trace                ; 40  fill random access block with zeros
-    dw do_nothing           ; 41
+    dw trace                ; 41
 
 bye:
     jp.lil ZINC_EXIT
@@ -135,5 +142,6 @@ dma_ptr:    dl EDOS_BASE + $80
 user_stk:   dw $00
 
     align $100
+
     include "ebios/index.asm"
     include "buffers.asm"

src/edos/disk.asm

@@ -5,6 +5,7 @@
 
 get_drives:
     ld hl,1
+    xor a
     ret
 
 get_drive:
@@ -83,6 +84,9 @@ scan_ok:
     ld hl, ffs_lfn
     call ascciz_to_fcb
 
+    xor a
+    ret 
+
 ;; Calculation file lenght 
 ;; Routine works not very correct, but many CP/M emulators skip this step
 ;; Honestly, not most necessary part of this project :-)
@@ -120,7 +124,7 @@ scan_ok:
     ret
 
 mask:
-    defb 12, '?'
+    db "????????????"
 
 init_dir:
     ld hl, path_buffer
@@ -139,16 +143,9 @@ init_dir:
     MOSCALL MOS_OPENDIR
     ret
 
-fopen:
-    ld hl, (args)
-    ld de, FCB_FP
-    add hl, de
-    ld a, (hl)
-
-    or a
-    jr z, @skip
-    call fclose
-@skip:
+_open:
+    ld c, 0
+    MOSCALL MOS_FCLOSE
 
     ld hl, (args)
     call fcb_to_asciiz_name
@@ -157,18 +154,22 @@ fopen:
     ld c, FA_READ + FA_WRITE
     MOSCALL MOS_FOPEN
 
-    or a
-    jr z, @err
-
-    ld hl, (args)
-    ld de, FCB_FP
+;; Store file pointer
+    ld de, (args)
+    ld hl, FCB_FP
     add hl, de
     ld (hl), a
+    ld c, a
 
-    xor a
     ret
-@err:
-    ld a, #ff
+
+fopen:
+    call _open
+
+    or a
+    jp z, err
+
+    xor a
     ret
 
 frename:
@@ -196,39 +197,22 @@ frename:
 
 fcreate:
     ld hl, (args)
-
     call fcb_to_asciiz_name
-    
+
     ld hl, dos_name
     ld c, FA_READ + FA_WRITE + FA_CREATE
     MOSCALL MOS_FOPEN
 
     or a
-    jr z, @err
-    ld hl, (args)
-    ld de, FCB_FP
-    add hl, de
-    ld (hl), a
+    jp z, err
 
     xor a
     ret
-@err:
-    ld a, #ff
-    ret
 
+;; Not it's just dummy implementation - all files will be closed on any file operations
+;; And exit from CP/M emulator
 fclose:
-    ld de, (args)
-    ld hl, FCB_FP
-    add hl, de
-    ld a, (hl)
-    or a 
-    ret z
-
-    ld c, a
-    MOSCALL MOS_FCLOSE
-    
     xor a
-    ld (hl), a
     ret
 
 fdelete:
@@ -240,24 +224,38 @@ fdelete:
 
 ;; Random write
 fwrite_rnd:
+    call _open
+    or a
+    jr z, err
     call set_rnd_offset
     jr do_write
 
 ;; Sequental write
 fwrite:
+    call _open
+    or a
+    jr z, err
+    
     ld hl, FCB_FP
-    add hl, de
-    ld a, (hl)
-    ld c, a
+    ld (hl), a
 
+    call fcb_calc_offset
 do_write:
+    MOSCALL MOS_FSEEK
+
     ld.lil hl, (dma_ptr)
     ld de, $80
     MOSCALL MOS_FWRITE
-    call fcb_next_record
 
+    call fcb_next_record
+    
+    ld hl, 0
+    ld bc, 0
     xor a
     ret
+err:
+    ld a, #ff
+    ret
 
 clean_dma:
     ld de, (dma_ptr)
@@ -291,11 +289,15 @@ set_rnd_offset:
     add.lil hl, hl ; *32
     add.lil hl, hl ; *64
     add.lil hl, hl ; *128
-    ld e, 0
+    ld de, 0
     ret
 
 ;; Random read
 fread_rnd:
+    call _open
+    or a
+    jp z, err
+
     call clean_dma
     call set_rnd_offset
 
@@ -305,26 +307,61 @@ fread_rnd:
 fread:
     call clean_dma
     
-    ld de, (args)
-    ld hl, FCB_FP
-    add hl, de
-    ld a, (hl)
-    ld c, a
+    call _open
+    or a
+    jp z, err
 
     call fcb_calc_offset
 read_offset:
     MOSCALL MOS_FSEEK
 
     ld.lil hl, (dma_ptr)
-    ld de, 128
+    ld de, $80
     MOSCALL MOS_FREAD
 
     ld a, d
     or e
-    ld a, $ff
+    ld a, $01
     ret z
 
     call fcb_next_record
+    
     xor a
     ret
 
+;; DE - FCB
+calc_size:
+    ex de, hl
+    call fcb_to_asciiz_name
+
+    ld.lil de, dos_name
+    ld.lil hl, ffs_file_struct
+    MOSCALL MOS_FSTAT
+    or a
+    jr nz, @nope
+
+    ld.lil hl, (ffs_size)
+    add.lil hl, hl
+    
+    ld a, l
+    and $7f
+    jr z, @skip
+
+    ld de, $100
+    add.lil hl, de
+@skip:
+    ld.lil (@buff), hl
+
+    ld hl, (args)
+    ld de, FCB_RN
+    add hl, de
+
+    ld de, (@buff + 1)
+    ld (hl), de 
+    xor a
+    ret
+@nope:    
+    ld a, $ff
+    ret
+@buff:
+    dl 0

src/edos/ebios/index.asm

@@ -17,7 +17,7 @@ CONOUT:	JP	bios_out
 
 LIST:	JP	nothing
 PUNCH:	JP	nothing
-READER:	JP	nothing
+READER:	JP	reader
 
 HOME:	JP	nothing
 SELDSK:	JP	bios_seldsk
@@ -33,6 +33,10 @@ nothing:
     ld a, $ff
     ret
 
+reader:
+    ld a, 26
+    ret
+
 direct:
     ld hl, @msg
     ld bc, 0