more sane directory name, updated binaries

src/basic/memory/shift_mem_down_38k.s

@@ -0,0 +1,30 @@
+// #LAYOUT# STD *       #TAKE
+// #LAYOUT# *   BASIC_0 #TAKE
+// #LAYOUT# *   *       #IGNORE
+
+
+#if CONFIG_MEMORY_MODEL_38K
+
+shift_mem_down:
+
+	// Move __memmove_size bytes from __memmove_src to __memmove_dst,
+	// where __memmove_dst > __memmove_src
+	// This means we have to copy from the back end down.
+	// This routine assumes the pointers are already pointed
+	// to the end of the areas, and that Y is correctly initialised
+	// to allow the copy to begin.
+
+	php
+!:
+	lda (__memmove_src),y
+	sta (__memmove_dst),y
+	iny
+	bne !-
+	inc __memmove_src+1
+	inc __memmove_dst+1
+	dec __memmove_size+1
+	bne !-
+	plp
+	rts
+
+#endif

src/basic/memory/shift_mem_up_38k.s

@@ -0,0 +1,30 @@
+// #LAYOUT# STD *       #TAKE
+// #LAYOUT# *   BASIC_0 #TAKE
+// #LAYOUT# *   *       #IGNORE
+
+
+#if CONFIG_MEMORY_MODEL_38K
+
+shift_mem_up:
+
+	// Move __memmove_size bytes from __memmove_src to __memmove_dst,
+	// where __memmove_dst > __memmove_src
+	// This means we have to copy from the back end down.
+	// This routine assumes the pointers are already pointed
+	// to the end of the areas, and that Y is correctly initialised
+	// to allow the copy to begin.
+
+	php
+!:	
+	lda (__memmove_src),y
+	sta (__memmove_dst),y
+	dey
+	bne !-
+	dec __memmove_src+1
+	dec __memmove_dst+1
+	dec __memmove_size+1
+	bne !-
+	plp
+	rts
+
+#endif

src/basic/memory/under_rom_routines_46k_50k.s

@@ -0,0 +1,147 @@
+// #LAYOUT# STD *       #TAKE-HIGH
+// #LAYOUT# *   BASIC_0 #TAKE-HIGH
+// #LAYOUT# *   *       #IGNORE
+
+// This has to go $E000 or above - as the routines below bank out the main BASIC ROM!
+
+
+#if CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
+
+
+peek_under_roms_via_TXTPTR:
+
+	// Unmap BASIC lower ROM
+
+	lda #$26
+	sta CPU_R6510
+
+	// Retrieve value from under ROMs
+
+	lda (TXTPTR), y
+
+	// FALLTROUGH
+
+peek_under_roms_finalize:
+
+	// Restore memory mapping
+
+	pha
+	lda #$27
+	sta CPU_R6510
+	pla
+
+	// Quit
+
+	rts
+
+peek_under_roms_via_OLDTXT:
+
+	// Unmap BASIC lower ROM
+
+	lda #$26
+	sta CPU_R6510
+
+	// Retrieve value from under ROMs
+
+	lda (OLDTXT), y
+
+#if HAS_OPCODES_65C02
+	bra peek_under_roms_finalize
+#else
+	jmp peek_under_roms_finalize
+#endif
+
+peek_under_roms_via_FAC1_PLUS_1:
+
+	// Unmap BASIC lower ROM
+
+	lda #$26
+	sta CPU_R6510
+
+	// Retrieve value from under ROMs
+
+	lda (__FAC1 + 1), y
+
+#if HAS_OPCODES_65C02
+	bra peek_under_roms_finalize
+#else
+	jmp peek_under_roms_finalize
+#endif
+
+
+
+shift_mem_up:
+
+	// Move __memmove_size bytes from __memmove_src to __memmove_dst,
+	// where __memmove_dst > __memmove_src
+	// This means we have to copy from the back end down.
+	// This routine assumes the pointers are already pointed
+	// to the end of the areas, and that Y is correctly initialised
+	// to allow the copy to begin.
+
+	// Unmap BASIC lower ROM
+
+	php
+
+	lda #$26
+	sta CPU_R6510
+
+	// Perform the copying
+!:	
+	lda (__memmove_src),y
+	sta (__memmove_dst),y
+	dey
+	bne !-
+	dec __memmove_src+1
+	dec __memmove_dst+1
+	dec __memmove_size+1
+	bne !-
+
+#if HAS_OPCODES_65C02
+	bra shift_mem_finalize
+#else
+	jmp shift_mem_finalize
+#endif
+
+
+shift_mem_down:
+
+	// Move __memmove_size bytes from __memmove_src to __memmove_dst,
+	// where __memmove_dst > __memmove_src
+	// This means we have to copy from the back end down.
+	// This routine assumes the pointers are already pointed
+	// to the end of the areas, and that Y is correctly initialised
+	// to allow the copy to begin.
+
+	// Unmap BASIC lower ROM
+
+	php
+
+	lda #$26
+	sta CPU_R6510
+
+	// Perform the copying
+!:
+	lda (__memmove_src),y
+	sta (__memmove_dst),y
+	iny
+	bne !-
+	inc __memmove_src+1
+	inc __memmove_dst+1
+	dec __memmove_size+1
+	bne !-
+	// FALLTROUGH
+
+shift_mem_finalize:
+
+	// Restore memory mapping and quit
+
+	lda #$27
+	sta CPU_R6510
+	
+	plp
+
+	rts
+
+
+#endif

