From a523a64e242dbb83c6b67f3bdfd0f7f291a010c4 Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Fri, 1 Apr 2016 10:26:27 +1100 Subject: [PATCH] Work in progress to new char blit --- 025.scroll_text/Makefile | 2 +- 025.scroll_text/blitchar.s | 143 ++++++++++++++++++++++++++++++++++ 025.scroll_text/scroll_text.s | 5 +- 3 files changed, 146 insertions(+), 4 deletions(-) create mode 100644 025.scroll_text/blitchar.s diff --git a/025.scroll_text/Makefile b/025.scroll_text/Makefile index 71242a1..3f9875a 100644 --- a/025.scroll_text/Makefile +++ b/025.scroll_text/Makefile @@ -9,7 +9,7 @@ BASE_ADDRESS=4000 NUM_COLORS=16 BOOTBLOCK_ASM=alpine_bootblock.s -OBJS=out/init.o out/utils.o out/image.o out/blittext.o out/cpu.o out/blit.o +OBJS=out/init.o out/utils.o out/image.o out/blitchar.o out/cpu.o out/blit.o IMAGES=font8x8.png IMAGEDATA=$(addprefix out/, $(IMAGES:.png=.bin)) diff --git a/025.scroll_text/blitchar.s b/025.scroll_text/blitchar.s new file mode 100644 index 0000000..9ef2698 --- /dev/null +++ b/025.scroll_text/blitchar.s @@ -0,0 +1,143 @@ + include "includes.i" + xdef BlitChar8 + +BLIT_LF_MINTERM equ $ca ; cookie cut +BLIT_WIDTH_WORDS equ 2 ; blit 2 words to allow shifting +BLIT_WIDTH_BYTES equ 4 +FONTMAP_WIDTH_BYTES equ 32 + +BlitChar8: + ;; a0 - bitplane + ;; d0 - xpos + ;; d1 - ypos + ;; d2 - char + movem.l d0-d7/a0-a4,-(sp) + WaitBlitter + + ;; blitter config that is shared for every character + if MASKED_FONT==1 + move.w #BLIT_SRCA|BLIT_SRCB|BLIT_SRCC|BLIT_DEST|BLIT_LF_MINTERM,d6 ; BLTCON0 value (masked version) + move.w #FONTMAP_WIDTH_BYTES-BLIT_WIDTH_BYTES,BLTAMOD(a6) ; A modulo (only used for masked version) + else + move.w #BLIT_SRCB|BLIT_SRCC|BLIT_DEST|BLIT_LF_MINTERM,d6 ; BLTCON0 value + endif + move.w #FONTMAP_WIDTH_BYTES-BLIT_WIDTH_BYTES,BLTBMOD(a6) ; B modulo + move.w #BITPLANE_WIDTH_BYTES-BLIT_WIDTH_BYTES,BLTCMOD(a6) ; C modulo + move.w #BITPLANE_WIDTH_BYTES-BLIT_WIDTH_BYTES,BLTDMOD(a6) ; D modulo + mulu.w #BITPLANE_WIDTH_BYTES*SCREEN_BIT_DEPTH,d1 ; ypos bytes + move.w #$0000,BLTALWM(a6) ; mask out extra word used for shifting + move.w #$ffff,BLTADAT(a6) ; preload source mask so only BLTA?WM mask is used + move.l #font,a5 ; font pointer + move.l #fontMask,d7 ; font mask pointer + move.w #FONTMAP_WIDTH_BYTES*SCREEN_BIT_DEPTH*FONT_HEIGHT,d3 ; bytes per font line + + move.l a0,a4 ; bitplane pointer + bsr DrawChar8 ; draw it + + movem.l (sp)+,d0-d7/a0-a4 + rts + +DrawChar8: + ;; kills d2,d4,d5,a1,a2,a4 + ;; d0 - xpos + ;; d1 - ypos bytes + ;; d2* - char + ;; d3 - bytes per font line + ;; d6 - bltcon0 value + ;; a4* - bitplane + ;; a5 - #font + ;; d7 - #fontMask + + sub.w #'!',d2 ; index = char - '!' + move.w d2,d5 + + lsr.w #5,d5 ; char / 32 = fontmap line + andi.w #$1f,d2 ; char index in line (char index - start of line index) + + add.l #1,d5 ; while we have a weird font image, '!' starts on second line + move.l a5,a1 ; #font + + if 1 + mulu.w d3,d5 ; d5 *= #FONTMAP_WIDTH_BYTES*SCREEN_BIT_DEPTH*FONT_HEIGHT + else + move.w d5,d3 + lsl.w #7,d3 ; d5 *= FONTMAP_WIDTH_BYTES*SCREEN_BIT_DEPTH + move.w d3,d5 + add.l d3,d5 + add.l d3,d5 + add.l d3,d5 + add.l d3,d5 + add.l d3,d5 + add.l d3,d5 + add.l d3,d5 + add.l d3,d5 + add.l d3,d5 + endif + + if MASKED_FONT==1 + move.l d7,a2 ; #fontMask + add.w d5,a2 ; add y offset in lines to fontMask address + endif + + add.w d5,a1 ; add y offset in lines to font address + + add.w d2,a1 ; add offset into font + if MASKED_FONT==1 + add.l d2,a2 ; add offset into mask + endif + +.blitChar8: + ;; kills a4,d2,d4,d5 + ;; d0 - xpos + ;; d1 - ypos bytes + ;; d2.0 - odd character = 1, even character = 0 + ;; d3 - bytes per font line + ;; d6 - bltcon0 value + ;; a4 - display + ;; a1 - object + ;; a2 - mask + + move.l d0,d4 ; xpos + move.l d0,d5 ; xpos + lsr.w #3,d4 ; d4 = xpos bytes + + WaitBlitter + + btst #0,d2 ; check if odd or even char + beq .evenChar ; +.oddChar + subq #8,d5 ; offset the x position for the odd character + move.w #$00FF,BLTAFWM(a6) ; select the second (odd) character in the word + subq #1,a4 ; move the destination pointer left by one byte + bra .continue +.evenChar: + move.w #$FF00,BLTAFWM(a6) ; select the first character in the word +.continue: + + ;; this shift will give us the bits to shift (bits 0-3) in bits (12-15) of d5 + swap d5 ; d5 << 12 + lsr.l #4,d5 ; + + move.w d5,BLTCON1(A6) ; set the shift bits 12-15, bits 00-11 cleared + + if MASKED_FONT==1 + move.l a2,BLTAPTH(a6) ; mask bitplane + endif + + move.l a1,BLTBPTH(a6) ; source bitplane + or.w d6,d5 ; d5 = BLTCON0 value + move.w d5,BLTCON0(a6) ; set minterm, dma channel and shift + + add.l d4,a4 ; dest += XPOS_BYTES + add.l d1,a4 ; dest += YPOS_BYTES + + move.l a4,BLTCPTH(a6) ; background top left corner + move.l a4,BLTDPTH(a6) ; destination top left corner + + move.w #(FONT_HEIGHT*SCREEN_BIT_DEPTH)<<6|(BLIT_WIDTH_WORDS),BLTSIZE(a6) ;rectangle size, starts blit + rts + +font: + incbin "out/font8x8.bin" +fontMask: + incbin "out/font8x8-mask.bin" diff --git a/025.scroll_text/scroll_text.s b/025.scroll_text/scroll_text.s index d4724a6..4fa26a1 100644 --- a/025.scroll_text/scroll_text.s +++ b/025.scroll_text/scroll_text.s @@ -49,12 +49,11 @@ MainLoop: .wrapText: lea text,a3 .moreText: - move.b (a3)+,charbuffer + move.b (a3)+,d2 move.l #BITPLANE_WIDTH-16,d0 ; xpos move.l #16,d1 ; ypos move.l onscreen,a0 - lea charbuffer,a1 - jsr DrawText8 + jsr BlitChar8 move.l #0,shiftcounter .shift: move.l onscreen,a0