RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

revamped 32X draw arm asm code

Browse source
This commit is contained in:
kub 2019-03-22 23:02:11 +01:00
parent 064cc6d103
commit 23eef37f25
2 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -47,7 +47,7 @@ asm_ym2612 ?= 1
asm_misc ?= 1 asm_misc ?= 1
asm_cdmemory ?= 1 asm_cdmemory ?= 1
asm_mix ?= 1 asm_mix ?= 1
asm_32xdraw ?= 0 # currently defunct asm_32xdraw ?= 1
else # if not arm else # if not arm
use_fame ?= 1 use_fame ?= 1
use_cz80 ?= 1 use_cz80 ?= 1

46
pico/32x/draw_arm.s → pico/32x/draw_arm.S
View file

@ -6,9 +6,10 @@
@* See COPYING file in the top-level directory. @* See COPYING file in the top-level directory.
@* @*
#include "pico/pico_int_o32.h"
.extern Pico32x .extern Pico32x
.extern PicoDraw2FB .extern Pico
.extern HighPal
.equiv P32XV_PRI, (1<< 7) .equiv P32XV_PRI, (1<< 7)
@ -22,11 +23,11 @@ Pico32xNativePal:
.align 2 .align 2
.macro call_scan_prep cond .macro call_scan_prep cond est @ &Pico.est
.if \cond .if \cond
ldr r4, =PicoScan32xBegin ldr r4, =PicoScan32xBegin
ldr r5, =PicoScan32xEnd ldr r5, =PicoScan32xEnd
ldr r6, =DrawLineDest ldr r6, [\est, #OFS_EST_DrawLineDest]
ldr r4, [r4] ldr r4, [r4]
ldr r5, [r5] ldr r5, [r5]
stmfd sp!, {r4,r5,r6} stmfd sp!, {r4,r5,r6}
@ -70,19 +71,20 @@ Pico32xNativePal:
\name: \name:
stmfd sp!, {r4-r11,lr} stmfd sp!, {r4-r11,lr}
ldr lr,=Pico
ldr r10,=Pico32x ldr r10,=Pico32x
ldr r11,=PicoDraw2FB ldr r11, [lr, #OFS_Pico_est+OFS_EST_Draw2FB]
ldr r10,[r10, #0x40] @ Pico32x.vdp_regs[0] ldr r10,[r10, #0x40] @ Pico32x.vdp_regs[0]
ldr r11,[r11] add r9, lr, #OFS_Pico_est+OFS_EST_HighPal @ palmd
ldr r9, =HighPal @ palmd
and r4, r2, #0xff and r4, r2, #0xff
mov r5, #328 mov r5, #328
lsl r3, #26 @ mdbg << 26 mov r3, r3, lsl #26 @ mdbg << 26
mla r11,r4,r5,r11 @ r11 = pmd = PicoDraw2FB + offs*328: md data mla r11,r4,r5,r11 @ r11 = pmd = PicoDraw2FB + offs*328: md data
tst r10,#P32XV_PRI tst r10,#P32XV_PRI
moveq r10,#0 moveq r10,#0
movne r10,#0x8000 @ r10 = inv_bit movne r10,#0x8000 @ r10 = inv_bit
call_scan_prep \call_scan call_scan_prep \call_scan lr
mov r4, #0 @ line mov r4, #0 @ line
b 1f @ loop_outer_entry b 1f @ loop_outer_entry
@ -139,16 +141,17 @@ Pico32xNativePal:
\name: \name:
stmfd sp!, {r4-r11,lr} stmfd sp!, {r4-r11,lr}
ldr r11,=PicoDraw2FB ldr lr,=Pico
ldr r10,=Pico32xNativePal ldr r10,=Pico32xNativePal
ldr r11,[r11] ldr r11, [lr, #OFS_Pico_est+OFS_EST_Draw2FB]
ldr r10,[r10] ldr r10,[r10]
ldr r9, =HighPal @ palmd add r9, lr, #OFS_Pico_est+OFS_EST_HighPal @ palmd
and r4, r2, #0xff and r4, r2, #0xff
mov r5, #328 mov r5, #328
lsl r3, #26 @ mdbg << 26 mov r3, r3, lsl #26 @ mdbg << 26
mla r11,r4,r5,r11 @ r11 = pmd = PicoDraw2FB + offs*328: md data mla r11,r4,r5,r11 @ r11 = pmd = PicoDraw2FB + offs*328: md data
call_scan_prep \call_scan call_scan_prep \call_scan lr
mov r4, #0 @ line mov r4, #0 @ line
b 1f @ loop_outer_entry b 1f @ loop_outer_entry
@ -179,8 +182,8 @@ Pico32xNativePal:
ldrneb r8, [r5, #2]! @ r7,r8 - pixel 0,1 index ldrneb r8, [r5, #2]! @ r7,r8 - pixel 0,1 index
subs r6, r6, #1 subs r6, r6, #1
blt 0b @ loop_outer blt 0b @ loop_outer
cmp r7, r8 @ cmp r7, r8 @ is this really improving things?
beq 5f @ check_fill @ +8 @ beq 5f @ check_fill @ +8
3: @ no_fill: 3: @ no_fill:
mov r12,r7, lsl #1 mov r12,r7, lsl #1
@ -297,16 +300,17 @@ Pico32xNativePal:
\name: \name:
stmfd sp!, {r4-r11,lr} stmfd sp!, {r4-r11,lr}
ldr r11,=PicoDraw2FB ldr lr,=Pico
ldr r10,=Pico32xNativePal ldr r10,=Pico32xNativePal
ldr r11,[r11] ldr r11, [lr, #OFS_Pico_est+OFS_EST_Draw2FB]
ldr r10,[r10] ldr r10,[r10]
ldr r9, =HighPal @ palmd add r9, lr, #OFS_Pico_est+OFS_EST_HighPal @ palmd
and r4, r2, #0xff and r4, r2, #0xff
mov r5, #328 mov r5, #328
lsl r3, #26 @ mdbg << 26 mov r3, r3, lsl #26 @ mdbg << 26
mla r11,r4,r5,r11 @ r11 = pmd = PicoDraw2FB + offs*328: md data mla r11,r4,r5,r11 @ r11 = pmd = PicoDraw2FB + offs*328: md data
call_scan_prep \call_scan call_scan_prep \call_scan lr
mov r4, #0 @ line mov r4, #0 @ line
b 1f @ loop_outer_entry b 1f @ loop_outer_entry