diff --git a/DSS/DOS5.ASM b/DSS/DOS5.ASM index 87656a3..d7f66e3 100644 --- a/DSS/DOS5.ASM +++ b/DSS/DOS5.ASM @@ -29,7 +29,7 @@ ; B = 1 SET ATTRIB ; OUTPUT: A - ATTRIB //////////////////////////////////////////////////////////////////////// -ATTRIB: ;!Test Current Dir ;[x] 15/10/23 +ATTRIB: ;!TEST Current Dir ;[x] 15/10/23 LD C,A PUSH HL PUSH BC @@ -98,7 +98,7 @@ ATTRIB: ;!Test Current Dir ;[x] 15/10/23 ; INPUT: HL - "C:\DIR1\DIR2\filename.ext",#00 ; OUTPUT: A - FM //////////////////////////////////////////////////////////////////////// -CREATE: ;!Test Current Dir ;[x] 15/10/23 +CREATE: ;!TEST Current Dir ;[x] 15/10/23 PUSH HL CALL DIR_PATH_CHECK POP HL @@ -112,7 +112,7 @@ CREATE: ;!Test Current Dir ;[x] 15/10/23 ; ; INPUT: HL - "C:\DIR1\DIR2\filename.ext",#00 ; OUTPUT: A - FM -.NEW: ;!Test Current Dir ;[x] 15/10/23 +.NEW: ;!TEST Current Dir ;[x] 15/10/23 PUSH HL CALL DIR_PATH_CHECK POP HL @@ -179,7 +179,7 @@ CREAT_N EQU CREATE.NEW ; INPUT: HL - "c:\dir\filename.ext",#00 without simbols * ? //////////////////////////////////////////////////////////////////////// DEL_FN: ;!TEST - ;!Test Current Dir ;[x] 15/10/23 + ;!TEST Current Dir ;[x] 15/10/23 PUSH HL CALL DIR_PATH_CHECK POP HL @@ -240,7 +240,7 @@ DELETE: SET_PAGE_X DIRPAGE ; DE - "new_name.ext",#00 without simbols * ? //////////////////////////////////////////////////////////////////////// RENAME: - ;!Test Current Dir + ;!TEST Current Dir ;[x] 15/10/23 PUSH HL PUSH DE CALL DIR_PATH_CHECK.forceCheck @@ -307,7 +307,7 @@ RENAME: ; выход: A - дескриптор файла, если CF=0 ; код ошибки, если CF=1 //////////////////////////////////////////////////////////////////////// -OPEN_FN:;!Test Current Dir ;[x] 15/10/23 +OPEN_FN:;!TEST Current Dir ;[x] 15/10/23 LD C,A PUSH HL PUSH BC @@ -433,25 +433,26 @@ CLOSE: LD (F_FIRST.ACCESS),A ; A - код ошибки, если CF=1 //////////////////////////////////////////////////////////////////////// F_FIRST: - ;!Test Current Dir - LD C,A - PUSH HL - PUSH DE - PUSH BC - CALL DIR_PATH_CHECK - POP BC - POP DE - POP HL - RET C - LD A,C - ; - - + ; Current Dir [x] 15/10/23 + ; LD C,A + ; PUSH HL + ; PUSH DE + ; PUSH BC + ; CALL DIR_PATH_CHECK + ; POP BC + ; POP DE + ; POP HL + ; RET C + ; LD A,C + ; ; LD (.ACCESS),A LD (.DTABUF),DE LD A,B LD (.FNDMODE),A PUSH HL + ;!TEST Current Dir ;[x] 15/10/23 + CALL DIR_PATH_CHECK + ; CALL LOADDIR POP HL CALL GETWORD @@ -848,7 +849,7 @@ PUT_D_T: ; INPUT: HL - "C:\DIR\DIR\DIR_NAME[\]",0 //////////////////////////////////////////////////////////////////////// CHDIR_FN: - ;!Test Current Dir ;[x] 15/10/23 + ;!TEST Current Dir ;[x] 15/10/23 PUSH HL CALL DIR_PATH_CHECK POP HL @@ -872,7 +873,7 @@ CHDIR: CALL GETWORD ; ; ; INPUT: HL - "C:\DIR\DIR\DIR_NAME",0 //////////////////////////////////////////////////////////////////////// -MKDIR: ;!Test Current Dir ;[x] 15/10/23 +MKDIR: ;!TEST Current Dir ;[x] 15/10/23 LD C,A PUSH HL PUSH BC @@ -1046,7 +1047,7 @@ MKDIR: ;!Test Current Dir ;[x] 15/10/23 ; ; INPUT: HL - "C:\DIR\DIR\DIR_NAME",0 //////////////////////////////////////////////////////////////////////// -RMDIR: ;!Test Current Dir ;[x] 15/10/23 +RMDIR: ;!TEST Current Dir ;[x] 15/10/23 LD C,A PUSH HL PUSH BC diff --git a/DSS/DOS_FM.ASM b/DSS/DOS_FM.ASM index e7105c0..95debd3 100644 --- a/DSS/DOS_FM.ASM +++ b/DSS/DOS_FM.ASM @@ -73,7 +73,7 @@ RES_FM: _mFM_FIND LD A,DSS_Error.sys.INVALID_HANDLE - EXX + ;EXX SCF RET Z XOR A diff --git a/DSS/EXECUTE.ASM b/DSS/EXECUTE.ASM index d8d42fe..8cbc0b5 100644 --- a/DSS/EXECUTE.ASM +++ b/DSS/EXECUTE.ASM @@ -21,6 +21,15 @@ ;R01 14-05-1999 DNS DECREASE HEADER SIZE FOR EXE-FILE ;--------------------------------------------------------------- + MACRO _mINCTASK + LD HL,TASK ;R08 + INC (HL) ;R08 + ENDM + ; + MACRO _mDECTASK + LD HL,TASK ;R08 + DEC (HL) ;R08 + ENDM ////////////////////////////////////////////////////////////////////// ; !FIXIT тут одни затупы и дебилизм @@ -779,14 +788,6 @@ PATH_PNT_ARRAY EQU #FC80 TMP_CURDIR EQU #FD00 ENVTEMP EQU #FE00 -INCTASK: LD HL,TASK ;R08 - INC (HL) ;R08 - RET ;R08 - -DECTASK: LD HL,TASK ;R08 - DEC (HL) ;R08 - RET ;R08 - ;///////////////////////////////////////////////////////////////////// ; Функция #40. Выполнить файл. @@ -852,10 +853,10 @@ EXEC_1: LD (CMDLINE),HL CALL TST_EXT LD A,DSS_Error.sys.FILE_NOT_FOUND RET C - CALL INCTASK ;R08 + _mINCTASK ;R08 CALL OPEN.FILE JR NC,.noError - CALL DECTASK ;R08 + _mDECTASK ;R08 AND A RET ; @@ -996,7 +997,7 @@ ERREXE0: LD A,DSS_Error.sys.NOT_ENOUGH_MEMORY ERREXE: PUSH AF LD A,(EXE_FM) CALL CLOSE - CALL DECTASK + _mDECTASK POP AF RET @@ -1046,7 +1047,7 @@ _TST_PROC: IN A,(SLOT1) PUSH DE PUSH AF - ;!Test close EXE FM [x] 25/10/23 + ;[x] 25/10/23 close EXE FM LD A,(EXE_FM) PUSH AF ; @@ -1131,7 +1132,7 @@ _TST_PROC_2: LD DE,RETFAR ; адрес п/п "неожиданное завершение процесса" PUSH DE PUSH HL - ;!Test Current Dir ;[x] 15/10/23 + ;!TEST Current Dir ;[x] 15/10/23 PUSH IX LD HL,CurrentDirectory CALL CHDIR_FN @@ -1158,12 +1159,11 @@ _TST_PROC_2: LEAVE: LD A,B LD (ERLEVEL),A CALL LEAVMEM - ;CALL DECTASK ;!Test close EXE FM [x] 25/10/23 LD SP,(EXSTACK) - ;!Test close EXE FM [x] 25/10/23 + ;[x] 25/10/23 close EXE FM POP AF CALL RES_FM - CALL DECTASK + _mDECTASK ; POP AF POP HL diff --git a/DSS/VIDEO.ASM b/DSS/VIDEO.ASM index d3dd389..ca42338 100644 --- a/DSS/VIDEO.ASM +++ b/DSS/VIDEO.ASM @@ -261,7 +261,7 @@ WINREST: AND A ; выход: нет ;///////////////////////////////////////////////////////////////////// SCROLL: DJNZ SCR_DW ;!TODO заменить на BIOS.LP_SCROLL_UD и посмотреть, что шустрее - ; [x] 04/04/23 + ;[x] 04/04/23 ;LD B,A ;LD C,H ;PUSH BC @@ -274,21 +274,21 @@ SCROLL: DJNZ SCR_DW ;!TODO INC D DEC H LD C,BIOS.WIN_MOVE - ; [x] 29/9/23 + ;[x] 29/9/23 LD A,R PUSH AF ; XOR A - DI ; [x] 29/9/23 + DI ;[x] 29/9/23 RST ToBIOS - ; [x] 29/9/23 + ;[x] 29/9/23 POP AF JP PO,1F EI 1: ; POP HL POP DE - ; [x] 04/04/23 + ;[x] 04/04/23 ;POP BC POP AF ;XOR A @@ -312,7 +312,7 @@ SCROLL: DJNZ SCR_DW ;!TODO RET SCR_DW: DJNZ SCR_ERR - ; [x] 04/04/23 + ;[x] 04/04/23 ;LD B,A ;LD C,H ;PUSH BC @@ -325,12 +325,12 @@ SCR_DW: DJNZ SCR_ERR INC XH DEC H LD C,BIOS.WIN_MOVE - ; [x] 29/9/23 + ;[x] 29/9/23 LD A,R PUSH AF ; XOR A - DI ; [x] 29/9/23 + DI ;[x] 29/9/23 RST ToBIOS ; [x] 29/9/23 POP AF @@ -339,7 +339,7 @@ SCR_DW: DJNZ SCR_ERR 1: ; POP HL POP DE - ; [x] 29/9/23 + ;[x] 29/9/23 ;POP BC POP AF ;XOR A @@ -632,14 +632,14 @@ SVTEXT1 LD (SVHL1),HL LD A,(BANKTBL+TXTPAGE) LD B,A LD C,BIOS.WIN_COPY - ; [x] 29/9/23 + ;[x] 29/9/23 LD A,R PUSH AF ; XOR A DI RST ToBIOS - ; [x] 29/9/23 + ;[x] 29/9/23 POP AF JP PO,1F EI @@ -670,14 +670,14 @@ SVHL1+1: LD A,(BANKTBL+TXTPAGE) LD B,A LD C,BIOS.WIN_RESTORE - ; [x] 29/9/23 + ;[x] 29/9/23 LD A,R PUSH AF ; XOR A DI RST ToBIOS - ; [x] 29/9/23 + ;[x] 29/9/23 POP AF JP PO,1F EI @@ -755,7 +755,7 @@ PRINT_INIT: LD A,#CF ; port #1F только чеpез LD BC,1F : Out (BC),reg (в альтере идёт перехват этого порта проца, если он в команде явно указан) LD BC,LPT2_C OUT (C),A - ; [x] 29/9/23 + ;[x] 29/9/23 ;LD A,#63 LD A,63 ; @@ -768,7 +768,7 @@ PRINT_INIT: ; клава XOR A ;LD A,0 OUT (COM_A),A - ; [x] 29/9/23 + ;[x] 29/9/23 INC A OUT (COM_A),A DEC A diff --git a/DSS/build.txt b/DSS/build.txt index 1dd3380..8db1e5f 100644 --- a/DSS/build.txt +++ b/DSS/build.txt @@ -1 +1 @@ -516 \ No newline at end of file +522 \ No newline at end of file diff --git a/SHELL/SHELL_EXEC.ASM b/SHELL/SHELL_EXEC.ASM index c6487a3..a8be837 100644 --- a/SHELL/SHELL_EXEC.ASM +++ b/SHELL/SHELL_EXEC.ASM @@ -157,7 +157,6 @@ A839D: ld bc,0*256 + Dss.Exec ; CALL RESTORE_ALL POP AF ; - ;[x] 25/10/23 JP NC,Ret_New_Line ; Ok ; diff --git a/Shared_Includes b/Shared_Includes index a8a109e..4c835d3 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit a8a109eb8f4ee85e47d65911e8a0f2d2f5b71db1 +Subproject commit 4c835d305fd5d1bc296039706d5e163c1f2224ca