From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-198361-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 9210 invoked by alias); 1 Jul 2007 05:11:24 -0000
Received: (qmail 9196 invoked by uid 22791); 1 Jul 2007 05:11:23 -0000
X-Spam-Check-By: sourceware.org
Received: from smtp1.dnsmadeeasy.com (HELO smtp1.dnsmadeeasy.com) (205.234.170.134)     by sourceware.org (qpsmtpd/0.31) with ESMTP; Sun, 01 Jul 2007 05:11:21 +0000
Received: from smtp1.dnsmadeeasy.com (localhost [127.0.0.1]) 	by smtp1.dnsmadeeasy.com (Postfix) with ESMTP id B23672F52A7; 	Sun,  1 Jul 2007 05:11:19 +0000 (UTC)
X-Authenticated-Name: js.dnsmadeeasy
X-Transit-System: In case of SPAM please contact abuse@dnsmadeeasy.com
Received: from avtrex.com (unknown [67.116.42.147]) 	by smtp1.dnsmadeeasy.com (Postfix) with ESMTP; 	Sun,  1 Jul 2007 05:11:19 +0000 (UTC)
Received: from jennifer.localdomain ([192.168.7.222]) by avtrex.com with Microsoft SMTPSVC(6.0.3790.1830); 	 Sat, 30 Jun 2007 22:11:18 -0700
Message-ID: <4687370E.7090801@avtrex.com>
Date: Sun, 01 Jul 2007 05:11:00 -0000
From: David Daney <ddaney@avtrex.com>
User-Agent: Thunderbird 2.0.0.4 (X11/20070615)
MIME-Version: 1.0
To: gcc-patches@gcc.gnu.org, java-patches@gcc.gnu.org
Subject: [Patch] 3/3 FFI: Use __builtin_flush_icache() to flush MIPS i-cache.
References: <468734D3.3020908@avtrex.com>
In-Reply-To: <468734D3.3020908@avtrex.com>
Content-Type: multipart/mixed;  boundary="------------030301090607040605090204"
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
X-SW-Source: 2007-07/txt/msg00009.txt.bz2

This is a multi-part message in MIME format.
--------------030301090607040605090204
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-length: 847

This is the third and final part of the __builtin_flush_icache patch.
It replaces the hard coded library call to cacheflush() in the MIPS
ffi_prep_closure_loc with a call to __builtin_flush_icache();

For targets that support user-space i-cache flushing (mips32r2), this
will eliminate a system call from the ffi closure preparation path.
On all other targets the generated code is the same as before.

Bootstrapped and tested on x86_64-unknown-linux-gnu all default
languages with no regressions.

Also tested on:
 x86_64 cross to mipsel-linux --with-arch=mips32
 i686   cross to mipsel-linux --with-arch=mips32r2

with no regressions.

OK to commit?

libffi/:
2007-06-30  David Daney  <ddaney@avtrex.com>

    * src/mips/ffi.c: Don't include sys/cachectl.h.
    (ffi_prep_closure_loc): Use __builtin_flush_icache() instead of
    cacheflush().


--------------030301090607040605090204
Content-Type: text/x-patch;
 name="flush-cache3.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="flush-cache3.diff"
Content-length: 617

Index: src/mips/ffi.c
===================================================================
--- src/mips/ffi.c	(revision 125997)
+++ src/mips/ffi.c	(working copy)
@@ -27,7 +27,6 @@
 #include <ffi_common.h>
 
 #include <stdlib.h>
-#include <sys/cachectl.h>
 
 #if _MIPS_SIM == _ABIN32
 #define FIX_ARGP \
@@ -525,8 +524,7 @@ ffi_prep_closure_loc (ffi_closure *closu
   closure->fun = fun;
   closure->user_data = user_data;
 
-  /* XXX this is available on Linux, but anything else? */
-  cacheflush (codeloc, FFI_TRAMPOLINE_SIZE, ICACHE);
+  __builtin_flush_icache(codeloc, FFI_TRAMPOLINE_SIZE);
 
   return FFI_OK;
 }

--------------030301090607040605090204--