src/basic/memory/under_rom_routines_60k.s

@@ -0,0 +1,116 @@
+// #LAYOUT# STD *       #TAKE
+// #LAYOUT# *   BASIC_0 #TAKE
+// #LAYOUT# *   *       #IGNORE
+
+
+#if CONFIG_MEMORY_MODEL_60K
+
+// IMPORTANT:
+// These routines lengths cannot be changed without changing
+// the aliases for peek_under_roms, poke_under_roms, etc.
+// Thus those addresses are expressed using formulae.
+
+install_ram_routines:
+	// Copy routines into place
+	ldx #__ram_routines_end-__ram_routines_start-1
+!:
+	lda __ram_routines_start,x
+	sta tiny_nmi_handler,x
+	dex
+	bpl !-
+
+	// Point NMI handler to tiny_nmi_handler
+	lda #<tiny_nmi_handler
+	sta $FFFE
+	lda #>tiny_nmi_handler
+	sta $FFFF
+
+	rts
+
+__ram_routines_start:
+
+	// XXX - Routine order must match that of the KERNAL version of the file.
+	// (since it has fewer routines)
+tiny_nmi_handler_routine:
+	inc missed_nmi_flag
+	rti
+peek_under_roms_routine:
+	php
+	// Offset of arg of lda ($00),y	
+	stx peek_under_roms+pa-peek_under_roms_routine+1
+	jsr memmap_allram
+pa:	lda ($00),y
+	jsr memmap_normal
+	plp
+	rts
+
+poke_under_roms_routine:
+	php
+	// Offset of arg of lda ($00),y	
+	stx poke_under_roms+pb-poke_under_roms_routine+1
+	jsr memmap_allram
+pb:	sta ($00),y
+	jsr memmap_normal
+	plp
+	rts
+
+memmap_normal_routine:
+	pha
+	lda #$37
+	sta $01
+	pla
+	rts
+
+memmap_allram_routine:
+	sei
+	pha
+	lda #$04
+	sta $01
+	pla
+	rts
+
+shift_mem_up_routine:
+	// Move __memmove_size bytes from __memmove_src to __memmove_dst,
+	// where __memmove_dst > __memmove_src
+	// This means we have to copy from the back end down.
+	// This routine assumes the pointers are already pointed
+	// to the end of the areas, and that Y is correctly initialised
+	// to allow the copy to begin.
+	php
+	jsr memmap_allram
+smu1:	
+	lda (__memmove_src),y
+	sta (__memmove_dst),y
+	dey
+	bne smu1
+	dec __memmove_src+1
+	dec __memmove_dst+1
+	dec __memmove_size+1
+	bne smu1
+	plp
+	jmp memmap_normal
+
+shift_mem_down_routine:
+	// Move __memmove_size bytes from __memmove_src to __memmove_dst,
+	// where __memmove_dst > __memmove_src
+	// This means we have to copy from the back end down.
+	// This routine assumes the pointers are already pointed
+	// to the end of the areas, and that Y is correctly initialised
+	// to allow the copy to begin.
+	php
+	jsr memmap_allram
+smd1:
+	lda (__memmove_src),y
+	sta (__memmove_dst),y
+	iny
+	bne smd1
+	inc __memmove_src+1
+	inc __memmove_dst+1
+	dec __memmove_size+1
+	bne smd1
+	plp
+	jmp memmap_normal
+
+__ram_routines_end:
+
+#endif