From cd4e2bda37c4a76478053272a256c7ddedfcb9d6 Mon Sep 17 00:00:00 2001
From: notaz <notaz@pixelinis>
Date: Mon, 8 Jun 2009 01:58:20 +0300
Subject: [PATCH] switch to older compiler, it generates better code

---
 gp2x/Makefile         | 12 +++---------
 gp2x/upscale_aspect.s |  8 ++++----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 7258644..94eb604 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -4,15 +4,9 @@
 
 # Global definitions
 
-ifeq ($(WIZ),1)
-PREFIX  = /opt/arm-openwiz-linux-gnu
-CC        = $(PREFIX)/bin/arm-openwiz-linux-gnu-gcc
-STRIP     = $(PREFIX)/bin/arm-openwiz-linux-gnu-strip
-else
 PREFIX  = /opt/open2x/gcc-4.1.1-glibc-2.3.6
 CC        = $(PREFIX)/bin/arm-open2x-linux-gcc
 STRIP     = $(PREFIX)/bin/arm-open2x-linux-strip
-endif
 
 OBJS      = main.o cpu.o memory.u video.o input.o sound.o gp2x.o gui.o        \
             cheats.o zip.o cpu_threaded.z arm_stub.o video_blend.o            \
@@ -37,8 +31,8 @@ ifneq ($(WIZ),1)
 LIBS       += -static
 endif
 
-CFLAGS     += -ggdb
-LIBS       += -ggdb
+#CFLAGS     += -ggdb
+#LIBS       += -ggdb
 
 # Compilation:
 
@@ -61,7 +55,7 @@ LIBS       += -ggdb
 
 all:	$(OBJS)
 	$(CC) $(OBJS) $(LIBS) -o $(BIN)  
-#	$(STRIP) $(BIN)
+	$(STRIP) $(BIN)
 
 clean:
 	rm -f *.o *.u *.z $(BIN) 
diff --git a/gp2x/upscale_aspect.s b/gp2x/upscale_aspect.s
index b7694ca..ed67c63 100644
--- a/gp2x/upscale_aspect.s
+++ b/gp2x/upscale_aspect.s
@@ -37,14 +37,14 @@
  */
 
 .macro unpack_hi dst, src
-    mov     \dst, \src, lsr #16
-    orr     \dst, \dst, lsl #16
+    mov     \dst, \src,       lsr #16
+    orr     \dst, \dst, \dst, lsl #16
     and     \dst, \dst, lr
 .endm
 
 .macro unpack_lo dst, src
-    mov     \dst, \src, lsl #16
-    orr     \dst, \dst, lsr #16
+    mov     \dst, \src,       lsl #16
+    orr     \dst, \dst, \dst, lsr #16
     and     \dst, \dst, lr
 .endm