code size optimization for Mega65

src/basic/memory/fetch_character.s

@@ -0,0 +1,56 @@
+// #LAYOUT# STD *       #TAKE
+// #LAYOUT# *   BASIC_0 #TAKE
+// #LAYOUT# *   *       #IGNORE
+
+//
+// Fetches a single character
+//
+
+
+// For these configurations we have optimized version in another file
+#if !(ROM_LAYOUT_M65 && (CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K))
+
+fetch_character:
+
+	ldy #0
+
+#if CONFIG_MEMORY_MODEL_60K
+
+	ldx #<TXTPTR
+	jsr peek_under_roms
+
+#elif CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
+
+	jsr peek_under_roms_via_TXTPTR
+
+#else // CONFIG_MEMORY_MODEL_38K
+
+	lda (TXTPTR),y
+
+#endif
+
+#if !HAS_OPCODES_65CE02
+
+	// FALLTHROUGH
+	
+consume_character:
+
+	// Advance basic text pointer
+
+	inc TXTPTR+0
+	bne !+
+	inc TXTPTR+1
+!:
+
+#else // HAS_OPCODES_65CE02
+
+	// Advance basic text pointer
+
+	inw TXTPTR
+
+#endif
+
+	rts
+
+
+#endif

src/basic/memory/fetch_character_skip_spaces.s

@@ -0,0 +1,22 @@
+// #LAYOUT# STD *       #TAKE
+// #LAYOUT# *   BASIC_0 #TAKE
+// #LAYOUT# *   *       #IGNORE
+
+//
+// Fetches a single character, but skips spaces
+//
+
+
+// For these configurations we have optimized version in another file
+#if !(ROM_LAYOUT_M65 && (CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K))
+
+fetch_character_skip_spaces:
+
+	jsr fetch_character
+	cmp #$20
+	beq fetch_character_skip_spaces
+
+	rts
+
+
+#endif

src/basic/memory/under_rom_peek_fetch_46k_50k.s

@@ -103,4 +103,52 @@ peek_under_roms_via_FAC1_PLUS_1:
 #endif
 
 
+#if ROM_LAYOUT_M65
+
+
+fetch_character:
+
+	ldy #0
+
+	// Unmap BASIC lower ROM
+
+	lda #$26
+	sta CPU_R6510
+
+	// Retrieve value from under ROMs, advance text pointer
+
+	lda (TXTPTR), y
+	inw TXTPTR
+
+	// Restore memory mapping
+
+	bra peek_under_roms_finalize
+
+
+fetch_character_skip_spaces:
+
+	ldy #0
+
+	// Unmap BASIC lower ROM
+
+	lda #$26
+	sta CPU_R6510
+
+	// Retrieve value from under ROMs, advance text pointer
+!:
+	lda (TXTPTR), y
+	inw TXTPTR
+
+	// Skip space characters
+
+	cmp #$20
+	beq !-
+
+	// Restore memory mapping
+
+	bra peek_under_roms_finalize
+
+
+#endif
+
 #endif