From f5c32423bcc26c5d913b7b36d6ae6bd165a08c20 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Mon, 2 Mar 2020 20:44:44 -0800 Subject: [PATCH 1/4] Update ReadMe.txt --- ReadMe.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ReadMe.txt b/ReadMe.txt index c920f793..003c1230 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -122,6 +122,9 @@ ROM version: - FDU.COM - XM.COM - RTC.COM + - FAT.COM + - TIMER.COM + - INTTEST.COM UNA Hardware BIOS ----------------- From 8b7c9e10c3fbc32a3a4a8029064d834c9bb7222e Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Tue, 3 Mar 2020 12:45:16 -0800 Subject: [PATCH 2/4] Update hbios.asm Minor cosmetic changes. --- Source/HBIOS/hbios.asm | 55 ++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm index 61144d64..78bde396 100644 --- a/Source/HBIOS/hbios.asm +++ b/Source/HBIOS/hbios.asm @@ -250,7 +250,7 @@ CB_BIDROMDN .DB BID_ROMDN ; ; DEFINITIONS ; -HBX_BUFSIZ .EQU $40 ; INTERBANK COPY BUFFER SIZE +HBX_BUFSIZ .EQU $40 ; INTERBANK COPY BOUNCE BUFFER SIZE ; ; HBIOS IDENTIFICATION DATA BLOCK ; @@ -263,19 +263,25 @@ HBX_IDENT: ; HBIOS ENTRY FOR RST 08 PROCESSING ;================================================================================================== ; +; NOTE: THE SIZE OF HBX_TMPSTK (TYPICALLY 20 BYTES) IS INSUFFICIENT FOR +; FREERTOS IF AN INTERRUPT STRIKES WHILE THE TEMPORARY STACK IS ACTIVE. +; BELOW, HBX_BUF HAS BEEN USURPED TO PROVIDE A LARGER TEMP STACK TO +; ACCOMMODATE FREERTOS. HBX_BUF IS ONLY USED AS A BOUNCE BUFFER, SO IT'S +; USE WILL NEVER OVERLAP WITH BELOW. +; HBX_INVOKE: LD (HBX_INVSP),SP ; SAVE ORIGINAL STACK FRAME LD A,(HB_CURBNK) ; GET CURRENT BANK LD (HB_INVBNK),A ; SAVE INVOCATION BANK - LD SP,HBX_TMPSTK ; BORROW HBX_BUF FOR STACK IN HIGH MEMORY + LD SP,HBX_BUF_END ; BORROW HBX_BUF FOR TEMP STACK LD A,BID_BIOS ; HBIOS BANK CALL HBX_BNKSEL ; SELECT IT LD SP,HB_STACK ; NOW USE FULL HBIOS STACK IN HBIOS BANK CALL HB_DISPATCH ; CALL HBIOS FUNCTION DISPATCHER - LD SP,HBX_TMPSTK ; BORROW HBX_BUF FOR STACK IN HIGH MEMORY + LD SP,HBX_BUF_END ; BORROW HBX_BUF FOR TEMP STACK PUSH AF ; SAVE AF (FUNCTION RETURN) LD A,(HB_INVBNK) ; LOAD ORIGINAL BANK @@ -376,7 +382,6 @@ HBX_BNKSEL1: ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ; Copy Data - Possibly between banks. This resembles CP/M 3, but ; usage of the HL and DE registers is reversed. -; Caller MUST ensure stack is already in high memory. ; Caller MUST preset HBX_SRCBNK and HBX_DSTBNK. ; Caller MUST disable ints if IM1 active ; Enter: @@ -390,7 +395,7 @@ HBX_BNKSEL1: ; HBX_BNKCPY: LD (HBX_BC_SP),SP ; PUT STACK - LD SP,HBX_BNKSTK ; TEMPORARY STACK IN HIGH MEMORY (NOT IN HBX_BUF) + LD SP,HBX_TMPSTK ; ... IN HI MEM LD A,(HB_CURBNK) ; GET CURRENT BANK PUSH AF ; AND SAVE TO RESTORE LATER @@ -471,7 +476,7 @@ HBX_TGTADR .EQU $ + 1 ; HBX_PEEK: LD (HBX_PPSP),SP ; SAVE ORIGINAL STACK FRAME - LD SP,HBX_TMPSTK ; BORROW HBX_BUF FOR STACK IN HIGH MEMORY + LD SP,HBX_TMPSTK ; USE SMALL TEMP STACK FRAME IN HI MEM LD A,(HB_CURBNK) PUSH AF LD A,D @@ -481,7 +486,7 @@ HBX_PEEK: ; HBX_POKE: LD (HBX_PPSP),SP ; SAVE ORIGINAL STACK FRAME - LD SP,HBX_TMPSTK ; BORROW HBX_BUF FOR STACK IN HIGH MEMORY + LD SP,HBX_TMPSTK ; USE SMALL TEMP STACK FRAME IN HI MEM LD A,(HB_CURBNK) PUSH AF LD A,D @@ -498,12 +503,12 @@ HBX_PPSP .EQU $ - 2 ; PRIVATE STACK AT END OF HBIOS CODE ; OCCUPIES SPACE BEFORE IVT ; -HBX_STKSIZ .EQU $FF00 - $ - .ECHO "HBIOS PROXY STACK space: " - .ECHO HBX_STKSIZ +HBX_INTSTKSIZ .EQU $FF00 - $ + .ECHO "HBIOS INT STACK space: " + .ECHO HBX_INTSTKSIZ .ECHO " bytes.\n" - .FILL HBX_STKSIZ,$FF -HBX_STACK .EQU $ + .FILL HBX_INTSTKSIZ,$FF +HBX_INTSTK .EQU $ ; #IF (INTMODE == 2) ; @@ -585,7 +590,7 @@ HBX_INT: ; COMMON INTERRUPT ROUTING CODE EX (SP),HL ; SAVE HL AND GET INT JP TABLE OFFSET LD (HBX_INT_SP),SP ; SAVE ORIGINAL STACK FRAME - LD SP,HBX_STACK ; USE STACK FRAME IN HI MEM + LD SP,HBX_INTSTK ; USE DEDICATED INT STACK FRAME IN HI MEM ; SAVE STATE (HL SAVED PREVIOUSLY ON ORIGINAL STACK FRAME) PUSH AF ; SAVE AF @@ -620,25 +625,23 @@ HBX_INT_SP .EQU $ - 2 ; #ENDIF ; -; FILL TO START OF BOUNCE BUFFER +; SMALL TEMPORARY STACK FOR USE BY BNKCPY, PEEK, AND POKE ; -HBX_PROXYFILL .EQU (HBX_XFC - HBX_BUFSIZ - $) - .ECHO "HBIOS PROXY space remaining: " - .ECHO HBX_PROXYFILL +HBX_TMPSTKSIZ .EQU (HBX_XFC - HBX_BUFSIZ - $) + .ECHO "HBIOS TEMP STACK space: " + .ECHO HBX_TMPSTKSIZ .ECHO " bytes.\n" - .FILL HBX_PROXYFILL,$FF -; -; TEMPORARY STACK FOR USE BY HBX_BNKCPY (NOT IN HBX_BUF) + .FILL HBX_TMPSTKSIZ,$CC +HBX_TMPSTK .EQU $ ; -HBX_BNKSTK .EQU $ +; INTERBANK COPY BOUNCE BUFFER (64 BYTES) ; -; INTERBANK COPY BUFFER (64 BYTES) +; N.B., THIS BUFFER IS ALSO USED AS A TEMPORARY STACK BY HBX_INVOKE. +; THEREFORE, THIS BUFFER *CANNOT* BE USED TO PASS DATA OUTSIDE OF +; HBIOS FUNCTION CALLS. ; HBX_BUF .FILL HBX_BUFSIZ,0 -; -; TEMPORARY STACK FOR USE BY INVOKE, PEEK, AND POKE -; -HBX_TMPSTK .EQU $ +HBX_BUF_END .EQU $ ; ; HBIOS PROXY MGMT BLOCK (TOP 32 BYTES) ; From a40e7961a1068fbec828716fa60b5a22d495add4 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Tue, 3 Mar 2020 16:07:35 -0800 Subject: [PATCH 3/4] Build Process Updates Minor udpates to build process to improve consistency between Windows and Mac/Linux builds. --- Source/HBIOS/Build.ps1 | 2 +- Source/HBIOS/Makefile | 34 +++++++++++++++++----------------- Source/Images/Makefile | 3 ++- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Source/HBIOS/Build.ps1 b/Source/HBIOS/Build.ps1 index cc61b0b9..32f97ded 100644 --- a/Source/HBIOS/Build.ps1 +++ b/Source/HBIOS/Build.ps1 @@ -238,7 +238,7 @@ else { Concat 'hbios_rom.bin','osimg.bin','osimg1.bin','osimg.bin',$RomDiskFile $RomFile Concat 'hbios_app.bin','osimg.bin' $ComFile - Concat 'hbios_img.bin','osimg.bin' $ImgFile + # Concat 'hbios_img.bin','osimg.bin' $ImgFile } # Remove the temporary working ROM disk file diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index 3ca139f5..354dcd26 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -1,25 +1,25 @@ OBJECTS = ifeq (1,1) -OBJECTS += DYNO_std.rom -OBJECTS += EZZ80_std.rom -OBJECTS += MK4_std.rom -OBJECTS += N8_std.rom -OBJECTS += RCZ180_ext.rom -OBJECTS += RCZ180_nat.rom -OBJECTS += RCZ80_kio.rom -OBJECTS += RCZ80_mt.rom -OBJECTS += RCZ80_std.rom -OBJECTS += RCZ80_wiz.rom -OBJECTS += SBC_simh.rom -OBJECTS += SBC_std.rom -OBJECTS += SCZ180_126.rom -OBJECTS += SCZ180_130.rom +OBJECTS += DYNO_std.rom DYNO_std.com +OBJECTS += EZZ80_std.rom EZZ80_std.com +OBJECTS += MK4_std.rom MK4_std.com +OBJECTS += N8_std.rom N8_std.com +OBJECTS += RCZ180_ext.rom RCZ180_ext.com +OBJECTS += RCZ180_nat.rom RCZ180_nat.com +OBJECTS += RCZ80_kio.rom RCZ80_kio.com +OBJECTS += RCZ80_mt.rom RCZ80_mt.com +OBJECTS += RCZ80_std.rom RCZ80_std.com +OBJECTS += RCZ80_wiz.rom RCZ80_wiz.com +OBJECTS += SBC_simh.rom SBC_simh.com +OBJECTS += SBC_std.rom SBC_std.com +OBJECTS += SCZ180_126.rom SCZ180_126.com +OBJECTS += SCZ180_130.rom SCZ180_130.com OBJECTS += UNA_std.rom -OBJECTS += ZETA_std.rom -OBJECTS += ZETA2_std.rom +OBJECTS += ZETA_std.rom ZETA_std.com +OBJECTS += ZETA2_std.rom ZETA2_std.com else -OBJECTS += ZETA2_std.rom +OBJECTS += ZETA2_std.rom ZETA2_std.com endif MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \ diff --git a/Source/Images/Makefile b/Source/Images/Makefile index b7953099..277ee494 100644 --- a/Source/Images/Makefile +++ b/Source/Images/Makefile @@ -6,7 +6,8 @@ SYSTEMS = ../CPM22/cpm_wbw.sys ../ZSDOS/zsys_wbw.sys ../CPM3/cpmldr.sys FDIMGS = fd_cpm22.img fd_zsdos.img fd_nzcom.img \ fd_cpm3.img fd_zpm3.img fd_ws4.img HDIMGS = hd_cpm22.img hd_zsdos.img hd_nzcom.img \ - hd_cpm3.img hd_zpm3.img hd_ws4.img hd_bp.img + hd_cpm3.img hd_zpm3.img hd_ws4.img +# HDIMGS += hd_bp.img OBJECTS = $(FDIMGS) $(HDIMGS) hd_combo.img OTHERS = blank144 blankhd From a207ede5bed7f91d38cf0385f568e63c7afab8d0 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Tue, 3 Mar 2020 20:40:46 -0800 Subject: [PATCH 4/4] Update hbios.asm Add improved interrupt protection to HBIOS PEEK, POKE, and BNKCPY functions. --- Source/HBIOS/hbios.asm | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm index 78bde396..8e49d713 100644 --- a/Source/HBIOS/hbios.asm +++ b/Source/HBIOS/hbios.asm @@ -2221,11 +2221,15 @@ SYS_BNKCPY: LD HL,(HB_CPYLEN) ; HL := COPY LEN (SAVED IN SETCPY) EX (SP),HL ; RESTORE HL & SET (SP) TO COPY LEN POP BC ; BC := COPY LEN -#IF (INTMODE == 1) +#IF (INTMODE > 0) + LD A,I DI + PUSH AF #ENDIF CALL HB_BNKCPY -#IF (INTMODE == 1) +#IF (INTMODE > 0) + POP AF + JP PO,$+4 EI #ENDIF XOR A @@ -2436,11 +2440,15 @@ SYS_SETSECS: ; RETURN: E=BYTE VALUE ; SYS_PEEK: -#IF (INTMODE == 1) +#IF (INTMODE > 0) + LD A,I DI + PUSH AF #ENDIF CALL HBX_PEEK ; IMPLEMENTED IN PROXY -#IF (INTMODE == 1) +#IF (INTMODE > 0) + POP AF + JP PO,$+4 EI #ENDIF XOR A @@ -2450,11 +2458,15 @@ SYS_PEEK: ; ENTRY: D=BANK ID, HL=ADDRESS IN HBIOS BANK, E=BYTE VALUE ; SYS_POKE: -#IF (INTMODE == 1) +#IF (INTMODE > 0) + LD A,I DI + PUSH AF #ENDIF CALL HBX_POKE ; IMPLEMENTED IN PROXY -#IF (INTMODE == 1) +#IF (INTMODE > 0) + POP AF + JP PO,$+4 EI #ENDIF XOR A @@ -2564,9 +2576,6 @@ SYS_INTSET1: INC HL LD (HL),B ; SAVE MSB EX DE,HL ; HL := PREV VEC -;#IF (INTMODE == 2) -; LD DE,HBX_INT ; DE := IM2 INT ROUTING ENGINE -;#ENDIF XOR A ; SIGNAL SUCCESS RET ; DONE ;