more work on extended command set

c64/basic/print/list_single_line.s

@@ -82,11 +82,82 @@ list_not_quote:
 
 	// Display a token
 
+list_display_token_CC:
+
+	cmp #$CC
+	bne list_display_token_CD
+
+	// Fetch the sub-token
+
+	iny
+#if ROM_LAYOUT_M65
+	jsr peek_via_OLDTXT
+#elif CONFIG_MEMORY_MODEL_60K
+	ldx #<OLDTXT
+	jsr peek_under_roms
+	cmp #$00
+#else
+	lda (OLDTXT),y
+#endif
+
 	// Save registers
 	tax
 	pha
 	phy_trash_a
 
+	// Subtract $1 from token to get offset in token list
+	dex
+
+	// Now ask for it to be printed
+	jsr print_packed_keyword_CC
+
+#if HAS_OPCODES_65C02
+	bra list_token_displayed
+#else
+	jmp list_token_displayed
+#endif
+
+list_display_token_CD:
+
+	cmp #$CD
+	bne list_display_token_V2
+	
+	// Fetch the sub-token
+
+	iny
+#if ROM_LAYOUT_M65
+	jsr peek_via_OLDTXT
+#elif CONFIG_MEMORY_MODEL_60K
+	ldx #<OLDTXT
+	jsr peek_under_roms
+	cmp #$00
+#else
+	lda (OLDTXT),y
+#endif
+	
+	// Save registers
+	tax
+	pha
+	phy_trash_a
+
+	// Subtract $1 from token to get offset in token list
+	dex
+
+	// Now ask for it to be printed
+	jsr print_packed_keyword_CD
+
+#if HAS_OPCODES_65C02
+	bra list_token_displayed
+#else
+	jmp list_token_displayed
+#endif
+
+list_display_token_V2:
+
+	// Save registers
+	tax
+	pha
+	phy_trash_a
 
 	// Subtract $80 from token to get offset in token list
 	txa
@@ -96,6 +167,10 @@ list_not_quote:
 	// Now ask for it to be printed
 	jsr print_packed_keyword_V2
 
+	// FALLTROUGH
+
+list_token_displayed:
+
 	// Restore registers
 	ply_trash_a
 	pla

c64/basic/print/print_packed_string.s

@@ -21,12 +21,6 @@ print_packed_misc_str:
 	jsr_ind VB1__print_packed_misc_str
 	jmp     map_NORMAL
 
-print_packed_keyword_V2:
-
-	jsr     map_BASIC_1
-	jsr_ind VB1__print_packed_keyword_V2
-	jmp     map_NORMAL
-
 #else
 
 print_packed_error:                    // .X - error string index
@@ -41,6 +35,18 @@ print_packed_misc_str:                 // .X - misc string index
 	ldy #>packed_str_misc
 	bne print_freq_packed_string       // branch always
 
+print_packed_keyword_CC:               // .X - token number
+
+	lda #<packed_str_keywords_CC
+	ldy #>packed_str_keywords_CC
+	bne print_freq_packed_string       // branch always
+
+print_packed_keyword_CD:               // .X - token number
+
+	lda #<packed_str_keywords_CD
+	ldy #>packed_str_keywords_CD
+	bne print_freq_packed_string       // branch always
+
 print_packed_keyword_V2:               // .X - token number
 
 	lda #<packed_str_keywords_V2