fix: slot 5 re-entrancy bug in / command and remove unused SIZE keyword (#120)

Move IsDestructiveActionOK check out of module code (dos.asm) into
warmstart.asm so it runs before slot 5 is paged in. The confirmation
dialog calls EXTPrintCharacter/KNLGetSingleCharacter which do their
own inc 8+5, double-incrementing slot 5 and executing from the wrong
page — hanging the system.

Also change jmp EXTBootXA to jsr so the wrapper's dec 8+5 properly
restores slot 5 when kernel.RunNamed returns (program not found).

Remove unused SIZE keyword from token table and tokeniser module.

Author: mbrukner

modules/hardware/dos.asm

@@ -12,15 +12,6 @@
 		.section code
 
 Export_EXTBootXA:
-		pha
-		phx
-		jsr		IsDestructiveActionOK
-		plx
-		pla
-		bcc		_action_ok
-		jmp		WarmStart
-
-_action_ok:
 		sta		zTemp0+0
 		stx		zTemp0+1
 
@@ -77,10 +68,6 @@ _copy_done:
 		sta		kernel.args.buf+1
 
 		jsr		kernel.RunNamed
-
-		jsr		ResetTokenBuffer
-		.error_noprogram
-
-		jmp		WarmStart
+		rts
 
 		.send code

modules/kernel/commands/files/dir.asm

@@ -523,14 +523,15 @@ _PEPadDone:
 		lda 	DIR_FLAGS,x
 		and 	#DIR_ATTR_DIR
 		beq 	_PENotDir
-		;		Print " <DIR>" right-aligned
+		;		Print " <dir>" right-aligned
 		lda 	#32
 		jsr 	EXTPrintCharacter
 		ldx 	#_CDDirTag >> 8
 		lda 	#_CDDirTag & $FF
 		jsr 	PrintStringXA
 		bra 	_PEEndLine
 _PENotDir:
+		;		Print right-aligned block count
 		;		Print right-aligned block count
 		ldx 	dirPrintIdx
 		ldy 	DIR_BLK_HI,x 				; blocks hi → Y
@@ -587,7 +588,7 @@ _CDFreeMsg:
 _CDBlocksHdr:
 		.text 	"                   Blocks",0
 _CDDirTag:
-		.text 	"<DIR>",0
+		.text 	"<dir>",0
 
 ; ************************************************************************************************
 ;

modules/tokeniser/__kwdtext.asm

@@ -100,13 +100,12 @@ KeywordSet0:
 	.text	4,$1c,"READ"           ; $de READ
 	.text	4,$2e,"RECT"           ; $df RECT
 	.text	3,$e4,"REM"            ; $e0 REM
-	.text	4,$3b,"SIZE"           ; $e1 SIZE
-	.text	5,$7b,"SOLID"          ; $e2 SOLID
-	.text	5,$89,"SOUND"          ; $e3 SOUND
-	.text	6,$d7,"SPRITE"         ; $e4 SPRITE
-	.text	4,$45,"TEXT"           ; $e5 TEXT
-	.text	2,$a3,"TO"             ; $e6 TO
-	.text	4,$3c,"STEP"           ; $e7 STEP
+	.text	5,$7b,"SOLID"          ; $e1 SOLID
+	.text	5,$89,"SOUND"          ; $e2 SOUND
+	.text	6,$d7,"SPRITE"         ; $e3 SPRITE
+	.text	4,$45,"TEXT"           ; $e4 TEXT
+	.text	2,$a3,"TO"             ; $e5 TO
+	.text	4,$3c,"STEP"           ; $e6 STEP
 	.text	$FF
 KeywordSet1:
 	.text	0,$65,""               ; $80 !0:EOF

source/common/cli/warmstart.asm

@@ -48,9 +48,13 @@ _slot3ok:
 		lda 	lineBuffer 					; first character is slash
 		cmp 	#"/"
 		bne 	_WSNotSlash
+		jsr 	IsDestructiveActionOK 		; confirm if unsaved program (before module page-in)
+		bcs 	WarmStart 					; user cancelled
 		ldx 	#(lineBuffer+1) >> 8 		; boot rest of line.
 		lda 	#(lineBuffer+1) & $FF
-		jmp 	EXTBootXA
+		jsr 	EXTBootXA 					; JSR so wrapper restores slot 5 on return
+		jsr 	ResetTokenBuffer 			; RunNamed returned, program was not found
+		.error_noprogram
 
 _WSNotSlash:
 		jsr 	TKTokeniseLine 				; tokenise the line

source/common/generated/kwdconst.inc

@@ -157,13 +157,12 @@ KWD_POKEW                            = $dd; $dd POKEW
 KWD_READ                             = $de; $de READ
 KWD_RECT                             = $df; $df RECT
 KWD_REM                              = $e0; $e0 REM
-KWD_SIZE                             = $e1; $e1 SIZE
-KWD_SOLID                            = $e2; $e2 SOLID
-KWD_SOUND                            = $e3; $e3 SOUND
-KWD_SPRITE                           = $e4; $e4 SPRITE
-KWD_TEXT                             = $e5; $e5 TEXT
-KWD_TO                               = $e6; $e6 TO
-KWD_STEP                             = $e7; $e7 STEP
+KWD_SOLID                            = $e1; $e1 SOLID
+KWD_SOUND                            = $e2; $e2 SOUND
+KWD_SPRITE                           = $e3; $e3 SPRITE
+KWD_TEXT                             = $e4; $e4 TEXT
+KWD_TO                               = $e5; $e5 TO
+KWD_STEP                             = $e6; $e6 STEP
 KWD1_ASSEMBLE                         = $83; $83 ASSEMBLE
 KWD1_ASSERT                           = $84; $84 ASSERT
 KWD1_BITMAP                           = $85; $85 BITMAP

source/common/generated/kwdtext.dat

@@ -100,13 +100,12 @@ KeywordSet0:
 	.text	4,$1c,"READ"           ; $de READ
 	.text	4,$2e,"RECT"           ; $df RECT
 	.text	3,$e4,"REM"            ; $e0 REM
-	.text	4,$3b,"SIZE"           ; $e1 SIZE
-	.text	5,$7b,"SOLID"          ; $e2 SOLID
-	.text	5,$89,"SOUND"          ; $e3 SOUND
-	.text	6,$d7,"SPRITE"         ; $e4 SPRITE
-	.text	4,$45,"TEXT"           ; $e5 TEXT
-	.text	2,$a3,"TO"             ; $e6 TO
-	.text	4,$3c,"STEP"           ; $e7 STEP
+	.text	5,$7b,"SOLID"          ; $e1 SOLID
+	.text	5,$89,"SOUND"          ; $e2 SOUND
+	.text	6,$d7,"SPRITE"         ; $e3 SPRITE
+	.text	4,$45,"TEXT"           ; $e4 TEXT
+	.text	2,$a3,"TO"             ; $e5 TO
+	.text	4,$3c,"STEP"           ; $e6 STEP
 	.text	$FF
 KeywordSet1:
 	.text	0,$65,""               ; $80 !0:EOF

source/common/generated/vectors.dat

@@ -164,13 +164,12 @@ VectorSet0:
 	.word	Command_Read                     ; $de READ
 	.word	RectangleCommand                 ; $df RECT
 	.word	RemCommand                       ; $e0 REM
-	.word	SyntaxError                      ; $e1 SIZE
-	.word	SyntaxError                      ; $e2 SOLID
-	.word	SoundCommand                     ; $e3 SOUND
-	.word	SpriteCommand                    ; $e4 SPRITE
-	.word	TextCommand                      ; $e5 TEXT
-	.word	Unused2                          ; $e6 TO
-	.word	Unused5                          ; $e7 STEP
+	.word	SyntaxError                      ; $e1 SOLID
+	.word	SoundCommand                     ; $e2 SOUND
+	.word	SpriteCommand                    ; $e3 SPRITE
+	.word	TextCommand                      ; $e4 TEXT
+	.word	Unused2                          ; $e5 TO
+	.word	Unused5                          ; $e6 STEP
 VectorSet1:
 	.word	SyntaxError                      ; $80 !0:EOF
 	.word	SyntaxError                      ; $81 !1:SH1

source/scripts/tokens.py

@@ -55,7 +55,7 @@ def get(self):
 				from		plot 		on 			off 		palette 	sound
 				poke 		pokew 		pokel 		poked 		memcopy 	clear
 				step~
-				name		size
+				name
 
 			{1}							// Set 1
 				end 		new 		list 		run 		stop