From a460d7a147af83ab70564aa339843505fadc4936 Mon Sep 17 00:00:00 2001 From: Andrew Stubbs Date: Mon, 6 Apr 2009 11:22:09 +0000 Subject: [PATCH] lib1funcs.asm (ic_invalidate): Move ICBI out of the delay slot. 2009-04-06 Andrew Stubbs * config/sh/lib1funcs.asm (ic_invalidate): Move ICBI out of the delay slot. (ic_invalidate_array): Likewise. From-SVN: r145588 --- gcc/ChangeLog | 6 ++++++ gcc/config/sh/lib1funcs.asm | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 91ced6edd60..fff2d81c700 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-04-06 Andrew Stubbs + + * config/sh/lib1funcs.asm (ic_invalidate): Move ICBI out of the + delay slot. + (ic_invalidate_array): Likewise. + 2009-04-06 Hariharan Sandanagobalane * calls.c (emit_library_call_value_1): Fix a problem with parameter diff --git a/gcc/config/sh/lib1funcs.asm b/gcc/config/sh/lib1funcs.asm index f90374ce4ff..ce5ae978759 100644 --- a/gcc/config/sh/lib1funcs.asm +++ b/gcc/config/sh/lib1funcs.asm @@ -1,5 +1,5 @@ /* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006 + 2004, 2005, 2006, 2009 Free Software Foundation, Inc. This file is free software; you can redistribute it and/or modify it @@ -2084,8 +2084,9 @@ GLOBAL(ic_invalidate): GLOBAL(ic_invalidate): ocbwb @r4 synco - rts icbi @r4 + rts + nop ENDFUNC(GLOBAL(ic_invalidate)) #elif defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__) || (defined(__SH4_NOFPU__) && !defined(__SH5__)) /* For system code, we use ic_invalidate_line_i, but user code @@ -2151,8 +2152,10 @@ GLOBAL(ic_invalidate): GLOBAL(ic_invalidate_array): add r1,r4 synco - rts icbi @r4 + rts + nop + .align 2 .long 0 ENDFUNC(GLOBAL(ic_invalidate_array)) #elif defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__) || (defined(__SH4_NOFPU__) && !defined(__SH5__)) -- 2.30.2