HTTPGET : many bug fixing, many remaining....?

BIN/FORTH.S.txt

@@ -711,7 +711,7 @@ CS.QUIT			jsr GFX.Close
 				>LDA.G HIS.hBuf
 				beq .10
 
-				>SYSCALL FreeStkObj
+				>SYSCALL StrVFree
 
 .10				>LDA.G hSList
 				beq .1

BIN/HTTPGET.S.txt

@@ -70,6 +70,7 @@ L.SA.REMOTE.AD	.DA SA.REMOTE+S.SOCKADDR.ADDR
 L.MSG.IPKO		.DA MSG.IPKO
 L.MSG.USAGE		.DA MSG.USAGE
 L.MSG.CRLF		.DA MSG.CRLF
+L.MSG.NULL		.DA MSG.NULL
 L.MSG.UNKNOWN	.DA MSG.UNKNOWN
 L.MSG.CONNECT	.DA MSG.CONNECT
 L.MSG.SKTKO		.DA MSG.SKTKO
@@ -166,6 +167,7 @@ CS.RUN.HOSTOK	jsr CS.RUN.GETNEXTARG
 				lda (ZPPtr),y
 				cmp #'a'
 				bcc .11
+
 				cmp #'z'+1
 				bcs .11
 
@@ -193,10 +195,10 @@ CS.RUN.HOSTOK	jsr CS.RUN.GETNEXTARG
 				bne CS.RUN.ESYN
 
 				jsr CS.RUN.GETNEXTARG
-				bcs .9
+				bcs CS.RUN.ESYN2
 
 				>SYSCALL LoadTxtFile
-				bcs .9
+				bcs CS.RUN.RTS
 
 				>STYA ZPReqBufLen
 				stx hReqBuf
@@ -206,13 +208,13 @@ CS.RUN.HOSTOK	jsr CS.RUN.GETNEXTARG
 				jmp CS.RUN.HOSTOK
 
 .3 				cmp #'O'
-				bne .9
+				bne CS.RUN.ESYN2
 				
 				lda ZPFileName+1
 				bne CS.RUN.ESYN2
 
 				jsr CS.RUN.GETNEXTARG
-				bcs .9
+				bcs CS.RUN.ESYN2
 
 				>STYA ZPFileName
 				jmp CS.RUN.HOSTOK
@@ -221,10 +223,7 @@ CS.RUN.ESYN2	lda #E.SYN
 				sec
 				rts
 *--------------------------------------
-CS.RUN.ARGSOK	lda ZPReqBufPtr+1
+CS.RUN.ARGSOK	>PUSHW L.MSG.CONNECT
-				beq CS.RUN.ESYN2
-
-				>PUSHW L.MSG.CONNECT
 				ldx #0
 
 .1				>PUSHB SA.REMOTE+S.SOCKADDR.ADDR,x
@@ -311,7 +310,8 @@ CS.RUN.GET		jsr CS.RUN.ENCODE
 				>PUSHBI 0				TYPE
 				>PUSHWZ					AUXTYPE
 				>SYSCALL FOpen
-				bcs .9
+				bcs .99
+
 				sta hFile
 
 .1				jsr CS.RUN.RESPONSE
@@ -342,8 +342,14 @@ CS.RUN.GETNEXTARG
 				>SYSCALL ArgV
 				rts
 *--------------------------------------
-CS.RUN.ENCODE	>LDYA ZPReqBufPtr
+CS.RUN.ENCODE	ldy ZPReqBufPtr
-				>STYA ZPPtr
+				lda ZPReqBufPtr+1
+				bne .10
+				
+				>LDYA L.MSG.NULL
+				>STYA ZPReqBufPtr
+				
+.10				>STYA ZPPtr
 
 				inc ZPEncodedBufLen		for ending \0
 
@@ -542,14 +548,17 @@ CS.RUN.RESPONSE jsr Init.TimeOut
 
 				inc Received+3
 
-.70				>PUSHW L.MSG.Progress
+.70				lda hFile
+				beq .71
+
+				>PUSHW L.MSG.Progress
 				>PUSHL Received
 				>PUSHBI 4
 
 				>SYSCALL PrintF
 				bcs .9
 
