X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2F32x%2Fdraw_arm.s;h=ad50ff3ddae7b1e8f6d946f47fb10d76832a58c3;hb=41946d7023cded9999495eb8916eeb5ab0480a1f;hp=94363f9e699c90921cc8d5d016ac8677ebaa69fd;hpb=e51e5983fe5cac8486df76bf349bde8aa23d1e5d;p=picodrive.git diff --git a/pico/32x/draw_arm.s b/pico/32x/draw_arm.s index 94363f9..ad50ff3 100644 --- a/pico/32x/draw_arm.s +++ b/pico/32x/draw_arm.s @@ -1,4 +1,10 @@ -@ vim:filetype=armasm +@* +@* PicoDrive +@* (C) notaz, 2010 +@* +@* This work is licensed under the terms of MAME license. +@* See COPYING file in the top-level directory. +@* .extern Pico32x .extern PicoDraw2FB @@ -69,7 +75,9 @@ Pico32xNativePal: ldr r10,[r10, #0x40] @ Pico32x.vdp_regs[0] ldr r11,[r11] ldr r9, =HighPal @ palmd - add r11,r11,#(328*8) @ r11 = pmd: md data + and r4, r2, #0xff + mov r5, #328 + mla r11,r4,r5,r11 @ r11 = pmd = PicoDraw2FB + offs*328: md data tst r10,#P32XV_PRI moveq r10,#0 movne r10,#0x8000 @ r10 = inv_bit @@ -122,28 +130,8 @@ Pico32xNativePal: @ packed pixel -.macro do_pixel_pp do_md - ldrb r7, [r11], #1 @ MD pixel - eor r12,r5, #1 - ldrb r8, [r12] @ palette index - cmp r7, r3 @ MD has bg pixel? - mov r12,r8,lsl #1 - ldrh r8, [r10,r12] @ t = 32x pixel - mov r7, r7, lsl #1 - add r5, r5, #1 - eorne r12,r8, #0x20 - tstne r12, #0x20 -.if \do_md - ldrneh r8, [r9, r7] @ t = palmd[*pmd] - subs r6, r6, #1 - strh r8, [r0], #2 @ *dst++ = t -.else - streqh r8, [r0], #2 - addne r0, r0, #2 - subs r6, r6, #1 -.endif -.endm - +@ note: this may read a few bytes over the end of PicoDraw2FB and dram, +@ so those should have a bit more alloc'ed than really needed. @ unsigned short *dst, unsigned short *dram, int lines_sft_offs, int mdbg .macro make_do_loop_pp name call_scan do_md .global \name @@ -155,7 +143,9 @@ Pico32xNativePal: ldr r11,[r11] ldr r10,[r10] ldr r9, =HighPal @ palmd - add r11,r11,#(328*8) @ r11 = pmd: md data + and r4, r2, #0xff + mov r5, #328 + mla r11,r4,r5,r11 @ r11 = pmd = PicoDraw2FB + offs*328: md data call_scan_prep \call_scan mov r4, #0 @ line @@ -173,16 +163,128 @@ Pico32xNativePal: mov r12,r4, lsl #1 ldrh r12,[r1, r12] add r11,r11,#8 - mov r6, #320 + mov r6, #320/2 add r5, r1, r12, lsl #1 @ p32x = dram + dram[l] and r12,r2, #0x100 @ shift add r5, r5, r12,lsr #8 2: @ loop_inner: - do_pixel_pp \do_md - do_pixel_pp \do_md - bgt 2b @ loop_inner - b 0b @ loop_outer +@ r4,r6 - counters; r5 - 32x data; r9,r10 - md,32x pal; r11 - md data +@ r7,r8,r12,lr - temp + tst r5, #1 + ldreqb r8, [r5], #2 + ldrb r7, [r5, #-1] + ldrneb r8, [r5, #2]! @ r7,r8 - pixel 0,1 index + subs r6, r6, #1 + blt 0b @ loop_outer + cmp r7, r8 + beq 5f @ check_fill @ +8 + +3: @ no_fill: + mov r12,r7, lsl #1 + mov lr, r8, lsl #1 + ldrh r7, [r10,r12] + ldrh r8, [r10,lr] + add r11,r11,#2 + + eor r12,r7, #0x20 + tst r12,#0x20 + ldrneb r12,[r11,#-2] @ MD pixel 0 + eor lr, r8, #0x20 + cmpne r12,r3 @ MD has bg pixel? +.if \do_md + mov r12,r12,lsl #1 + ldrneh r7, [r9, r12] @ t = palmd[pmd[0]] + tst lr, #0x20 + ldrneb lr, [r11,#-1] @ MD pixel 1 + strh r7, [r0], #2 + cmpne lr, r3 @ MD has bg pixel? + mov lr, lr, lsl #1 + ldrneh r8, [r9, lr] @ t = palmd[pmd[1]] + strh r8, [r0], #2 +.else + streqh r7, [r0] + tst lr, #0x20 + ldrneb lr, [r11,#-1] @ MD pixel 1 + add r0, r0, #4 + cmpne lr, r3 @ MD has bg pixel? + streqh r8, [r0, #-2] +.endif + b 2b @ loop_inner + +5: @ check_fill + @ count pixels, align if needed + bic r12,r5, #1 + ldrh r12,[r12] + orr lr, r7, r7, lsl #8 + cmp r12,lr + bne 3b @ no_fill + + tst r5, #1 + sub lr, r5, #2 @ starting r5 (32x render data start) + addeq r5, r5, #2 + addne r5, r5, #1 @ add for the check above + add r6, r6, #1 @ restore from dec + orr r7, r7, r7, lsl #8 +6: + sub r12,r5, lr + ldrh r8, [r5], #2 + cmp r12,r6, lsl #1 + ldrh r12,[r5], #2 + bge 7f @ count_done + cmp r8, r7 + cmpeq r12,r7 + beq 6b + +7: @ count_done + sub r5, r5, #4 @ undo readahead + + @ fix alignment and check type + sub r8, r5, lr + tst r8, #1 + subne r5, r5, #1 + subne r8, r8, #1 + + and r7, r7, #0xff + cmp r8, r6, lsl #1 + mov r7, r7, lsl #1 + movgt r8, r6, lsl #1 @ r8=count + ldrh r7, [r10,r7] + sub r6, r6, r8, lsr #1 @ adjust counter + tst r7, #0x20 + beq 9f @ bg_mode + + add r11,r11,r8 +8: + subs r8, r8, #2 + strgeh r7, [r0], #2 + strgeh r7, [r0], #2 + bgt 8b + b 2b @ loop_inner + +9: @ bg_mode: + ldrb r12,[r11],#1 @ MD pixel + ldrb lr, [r11],#1 + cmp r12,r3 @ MD has bg pixel? +.if \do_md + mov r12,r12,lsl #1 + ldrneh r12,[r9, r12] @ t = palmd[*pmd] + moveq r12,r7 + cmp lr, r3 + mov lr, lr, lsl #1 + ldrneh lr, [r9, lr] + moveq lr, r7 + strh r12,[r0], #2 + strh lr, [r0], #2 +.else + streqh r7, [r0] + cmp lr, r3 + streqh r7, [r0, #2] + add r0, r0, #4 +.endif + subs r8, r8, #2 + bgt 9b @ bg_mode + b 2b @ loop_inner .endm @@ -198,7 +300,9 @@ Pico32xNativePal: ldr r11,[r11] ldr r10,[r10] ldr r9, =HighPal @ palmd - add r11,r11,#(328*8) @ r11 = pmd: md data + and r4, r2, #0xff + mov r5, #328 + mla r11,r4,r5,r11 @ r11 = pmd = PicoDraw2FB + offs*328: md data call_scan_prep \call_scan mov r4, #0 @ line @@ -263,3 +367,4 @@ make_do_loop_rl do_loop_rl_md, 0, 1 make_do_loop_rl do_loop_rl_scan, 1, 0 make_do_loop_rl do_loop_rl_scan_md, 1, 1 +@ vim:filetype=armasm