From 5fd45f1ece7c60e60212225f069d699ed96d6102 Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Wed, 12 Feb 2020 20:43:48 +0100 Subject: [PATCH] fixed 2 typos in syymbol names, updated binaries --- bin/basic_generic.rom | Bin 8192 -> 8192 bytes bin/basic_testing.rom | Bin 8192 -> 8192 bytes bin/basic_ultimate64.rom | Bin 8192 -> 8192 bytes bin/kernal_generic.rom | Bin 8192 -> 8192 bytes bin/kernal_testing.rom | Bin 8192 -> 8192 bytes bin/kernal_ultimate64.rom | Bin 8192 -> 8192 bytes bin/mega65.rom | Bin 131072 -> 131072 bytes c64/aliases/,aliases_ram_lowmem.s | 4 ++-- c64/kernal/keyboard/chrin_keyboard.s | 20 +++++++++--------- c64/kernal/screen/chrout_screen_ins.s | 2 +- c64/kernal/screen/chrout_screen_return.s | 2 +- c64/kernal/screen/e544.clear_screen.s | 4 ++-- c64/kernal/screen/e8ea.screen_scroll_up.s | 10 ++++----- .../screen/screen_calculate_pntr_lnmx.s | 6 +++--- .../screen/screen_get_logical_line_end_ptr.s | 4 ++-- c64/kernal/screen/screen_grow_logical_line.s | 12 +++++------ 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom index 21915674b22e052c9d7dfed6a98da1c83dee5908..a6b3a27e12b5bab2a0119ccabf451ae57bca33e5 100644 GIT binary patch delta 164 zcmZp0XmHq&!@_j_>E=8ZUq&E3c`xf~-iUWgHz-8BQ#k+Br*`Q?LCMK|Y!-~iCm&}E z0I8H@zt6;YeDhCEEe?(5g1X2HlOn}s86Jb6!wvNv}D_7*F$ICAS E0QYrA@Bjb+ delta 164 zcmZp0XmHq&!@~6O)#f}FUq&E3c`xf~-p+SRHz;(zQ~3DGr*`Q?LCMK|Y!-}fCLd=D z0I8H@zt6<@X7f)@Ee?(5g1X2HlOn}s86Jb6!w)0PY?!Hc#C}=%d zTZV7)2Pw{p3QC*zNQy8^eSEdjUg6UJj8zIpS1P=DwMY>}e|!Z*n_tP4FfkfTj+b8u E0104xT|Kw!jVAPu=q|2x`Sx?9cNM;I|0?nE)^qifw7?o-!I*up#EM#Z}WcXG)6|v$!fBpK*cq(w}6Vn<=7b+jV8y-XGmhRUP14Tg5Kl@ G@(KV}ib9(J delta 178 zcmZp0XmHq&!@?N3IhVzc5lHP}m0{F~e6!MC;nM$%RSHK}DuldQqzI&!TAlp=foG9C zn7PbSVeLAF$W81&m>5Gg|Kw!jV2qq3q{|pNSx?9cNM;I|0?nE)^qieF^P>;v+s)ll z+Kikw@0V^+uz9Z#xp}{I8Y5%KWHs4PpyC?YTR_F(a_o$Z29x9EGbFKDuMqi0A#(Bq Gc?AFww?xbU diff --git a/bin/basic_ultimate64.rom b/bin/basic_ultimate64.rom index ff716437f734af5a37f4d8015b8ffa81b68310c8..bd9dfcf4f2b98e27c7dbb15792ab3d278e1d385c 100644 GIT binary patch delta 152 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 diff --git a/bin/kernal_testing.rom b/bin/kernal_testing.rom index 36d43691c572d95e5b38162431ba98d58e0e2fe5..7bd2be849d7edf40f59963f6f9ec396cea0a657c 100644 GIT binary patch delta 2974 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 RukkwWA)BCl{oR-9e*y0esl)&P delta 2954 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 b*rMS!mRwctgr1&gr=rE}EcyShjxG2fxW~5s diff --git a/c64/aliases/,aliases_ram_lowmem.s b/c64/aliases/,aliases_ram_lowmem.s index 828aef45..fa426b09 100644 --- a/c64/aliases/,aliases_ram_lowmem.s +++ b/c64/aliases/,aliases_ram_lowmem.s @@ -145,7 +145,7 @@ .label NDX = $C6 // number of chars in keyboard buffer .label RVS = $C7 // flag, whether to print reversed characters .label INDX = $C8 // end of logical line (column, 0-79) - .label LXSP = $C9 // $C9-$CA start of input, X/Y position + .label LSXP = $C9 // $C9-$CA start of input, X/Y position (typo in Mapping the C64, fixed in Mapping the C128) .label SFDX = $CB // -- NOT IMPLEMENTED -- .label BLNSW = $CC // cursor blink disable flag .label BLNCT = $CD // cursor blink countdown @@ -159,7 +159,7 @@ .label TBLX = $D6 // current screen Y position (row), 0-24 .label SCHAR = $D7 // ASCII value of the last printed character .label INSRT = $D8 // insert mode flag/counter - .label LDTBL = $D9 // $D9-$F2 screen line link table, [!] our usage is different XXX give more details + .label LDTB1 = $D9 // $D9-$F2 screen line link table, [!] our usage is different XXX give more details .label USER = $F3 // $F3-$F4 pointer to current color RAM location .label KEYTAB = $F5 // $F5-$F6 pointer to keyboard lookup table .label RIBUF = $F7 // $F7-$F8 -- WIP -- RS-232 receive buffer pointer diff --git a/c64/kernal/keyboard/chrin_keyboard.s b/c64/kernal/keyboard/chrin_keyboard.s index 7e914c6d..a7ab5e83 100644 --- a/c64/kernal/keyboard/chrin_keyboard.s +++ b/c64/kernal/keyboard/chrin_keyboard.s @@ -25,7 +25,7 @@ chrin_repeat: lda CRSW beq read_from_keyboard - // Yes, we have input waiting at (LXSP)+CRSW + // Yes, we have input waiting at (LSXP)+CRSW // When CRSW = INDX, then we return a carriage return // and clear the flag cmp INDX @@ -57,7 +57,7 @@ not_end_of_input: tay chrin_keyboard_return_byte: - lda (LXSP),y + lda (LSXP),y jsr screen_check_toggle_quote tax ply_trash_a @@ -92,20 +92,20 @@ chrin_enter: // Set pointer to line of input lda PNT+0 - sta LXSP+0 + sta LSXP+0 lda PNT+1 - sta LXSP+1 + sta LSXP+1 - // If the current line is a continuation of the previous one, decrease LXSP by 40 + // If the current line is a continuation of the previous one, decrease LSXP by 40 ldy TBLX - lda LDTBL, y + lda LDTB1, y bmi chrin_enter_calc_length // branch if not continuation - lda LXSP+0 + lda LSXP+0 sec sbc #40 - sta LXSP+0 + sta LSXP+0 bcs !+ - dec LXSP+1 + dec LSXP+1 !: ldy #80 bne chrin_enter_loop // branch always @@ -121,7 +121,7 @@ chrin_enter_loop: // Retrieve bytes dey bmi empty_line - lda (LXSP),y + lda (LSXP),y cmp #$20 beq chrin_enter_loop iny diff --git a/c64/kernal/screen/chrout_screen_ins.s b/c64/kernal/screen/chrout_screen_ins.s index 61ac4211..0e3eed38 100644 --- a/c64/kernal/screen/chrout_screen_ins.s +++ b/c64/kernal/screen/chrout_screen_ins.s @@ -26,7 +26,7 @@ chrout_screen_ins_possible: // Special handling for cursor in second line ldx TBLX - lda LDTBL+0, x + lda LDTB1+0, x bpl chrout_screen_ins_second_line // Perform character copy diff --git a/c64/kernal/screen/chrout_screen_return.s b/c64/kernal/screen/chrout_screen_return.s index 5f42ae14..93a28a19 100644 --- a/c64/kernal/screen/chrout_screen_return.s +++ b/c64/kernal/screen/chrout_screen_return.s @@ -24,7 +24,7 @@ chrout_screen_RETURN: cpy #24 beq !+ // last line on screen - no need for a double line skip - lda LDTBL+1, y + lda LDTB1+1, y bmi !+ // current line is not continued inc TBLX diff --git a/c64/kernal/screen/e544.clear_screen.s b/c64/kernal/screen/e544.clear_screen.s index 7c241c09..8c3abe1d 100644 --- a/c64/kernal/screen/e544.clear_screen.s +++ b/c64/kernal/screen/e544.clear_screen.s @@ -17,9 +17,9 @@ clear_screen: // continuation of the previous one lda #$80 - ldy #24 + ldy #24 !: - sta LDTBL,y + sta LDTB1,y dey bpl !- diff --git a/c64/kernal/screen/e8ea.screen_scroll_up.s b/c64/kernal/screen/e8ea.screen_scroll_up.s index 2b11f352..7d4712d4 100644 --- a/c64/kernal/screen/e8ea.screen_scroll_up.s +++ b/c64/kernal/screen/e8ea.screen_scroll_up.s @@ -47,18 +47,18 @@ screen_scroll_up: screen_scroll_up_delay_done: // entry point for cursor move control codes - // Scroll the LDTBL (line link table) + // Scroll the LDTB1 (line link table) ldy #$00 !: - lda LDTBL+1, y - sta LDTBL+0, y + lda LDTB1+1, y + sta LDTB1+0, y iny cpy #24 bne !- lda #$80 - sta LDTBL+24 + sta LDTB1+24 // Preserve SAL and EAL, prepare initial SAL/EAL/PNT/USER values @@ -126,7 +126,7 @@ screen_scroll_up_loop_done: // If the first line is linked, scroll once more - bit LDTBL+0 + bit LDTB1+0 bpl screen_scroll_up // Recalculate PNT and USER diff --git a/c64/kernal/screen/screen_calculate_pntr_lnmx.s b/c64/kernal/screen/screen_calculate_pntr_lnmx.s index b024c448..75c31643 100644 --- a/c64/kernal/screen/screen_calculate_pntr_lnmx.s +++ b/c64/kernal/screen/screen_calculate_pntr_lnmx.s @@ -12,7 +12,7 @@ screen_calculate_PNTR_LNMX: ldy TBLX - lda LDTBL, y + lda LDTB1, y php jsr screen_get_clipped_PNTR plp @@ -38,14 +38,14 @@ screen_calculate_PNTR_0_39: screen_calculate_LNMX: ldy TBLX - lda LDTBL, y + lda LDTB1, y bpl screen_calculate_lnmx_79 // this line is a continuation cpy #24 beq screen_calculate_lnmx_39 // this is the last line, which is not a continuation iny - lda LDTBL, y + lda LDTB1, y bpl screen_calculate_lnmx_79 // line is continued // FALLTROUGH diff --git a/c64/kernal/screen/screen_get_logical_line_end_ptr.s b/c64/kernal/screen/screen_get_logical_line_end_ptr.s index b2bbc293..d52dbc75 100644 --- a/c64/kernal/screen/screen_get_logical_line_end_ptr.s +++ b/c64/kernal/screen/screen_get_logical_line_end_ptr.s @@ -10,10 +10,10 @@ screen_get_logical_line_end_ptr: cpy #24 bcs screen_get_logical_line_end_39 // last line of the screen - lda LDTBL+0, y + lda LDTB1+0, y bpl screen_get_logical_line_end_39 // current line continues previous one - lda LDTBL+1, y + lda LDTB1+1, y bmi screen_get_logical_line_end_39 // current line is not continued // FALLTROUGH diff --git a/c64/kernal/screen/screen_grow_logical_line.s b/c64/kernal/screen/screen_grow_logical_line.s index 96ecac98..b7e5acc6 100644 --- a/c64/kernal/screen/screen_grow_logical_line.s +++ b/c64/kernal/screen/screen_grow_logical_line.s @@ -26,7 +26,7 @@ screen_grow_logical_line: // Do not grow line if previus one is grown ldy TBLX - lda LDTBL+0, y + lda LDTB1+0, y bpl screen_grow_logical_line_done_scroll // If last line, scroll the screen up @@ -34,22 +34,22 @@ screen_grow_logical_line: beq screen_grow_logical_line_screen_up // Do not grow line if already grown - lda LDTBL+1, y + lda LDTB1+1, y bpl screen_grow_logical_line_done // Preserve SAL and EAL jsr screen_preserve_sal_eal - // Scroll LDTBL down (start from the end) + // Scroll LDTB1 down (start from the end) ldy #23 !: cpy TBLX beq !+ bcc !+ - lda LDTBL+0, y - sta LDTBL+1, y + lda LDTB1+0, y + sta LDTB1+1, y dey bne !- @@ -57,7 +57,7 @@ screen_grow_logical_line: // Mark current line as grown ldy TBLX lda #$00 - sta LDTBL+1, y + sta LDTB1+1, y // Now we have to scroll lines downwards to make space. We start from the end, // and work backwards. We cannot be as simple and efficient here as we are