-				jmp CS.RUN.RESPONSE
+.71				jmp CS.RUN.RESPONSE
 
 .8				bit bHeader
 				bpl .99
@@ -749,7 +758,8 @@ MSG.USAGE		.CS "Usage : HTTPGET <ip|host> [port]\r\n"
 				.CS "   -U : Url\r\n"
 				.CS "   -F : UrlFile\r\n"
 				.CS "   -O : OutputFile"
-MSG.CRLF		.CZ "\r\n"
+MSG.CRLF		.CS "\r\n"
+MSG.NULL		.DA #0
 MSG.UNKNOWN		.CZ "%s: Unknown host\r\n"
 MSG.CONNECT		.CZ "Connecting to %d.%d.%d.%d:%D (%s)..."
 MSG.SKTKO		.CZ "Failed to Open Socket."

BIN/SH.S.txt

@@ -501,7 +501,7 @@ CS.QUIT			jsr CORE.FUNCRESET
 .10				>LDA.G HIS.hBuf
 				beq .1
 
-				>SYSCALL FreeStkObj
+				>SYSCALL StrVFree
 
 .1				ldy #CL.hBuf
 				jsr .7

SCMASM.31/SCMASM.S.SYMT.txt

@@ -10,13 +10,17 @@ STINIT LDA LO.MEM    START OF SYMBOL TABLE
        LDA LO.MEM+1
        STA EOT+1
        STA MACLBL+1 PRIVATE LABELS GO DOWN FROM THERE
-       LDX #56      # BYTES IN HASH POINTER TABLE
+
        LDA #0
        STA MACLBL
        STA CURRENT.MAJOR.LABEL+1
+
+       LDX #58      # BYTES IN HASH POINTER TABLE
+
 .1     STA HSHTBL-1,X
        DEX
        BNE .1
+
   .DO AUXMEM
        LDA RDRAM
        LDA RDRAM
@@ -119,7 +123,9 @@ AUX.IMAGE.LEN .EQ *-AUX.IMAGE
 *      HSHTBL+$04:  Chain for labels starting with "B"
 *        - - -
 *      HSHTBL+$34:  Chain for labels starting with "Z"
-*      HSHTBL+$36:  Chain for Macro Names and Skeletons
+*      HSHTBL+$36:  Chain for labels starting with "_"
+*
+*      HSHTBL+$38:  Chain for Macro Names and Skeletons
 *
 *      Format of Target File Entry:
 *          0,1 -- Forward chain pointer (0=end of chain)
@@ -233,16 +239,27 @@ STSRCH SEC          CONVERT FIRST CHARACTER
        LDA SYMBOL+7 OF SYMBOL TO HASH TABLE INDEX
        CMP #CHR.PERIOD SEE IF LOCAL SYMBOL
        BEQ .8       YES
+
        CMP #':      COLON, THEN PRIVATE LABEL
        BNE .12      NO, NORMAL LABEL
+
        JMP SEARCH.PRIVATE.LABELS
-.12    SBC #$40     AT-SIGN
+	   
+.12 			cmp #'_
+				bne .55
+
+				lda #'Z+1
+
+.55				sec
+				sbc #'A
+
        ASL          DOUBLE INDEX, CLEAR CARRY
        ADC #HSHTBL
        STA STPNTR
        LDA /HSHTBL
        ADC #0
        STA STPNTR+1
+
 .1     LDY #0
        >SYM LDA,STPNTR GET POINTER FROM ENTRY
        STA TPTR

SYS/KERNEL.S.MEM.txt

@@ -20,10 +20,10 @@ MEM.BestScore	.EQ ZPMemMgrTmp1
 *  X = hMem
 *\--------------------------------------
 K.Realloc		>PULLA
-				sta .2+1				New Size HI
+				sta .1+1				New Size LO
 
 				>PULLA
-				sta .1+1				New Size LO
+				sta .2+1				New Size HI
 
 				>PULLA					Src hMem
 				tax