Mercurial > hg > Members > kono > nitros9-code
changeset 1260:0e08f0830fd8
Changes pointed out by Rodney H.
author | boisy |
---|---|
date | Mon, 18 Aug 2003 12:03:50 +0000 |
parents | d0e7200c1279 |
children | 1a630b5769e6 |
files | 3rdparty/utils/boisy/askmontype.asm 3rdparty/utils/boisy/bawk.asm 3rdparty/utils/boisy/bigbro.asm 3rdparty/utils/boisy/defsfile 3rdparty/utils/boisy/del.asm 3rdparty/utils/boisy/font.asm 3rdparty/utils/boisy/grep.asm 3rdparty/utils/boisy/joypoll.asm 3rdparty/utils/boisy/makdir.asm 3rdparty/utils/boisy/mode.asm 3rdparty/utils/boisy/more.asm 3rdparty/utils/boisy/send.asm 3rdparty/utils/boisy/tee.asm 3rdparty/utils/boisy/timer.asm |
diffstat | 14 files changed, 121 insertions(+), 100 deletions(-) [+] |
line wrap: on
line diff
--- a/3rdparty/utils/boisy/askmontype.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/askmontype.asm Mon Aug 18 12:03:50 2003 +0000 @@ -2,7 +2,7 @@ ttl Prompts for monitor type and sets accordingly ifp1 - use os9defs.l2v3 + use defsfile endc tylg set Prgrm+Objct @@ -104,3 +104,5 @@ emod eom equ * + end +
--- a/3rdparty/utils/boisy/bawk.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/bawk.asm Mon Aug 18 12:03:50 2003 +0000 @@ -144,7 +144,7 @@ use defsfile endc - mod Size,Name,Prgrm+Objct,Reent+1,Start,Finish + mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Finish Name fcs /bawk/ Ed fcb 3 Edition #3 @@ -376,7 +376,7 @@ EOF cmpb #E$EOF bne Error - lda path + lda Path os9 I$Close Close path puls x and restore the cmd line pointer tst Path @@ -401,7 +401,7 @@ beq Done OpenFile lbsr SaveFile - lda #read. else assume a file name + lda #READ. else assume a file name os9 I$Open and try to open it bcs Error sta Path @@ -558,3 +558,4 @@ emod Size equ * end +
--- a/3rdparty/utils/boisy/bigbro.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/bigbro.asm Mon Aug 18 12:03:50 2003 +0000 @@ -22,7 +22,7 @@ use defsfile endc - mod Size,Name,Prgrm+Objct,Reent+1,Start,Fin + mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Fin Name fcs /BigBro/ ed fcb 1 @@ -72,3 +72,4 @@ emod Size equ * end +
--- a/3rdparty/utils/boisy/defsfile Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/defsfile Mon Aug 18 12:03:50 2003 +0000 @@ -1,1 +1,2 @@ use os9defs + use scfdefs
--- a/3rdparty/utils/boisy/del.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/del.asm Mon Aug 18 12:03:50 2003 +0000 @@ -16,7 +16,7 @@ use defsfile endc - mod Size,Name,Prgrm+Objct,Reent+1,Start,Fin + mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Fin Mode rmb 1 access mode byte Stack rmb 200 @@ -26,7 +26,7 @@ Name fcs /Del/ fcb $06 Edition number -Start lda #write. default to current directory +Start lda #WRITE. default to current directory sta Mode Parse lda ,x+ get next char @@ -45,7 +45,7 @@ beq ChMode yep, set mode to execute bra Parse else resume parsing -ChMode lda #write.+exec. delete in current exec dir. +ChMode lda #WRITE.+EXEC. delete in current exec dir. sta Mode and save mode DelFile lda Mode get current access mode @@ -68,3 +68,4 @@ emod Size equ * end +
--- a/3rdparty/utils/boisy/font.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/font.asm Mon Aug 18 12:03:50 2003 +0000 @@ -1,23 +1,26 @@ nam Font ttl Sets Fonts + ifp1 use defsfile endc - mod psize,pname,prgrm+objct,reent+1,dsize,start + + mod psize,pname,Prgrm+Objct,ReEnt+1,dsize,start + pname fcs /Font/ temp rmb 2 mpf rmb 2 fontset rmb 3 -fontinfo rmb 2 +fontinfo rmb 2 stack rmb 200 params rmb 200 BadBuff fcc /You've selected an undefined buffer./ - fcb $0a,$0a,$0d + fcb C$LF,C$LF,C$CR dsize equ * start decb - beq Error + beq error leay fontset,u ldd #$1b3a std ,y++ @@ -32,14 +35,14 @@ leax fontset,u ldy #4 lda #1 - os9 i$write + os9 I$Write bcc Exit cmpb #194 - bne Error + bne error leax BadBuff,pcr lda #2 ldy #50 - os9 i$writln + os9 I$WritLn bra Exit numcvt pshs b,y nloop2 lda ,x+ @@ -72,7 +75,8 @@ puls x puls b,y,pc exit clrb -error os9 f$exit +error os9 F$Exit + emod psize equ * end
--- a/3rdparty/utils/boisy/grep.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/grep.asm Mon Aug 18 12:03:50 2003 +0000 @@ -32,6 +32,7 @@ endc mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Fin + Name fcs /Grep/ Ed fcb $01 @@ -50,8 +51,8 @@ Params rmb 200 Fin equ . -HelpMsg fcc /Usage: Grep <-c> "pattern" [file]/ - fcb $0d +HelpMsg fcc /Usage: Grep <-c> <-n> "pattern" [file]/ + fcb C$CR HelpLen equ *-HelpMsg Start clr Path Clear path (assume StdIn) @@ -63,9 +64,9 @@ sta MaskByte Parse lda ,x+ Get char off cmd line - cmpa #$20 is it a space? + cmpa #C$SPAC is it a space? beq Parse yep, get next char - cmpa #$0d is it a CR? + cmpa #C$CR is it a CR? beq Help Yep, premature, so show help cmpa #'- is it a dash? beq Parse2 yeah, go to option handler @@ -74,7 +75,7 @@ bra Help else wrong usage, show help Parse2 lda ,x+ get char after dash - anda #$df and mask it + anda #$DF and mask it cmpa #'N is it an N for line numbers? bne Parse3 nope, try C sta numflag set the line numbers flag @@ -90,14 +91,14 @@ Store lda ,x+ get char cmpa #'" is it the ending quote? beq ChckFile yep, see if a file was specified - cmpa #$0d is it a CR? + cmpa #C$CR is it a CR? beq Help Yep, in middle of quote! show help ora MaskByte else mask char sta ,y+ and save it in buffer inc StrSiz increment the size by one bra Store and get the next char -EOF cmpb #211 Is error an end-of-file? +EOF cmpb #E$EOF Is error an end-of-file? bne Error nope, other error bra Done else we're done @@ -111,9 +112,9 @@ Error os9 F$Exit and exit! ChckFile lda ,x get char - cmpa #$0d is it a CR? + cmpa #C$CR is it a CR? beq ReadIn yep, we'll use StdIn - cmpa #$20 is it a space? + cmpa #C$SPAC is it a space? bne GetFile nope, its a filename char leax 1,x else increment X bra ChckFile and get the next char @@ -174,15 +175,16 @@ bcdtoasc leay linestr,u ldb <linecnt - bsr btod2 + bsr btod convert all 6 digits ldb <linecnt+1 bsr btod ldb <linecnt+2 bsr btod - ldb #$20 + ldb #C$SPAC stb ,y - leax linestr,u - ldy #257 + leax linestr+1,u but print only last 5 + ldy #256 +* to print 6 digits change previous 2 lines to leax linestr,u/ldy #257 bra PrnLine2 btod pshs b @@ -200,3 +202,4 @@ emod Size equ * end +
--- a/3rdparty/utils/boisy/joypoll.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/joypoll.asm Mon Aug 18 12:03:50 2003 +0000 @@ -2,11 +2,10 @@ ttl Joystick poll utility ifp1 - use os9defs - use scfdefs + use defsfile endc - mod eom,Name,Prgrm+Objct,Reent+1,Start,Fin + mod eom,Name,Prgrm+Objct,ReEnt+1,Start,Fin Name fcs /AutoEx/ Ed fcb $02 @@ -169,3 +168,4 @@ eom equ * end +
--- a/3rdparty/utils/boisy/makdir.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/makdir.asm Mon Aug 18 12:03:50 2003 +0000 @@ -5,7 +5,7 @@ use defsfile endc - mod Size,Name,Prgrm+Objct,Reent+1,Start,Fin + mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Fin Name fcs /MakDir/ Vrsn fcb $05 @@ -32,6 +32,8 @@ bcs Error clrb Error os9 F$Exit + emod -size equ * +Size equ * end +
--- a/3rdparty/utils/boisy/mode.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/mode.asm Mon Aug 18 12:03:50 2003 +0000 @@ -26,54 +26,54 @@ mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Fin Name fcs /Mode/ -Vrsn fcb $06 + fcb $06 -Helpmess fdb $0a0d +Helpmess fdb C$LF,C$CR fcc /Mode - (C) 1992 Boisy G. Pitre/ - fdb $0a0d + fdb C$LF,C$CR fcc / Usage: MODE <opts>/ - fdb $0a0d + fdb C$LF,C$CR fcc / D - Display settings/ - fdb $0a0d + fdb C$LF,C$CR fcc / R - RGB/ - fdb $0a0d + fdb C$LF,C$CR fcc / C - Composite/ - fdb $0a0d + fdb C$LF,C$CR fcc / M - Monochrome/ - fdb $0a0d + fdb C$LF,C$CR fcc / F - Fast CPU/ - fdb $0a0d + fdb C$LF,C$CR fcc / S - Slow CPU/ - fdb $0a0d + fdb C$LF,C$CR fcc / # - Window type/ - fdb $0a0d + fdb C$LF,C$CR Type1 fcc /Type 1 - 40 x 24 text/ -CR fdb $0a0d +CR fdb C$LF,C$CR Type2 fcc /Type 2 - 80 x 24 text/ - fdb $0a0d + fdb C$LF,C$CR Type5 fcc /Type 5 - 640 x 192, 2 color graphics/ - fdb $0a0d + fdb C$LF,C$CR Type6 fcc /Type 6 - 320 x 192, 4 color graphics/ - fdb $0a0d + fdb C$LF,C$CR Type7 fcc /Type 7 - 640 x 192, 4 color graphics/ - fdb $0a0d + fdb C$LF,C$CR Type8 fcc /Type 8 - 320 x 192, 16 color graphics/ - fdb $0a0d + fdb C$LF,C$CR Helplen equ *-Helpmess -Fastmess fdb $0a0d +Fastmess fdb C$LF,C$CR fcc /CPU is set to FAST (1.78Mhz)/ - fdb $0a0d + fdb C$LF,C$CR -Slowmess fdb $0a0d +Slowmess fdb C$LF,C$CR fcc /CPU is set to SLOW (0.89Mhz)/ - fdb $0a0d + fdb C$LF,C$CR BadParm fcc /: Bad parameter/ - fcb $0d + fcb C$CR VDG fcc /32 x 16 VDG text screen/ - fdb $0a0d + fdb C$LF,C$CR W1 fcb $1b,$24,$1b,$20,$01,$00,$00,$28,$18 W2 fcb $1b,$24,$1b,$20,$02,$00,$00,$50,$18 @@ -94,9 +94,9 @@ * Parsing routine Parse2 lda ,x+ load A with next char. -Parse3 cmpa #$0d is it a CR? +Parse3 cmpa #C$CR is it a CR? lbeq Done Yep, done - cmpa #$20 is it a space? + cmpa #C$SPAC is it a space? beq Parse2 yep, get next char cmpa #'1 Check for window types... lbeq Win1 @@ -110,7 +110,7 @@ lbeq Win7 cmpa #'8 lbeq Win8 - anda #$df Mask to uppercase + anda #$DF Mask to uppercase cmpa #'D Check other opts... lbeq Query cmpa #'R @@ -226,12 +226,12 @@ rts Fast pshs x - clr $ffd9 + clr $FFD9 leax Fastmess,pcr bra SpeedM Slow pshs x - clr $ffd8 + clr $FFD8 leax Slowmess,pcr SpeedM ldy #32 @@ -290,3 +290,4 @@ emod Size equ * end +
--- a/3rdparty/utils/boisy/more.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/more.asm Mon Aug 18 12:03:50 2003 +0000 @@ -41,8 +41,9 @@ REVOFF equ $1f21 mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Fin + Name fcs /M/ -Ed fcb 2 + fcb 2 Path rmb 1 Response rmb 1 @@ -68,14 +69,13 @@ fdb REVOFF Reverse Video off MessLen equ *-Message -Header fdb $0a0d +Header fdb C$LF +CR fcb C$CR fcc /****** File: / HeadLen equ *-Header DelLine fcb DELNE Delete line char -CR fcb $0d Carriage Return - ****** SUBROUTINES PutHead pshs x Here, we actually print the header leax Header,pcr for the file we are working on. @@ -95,18 +95,18 @@ SaveFile pshs x leay FileBuf,u SaveF2 lda ,x+ - cmpa #$20 + cmpa #C$SPAC bne SaveF3 - lda #$0d + lda #C$CR SaveF3 sta ,y+ - cmpa #$0d + cmpa #C$CR bne SaveF2 puls x rts GetSize pshs x lda #1 Using stdout... - ldb #$26 + ldb #SS.ScSiz os9 I$GetStt Find the X and Y size of window bcs ChekErr stx XH Save the X value @@ -139,20 +139,20 @@ bsr GetSize Parse lda ,x+ Parsing of the line is done here - cmpa #$20 + cmpa #C$SPAC beq Parse cmpa #'- beq GetOpt - cmpa #$0d + cmpa #C$CR bne TestFlag tst Path beq Cycle bra Done GetOpt lda ,x+ - cmpa #$20 + cmpa #C$SPAC beq Parse - anda #$df + anda #$DF cmpa #'L bne IsItW com LFlag @@ -207,7 +207,7 @@ Loop leax 1,x end. decb This is unnecessary if the line bne Loop is less than XH, but doesn't slow - lda #$0d down the processing considerably + lda #C$CR down the processing considerably sta ,x and would take longer if we actually puls x checked to see if a CR existed. @@ -254,9 +254,9 @@ lbra Parse command line. TestInp lda Response Here we test the response at prompt - cmpa #$0d is it cr? + cmpa #C$CR is it cr? beq OneLine yep, go up one line - anda #$df else mask uppercase + anda #$DF else mask uppercase cmpa #'Q is it Q? beq IntSvc Yep, kill prompt and exit cmpa #'N is it N? @@ -274,3 +274,4 @@ emod Size equ * end +
--- a/3rdparty/utils/boisy/send.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/send.asm Mon Aug 18 12:03:50 2003 +0000 @@ -41,10 +41,10 @@ use defsfile endc - mod Size,Name,Prgrm+Objct,Reent+1,Start,Finish + mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Finish Name fcs /Send/ -Ed fcb $02 + fcb $02 XPlace rmb 1 Signal rmb 1 Holds current signal @@ -59,9 +59,9 @@ Parse lda ,x+ get char cmpa #'- dash? beq GetSig yeah, get signal no - cmpa #$20 space? + cmpa #C$SPAC space? beq Parse yeah, get next char - cmpa #$0d eol? + cmpa #C$CR eol? beq Done yeah, exit KillIt leax -1,x backup on char.. must be a pid @@ -70,7 +70,7 @@ ldb Signal load B with current signal os9 F$Send and send it to the process bcc Parse - os9 F$Perr else print the error + os9 F$PErr else print the error bra Parse and continue parsing Done clrb clear, no error @@ -111,8 +111,9 @@ bra Done HelpMsg fcc /Usage: Send [-signal] procID [...]/ - fcb $0d + fcb C$CR emod Size equ * end +
--- a/3rdparty/utils/boisy/tee.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/tee.asm Mon Aug 18 12:03:50 2003 +0000 @@ -19,9 +19,10 @@ use defsfile endc - mod Size,Name,Prgrm+Objct,Reent+1,Start,Fin + mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Fin + Name fcs "Tee" -Ed fcb $03 Replaces Tandy's Edition #2 + fcb $03 Replaces Tandy's Edition #2 PathCnt rmb 1 BuffSize rmb 2 @@ -37,8 +38,8 @@ sta StdOut,u and the StdOut buffer leay PathStk,u Position Y on the path queue -GetNext lda #write. Set mode to write only - ldb #read.+write.+pread. owner read/write, other read +GetNext lda #WRITE. Set mode to write only + ldb #UPDAT.+PREAD. owner read/write, other read os9 I$Create create the path bcs Error exit if error @@ -46,7 +47,7 @@ inc PathCnt,u inc path counter CheckCR lda ,x See if last param on line - cmpa #$0d if cr, must be last parm + cmpa #C$CR if cr, must be last parm beq GoTee so start teeing out leax 1,x inc X bra CheckCR and check again @@ -79,3 +80,4 @@ emod Size equ * end +
--- a/3rdparty/utils/boisy/timer.asm Mon Aug 18 03:22:19 2003 +0000 +++ b/3rdparty/utils/boisy/timer.asm Mon Aug 18 12:03:50 2003 +0000 @@ -19,7 +19,7 @@ use defsfile endc - mod Size,Name,Prgrm+Objct,Reent+1,Start,Fin + mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Fin Name fcs /Timer/ Ed fcb $02 @@ -37,13 +37,13 @@ Fin equ . HelpMsg fcc /Usage: Timer <progname> [params]/ -SpCR fcb $20,$0a,$0d +SpCR fcb C$SPAC,C$LF,C$CR HelpLen equ *-HelpMsg -Header fdb $0a0d +Header fdb C$LF,C$CR fcc /Timer Statistics:/ - fdb $0a0d,$0a0d + fdb C$LF,C$CR,C$LF,C$CR fcc /Command line: / Header1 fcc /Date: / Header2 fcc /Start Time: / @@ -53,31 +53,31 @@ Start decb Check for params lbeq Help if none, show help - lda #$0d + lda #C$CR leay ParmBuff,u Else put a CR in param buffer sta ,y leay ProgName,u and put progname in progname buffer GetName lda ,x+ sta ,y+ - cmpa #$20 any space after name? + cmpa #C$SPAC any space after name? beq PlaceCR Yep, assume params are on line - cmpa #$0d Is next char a CR? + cmpa #C$CR Is next char a CR? bne GetName nope, not finished getting name bra GetTime else assume no params... -PlaceCR lda #$0D Put CR behind progname, +PlaceCR lda #C$CR Put CR behind progname, sta -1,y SkipSpac lda ,x+ skip leading spaces - cmpa #$20 + cmpa #C$SPAC beq SkipSpac leax -1,x SaveParm leay ParmBuff,u and store params in param buffer Loop lda ,x+ sta ,y+ - cmpa #$0d Is char a CR? + cmpa #C$CR Is char a CR? beq GetTime Yep, we're finished parsing bra Loop else get next char @@ -122,7 +122,7 @@ leax ParmBuff,u ldy #200 lda #2 - os9 I$Writln + os9 I$WritLn bcs Error bra DateShow @@ -252,7 +252,7 @@ bcc p1 sta ,u+ cmpa #$30 - bne P2 + bne p2 leau -1,u p2 lda #$3a p3 deca @@ -263,6 +263,7 @@ stb ,u+ puls a,b,u rts + emod Size equ * end