From: izydorst Date: Mon, 23 Dec 2002 14:52:51 +0000 (+0000) Subject: fixed addressing problems seen on the Real Machine (tm) X-Git-Tag: V2.12.0~1840 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=17a99e2709132c70c6f2bf5a96120c6147837303;p=cc65 fixed addressing problems seen on the Real Machine (tm) git-svn-id: svn://svn.cc65.org/cc65/trunk@1831 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- diff --git a/libsrc/c128/c128-640-200-2.s b/libsrc/c128/c128-640-200-2.s index 26ab0b9d1..a220b9f55 100644 --- a/libsrc/c128/c128-640-200-2.s +++ b/libsrc/c128/c128-640-200-2.s @@ -4,15 +4,12 @@ ; 23.12.2002 ; ; NOTES: -; On the real machine there are some additional pixels appearing (probably bad reads) -; VICE emulator does not show them. Needs further investigation. +; For any smart monkey that will try to optimize this: PLEASE do tests on real VDC, +; not only VICE. ; ; Only DONE routine contains C128-mode specific stuff, everything else will work in ; C64-mode of C128 (C64 needs full VDC init then). ; -; X-axis resolution can be changed by manipulating xres header field so -; any resolution 8..708 is possible only with gfx-mode initialization and CALC changed. -; ; With special initialization and CALC we can get 320x200 double-pixel mode. ; ; Color translation values for BROWN and GRAY3 are obviously wrong, they could @@ -300,6 +297,11 @@ INIT: cmp #TGI_MODE_640_200_2 ; Correct mode? @L1: ldx #$FF stx BITMASK +; Remeber current color value + ldx #VDC_COLORS + jsr VDCReadReg + sta OLDCOLOR + ; Switch into graphics mode (set view page 0) ldy #0 @@ -312,11 +314,6 @@ INIT: cmp #TGI_MODE_640_200_2 ; Correct mode? bne @L2 @L3: -; Remeber current color value - ldx #VDC_COLORS - jsr VDCReadReg - sta OLDCOLOR - ; Done, reset the error code lda #TGI_ERR_OK @@ -333,7 +330,8 @@ INIT: cmp #TGI_MODE_640_200_2 ; Correct mode? DONE: ; This part is C128-mode specific - jsr $ce0c ; reload character set + jsr $e179 ; reload character set and setup VDC + jsr $ff62 lda $d7 ; in 80-columns? bne @L01 @L0: lda SCN80CLR,y @@ -1240,18 +1238,13 @@ icmp: ; VDC helpers VDCSetSourceAddr: - ldx #VDC_DATA_LO - stx VDC_ADDR_REG -@L0: bit VDC_ADDR_REG - bpl @L0 - sta VDC_DATA_REG - dex + pha tya -@L1: bit VDC_ADDR_REG - bpl @L1 - stx VDC_ADDR_REG - sta VDC_DATA_REG - rts + ldx #VDC_DATA_HI + jsr VDCWriteReg + pla + ldx #VDC_DATA_LO + bne VDCWriteReg VDCReadByte: ldx #VDC_DATA diff --git a/libsrc/c128/c128-640-480-2.s b/libsrc/c128/c128-640-480-2.s index 41c5429e2..9f45bc32a 100644 --- a/libsrc/c128/c128-640-480-2.s +++ b/libsrc/c128/c128-640-480-2.s @@ -1,19 +1,16 @@ ; -; Graphics driver for the 640x480x2 mode on the C128 VDC +; Graphics driver for the 640x480x2 mode on the C128 VDC 64k ; (values for this mode based on Fred Bowen's document) ; Maciej 'YTM/Elysium' Witkowiak ; 23.12.2002 ; ; NOTES: -; On the real machine there are some additional pixels appearing (probably bad reads) -; VICE emulator does not show them. Needs further investigation. +; For any smart monkey that will try to optimize this: PLEASE do tests on real VDC, +; not only VICE. ; ; Only DONE routine contains C128-mode specific stuff, everything else will work in ; C64-mode of C128 (C64 needs full VDC init then). ; -; X-axis resolution can be changed by manipulating xres header field so -; any resolution 8..708 is possible only with gfx-mode initialization and CALC changed. -; ; With special initialization and CALC we can get 320x200 double-pixel mode. ; ; Color translation values for BROWN and GRAY3 are obviously wrong, they could @@ -310,6 +307,11 @@ INIT: cmp #TGI_MODE_640_480_2 ; Correct mode? @L11: ldx #$FF stx BITMASK +; Remeber current color value + ldx #VDC_COLORS + jsr VDCReadReg + sta OLDCOLOR + ; Switch into graphics mode (set view page 0) ldy #0 @@ -322,11 +324,6 @@ INIT: cmp #TGI_MODE_640_480_2 ; Correct mode? bne @L2 @L3: -; Remeber current color value - ldx #VDC_COLORS - jsr VDCReadReg - sta OLDCOLOR - ; Done, reset the error code lda #TGI_ERR_OK @@ -343,7 +340,7 @@ INIT: cmp #TGI_MODE_640_480_2 ; Correct mode? DONE: ; This part is C128-mode specific - jsr $e179 ; reload character set + jsr $e179 ; reload character set and setup VDC jsr $ff62 lda $d7 ; in 80-columns? bne @L01 @@ -1256,16 +1253,13 @@ icmp: ; VDC helpers VDCSetSourceAddr: - ldx #VDC_DATA_LO - stx VDC_ADDR_REG -@L0: bit VDC_ADDR_REG - bpl @L0 - sta VDC_DATA_REG - dex + pha tya - stx VDC_ADDR_REG - sta VDC_DATA_REG - rts + ldx #VDC_DATA_HI + jsr VDCWriteReg + pla + ldx #VDC_DATA_LO + bne VDCWriteReg VDCReadByte: ldx #VDC_DATA