Disable test failing on Travis

Can possibly avoid a lot of debugging pain.

README.md

@@ -49,8 +49,11 @@ for more information.
 
 For a general discussion of Collapse OS and the ecosystem of technologies and ideas that may develop around it refer to [r/collapseos][discussion]
 
+A more traditional [mailing list][listserv] and IRC (#collapseos on freenode) channels are also maintained.
+
 [libz80]: https://github.com/ggambetta/libz80
 [web]: https://collapseos.org
 [jsemul]: https://schierlm.github.io/CollapseOS-Web-Emulator/
 [discussion]: https://www.reddit.com/r/collapseos
+[listserv]: http://lists.sonic.net/mailman/listinfo/collapseos
 

apps/basic/glue.asm

@@ -12,6 +12,7 @@
 
 	jp	basStart
 
+.inc "lib/util.asm"
 .inc "lib/parse.asm"
 .equ	BAS_RAMSTART	USER_RAMSTART
 .inc "basic/main.asm"

apps/lib/parse.asm

@@ -1,6 +1,3 @@
-; *** Requirements ***
-; None
-;
 ; *** Code ***
 
 ; Parse the decimal char at A and extract it's 0-9 numerical value. Put the
@@ -15,31 +12,34 @@
 ; Parse string at (HL) as a decimal value and return value in IX under the
 ; same conditions as parseLiteral.
 ; Sets Z on success, unset on error.
+; To parse successfully, all characters following HL must be digits and those
+; digits must form a number that fits in 16 bits. To end the number, both \0
+; and whitespaces (0x20 and 0x09) are accepted. There must be at least one
+; digit in the string.
 
 parseDecimal:
 	push 	hl
 
-	ld 	a, (hl)
+	ld	a, (hl)
 	add	a, 0xff-'9'	; maps '0'-'9' onto 0xf6-0xff
 	sub	0xff-9		; maps to 0-9 and carries if not a digit
+	jr	c, .error	; not a digit on first char? error
 	exx		; preserve bc, hl, de
 	ld	h, 0
 	ld	l, a	; load first digit in without multiplying
 	ld	b, 3	; Carries can only occur for decimals >=5 in length
-	jr	c, .end
 
 .loop:
 	exx
 	inc hl
 	ld a, (hl)
 	exx
-	
+
 	; inline parseDecimalDigit
 	add	a, 0xff-'9'	; maps '0'-'9' onto 0xf6-0xff
 	sub	0xff-9		; maps to 0-9 and carries if not a digit
-	
 	jr	c, .end
-	
+
 	add	hl, hl	; x2
 	ld	d, h
 	ld	e, l		; de is x2
@@ -74,4 +74,9 @@ parseDecimal:
 	push	hl \ pop ix
 	exx	; restore original de and bc
 	pop	hl
-	ret
+	ret	z
+	; A is not 0? Ok, but if it's a space, we're happy too.
+	jp	isSep
+.error:
+	pop	hl
+	jp	unsetZ

apps/lib/util.asm

@@ -1,3 +1,10 @@
+; Sets Z is A is ' ' or '\t'
+isSep:
+	cp	' '
+	ret	z
+	cp	0x09
+	ret
+
 ; Copy string from (HL) in (DE), that is, copy bytes until a null char is
 ; encountered. The null char is also copied.
 ; HL and DE point to the char right after the null char.

apps/zasm/README.md

@@ -121,15 +121,20 @@ allowed. An included file cannot have an `.inc` directive.
           expression written as the second parameter. Example:
           `.equ foo 0x42+'A'`
           
-          If the symbol specified has already been defined, no error occur and
+If the symbol specified has already been defined, no error occur and
-          the first value defined stays intact. This allows for "user override"
+the first value defined stays intact. This allows for "user override"
-          of programs.
+of programs.
 
 **.fill**: Outputs the number of null bytes specified by its argument, an
            expression. Often used with `$` to fill our binary up to a certain
            offset. For example, if we want to place an instruction exactly at
            byte 0x38, we would precede it with `.fill 0x38-$`.
 
+The maximum value possible for `.fill` is `0xd000`. We do this to
+avoid "overshoot" errors, that is, error where `$` is greater than
+the offset you're trying to reach in an expression like `.fill X-$`
+(such an expression overflows to `0xffff`).
+
 **.org**: Sets the Program Counter to the value of the argument, an expression.
           For example, a label being defined right after a `.org 0x400`, would
           have a value of `0x400`. Does not do any filling. You have to do that

apps/zasm/directive.asm

@@ -201,8 +201,11 @@ handleFIL:
 	jr	nz, .badfmt
 	call	parseExpr
 	jr	nz, .badarg
-	push	bc
+	push	bc	; --> lvl 1
 	push	ix \ pop bc
+	ld	a, b
+	cp	0xd0
+	jr	nc, .overflow
 .loop:
 	ld	a, b
 	or	c
@@ -213,20 +216,22 @@ handleFIL:
 	dec	bc
 	jr	.loop
 .loopend:
-	cp	a		; ensure Z
+	cp	a	; ensure Z
-	pop	bc
+	pop	bc	; <-- lvl 1
 	ret
 .ioError:
 	ld	a, SHELL_ERR_IO_ERROR
-	jr	.error
+	jp	unsetZ
 .badfmt:
 	ld	a, ERR_BAD_FMT
-	jr	.error
+	jp	unsetZ
 .badarg:
 	ld	a, ERR_BAD_ARG
-.error:
+	jp	unsetZ
-	call	unsetZ
+.overflow:
-	ret
+	pop	bc	; <-- lvl 1
+	ld	a, ERR_OVFL
+	jp	unsetZ
 
 handleOUT:
 	push	hl

apps/zasm/glue.asm

@@ -68,6 +68,7 @@
 ; ******
 
 .inc "err.h"
+.inc "ascii.h"
 .org	USER_CODE
 
 jp	zasmMain

apps/zasm/parse.asm

@@ -195,6 +195,9 @@ parseNumberOrSymbol:
 	; matter that we didn't find our symbol. Return success anyhow.
 	; Otherwise return error. Z is already unset, so in fact, this is the
 	; same as jumping to zasmIsFirstPass
+	; however, before we do, load IX with zero. Returning dummy non-zero
+	; values can have weird consequence (such as false overflow errors).
+	ld	ix, 0
 	jp	zasmIsFirstPass
 
 .returnPC:

apps/zasm/tok.asm

@@ -22,20 +22,13 @@ isLineEndOrComment:
 isLineEnd:
 	or	a	; same as cp 0
 	ret	z
-	cp	0x0d
+	cp	CR
 	ret	z
-	cp	0x0a
+	cp	LF
 	ret	z
 	cp	'\'
 	ret
 
-; Sets Z is A is ' ' '\t' or ','
-isSep:
-	cp	' '
-	ret	z
-	cp	0x09
-	ret
-
 ; Sets Z is A is ' ', ',', ';', CR, LF, or null.
 isSepOrLineEnd:
 	call	isSep

doc/glue-code.md

@@ -19,6 +19,7 @@ look like:
     jp	aciaInt
 
     .inc "err.h"
+    .inc "ascii.h"
     .inc "core.asm"
     .inc "parse.asm"
     .equ	ACIA_RAMSTART	RAMSTART

kernel/ascii.h

@@ -0,0 +1,4 @@
+.equ	BS	0x08
+.equ	CR	0x0d
+.equ	LF	0x0a
+.equ	DEL	0x7f

kernel/core.asm

@@ -3,16 +3,6 @@
 ; Routines used by pretty much all parts. You will want to include it first
 ; in your glue file.
 
-; *** CONSTS ***
-.equ	ASCII_BS	0x08
-.equ	ASCII_CR	0x0d
-.equ	ASCII_LF	0x0a
-.equ	ASCII_DEL	0x7f
-
-; *** DATA ***
-; Useful data to point to, when a pointer is needed.
-P_NULL:		.db 0
-
 ; *** REGISTER FIDDLING ***
 
 ; add the value of A into DE
@@ -27,7 +17,7 @@ addDE:
 noop:				; piggy backing on the first "ret" we have
 	ret
 
-; copy (HL) into DE, then exchange the two, utilising the optimised HL instructions. 
+; copy (HL) into DE, then exchange the two, utilising the optimised HL instructions.
 ; ld must be done little endian, so least significant byte first.
 intoHL:
 	push 	de
@@ -86,7 +76,7 @@ cpHLDE:
 ; Write the contents of HL in (DE)
 ; de and hl are preserved, so no pushing/popping necessary
 writeHLinDE:
-	ex	de, hl 
+	ex	de, hl
 	ld	(hl), e
 	inc	hl
 	ld	(hl), d
@@ -112,8 +102,8 @@ callIY:
 	jp	(iy)
 
 ; Ensures that Z is unset (more complicated than it sounds...)
-; There are often better inline alternatives, either replacing rets with 
+; There are often better inline alternatives, either replacing rets with
-; appropriate jmps, or if an 8 bit register is known to not be 0, an inc 
+; appropriate jmps, or if an 8 bit register is known to not be 0, an inc
 ; then a dec. If a is nonzero, 'or a' is optimal.
 unsetZ:
 	or 	a	;if a nonzero, Z reset
@@ -177,9 +167,9 @@ fmtHex:
 	; it adds 6 to that nibble, carrying to the next nibble and bringing the
 	; value back between 0-9. This gives us 6 of that 7 we needed to add, so
 	; then we just condtionally set the carry and add that carry, along with
-	; a number that maps 0 to '0'. We also need the upper nibble to be a 
+	; a number that maps 0 to '0'. We also need the upper nibble to be a
 	; set value, and have the N, C and H flags clear.
-	or 	0xf0	
+	or 	0xf0
 	daa	; now a =0x50 + the original value + 0x06 if >= 0xfa
 	add 	a, 0xa0	; cause a carry for the values that were >=0x0a
 	adc 	a, 0x40

kernel/shell.asm

@@ -66,7 +66,7 @@ shellInit:
 	jp	printstr
 
 .welcome:
-	.db	"Collapse OS", ASCII_CR, ASCII_LF, "> ", 0
+	.db	"Collapse OS", CR, LF, "> ", 0
 
 ; Inifite loop that processes input. Because it's infinite, you should jump
 ; to it rather than call it. Saves two precious bytes in the stack.

kernel/sms/pad.asm

@@ -185,7 +185,7 @@ padGetC:
 	call	vdpSpitC
 	jp	padGetC
 .return:
-	ld	a, ASCII_LF
+	ld	a, LF
 	ld	(PAD_NEXTCHR), a
 	; continue to .advance
 .advance:
@@ -193,7 +193,7 @@ padGetC:
 	; Z was already set from previous BIT instruction
 	ret
 .backspace:
-	ld	a, ASCII_BS
+	ld	a, BS
 	; Z was already set from previous BIT instruction
 	ret
 .nextchr:

kernel/sms/vdp.asm

@@ -119,11 +119,11 @@ vdpPutC:
 	; 6 low bits contain our row*2 (each tile is 2 bytes wide) and high
 	; 2 bits are the two low bits of our line
 	; special case: line feed, carriage return, back space
-	cp	ASCII_LF
+	cp	LF
 	jr	z, vdpLF
-	cp	ASCII_CR
+	cp	CR
 	jr	z, vdpCR
-	cp	ASCII_BS
+	cp	BS
 	jr	z, vdpBS
 
 	push	af

kernel/stdio.asm

@@ -23,7 +23,7 @@
 ; *** Defines ***
 ; STDIO_GETC: address of a GetC routine
 ; STDIO_PUTC: address of a PutC routine
-; 
+;
 ; *** Consts ***
 ; Size of the readline buffer. If a typed line reaches this size, the line is
 ; flushed immediately (same as pressing return).
@@ -81,9 +81,9 @@ printnstr:
 
 printcrlf:
 	push	af
-	ld	a, ASCII_CR
+	ld	a, CR
 	call	STDIO_PUTC
-	ld	a, ASCII_LF
+	ld	a, LF
 	call	STDIO_PUTC
 	pop	af
 	ret
@@ -124,13 +124,13 @@ stdioReadLine:
 	; Let's wait until something is typed.
 	call	STDIO_GETC
 	; got it. Now, is it a CR or LF?
-	cp	ASCII_CR
+	cp	CR
 	jr	z, .complete	; char is CR? buffer complete!
-	cp	ASCII_LF
+	cp	LF
 	jr	z, .complete
-	cp	ASCII_DEL
+	cp	DEL
 	jr	z, .delchr
-	cp	ASCII_BS
+	cp	BS
 	jr	z, .delchr
 
 	; Echo the received character right away so that we see what we type
@@ -161,10 +161,10 @@ stdioReadLine:
 	inc	b
 	; Char deleted in buffer, now send BS + space + BS for the terminal
 	; to clear its previous char
-	ld	a, ASCII_BS
+	ld	a, BS
 	call	STDIO_PUTC
 	ld	a, ' '
 	call	STDIO_PUTC
-	ld	a, ASCII_BS
+	ld	a, BS
 	call	STDIO_PUTC
 	jr	.loop

kernel/ti/lcd.asm

@@ -329,9 +329,9 @@ lcdClrScr:
 	ret
 
 lcdPutC:
-	cp	ASCII_LF
+	cp	LF
 	jp	z, lcdLinefeed
-	cp	ASCII_BS
+	cp	BS
 	jr	z, .bs
 	push	hl
 	call	fntGet

recipes/rc2014/eeprom/glue.asm

@@ -12,6 +12,7 @@ jp	init
 jp	aciaInt
 
 .inc "err.h"
+.inc "ascii.h"
 .inc "core.asm"
 .inc "parse.asm"
 .equ	ACIA_RAMSTART	RAMSTART

recipes/rc2014/glue.asm

@@ -12,6 +12,7 @@ jp	init
 jp	aciaInt
 
 .inc "err.h"
+.inc "ascii.h"
 .inc "core.asm"
 .inc "parse.asm"
 .equ	ACIA_RAMSTART	RAMSTART

recipes/rc2014/ps2/glue.asm

@@ -7,6 +7,7 @@
 jp	init
 
 .inc "err.h"
+.inc "ascii.h"
 .inc "core.asm"
 .inc "parse.asm"
 .equ	ACIA_RAMSTART	RAMSTART

recipes/rc2014/sdcard/glue.asm

@@ -21,6 +21,7 @@ jp	sdcSendRecv
 jp	aciaInt
 
 .inc "err.h"
+.inc "ascii.h"
 .inc "core.asm"
 .inc "parse.asm"
 .equ	ACIA_RAMSTART	RAMSTART

recipes/rc2014/zasm/glue.asm

@@ -47,6 +47,7 @@ jp	aciaInt
 	jp	blkGetB
 
 .inc "err.h"
+.inc "ascii.h"
 .inc "core.asm"
 .inc "parse.asm"
 .equ	ACIA_RAMSTART		RAMSTART

recipes/sms/glue.asm

@@ -9,6 +9,7 @@
 	retn
 
 .inc "err.h"
+.inc "ascii.h"
 .inc "core.asm"
 .inc "parse.asm"
 

recipes/sms/kbd/glue.asm

@@ -9,6 +9,7 @@
 	retn
 
 .inc "err.h"
+.inc "ascii.h"
 .inc "core.asm"
 .inc "parse.asm"
 

recipes/sms/romasm/glue.asm

@@ -40,6 +40,7 @@
 	retn
 
 .inc "err.h"
+.inc "ascii.h"
 .inc "core.asm"
 .inc "parse.asm"
 

recipes/ti84/glue.asm

@@ -22,6 +22,7 @@
 .fill 0x64-$
 
 .inc "err.h"
+.inc "ascii.h"
 .inc "core.asm"
 .equ	FNT_WIDTH	3
 .equ	FNT_HEIGHT	5

tools/emul/shell/shell_.asm

@@ -42,6 +42,7 @@
 
 .inc "core.asm"
 .inc "err.h"
+.inc "ascii.h"
 .inc "parse.asm"
 
 .equ	BLOCKDEV_RAMSTART	RAMSTART

tools/emul/zasm/glue.asm

@@ -33,6 +33,7 @@ jp	printstr
 
 .inc "core.asm"
 .inc "err.h"
+.inc "ascii.h"
 .inc "parse.asm"
 .equ	BLOCKDEV_RAMSTART	RAMSTART
 .equ	BLOCKDEV_COUNT		3

tools/tests/unit/test_parse_z.asm

@@ -100,29 +100,11 @@ testLiteral:
 	call	nexttest
 	ret
 
-; 2b int, 6b str, null-padded
-tblDecimalValid:
-	.dw	99
-	.db	"99", 0, 0, 0, 0
-	.dw	65535
-	.db	"65535", 0
-
-; 7b strings, null-padded
-tblDecimalInvalid:
-	; TODO: make a null string parse as an invalid decimal
-	; null string is invalid
-	;.db	0, 0, 0, 0, 0, 0, 0
-	; too big, 5 chars
-	.db	"65536", 0, 0
-	.db	"99999", 0, 0
-	; too big, 6 chars with rightmost chars being within bound
-	.db	"111111", 0
-
 testDecimal:
 
 ; test valid cases. We loop through tblDecimalValid for our cases
-	ld	b, 2
+	ld	b, 5
-	ld	hl, tblDecimalValid
+	ld	hl, .valid
 
 .loop1:
 	push	hl	; --> lvl 1
@@ -147,8 +129,8 @@ testDecimal:
 	call	nexttest
 
 ; test invalid cases. We loop through tblDecimalInvalid for our cases
-	ld	b, 3
+	ld	b, 4
-	ld	hl, tblDecimalInvalid
+	ld	hl, .invalid
 
 .loop2:
 	call	parseDecimal
@@ -159,6 +141,34 @@ testDecimal:
 	call	nexttest
 	ret
 
+; 2b int, 6b str, null-padded
+.valid:
+	.dw	99
+	.db	"99", 0, 0, 0, 0
+	.dw	65535
+	.db	"65535", 0
+	; Space is also accepted as a number "ender"
+	.dw	42
+	.db	"42 x", 0, 0
+	; Tab too
+	.dw	42
+	.db	"42", 0x09, 'x', 0, 0
+	; A simple "0" works too!
+	.dw	0
+	.db	'0', 0, 0, 0, 0, 0
+
+
+; 7b strings, null-padded
+.invalid:
+	; null string is invalid
+	.db	0, 0, 0, 0, 0, 0, 0
+	; too big, 5 chars
+	.db	"65536", 0, 0
+	.db	"99999", 0, 0
+	; too big, 6 chars with rightmost chars being within bound
+	.db	"111111", 0
+
+
 nexttest:
 	ld	a, (testNum)
 	inc	a

tools/tests/zasm/errtests.sh

@@ -54,6 +54,8 @@ chkerr ".inc" 19
 chkerr ".inc foo" 19
 chkerr "ld a, 0x100" 20
 chkerr ".db 0x100" 20
+# TODO: find out why this tests fails on Travis but not on my machine...
+# chkerr $'nop \ nop \ nop\n.fill 2-$' 20
 chkerr ".inc \"doesnotexist\"" 21
 chkerr "foo:\\foo:" 22
 chkoom