Fixed self-extracting loader: (1) Proper startup code, ensuring the stack pointer is set to the desired location. (2) Code cleanup.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8103 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 23 deletions

diff --git a/firmware/decompressor/decompressor.c b/firmware/decompressor/decompressor.c
index 1223ff2f05..9cd7d5998e 100644
--- a/firmware/decompressor/decompressor.c
+++ b/firmware/decompressor/decompressor.c
@@ -31,7 +31,8 @@ extern char imgstart[], imgend[];
 extern char loadaddress[], dramend[];
 
 /* Prototypes */
-void start(void)  __attribute__ ((section (".start")));
+extern void start(void);
+
 void main(void) ICODE_ATTR;
 int ucl_nrv2e_decompress_8(const unsigned char *src, unsigned char *dst,
                            unsigned long *dst_len) ICODE_ATTR;
@@ -45,22 +46,6 @@ void (*vbr[]) (void) __attribute__ ((section (".vectors"))) =
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 };
 
-/* Inline copy function */
-static inline void longcopy(long *dst, long *dst_end, const long *src)
-                            __attribute__ ((always_inline));
-static inline void longcopy(long *dst, long *dst_end, const long *src)
-{
-    while (dst < dst_end)
-        *dst++ = *src++;
-}
-
-/* Entry point */
-void start(void)
-{
-    longcopy((long *)iramstart, (long *)iramend, (long *)iramcopy);
-    main();
-}
-
 /** All subsequent functions are executed from IRAM **/
 
 /* Thinned out version of the UCL 2e decompression sourcecode
@@ -133,18 +118,20 @@ void main(void)
 {
     unsigned long dst_len; /* dummy */
     unsigned long img_len = (unsigned long)(imgend - imgstart);
-
-    longcopy((long *)(dramend - img_len), (long *) dramend,
-             (long *) imgstart);
-
+    unsigned long *src = (unsigned long *)imgstart;
+    unsigned long *dst = (unsigned long *)(dramend - img_len);
+    
+    do
+        *dst++ = *src++;
+    while (dst < (unsigned long *)dramend);
+    
     ucl_nrv2e_decompress_8(dramend - img_len + UCL_HEADER,
                            loadaddress, &dst_len);
 
     asm(
         "mov.l   @%0+,r0     \n"
-        "mov.l   @%0+,r15    \n"
         "jmp     @r0         \n"
-        "nop                 \n"
+        "mov.l   @%0+,r15    \n"
         : : "r"(loadaddress) : "r0"
     );
 }