1
0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-02 10:20:55 +11:00

Compare commits

...

6 Commits

Author SHA1 Message Date
Virgil Dupras
22f132094a Clarify signed-ness
And fix broken negative display in ".".
2020-04-15 12:29:47 -04:00
Virgil Dupras
b73e1a5f7a z80a: invert the meaning of IFZ, IFNZ, IFC, IFNC,
It is much less confusing when "IFZ," means "If Z is set, continue
into IF, else, jump to THEN,".
2020-04-15 12:20:09 -04:00
Virgil Dupras
2439f1ed86 Change SCMP for S=
Remove flagsToBC boot routine.
2020-04-15 12:19:58 -04:00
Virgil Dupras
16d5cd91de emul: don't segfault on quit when there is no blkfs 2020-04-15 10:56:49 -04:00
Virgil Dupras
c40f336959 icore: extract "_pdacc" from "(parsed)"
Makes boot binary a bit bigger, but that "_pdacc" word will be
reused in high level apps.
2020-04-15 10:41:27 -04:00
Virgil Dupras
79acf92b28 emul: fix Makefile 2020-04-15 09:01:09 -04:00
14 changed files with 88 additions and 56 deletions

View File

@ -9,4 +9,4 @@ Contents
4 DOES> 6 Compilation vs meta-comp. 4 DOES> 6 Compilation vs meta-comp.
8 I/O 11 Chained comparisons 8 I/O 11 Chained comparisons
14 Addressed devices 14 Addressed devices 18 Signed-ness

9
blk/018 Normal file
View File

@ -0,0 +1,9 @@
Signed-ness
For simplicity purposes, numbers are generally considered
unsigned. For convenience, decimal parsing and formatting
support the "-" prefix, but under the hood, it's all unsigned.
This leads to some oddities. For example, "-1 0 <" is false.
To compare whether something is negative, use the "<0" word
which is the equivalent to "0x7fff >".

View File

@ -5,6 +5,6 @@ LIT -- Write a LIT entry. You're expected to write
LIT< x -- Read following word and write to HERE as a LIT< x -- Read following word and write to HERE as a
string literal. string literal.
LITS a -- Write word at addr a as a atring literal. LITS a -- Write word at addr a as a atring literal.
SCMP a1 a2 -- n Compare strings a1 and a2. See CMP S= a1 a2 -- f Returns whether string a1 == a2.
SCPY a -- Copy string at addr a into HERE. SCPY a -- Copy string at addr a into HERE.
SLEN a -- n Push length of str at a. SLEN a -- n Push length of str at a.

View File

@ -22,6 +22,8 @@ all: $(TARGETS)
$(BLKPACK): $(BLKPACK):
$(MAKE) -C ../tools $(MAKE) -C ../tools
.PHONY: $(STRIPFC) $(SLATEST) $(BIN2C)
$(STRIPFC): $(BLKPACK) $(STRIPFC): $(BLKPACK)
$(SLATEST): $(BLKPACK) $(SLATEST): $(BLKPACK)
$(BIN2C): $(BLKPACK) $(BIN2C): $(BLKPACK)

View File

@ -118,7 +118,9 @@ int main(int argc, char *argv[])
tcsetattr(0, TCSAFLUSH, &termInfo); tcsetattr(0, TCSAFLUSH, &termInfo);
emul_printdebug(); emul_printdebug();
} }
fclose(blkfp); if (blkfp != NULL) {
fclose(blkfp);
}
fclose(fp); fclose(fp);
return retcode; return retcode;
} }

Binary file not shown.

View File

@ -27,7 +27,7 @@ NOP, NOP, ( 20, numberWord )
NOP, NOP, ( 22, litWord ) NOP, NOP, ( 22, litWord )
NOP, NOP, ( 24, addrWord ) NOP, NOP, ( 24, addrWord )
NOP, NOP, ( 26, unused ) NOP, NOP, ( 26, unused )
0 JPnn, ( 28, flagsToBC ) RAMSTART 0x4e + JPnn, ( 28, RST 28 )
0 JPnn, ( 2b, doesWord ) 0 JPnn, ( 2b, doesWord )
NOP, NOP, ( 2e, unused ) NOP, NOP, ( 2e, unused )
RAMSTART 0x4e + JPnn, ( RST 30 ) RAMSTART 0x4e + JPnn, ( RST 30 )
@ -201,7 +201,7 @@ L4 FSET L3 FSET ( loopend )
( HL is prev field's addr. Is offset zero? ) ( HL is prev field's addr. Is offset zero? )
A D LDrr, A D LDrr,
E ORr, E ORr,
IFZ, ( noprev ) IFNZ, ( noprev )
( get absolute addr from offset ) ( get absolute addr from offset )
( carry cleared from "or e" ) ( carry cleared from "or e" )
DE SBCHLss, DE SBCHLss,
@ -218,16 +218,6 @@ L4 FSET ( end )
BC POPqq, BC POPqq,
RET, RET,
PC ORG @ 0x29 + ! ( flagsToBC )
BC 0 LDddnn,
CZ RETcc, ( equal )
BC INCss,
CC RETcc, ( > )
( < )
BC DECss,
BC DECss,
RET,
PC ORG @ 0x12 + ! ( pushRS ) PC ORG @ 0x12 + ! ( pushRS )
IX INCss, IX INCss,
IX INCss, IX INCss,

