sms wip: random tweaks, refactoring (palette, sound stuff, etc)

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@764 be3aeb3a-fb24-0410-a615-afba39da0efa

common/arm_utils.h

@@ -3,9 +3,9 @@
 
 // For commercial use, separate licencing terms must be obtained.
 
-void vidConvCpyRGB32  (void *to, void *from, int pixels);
-void vidConvCpyRGB32sh(void *to, void *from, int pixels);
-void vidConvCpyRGB32hi(void *to, void *from, int pixels);
+void bgr444_to_rgb32(void *to, void *from);
+void bgr444_to_rgb32_sh(void *to, void *from);
+
 void vidcpy_m2(void *dest, void *src, int m32col, int with_32c_border);
 void vidcpy_m2_rot(void *dest, void *src, int m32col, int with_32c_border);
 void spend_cycles(int c); // utility

common/arm_utils.s

@@ -13,7 +13,6 @@
 @ to      00000000 rrr00000 ggg00000 bbb00000 ...
 
 @ lr =  0x00e000e0, out: r3=lower_pix, r2=higher_pix; trashes rin
-@ if sh==2, r8=0x00404040 (sh!=0 destroys flags!)
 .macro convRGB32_2 rin sh=0
     and     r2,  lr, \rin, lsr #4 @ blue
     and     r3,  \rin, lr
@@ -59,16 +58,19 @@
 .endif
 
     orr     r2,  r2,   r2,  lsr #3
+.if \sh == 1
+    str     r2, [r0, #0x40*2*4]
+.endif
     str     r2, [r0], #4
 .endm
 
 
-.global vidConvCpyRGB32 @ void *to, void *from, int pixels
+.global bgr444_to_rgb32 @ void *to, void *from
 
-vidConvCpyRGB32:
+bgr444_to_rgb32:
     stmfd   sp!, {r4-r7,lr}
 
-    mov     r12, r2, lsr #3 @ repeats
+    mov     r12, #0x40>>3 @ repeats
     mov     lr, #0x00e00000
     orr     lr, lr, #0x00e0
 
@@ -80,19 +82,18 @@ vidConvCpyRGB32:
     convRGB32_2 r5
     convRGB32_2 r6
     convRGB32_2 r7
-
     bgt     .loopRGB32
 
-    ldmfd   sp!, {r4-r7,lr}
-    bx      lr
+    ldmfd   sp!, {r4-r7,pc}
 
 
-.global vidConvCpyRGB32sh @ void *to, void *from, int pixels
+.global bgr444_to_rgb32_sh @ void *to, void *from
 
-vidConvCpyRGB32sh:
+bgr444_to_rgb32_sh:
     stmfd   sp!, {r4-r7,lr}
 
-    mov     r12, r2, lsr #3 @ repeats
+    mov     r12, #0x40>>3 @ repeats
+    add     r0, r0, #0x40*4
     mov     lr, #0x00e00000
     orr     lr, lr, #0x00e0
 
@@ -104,21 +105,10 @@ vidConvCpyRGB32sh:
     convRGB32_2 r5, 1
     convRGB32_2 r6, 1
     convRGB32_2 r7, 1
-
     bgt     .loopRGB32sh
 
-    ldmfd   sp!, {r4-r7,lr}
-    bx      lr
-
-
-.global vidConvCpyRGB32hi @ void *to, void *from, int pixels
-
-vidConvCpyRGB32hi:
-    stmfd   sp!, {r4-r7,lr}
-
-    mov     r12, r2, lsr #3 @ repeats
-    mov     lr, #0x00e00000
-    orr     lr, lr, #0x00e0
+    mov     r12, #0x40>>3 @ repeats
+    sub     r1, r1, #0x40*2
 
 .loopRGB32hi:
      ldmia    r1!, {r4-r7}

common/emu.c

@@ -1332,7 +1332,7 @@ void emu_loop(void)
 {
 	int pframes_done;		/* "period" frames, used for sync */
 	int frames_done, frames_shown;	/* actual frames for fps counter */
-	int oldmodes, target_fps, target_frametime;
+	int target_fps, target_frametime;
 	unsigned int timestamp_base = 0, timestamp_fps;
 	char *notice_msg = NULL;
 	char fpsbuff[24];
@@ -1341,8 +1341,8 @@ void emu_loop(void)
 	fpsbuff[0] = 0;
 
 	/* make sure we are in correct mode */
-	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
 	Pico.m.dirtyPal = 1;
+	rendstatus_old = -1;
 
 	/* number of ticks per frame */
 	if (Pico.m.pal) {
@@ -1371,7 +1371,6 @@ void emu_loop(void)
 	{
 		unsigned int timestamp;
 		int diff, diff_lim;
-		int modes;
 
 		timestamp = get_ticks();
 		if (reset_timing) {
@@ -1398,13 +1397,6 @@ void emu_loop(void)
 			}
 		}
 
-		// check for mode changes
-		modes = ((Pico.video.reg[12]&1)<<2) | (Pico.video.reg[1]&8);
-		if (modes != oldmodes) {
-			oldmodes = modes;
-			pemu_video_mode_change(!(modes & 4), (modes & 8));
-		}
-
 		// second changed?
 		if (timestamp - timestamp_fps >= ms_to_ticks(1000))
 		{

common/plat.h

@@ -9,7 +9,6 @@ void pemu_prep_defconfig(void);
 void pemu_loop_prep(void);
 void pemu_loop_end(void);
 void pemu_forced_frame(int opts);
-void pemu_video_mode_change(int is_32col, int is_240_lines);
 void pemu_update_display(const char *fps, const char *notice_msg);
 
 void pemu_sound_start(void);