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

giz wip (acc 16bit faster than 8!)

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@260 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-09-24 21:06:34 +00:00
parent 2ec14aec8f
commit 499a0be394
7 changed files with 201 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

3
platform/gizmondo/Makefile
View file

@ -106,7 +106,8 @@ all: PicoDrive.exe
PicoDrive.exe : $(OBJS)
@echo ">>>" $@
$(GCC) -o $@ -static $(COPT) $^ -lm -lpng -Lkgsdk/ -lKGSDK -Wl,-Map=PicoDrive.map
$(GCC) -o $@ -static $(COPT) $^ -lm -lpng -Lkgsdk/ -lKGSDK -Wl,-Map=PicoDrive.map 2>&1 | \
grep -v ".idata$$4" # | grep -v "supports interworking, whereas"
ifeq ($(DEBUG),)
$(STRIP) $@
endif

31
platform/gizmondo/asm_utils.s
View file

@ -65,7 +65,7 @@ vcloop_40_aligned:
mul r4, r5, r6
sub r1, r1, r4
vcloop_40_unaligned:
vcloop_40_unaligned_outer:
ldr r12, [r1], #4
ldr r7, [r1], #4
@ -73,42 +73,55 @@ vcloop_40_unaligned:
ldrh r4, [r2, r4]
and r5, lr, r12, lsr #7
ldrh r5, [r2, r5]
strh r4, [r0], #2
strh r4, [r0], #2
b vcloop_40_unaligned_enter
vcloop_40_unaligned:
ldr r12, [r1], #4
ldr r7, [r1], #4
and r6, lr, r12, lsl #1
ldrh r6, [r2, r6]
and r5, lr, r12, lsr #7
ldrh r5, [r2, r5]
orr r4, r4, r6, lsl #16
str r4, [r0], #4
vcloop_40_unaligned_enter:
and r6, lr, r12, lsr #15
ldrh r6, [r2, r6]
and r4, lr, r12, lsr #23
ldrh r4, [r2, r4]
orr r5, r5, r6, lsl #16
orr r5, r5, r6, lsl #16
and r8, lr, r7, lsl #1
ldrh r8, [r2, r8]
and r6, lr, r7, lsr #7
ldrh r6, [r2, r6]
orr r8, r4, r8, lsl #16
orr r8, r4, r8, lsl #16
and r12,lr, r7, lsr #15
ldrh r12,[r2, r12]
and r4, lr, r7, lsr #23
ldrh r4, [r2, r4]
orr r12,r6, r12,lsl #16
orr r12,r6, r12,lsl #16
subs r3, r3, #1<<24
stmia r0!, {r5,r8,r12}
strh r4, [r0], #2
bpl vcloop_40_unaligned
strh r4, [r0], #2
add r1, r1, #336 @ skip a line and 1 col
add r0, r0, #320*2+2*2
add r3, r3, #(320/8)<<24
sub r3, r3, #1
tst r3, #0xff
bne vcloop_40_unaligned
bne vcloop_40_unaligned_outer
ldmfd sp!, {r4-r9,lr}
bx lr

51
platform/gizmondo/emu.c
View file

@ -160,17 +160,22 @@ static int EmuScan8(unsigned int num, void *sdata)
static void osd_text(int x, int y, const char *text)
{
int len = strlen(text) * 8;
int *p, i, h;
len = (len+1) >> 1;
int len = strlen(text) * 8 / 2;
int *p, h;
for (h = 0; h < 8; h++) {
p = (int *) ((unsigned short *) giz_screen+x+321*(y+h));
p = (int *) ((int)p & ~3); // align
for (i = len; i; i--, p++) *p = 0;
memset32(p, 0, len);
}
emu_textOut16(x, y, text);
}
/*
void log1(void *p1, void *p2)
{
lprintf("%p %p %p\n", p1, p2, DrawLineDest);
}
*/
short localPal[0x100];
static void (*vidCpy8to16)(void *dest, void *src, short *pal, int lines) = NULL;
@ -207,9 +212,7 @@ static void blit(const char *fps, const char *notice)
} */
}
// TODO...
//lprintf("vidCpy8to16 %p %p\n", (unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8);
vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, 224);
//lprintf("after vidCpy8to16\n");
}
if (notice || (emu_opt & 2)) {
@ -220,21 +223,6 @@ static void blit(const char *fps, const char *notice)
// if ((emu_opt & 0x400) && (PicoMCD & 1))
// cd_leds();
//gp2x_video_wait_vsync();
if (!(PicoOpt&0x10)) {
if (Pico.video.reg[1] & 8) {
if (currentConfig.EmuOpt&0x80)
DrawLineDest = (unsigned short *) giz_screen;
else
HighCol = gfx_buffer;
} else {
if (currentConfig.EmuOpt&0x80)
DrawLineDest = (unsigned short *) giz_screen + 320*8;
else
HighCol = gfx_buffer + 328*8;
}
}
}
// clears whole screen or just the notice area (in all buffers)
@ -243,21 +231,22 @@ static void clearArea(int full)
if (giz_screen == NULL)
giz_screen = Framework2D_LockBuffer();
if (full) memset32(giz_screen, 0, 320*240*2/4);
else memset32((int *)((char *)giz_screen + 320*232*2), 0, 320*8*2/4);
else memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4);
}
static void vidResetMode(void)
{
void *screen;
giz_screen = Framework2D_LockBuffer();
if (PicoOpt&0x10) {
} else if (currentConfig.EmuOpt&0x80) {
PicoDrawSetColorFormat(1);
PicoScan = EmuScan16;
} else {
PicoDrawSetColorFormat(0);
PicoDrawSetColorFormat(-1);
PicoScan = EmuScan8;
}
if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) {
// setup pal for 8-bit modes
localPal[0xc0] = 0x0600;
localPal[0xd0] = 0xc000;
@ -265,8 +254,8 @@ static void vidResetMode(void)
localPal[0xf0] = 0xffff;
}
Pico.m.dirtyPal = 1;
screen = Framework2D_LockBuffer();
memset32(screen, 0, 320*240*2/4);
memset32(giz_screen, 0, 321*240*2/4);
Framework2D_UnlockBuffer();
giz_screen = NULL;
}
@ -520,10 +509,16 @@ void emu_Loop(void)
updateKeys();
if (giz_screen == NULL && (currentConfig.EmuOpt&0x80))
giz_screen = Framework2D_LockBuffer();
if (!(PicoOpt&0x10))
PicoScan((unsigned) -1, NULL);
PicoFrame();
if (giz_screen == NULL)
giz_screen = Framework2D_LockBuffer();
PicoFrame();
blit(fpsbuff, notice);
if (giz_screen != NULL) {

9
platform/gizmondo/port_config.s
View file

@ -3,11 +3,12 @@
@ .equiv START_ROW, 1
@ .equiv END_ROW, 27
@ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered.
.equiv START_ROW, 0
.equiv END_ROW, 28
.equiv START_ROW, 0
.equiv END_ROW, 28
.equiv OVERRIDE_HIGHCOL, 1
.equiv OVERRIDE_HIGHCOL, 1
.equiv UNALIGNED_DRAWLINEDEST, 1
@ this should be set to one only for GP2X port
.equiv EXTERNAL_YM2612, 0
.equiv EXTERNAL_YM2612, 0