devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Doom LCD update: * Speed up the C versions slightly (colour and greyscale). * Fix the ASM version for H300 (caused line flicker, probably since buffered LCD writes were enabled). Slightly slower, but still ~8% faster than plain C. Removed the C version of this ASM because of the same problem (was only there for reference). * Added ASM optimised version for X5 (~8.5% faster).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16009 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2008-01-06 23:48:30 +00:00
parent 43bc13e4b2
commit dbe24fcbac
1 changed files with 126 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

202
apps/plugins/doom/i_video.c
View file

@ -495,102 +495,152 @@ static void I_UploadNewPalette(int pal)
void I_FinishUpdate (void) void I_FinishUpdate (void)
{ {
int count;
byte *src = d_screens[0];
#if (CONFIG_LCD == LCD_H300) && !defined(SIMULATOR) #if (CONFIG_LCD == LCD_H300) && !defined(SIMULATOR)
count = SCREENWIDTH*SCREENHEIGHT;
#if 1 /* ASM screen update (drops ~300 tics) */
/* ASM screen update (drops 200 tics (100 asm)) */ asm volatile (
asm ( "move.w #33, (%[LCD]) \n" /* Setup the LCD controller */
"move.w #33,(%[LCD]) \n" /* Setup the LCD controller */ "nop \n"
"clr.w (%[LCD2]) \n" "clr.w (%[LCD2]) \n"
"move.w #34,(%[LCD]) \n" /* End LCD controller setup */ "nop \n"
"clr.l %%d1 \n" "move.w #34, (%[LCD]) \n" /* End LCD controller setup */
"clr.l %%d0 \n" "clr.l %%d1 \n"
"widthloop: \n" ".loop: \n"
"move.l (%[screenptr])+, %%d0 \n" "move.l (%[scrp])+, %%d0 \n"
"swap.w %%d0 \n" "swap.w %%d0 \n"
"move.w %%d0, %%d1 \n" "move.w %%d0, %%d1 \n"
"lsr.l #8,%%d1 \n" "lsr.l #8,%%d1 \n"
"move.w (%[palette], %%d1.l:2), (%[LCD2]) \n" "move.w (%[pal], %%d1.l:2), (%[LCD2]) \n"
"move.b %%d0,%%d1 \n" "move.b %%d0,%%d1 \n"
"move.w (%[palette], %%d1.l:2), (%[LCD2]) \n" "swap.w %%d0 \n"
"swap.w %%d0 \n" "nop \n"
"move.w %%d0, %%d1 \n" "move.w (%[pal], %%d1.l:2), (%[LCD2]) \n"
"lsr.l #8,%%d1 \n" "move.w %%d0, %%d1 \n"
"move.w (%[palette], %%d1.l:2), (%[LCD2]) \n" "lsr.l #8,%%d1 \n"
"move.b %%d0,%%d1 \n" "nop \n"
"move.w (%[palette], %%d1.l:2), (%[LCD2]) \n" "move.w (%[pal], %%d1.l:2), (%[LCD2]) \n"
"subq.l #4,%[WIDTH] \n" "move.b %%d0,%%d1 \n"
"bne widthloop \n" "nop \n"
"move.w #220,%[WIDTH] \n" "move.w (%[pal], %%d1.l:2), (%[LCD2]) \n"
"subq.l #1,%[HEIGHT] \n" "subq.l #4,%[cnt] \n"
"bne widthloop \n" "bne.b .loop \n"
: /* outputs */ : /* outputs */
: /* inputs */ [scrp]"+a"(src),
[screenptr] "a" (d_screens[0]), [cnt] "+d"(count)
[palette] "a" (palette), : /* inputs */
[LCD] "a" (0xf0000000), [pal] "a" (palette),
[LCD2] "a" (0xf0000002), [LCD] "a" (0xf0000000),
[WIDTH] "d" (220), [LCD2]"a" (0xf0000002)
[HEIGHT] "d" (176) : /* clobbers */
: /* clobbers */ "d0", "d1"
"d0", "d1" );
#elif (CONFIG_LCD == LCD_X5) && !defined(SIMULATOR)
count = SCREENWIDTH*SCREENHEIGHT;
/* ASM screen update (drops ~230 tics) */
asm volatile (
"clr.w (%[LCD]) \n" /* Setup the LCD controller */
"move.w #(33<<1), (%[LCD]) \n"
"clr.w (%[LCD2]) \n"
"clr.w (%[LCD2]) \n"
"clr.w (%[LCD]) \n" /* End LCD controller setup */
"move.w #(34<<1), (%[LCD]) \n"
"clr.l %%d1 \n"
".loop: \n"
"move.l (%[scrp])+, %%d0 \n"
"swap.w %%d0 \n"
"move.w %%d0, %%d1 \n"
"lsr.l #8,%%d1 \n"
"move.w (%[pal], %%d1.l:2), %%d2 \n"
"move.l %%d2, %%d3 \n"
"lsr.l #7, %%d3 \n"
"move.w %%d3, (%[LCD2]) \n"
"lsl.l #1, %%d2 \n"
"move.w %%d2, (%[LCD2]) \n"
"move.b %%d0,%%d1 \n"
"move.w (%[pal], %%d1.l:2), %%d2 \n"
"move.l %%d2, %%d3 \n"
"lsr.l #7, %%d3 \n"
"move.w %%d3, (%[LCD2]) \n"
"lsl.l #1, %%d2 \n"
"move.w %%d2, (%[LCD2]) \n"
"swap.w %%d0 \n"
"move.w %%d0, %%d1 \n"
"lsr.l #8,%%d1 \n"
"move.w (%[pal], %%d1.l:2), %%d2 \n"
"move.l %%d2, %%d3 \n"
"lsr.l #7, %%d3 \n"
"move.w %%d3, (%[LCD2]) \n"
"lsl.l #1, %%d2 \n"
"move.w %%d2, (%[LCD2]) \n"
"move.b %%d0,%%d1 \n"
"move.w (%[pal], %%d1.l:2), %%d2 \n"
"move.l %%d2, %%d3 \n"
"lsr.l #7, %%d3 \n"
"move.w %%d3, (%[LCD2]) \n"
"lsl.l #1, %%d2 \n"
"move.w %%d2, (%[LCD2]) \n"
"subq.l #4,%[cnt] \n"
"bne.b .loop \n"
: /* outputs */
[scrp]"+a"(src),
[cnt] "+d"(count)
: /* inputs */
[pal] "a" (palette),
[LCD] "a" (0xf0008000),
[LCD2]"a" (0xf0008002)
: /* clobbers */
"d0", "d1", "d2", "d3"
); );
#else #else
/* C version of above (drops 100 tics) */
// Start the write
*(volatile unsigned short *) 0xf0000000 = 0x21; // register
*(volatile unsigned short *) 0xf0000002 = 0; // value
*(volatile unsigned short *) 0xf0000000 = 0x22; // GRAM
unsigned char *screenptr=d_screens[0];
int hcnt=LCD_HEIGHT*LCD_WIDTH;
while(hcnt--)
{
*(volatile unsigned short *)0xf0000002 = palette[*screenptr];
screenptr++;
}
#endif
#else
unsigned char paletteIndex;
int y;
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
#if(LCD_HEIGHT>LCD_WIDTH) #if(LCD_HEIGHT>LCD_WIDTH)
if(rotate_screen) if(rotate_screen)
{ {
int x; int y;
for (y=0; y<LCD_HEIGHT; y++)
for (y = 0; y < SCREENHEIGHT; y++)
{ {
for (x=0; x < LCD_WIDTH; x++) fb_data *dst = rb->lcd_framebuffer + LCD_WIDTH - y;
count = SCREENWIDTH;
do
{ {
paletteIndex = d_screens[0][SCREENWIDTH*(SCREENHEIGHT-1-x) + y]; *dst = palette[*src++];
rb->lcd_framebuffer[y*LCD_WIDTH + x] = palette[paletteIndex]; dst += LCD_WIDTH;
} }
while (--count);
} }
} }
else else
#endif #endif
for (y = 0; y < LCD_HEIGHT *LCD_WIDTH; y++)
{ {
paletteIndex = d_screens[0][y]; fb_data *dst = rb->lcd_framebuffer;
rb->lcd_framebuffer[y] = palette[paletteIndex]; count = SCREENWIDTH*SCREENHEIGHT;
do
*dst++ = palette[*src++];
while (--count);
} }
rb->lcd_update(); rb->lcd_update();
#else /* !HAVE_LCD_COLOR */ #else /* !HAVE_LCD_COLOR */
int x; unsigned char *dst;
int y;
for (y = 0; y < SCREENHEIGHT; y++) for (y = 0; y < SCREENHEIGHT; y++)
{ {
for (x = 0; x < SCREENWIDTH; x++) dst = greybuffer;
{ count = SCREENWIDTH;
paletteIndex = d_screens[0][y*SCREENWIDTH + x];
greybuffer[x]=palette[paletteIndex]; do
} *dst++ = palette[*src++];
grey_ub_gray_bitmap(greybuffer, 0, y, SCREENWIDTH, 1); while (--count);
}
grey_ub_gray_bitmap(greybuffer, 0, y, SCREENWIDTH, 1);
}
#endif /* !HAVE_LCD_COLOR */ #endif /* !HAVE_LCD_COLOR */
#endif #endif
} }