diff options
-rw-r--r-- | apps/plugins/pacbox/pacbox_arm.S | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/apps/plugins/pacbox/pacbox_arm.S b/apps/plugins/pacbox/pacbox_arm.S index ade3ad2de6..2060168350 100644 --- a/apps/plugins/pacbox/pacbox_arm.S +++ b/apps/plugins/pacbox/pacbox_arm.S | |||
@@ -7,11 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Pacbox - a Pacman Emulator for Rockbox | 10 | * Copyright (c) 2006 Dave Chapman |
11 | * | ||
12 | * Based on PIE - Pacman Instructional Emulator | ||
13 | * | ||
14 | * Copyright (c) 1997-2003,2004 Alessandro Scotti | ||
15 | * | 11 | * |
16 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
17 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
@@ -42,15 +38,13 @@ | |||
42 | #if (LCD_WIDTH >= 288) && (LCD_HEIGHT >= 224) | 38 | #if (LCD_WIDTH >= 288) && (LCD_HEIGHT >= 224) |
43 | 39 | ||
44 | blit_display: | 40 | blit_display: |
45 | stmdb sp!, {r4-r12, lr} | 41 | stmdb sp!, {r4-r11, lr} |
46 | 42 | ||
47 | add r3, r0, #5696 | 43 | add r3, r0, #5696 |
48 | add r3, r3, #24 @ 5720 = (2*(YOFS*LCD_WIDTH+XOFS+ScreenHeight-4)) | 44 | add r3, r3, #24 @ 5720 = (2*(YOFS*LCD_WIDTH+XOFS+ScreenHeight-4)) |
49 | ldr r0, =palette | 45 | ldr r0, =palette |
50 | mov lr, #288 @ y = 288 | 46 | mov lr, #288 @ y = 288 |
51 | 47 | ||
52 | mov r12, #224*3 | ||
53 | |||
54 | loop_y: mov r2, r3 @ r2 = next_dst | 48 | loop_y: mov r2, r3 @ r2 = next_dst |
55 | sub r3, r3, #8 @ next_dst-=4 | 49 | sub r3, r3, #8 @ next_dst-=4 |
56 | 50 | ||
@@ -59,10 +53,10 @@ loop_y: mov r2, r3 @ r2 = next_dst | |||
59 | /* store 2 input bytes from the next four lines in r7-r10 */ | 53 | /* store 2 input bytes from the next four lines in r7-r10 */ |
60 | loop_x: | 54 | loop_x: |
61 | ldrh r8, [r1, #224] @ r8 = vbuf[224] | 55 | ldrh r8, [r1, #224] @ r8 = vbuf[224] |
62 | ldrh r7, [r1] @ r7 = vbuf[0] ; vbuf += 2; | 56 | ldrh r7, [r1] @ r7 = vbuf[0] |
63 | add r1, r1, #448 | 57 | add r1, r1, #448 |
64 | ldrh r10, [r1, #224] @ r8 = vbuf[224] | 58 | ldrh r10, [r1, #224] @ r10 = vbuf[224*3] |
65 | ldrh r9, [r1], #2 @ r7 = vbuf[0] ; vbuf += 2; | 59 | ldrh r9, [r1], #2 @ r9 = vbuf[224*2] ; vbuf += 2; |
66 | sub r1, r1, #448 | 60 | sub r1, r1, #448 |
67 | 61 | ||
68 | 62 | ||
@@ -124,7 +118,7 @@ loop_x: | |||
124 | /* end of y loop */ | 118 | /* end of y loop */ |
125 | add r1, r1, #224*3 @ vbuf += 224*3 | 119 | add r1, r1, #224*3 @ vbuf += 224*3 |
126 | subs lr, lr, #4 @ y-=4 | 120 | subs lr, lr, #4 @ y-=4 |
127 | ldmeqia sp!, {r4-r12, pc} | 121 | ldmeqia sp!, {r4-r11, pc} |
128 | b loop_y | 122 | b loop_y |
129 | #endif | 123 | #endif |
130 | #endif | 124 | #endif |