# HG changeset patch
# User boisy
# Date 1071183555 0
# Node ID 3e5e54b2a01ad671ac1703c29a288ab8dde9c5e1
# Parent  ca5c6be175d3da1f56dd31fd9a8d6390b4bd06df
fprsnam.asm is now ported to Level 1

diff -r ca5c6be175d3 -r 3e5e54b2a01a level2/modules/kernel/ffmodul.asm
--- a/level2/modules/kernel/ffmodul.asm	Thu Dec 11 20:05:22 2003 +0000
+++ b/level2/modules/kernel/ffmodul.asm	Thu Dec 11 22:59:15 2003 +0000
@@ -39,7 +39,7 @@
          bsr   L0712        Go find 1st char of module name requested
          cmpa  #PDELIM      Is it a '/'?
          beq   L070B        yes, exit with error
-         lbsr  L0741        parse the name to find the end & length
+         lbsr  ParseNam     parse the name to find the end & length
          bcs   L070E        error (illegal name), exit
          ldu   <D.ModEnd    get module directory end pointer
          bra   L0700        start looking for it
diff -r ca5c6be175d3 -r 3e5e54b2a01a level2/modules/kernel/fprsnam.asm
--- a/level2/modules/kernel/fprsnam.asm	Thu Dec 11 20:05:22 2003 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-**************************************************
-* System Call: F$PrsNam
-*
-* Function: Parse a path name
-*
-* Modification to allow '-' in filenames by WG
-*
-* Input:  X = Address of pathlist
-*
-* Output: X = Updated past optional "/" character
-*         Y = Address of last character of pathlist + 1
-*         B = Length of pathlist
-*
-* Error:  CC = C bit set; B = error code
-*
-FPrsNam  equ   *
-         IFGT  Level-1
-         ldx   <D.Proc      proc desc
-         leay  <P$DATImg,x  Y=DAT image ptr
-         ENDC
-         ldx   R$X,u        X=name string
-         bsr   L0741        get it and length
-         std   R$D,u        return length in D
-         bcs   L073E        ..err
-         stx   R$X,u        and X at name begin
-         abx                plus len
-L073E    stx   R$Y,u        return Y=end of name ptr
-         rts                end.
-
-* Parse name
-L0741    equ   *
-         IFGT  Level-1
-         pshs  y            save DAT image pointer
-         lbsr  AdjBlk0      go find map block...
-         pshs  x,y          save X offset within block and Y block pointer
-         bsr   GoGetAXY     go get byte at X in block Y...
-         ELSE
-         lda   ,x
-         ENDC
-         cmpa  #'.        is the first character a period?
-         bne   IsSlash    no, do proper first character checking
-         IFGT  Level-1
-         lbsr  L0AC8      do a LDAXY, without changing X or Y
-         ENDC
-         bsr   ChkFirst   is the next character non-period?
-         lda   #'.        restore the period character the LDAXY destroyed
-         bcc   Do.Loop    if NON-period character, skip 1st char checks
-
-IsSlash  cmpa  #'/          is it a slash?
-         bne   NotSlash     no, go keep X offset and block Y...
-         bsr   GetChar      go get character...
-NotSlash bsr   ChkFirst     go check if valid first character...
-         bcs   NotValid     not valid, go get next name start offset in X...
-Do.Loop  clrb               initialize character counter
-LastLoop incb               add one character
-         tsta               last character in name string?
-         bmi   LastChar     yes, go return valid...
-         bsr   GoGetAXY     go get next character...
-         bsr   ChkValid     go check if valid character...
-         bcc   LastLoop     valid, go check if last character...
-LastChar andcc #^Carry
-         bra   RtnValid
-
-GetChar  stx   2,s          save current offset over old offset
-         sty   4,s          save current block pointer over old block pointer
-GoGetAXY lbra  LDAXY        go get byte at X in block Y in A,  & return
-
-NextLoop bsr   GetChar      go get character...
-NotValid cmpa  #',          comma?
-         beq   NextLoop     yes, go get next character...
-         cmpa  #C$SPAC      space?
-         beq   NextLoop     yes, go get next character...
-         comb               error, set Carry
-         ldb   #E$BNam      'Bad Name' error
-RtnValid equ   *
-         IFGT  Level-1
-         puls  x,y          recover offset & pointer
-         ENDC
-         bra   L0720      go do a similar exit routine
-
-ChkFirst pshs  a            save character
-         anda  #$7F         drop msbit
-         bra   ChkRst       skip dash for first character check
-
-ChkValid pshs  a            save character
-         anda  #$7F         drop msbit
-         cmpa  #'.          period?
-         beq   ValidChr     yes, go return valid character...
-ChkRest  cmpa  #'-          is it a dash?
-         beq   ValidChr     yes, it's valid      
-ChkRst   cmpa  #'z          greater than "z"?
-         bhi   InvalidC     yes, go return invalid character...
-         cmpa  #'a          greater than or equal to "a"?
-         bhs   ValidChr     yes, go return valid character...
-         cmpa  #'_          underscore?
-         beq   ValidChr     yes, go return valid character...
-         cmpa  #'Z          greater than "Z"?
-         bhi   InvalidC     yes, go return invalid character...
-         cmpa  #'A          greater than or equal to "A"?
-         bhs   ValidChr     yes, go return valid character...
-         cmpa  #'9          greater than "9"?
-         bhi   InvalidC     yes, go return invalid character...
-         cmpa  #'0          greater than or equal to "0"?
-         bhs   ValidChr     yes, go return valid character...
-         cmpa  #'$          dollar symbol?
-         beq   ValidChr     yes, go return valid character...
-InvalidC coma               invalid character, set carry
-ValidChr puls  a,pc
-
diff -r ca5c6be175d3 -r 3e5e54b2a01a level2/modules/kernel/makefile
--- a/level2/modules/kernel/makefile	Thu Dec 11 20:05:22 2003 +0000
+++ b/level2/modules/kernel/makefile	Thu Dec 11 22:59:15 2003 +0000
@@ -1,9 +1,9 @@
 include ../../../rules.mak
 
-vpath %.asm $(6809L2)/modules/kernel
+vpath %.asm $(6809L1)/modules/krnl
 
 DEPENDS		= ./makefile
-ADDOPTS		= -e
+AFLAGS		+= -I$(6809L1)/modules/krnl
 
 KERNEL		= kernel
 KERNELP2	= kernelp2