Include divide-by-zero handling within plugins and codecs for ARM processors.

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

10 files changed, 65 insertions, 6 deletions

diff --git a/apps/codecs.c b/apps/codecs.c
index cddebb623d..231b612358 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -169,7 +169,9 @@ struct codec_api ci = {
 
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
-
+#ifdef CPU_ARM
+    __div0,
+#endif
 };
 
 void codec_get_full_path(char *path, const char *codec_root_fn)
diff --git a/apps/codecs.h b/apps/codecs.h
index e603c8b35b..3eab1d35c2 100644
--- a/apps/codecs.h
+++ b/apps/codecs.h
@@ -75,7 +75,7 @@
 #define CODEC_ENC_MAGIC 0x52454E43 /* RENC */
 
 /* increase this every time the api struct changes */
-#define CODEC_API_VERSION 30
+#define CODEC_API_VERSION 31
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
@@ -232,8 +232,10 @@ struct codec_api {
 #endif
 
     /* new stuff at the end, sort into place next time
-       the API gets incompatible */     
-
+       the API gets incompatible */
+#ifdef CPU_ARM
+    void (*__div0)(void);
+#endif
 };
 
 /* codec header */
diff --git a/apps/codecs/codec_crt0.c b/apps/codecs/codec_crt0.c
index 167a91ec4c..467e115de9 100644
--- a/apps/codecs/codec_crt0.c
+++ b/apps/codecs/codec_crt0.c
@@ -51,3 +51,10 @@ enum codec_status codec_start(void)
 #endif
     return codec_main();
 }
+
+#ifdef CPU_ARM
+void __attribute__((naked)) __div0(void)
+{
+    asm volatile("bx %0" : : "r"(ci->__div0));
+}
+#endif
diff --git a/apps/plugin.c b/apps/plugin.c
index a19a08b5fb..1e86b4d07e 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -627,6 +627,9 @@ static const struct plugin_api rockbox_api = {
     appsversion,
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
+#ifdef CPU_ARM
+    __div0,
+#endif
 };
 
 int plugin_load(const char* plugin, const void* parameter)
diff --git a/apps/plugin.h b/apps/plugin.h
index 992012be68..472daeafe4 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -126,7 +126,7 @@ void* plugin_get_buffer(size_t *buffer_size);
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 137
+#define PLUGIN_API_VERSION 138
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
@@ -782,6 +782,9 @@ struct plugin_api {
         const char *appsversion;
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
+#ifdef CPU_ARM
+    void (*__div0)(void);
+#endif
 };
 
 /* plugin header */
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES
index bb7da12e8b..c90613623c 100644
--- a/apps/plugins/lib/SOURCES
+++ b/apps/plugins/lib/SOURCES
@@ -1,3 +1,7 @@
+#ifdef CPU_ARM
+/* For now, only ARM uses this for __div0 */
+gcc-support.c
+#endif
 oldmenuapi.c
 configfile.c
 fixedpoint.c
diff --git a/apps/plugins/lib/gcc-support.c b/apps/plugins/lib/gcc-support.c
new file mode 100644
index 0000000000..91744d7fbc
--- /dev/null
+++ b/apps/plugins/lib/gcc-support.c
@@ -0,0 +1,30 @@
+/***************************************************************************
+*             __________               __   ___.
+*   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+*   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+*   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+*   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+*                     \/            \/     \/    \/            \/
+* $Id$
+*
+* Copyright (C) 2009 by Michael Sevakis
+*
+* Miscellaneous compiler support routines.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+* KIND, either express or implied
+*
+****************************************************************************/
+#include "plugin.h"
+
+#ifdef CPU_ARM
+void __attribute__((naked)) __div0(void)
+{
+    asm volatile("bx %0" : : "r"(rb->__div0));
+}
+#endif
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index c6c399db48..0f6804d591 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -17,6 +17,10 @@ ROCKS := $(subst $(ROOTDIR),$(BUILDDIR),$(ROCKS))
 PLUGINLIB := $(BUILDDIR)/apps/plugins/libplugin.a
 PLUGINLIB_SRC = $(call preprocess, $(APPSDIR)/plugins/lib/SOURCES)
 OTHER_SRC += $(PLUGINLIB_SRC)
+# include gcc-support routines for linking first if in SOURCES
+ifneq "$(findstring gcc-support.c,$(PLUGINLIB_SRC))" ""
+GCCSUPPORT_OBJ := $(BUILDDIR)/apps/plugins/lib/gcc-support.o
+endif
 
 PLUGINLIB_OBJ := $(PLUGINLIB_SRC:.c=.o)
 PLUGINLIB_OBJ := $(PLUGINLIB_OBJ:.S=.o)
@@ -70,7 +74,7 @@ else
  PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map
 endif
 
-$(BUILDDIR)/%.rock: $(BUILDDIR)/%.o $(PLUGINLINK_LDS)
+$(BUILDDIR)/%.rock: $(GCCSUPPORT_OBJ) $(BUILDDIR)/%.o $(PLUGINLINK_LDS)
         $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(BUILDDIR)/$*.elf \
                 $(filter %.o, $^) \
                 $(filter %.a, $^) \
diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c
index 48fceb9cf2..ec5c8e9800 100644
--- a/apps/plugins/test_codec.c
+++ b/apps/plugins/test_codec.c
@@ -494,6 +494,9 @@ static void init_ci(void)
     ci.semaphore_release = rb->semaphore_release;
 #endif
 
+#ifdef CPU_ARM
+    ci.__div0 = rb->__div0;
+#endif
 }
 
 static void codec_thread(void)
diff --git a/firmware/target/arm/system-arm.h b/firmware/target/arm/system-arm.h
index 851e0f3f1f..c383121b46 100644
--- a/firmware/target/arm/system-arm.h
+++ b/firmware/target/arm/system-arm.h
@@ -24,6 +24,7 @@
 #define nop \
   asm volatile ("nop")
 
+void __div0(void);
 
 /* This gets too complicated otherwise with all the ARM variation and would
    have conflicts with another system-target.h elsewhere so include a