View File

@ -2,6 +2,8 @@
: >= < NOT ; : >= < NOT ;
: <= > NOT ; : <= > NOT ;
: <0 32767 > ;
: >=0 <0 NOT ;
( n1 -- n1 true ) ( n1 -- n1 true )
: <>{ 1 ; : <>{ 1 ;

View File

@ -18,7 +18,7 @@
: BEGIN H@ ; IMMEDIATE : BEGIN H@ ; IMMEDIATE
: AGAIN COMPILE (br) H@ - , ; IMMEDIATE : AGAIN COMPILE (br) H@ - , ; IMMEDIATE
: UNTIL COMPILE (?br) H@ - , ; IMMEDIATE : UNTIL COMPILE (?br) H@ - , ; IMMEDIATE
: ( BEGIN LIT< ) WORD SCMP NOT UNTIL ; IMMEDIATE : ( BEGIN LIT< ) WORD S= UNTIL ; IMMEDIATE
( Hello, hello, krkrkrkr... do you hear me? ( Hello, hello, krkrkrkr... do you hear me?
Ah, voice at last! Some lines above need comments Ah, voice at last! Some lines above need comments
BTW: Forth lines limited to 64 cols because of default BTW: Forth lines limited to 64 cols because of default

View File

@ -12,9 +12,7 @@
: . ( n -- ) : . ( n -- )
( handle negative ) ( handle negative )
( that "0 1 -" thing is because we don't parse negative DUP <0 IF '-' EMIT -1 * THEN
number correctly yet. )
DUP 0 < IF '-' EMIT 0 1 - * THEN
_ _
BEGIN BEGIN
DUP '9' > IF DROP EXIT THEN ( stop indicator, we're done ) DUP '9' > IF DROP EXIT THEN ( stop indicator, we're done )

View File

@ -52,37 +52,52 @@
: < CMP -1 = ; : < CMP -1 = ;
: > CMP 1 = ; : > CMP 1 = ;
( r c -- r f )
( Parse digit c and accumulate into result r.
Flag f is 0 when c was a valid digit, 1 when c was WS,
-1 when c was an invalid digit. )
: _pdacc
DUP 0x21 < IF DROP 1 EXIT THEN
( parse char )
'0' -
( if bad, return "r -1" )
DUP 0 < IF DROP -1 EXIT THEN ( bad )
DUP 9 > IF DROP -1 EXIT THEN ( bad )
( good, add to running result )
SWAP 10 * + ( r*10+n )
0 ( good )
;
: (parsed) ( a -- n f ) : (parsed) ( a -- n f )
( read first char outside of the loop. it *has* to be ( read first char outside of the loop. it *has* to be
nonzero. ) nonzero. )
DUP C@ ( a c ) DUP C@ ( a c )
DUP NOT IF EXIT THEN ( a 0 )
( special case: do we have a negative? ) ( special case: do we have a negative? )
DUP '-' = IF DUP '-' = IF
( Oh, a negative, let's recurse and reverse ) ( Oh, a negative, let's recurse and reverse )
DROP 1 + ( a+1 ) DROP 1 + ( a+1 )
(parsed) ( n f ) (parsed) ( n f )
SWAP 0 SWAP ( f 0 n ) 0 ROT ( f 0 n )
- SWAP EXIT ( 0-n f ) - SWAP EXIT ( 0-n f )
THEN THEN
( running result, staring at zero ) ( running result from first char )
0 SWAP ( a r c ) 0 SWAP ( a r c )
( Loop over chars ) _pdacc ( a r f )
BEGIN DUP IF
( parse char ) ( first char was not a valid digit )
'0' - 2DROP 0 EXIT ( a 0 )
( if bad, return "a 0" ) THEN
DUP 0 < IF 2DROP 0 EXIT THEN ( bad ) BEGIN ( a r 0 )
DUP 9 > IF 2DROP 0 EXIT THEN ( bad ) DROP SWAP 1 + ( r a+1 )
( good, add to running result ) DUP C@ ( r a c )
SWAP 10 * + ( a r*10+n ) ROT SWAP ( a r c )
SWAP 1 + SWAP ( a+1 r ) _pdacc ( a r f )
( read next char ) DUP UNTIL
OVER C@ ( a r f -- f is 1 on success, -1 on error, normalize
DUP NOT UNTIL to bool. )
( we're done and it's a success. We have "a r c", we want 1 = ( a r f )
"r 1". ) ( we want "r f" )
DROP SWAP DROP 1 ROT DROP
; ;
( This is only the "early parser" in earlier stages. No need ( This is only the "early parser" in earlier stages. No need

View File

@ -372,10 +372,10 @@
: BWR @ AGAIN, ; : BWR @ AGAIN, ;
( same as BSET, but we need to write a placeholder ) ( same as BSET, but we need to write a placeholder )
: FJR, PC 0 A, ; : FJR, PC 0 A, ;
: IFZ, JRZ, FJR, ; : IFZ, JRNZ, FJR, ;
: IFNZ, JRNZ, FJR, ; : IFNZ, JRZ, FJR, ;
: IFC, JRC, FJR, ; : IFC, JRNC, FJR, ;
: IFNC, JRNC, FJR, ; : IFNC, JRC, FJR, ;
: THEN, : THEN,
DUP PC ( l l pc ) DUP PC ( l l pc )
-^ 1 - ( l off ) -^ 1 - ( l off )

View File

@ -149,10 +149,10 @@ CODE NOT
A L LDrr, A L LDrr,
H ORr, H ORr,
HL 0 LDddnn, HL 0 LDddnn,
IFNZ, ( skip ) IFZ,
( false, make 1 ) ( false, make 1 )
HL INCss, HL INCss,
THEN, ( skip ) THEN,
HL PUSHqq, HL PUSHqq,
;CODE ;CODE
@ -209,10 +209,10 @@ CODE /MOD
RLA, RLA,
HL ADCHLss, HL ADCHLss,
DE SBCHLss, DE SBCHLss,
IFNC, ( skip ) IFC,
DE ADDHLss, DE ADDHLss,
C DECr, C DECr,
THEN, ( skip ) THEN,
DJNZ, AGAIN, ( loop ) DJNZ, AGAIN, ( loop )
B A LDrr, B A LDrr,
HL PUSHqq, HL PUSHqq,
@ -311,10 +311,13 @@ CODE (resRS)
IX RS_ADDR LDddnn, IX RS_ADDR LDddnn,
;CODE ;CODE
CODE SCMP CODE S=
DE POPqq, DE POPqq,
HL POPqq, HL POPqq,
chkPS, chkPS,
( pre-push false )
BC 0 LDddnn,
BC PUSHqq,
BEGIN, ( loop ) BEGIN, ( loop )
LDA(DE), LDA(DE),
(HL) CPr, (HL) CPr,
@ -324,10 +327,11 @@ CODE SCMP
HL INCss, HL INCss,
DE INCss, DE INCss,
JRNZ, AGAIN, ( loop ) JRNZ, AGAIN, ( loop )
( success, change false to true )
HL POPqq,
HL INCss,
HL PUSHqq,
L1 FSET ( end ) L1 FSET ( end )
( 40 == flagsToBC )
40 CALLnn,
BC PUSHqq,
;CODE ;CODE
CODE CMP CODE CMP
@ -335,8 +339,16 @@ CODE CMP
DE POPqq, DE POPqq,
chkPS, chkPS,
DE SUBHLss, DE SUBHLss,
( 40 == flagsToBC ) BC 0 LDddnn,
40 CALLnn, IFNZ,
( not equal )
BC INCss,
IFNC,
( < )
BC DECss,
BC DECss,
THEN,
THEN,
BC PUSHqq, BC PUSHqq,
;CODE ;CODE
@ -347,13 +359,14 @@ CODE _find
chkPS, chkPS,
( 3 == find ) ( 3 == find )
3 CALLnn, 3 CALLnn,
IFZ, ( found ) IFNZ,
( not found ) ( not found )
HL PUSHqq, HL PUSHqq,
DE 0 LDddnn, DE 0 LDddnn,
DE PUSHqq, DE PUSHqq,
JPNEXT, JPNEXT,
THEN, ( found ) THEN,
( found )
DE PUSHqq, DE PUSHqq,
DE 1 LDddnn, DE 1 LDddnn,
DE PUSHqq, DE PUSHqq,

View File

@ -3,3 +3,4 @@
0x42 <>{ 0x40 &> 0x44 &< <>} # 0x42 <>{ 0x40 &> 0x44 &< <>} #
0x44 <>{ 0x40 &> 0x44 &< <>} NOT # 0x44 <>{ 0x40 &> 0x44 &< <>} NOT #
0x22 0x8065 < # 0x22 0x8065 < #
-1 0 > #