From 3b9bfde993b1a87899ebef3a69343ee412b7c5bf Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Tue, 31 Dec 2019 18:14:03 +0100 Subject: [PATCH] disabled screen editor - preparation for rework --- c64/kernal/interrupts/ea31.default_irq_handler.s | 4 ++-- c64/kernal/screen/chrout_screen.s | 4 ++-- .../screen/chrout_screen_advance_to_next_line.s | 4 ++++ c64/kernal/screen/chrout_screen_clr.s | 4 +++- c64/kernal/screen/chrout_screen_crsr.s | 12 ++++++++++++ c64/kernal/screen/chrout_screen_del.s | 6 ++++++ c64/kernal/screen/chrout_screen_home.s | 5 +++++ c64/kernal/screen/chrout_screen_ins.s | 5 +++++ c64/kernal/screen/chrout_screen_return.s | 4 +++- c64/kernal/screen/chrout_screen_shift_onoff.s | 1 + c64/kernal/screen/chrout_screen_tab.s | 7 ++++++- c64/kernal/screen/clear_screen_real.s | 8 ++++++++ c64/kernal/screen/cursor.s | 7 +++++++ c64/kernal/screen/cursor_enable.s | 1 + c64/kernal/screen/cursor_home.s | 2 ++ c64/kernal/screen/cursor_show.s | 5 +++++ c64/kernal/screen/e50a.plot.s | 8 +++++++- c64/kernal/screen/e544.clear_screen.jmp.s | 2 ++ c64/kernal/screen/screen_calculate_line_pointer.s | 3 +++ .../screen/screen_get_current_line_logical_length.s | 8 +++++++- c64/kernal/screen/screen_grow_logical_line.s | 3 +++ c64/kernal/screen/screen_normalize_xy.s | 4 ++++ c64/kernal/screen/screen_scroll_up_if_on_last_line.s | 3 +++ 23 files changed, 101 insertions(+), 9 deletions(-) diff --git a/c64/kernal/interrupts/ea31.default_irq_handler.s b/c64/kernal/interrupts/ea31.default_irq_handler.s index be964c9f..67912afd 100644 --- a/c64/kernal/interrupts/ea31.default_irq_handler.s +++ b/c64/kernal/interrupts/ea31.default_irq_handler.s @@ -11,8 +11,8 @@ default_irq_handler: #endif // CONFIG_RS232_UP9600 - - jsr cursor_blink +/* YYY disabled for rework + jsr cursor_blink */ jsr JSCNKEY jsr JUDTIM // update jiffy clock diff --git a/c64/kernal/screen/chrout_screen.s b/c64/kernal/screen/chrout_screen.s index 0b447fad..6a42cd38 100644 --- a/c64/kernal/screen/chrout_screen.s +++ b/c64/kernal/screen/chrout_screen.s @@ -55,7 +55,7 @@ chrout_screen: clc adc #$20 -output_literal_char: +output_literal_char: /* YYY disabled for rework // Write normal character on the screen @@ -108,7 +108,7 @@ chrout_screen_calc_lptr_done: jsr screen_calculate_line_pointer // FALLTROUGH - +*/ chrout_screen_done: jsr cursor_show_if_enabled diff --git a/c64/kernal/screen/chrout_screen_advance_to_next_line.s b/c64/kernal/screen/chrout_screen_advance_to_next_line.s index 323c47e8..ee417668 100644 --- a/c64/kernal/screen/chrout_screen_advance_to_next_line.s +++ b/c64/kernal/screen/chrout_screen_advance_to_next_line.s @@ -1,4 +1,6 @@ +/* YYY disabled for rework + chrout_screen_advance_to_next_line: // Go to start of line @@ -42,3 +44,5 @@ chrout_screen_advance_to_next_line: !: jmp chrout_screen_calc_lptr_done + +*/ diff --git a/c64/kernal/screen/chrout_screen_clr.s b/c64/kernal/screen/chrout_screen_clr.s index ab9469dd..1fb48047 100644 --- a/c64/kernal/screen/chrout_screen_clr.s +++ b/c64/kernal/screen/chrout_screen_clr.s @@ -3,7 +3,9 @@ // CLR key handling within CHROUT // -chrout_screen_CLR: +chrout_screen_CLR: /* YYY disabled for rework jsr clear_screen jmp chrout_screen_done + +*/ diff --git a/c64/kernal/screen/chrout_screen_crsr.s b/c64/kernal/screen/chrout_screen_crsr.s index ed174568..78bd2a71 100644 --- a/c64/kernal/screen/chrout_screen_crsr.s +++ b/c64/kernal/screen/chrout_screen_crsr.s @@ -4,6 +4,16 @@ // +chrout_screen_CRSR_UP: + rts +chrout_screen_CRSR_DOWN: + rts +chrout_screen_CRSR_LEFT: + rts +chrout_screen_CRSR_RIGHT: + rts + +/* YYY disabled for rework chrout_screen_CRSR_UP: lda PNTR @@ -41,3 +51,5 @@ chrout_screen_CRSR_RIGHT: inc PNTR jmp chrout_screen_calc_lptr_done + +*/ diff --git a/c64/kernal/screen/chrout_screen_del.s b/c64/kernal/screen/chrout_screen_del.s index 88a403b2..c7bb1274 100644 --- a/c64/kernal/screen/chrout_screen_del.s +++ b/c64/kernal/screen/chrout_screen_del.s @@ -3,6 +3,10 @@ // CHROUT routine - screen support, DEL key handling // +chrout_screen_DEL: + rts + +/* YYY disabled for rework chrout_screen_DEL: // In insert mode it embeds control character @@ -63,3 +67,5 @@ chrout_screen_del_column_non_0: chrout_screen_del_done: jmp chrout_screen_done + +*/ \ No newline at end of file diff --git a/c64/kernal/screen/chrout_screen_home.s b/c64/kernal/screen/chrout_screen_home.s index 77976bd0..ef800ca9 100644 --- a/c64/kernal/screen/chrout_screen_home.s +++ b/c64/kernal/screen/chrout_screen_home.s @@ -4,7 +4,12 @@ // +chrout_screen_HOME: + rts + +/* YYY disabled for rework chrout_screen_HOME: jsr cursor_home jmp chrout_screen_done +*/ \ No newline at end of file diff --git a/c64/kernal/screen/chrout_screen_ins.s b/c64/kernal/screen/chrout_screen_ins.s index 3082012a..81493f88 100644 --- a/c64/kernal/screen/chrout_screen_ins.s +++ b/c64/kernal/screen/chrout_screen_ins.s @@ -3,6 +3,10 @@ // CHROUT routine - screen support, INS key handling // +chrout_screen_INS: + rts + +/* YYY disabled for rework chrout_screen_INS: // Insert (shift-DELETE) @@ -62,3 +66,4 @@ chrout_screen_INS: sta (PNT),y jmp chrout_screen_done +*/ \ No newline at end of file diff --git a/c64/kernal/screen/chrout_screen_return.s b/c64/kernal/screen/chrout_screen_return.s index 521c5323..d8313f24 100644 --- a/c64/kernal/screen/chrout_screen_return.s +++ b/c64/kernal/screen/chrout_screen_return.s @@ -4,7 +4,7 @@ // -chrout_screen_RETURN: +chrout_screen_RETURN: /* YYY disabled for rework // RETURN clears quote and insert modes, it also clears reverse flag lda #$00 @@ -12,3 +12,5 @@ chrout_screen_RETURN: sta INSRT sta RVS jmp chrout_screen_advance_to_next_line + +*/ diff --git a/c64/kernal/screen/chrout_screen_shift_onoff.s b/c64/kernal/screen/chrout_screen_shift_onoff.s index 8f16587d..4f56ebac 100644 --- a/c64/kernal/screen/chrout_screen_shift_onoff.s +++ b/c64/kernal/screen/chrout_screen_shift_onoff.s @@ -3,6 +3,7 @@ // SHIFT ON/OFF handling within CHROUT // + chrout_screen_SHIFT_ON: lda #$00 // enable SHIFT+VENDOR combination diff --git a/c64/kernal/screen/chrout_screen_tab.s b/c64/kernal/screen/chrout_screen_tab.s index ac48295c..bd94c16f 100644 --- a/c64/kernal/screen/chrout_screen_tab.s +++ b/c64/kernal/screen/chrout_screen_tab.s @@ -6,7 +6,12 @@ #if CONFIG_EDIT_TABULATORS +chrout_screen_TAB_FW: + rts +chrout_screen_TAB_BW: + rts +/* YYY disabled for rework chrout_screen_TAB_FW: lda PNTR @@ -27,7 +32,7 @@ chrout_screen_TAB_BW: and #%11111000 sta PNTR !: - jmp chrout_screen_calc_lptr_done + jmp chrout_screen_calc_lptr_done */ #endif // CONFIG_EDIT_TABULATORS diff --git a/c64/kernal/screen/clear_screen_real.s b/c64/kernal/screen/clear_screen_real.s index df0b835a..83126486 100644 --- a/c64/kernal/screen/clear_screen_real.s +++ b/c64/kernal/screen/clear_screen_real.s @@ -1,6 +1,12 @@ // Clear screen and initialise line link table // (Compute's Mapping the 64 p215-216) + +clear_screen_real: + rts + +/* YYY disabled for rework + clear_screen_real: // XXX it is probably a good idea to hide cursor first @@ -60,3 +66,5 @@ clearscreen_l3: // (Compute's Mapping the 64 p216) jmp cursor_home + +*/ diff --git a/c64/kernal/screen/cursor.s b/c64/kernal/screen/cursor.s index 0221cf18..fdf585c6 100644 --- a/c64/kernal/screen/cursor.s +++ b/c64/kernal/screen/cursor.s @@ -11,7 +11,13 @@ // - PNTR (current screen x position) // +cursor_disable: + rts +cursor_hide_if_visible: + rts + +/* YYY disabled for rework cursor_blink: // Is the cursor enabled? lda BLNSW @@ -79,3 +85,4 @@ cursor_blink_timer_reset: cursor_blink_end: rts +*/ \ No newline at end of file diff --git a/c64/kernal/screen/cursor_enable.s b/c64/kernal/screen/cursor_enable.s index 72646312..09b53906 100644 --- a/c64/kernal/screen/cursor_enable.s +++ b/c64/kernal/screen/cursor_enable.s @@ -4,6 +4,7 @@ // - BLNSW (cursor blink switch) // + cursor_enable: lda #$00 sta BLNSW diff --git a/c64/kernal/screen/cursor_home.s b/c64/kernal/screen/cursor_home.s index bb9d9bd2..bd9461e4 100644 --- a/c64/kernal/screen/cursor_home.s +++ b/c64/kernal/screen/cursor_home.s @@ -3,6 +3,7 @@ // Home the cursor (Compute's Mapping the 64 p216) // +/* YYY disabled for rework cursor_home: lda #$00 @@ -10,3 +11,4 @@ cursor_home: sta TBLX // y position jmp screen_calculate_line_pointer +*/ \ No newline at end of file diff --git a/c64/kernal/screen/cursor_show.s b/c64/kernal/screen/cursor_show.s index c21b092c..3c29c870 100644 --- a/c64/kernal/screen/cursor_show.s +++ b/c64/kernal/screen/cursor_show.s @@ -6,6 +6,10 @@ // - BLNCT (cursor blink countdown) // +cursor_show_if_enabled: + rts + +/* YYY disabled for rework cursor_show_if_enabled: lda BLNSW bne cursor_show_end @@ -32,3 +36,4 @@ cursor_show: cursor_show_end: rts +*/ diff --git a/c64/kernal/screen/e50a.plot.s b/c64/kernal/screen/e50a.plot.s index a36dfc08..627eced5 100644 --- a/c64/kernal/screen/e50a.plot.s +++ b/c64/kernal/screen/e50a.plot.s @@ -8,7 +8,12 @@ // CPU registers that has to be preserved (see [RG64]): none // -PLOT: + +plot_set: + rts + + +PLOT: /* YYY disabled for rework bcs plot_get // Note: the 'set' part has to start from $E50C, as this is a known address @@ -30,3 +35,4 @@ plot_get: ldy PNTR ldx TBLX rts +*/ \ No newline at end of file diff --git a/c64/kernal/screen/e544.clear_screen.jmp.s b/c64/kernal/screen/e544.clear_screen.jmp.s index 50d16f38..6adfba39 100644 --- a/c64/kernal/screen/e544.clear_screen.jmp.s +++ b/c64/kernal/screen/e544.clear_screen.jmp.s @@ -1,6 +1,8 @@ + // Clear screen and initialise line link table // (Compute's Mapping the 64 p215-216) + clear_screen: jmp clear_screen_real diff --git a/c64/kernal/screen/screen_calculate_line_pointer.s b/c64/kernal/screen/screen_calculate_line_pointer.s index d982a38d..9383646d 100644 --- a/c64/kernal/screen/screen_calculate_line_pointer.s +++ b/c64/kernal/screen/screen_calculate_line_pointer.s @@ -1,4 +1,6 @@ +/* YYY disabled for rework + screen_calculate_line_pointer: jsr screen_normalize_xy @@ -52,3 +54,4 @@ update_colour_line_pointer: sta USER+1 rts +*/ \ No newline at end of file diff --git a/c64/kernal/screen/screen_get_current_line_logical_length.s b/c64/kernal/screen/screen_get_current_line_logical_length.s index 9d8aafc1..e81640fe 100644 --- a/c64/kernal/screen/screen_get_current_line_logical_length.s +++ b/c64/kernal/screen/screen_get_current_line_logical_length.s @@ -1,4 +1,9 @@ +screen_get_current_line_logical_length: + rts + +/* YYY disabled for rework + screen_get_current_line_logical_length: ldy TBLX lda LDTBL,y @@ -8,4 +13,5 @@ screen_get_current_line_logical_length: !: lda #39 sta LNMX - rts \ No newline at end of file + rts +*/ \ No newline at end of file diff --git a/c64/kernal/screen/screen_grow_logical_line.s b/c64/kernal/screen/screen_grow_logical_line.s index a4ac0b48..59a49a09 100644 --- a/c64/kernal/screen/screen_grow_logical_line.s +++ b/c64/kernal/screen/screen_grow_logical_line.s @@ -1,5 +1,7 @@ +/* YYY disabled for rework + screen_grow_logical_line_done: rts @@ -155,3 +157,4 @@ no_copy_down: bne !- rts +*/ diff --git a/c64/kernal/screen/screen_normalize_xy.s b/c64/kernal/screen/screen_normalize_xy.s index b4dc6ecd..90486ed3 100644 --- a/c64/kernal/screen/screen_normalize_xy.s +++ b/c64/kernal/screen/screen_normalize_xy.s @@ -4,6 +4,8 @@ // If X < 0, then make X = X + 40 (or 80, if previous line is linked) // +/* YYY disabled for rework + screen_normalize_xy: lda PNTR @@ -73,3 +75,5 @@ link_count_loop: sta TBLX y_ok: rts + +*/ \ No newline at end of file diff --git a/c64/kernal/screen/screen_scroll_up_if_on_last_line.s b/c64/kernal/screen/screen_scroll_up_if_on_last_line.s index 1ad713cc..30008068 100644 --- a/c64/kernal/screen/screen_scroll_up_if_on_last_line.s +++ b/c64/kernal/screen/screen_scroll_up_if_on_last_line.s @@ -1,4 +1,6 @@ +/* YYY disabled for rework + not_last_line: rts @@ -126,3 +128,4 @@ link_copy: // Restore correct line pointers jmp screen_calculate_line_pointer +*/ \ No newline at end of file