[Qemu-devel] [5843] Use libgcc __clear_cache to clean icache, when available.

[Andrzej Zaborowski]

Revision: 5843
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5843
Author:   balrog
Date:     2008-12-01 02:02:37 +0000 (Mon, 01 Dec 2008)

Log Message:
-----------
Use libgcc __clear_cache to clean icache, when available.

Calling the clear cache syscall directly generates an illegal instruction 
on some (armv4) kernels.

Modified Paths:
--------------
    trunk/exec-all.h
    trunk/tcg/arm/tcg-target.h

Modified: trunk/exec-all.h
===================================================================
--- trunk/exec-all.h    2008-12-01 01:53:55 UTC (rev 5842)
+++ trunk/exec-all.h    2008-12-01 02:02:37 UTC (rev 5843)
@@ -205,18 +205,26 @@
 #elif defined(__arm__)
 static inline void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long 
addr)
 {
+#if QEMU_GNUC_PREREQ(4, 1)
+    void __clear_cache(char *beg, char *end);
+#else
     register unsigned long _beg __asm ("a1");
     register unsigned long _end __asm ("a2");
     register unsigned long _flg __asm ("a3");
+#endif
 
     /* we could use a ldr pc, [pc, #-4] kind of branch and avoid the flush */
     *(uint32_t *)jmp_addr |= ((addr - (jmp_addr + 8)) >> 2) & 0xffffff;
 
+#if QEMU_GNUC_PREREQ(4, 1)
+    __clear_cache((char *) jmp_addr, (char *) jmp_addr + 4);
+#else
     /* flush icache */
     _beg = jmp_addr;
     _end = jmp_addr + 4;
     _flg = 0;
     __asm __volatile__ ("swi 0x9f0002" : : "r" (_beg), "r" (_end), "r" (_flg));
+#endif
 }
 #endif
 

Modified: trunk/tcg/arm/tcg-target.h
===================================================================
--- trunk/tcg/arm/tcg-target.h  2008-12-01 01:53:55 UTC (rev 5842)
+++ trunk/tcg/arm/tcg-target.h  2008-12-01 02:02:37 UTC (rev 5843)
@@ -69,8 +69,13 @@
 
 static inline void flush_icache_range(unsigned long start, unsigned long stop)
 {
+#if QEMU_GNUC_PREREQ(4, 1)
+    void __clear_cache(char *beg, char *end);
+    __clear_cache((char *) start, (char *) stop);
+#else
     register unsigned long _beg __asm ("a1") = start;
     register unsigned long _end __asm ("a2") = stop;
     register unsigned long _flg __asm ("a3") = 0;
     __asm __volatile__ ("swi 0x9f0002" : : "r" (_beg), "r" (_end), "r" (_flg));
+#endif
 }