* kern/sparc64/cache.S: Fix grub_arch_sync_caches implementation.

diff --git a/ChangeLog b/ChangeLog
index c7e854edebc19bcfd02607446c32df02ba814e63..c679982013508287492e0e9ad7337d723f145899 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
        * kern/sparc64/dl.c (grub_arch_dl_relocate_symbols): Add
        support for R_SPARC_OLO10 relocations.  Fix compile warning for
        R_SPARC_WDISP30 case.
+       * kern/sparc64/cache.S: Fix grub_arch_sync_caches implementation.
 
 2009-04-06  Pavel Roskin  <proski@gnu.org>
 

diff --git a/kern/sparc64/cache.S b/kern/sparc64/cache.S
index 2ebb693415ddf79f6f32e7eefc3e20dd590fbaf3..1a16adde863e0e62eac7a6c43db44e0c7f9f1a56 100644 (file)
--- a/kern/sparc64/cache.S
+++ b/kern/sparc64/cache.S
@@ -1,7 +1,7 @@
 /* cache.S - Flush the processor cache for a specific region.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007  Free Software Foundation, Inc.
+ *  Copyright (C) 2005,2007,2009  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,17 +27,15 @@
  * void grub_arch_sync_caches (void *address, grub_size_t len)
  */
 FUNCTION(grub_arch_sync_caches)
-        save            %o6,    -0xC,  %o6      ! Get a new register window,
-                                                ! reserve space on stack for
-                                                ! %i0, %i1, %i2
-        brz,pn          %i0,    return          ! Return if address == 0.
-         nop
-        brz,pn          %i1,    return          ! Return if len == 0.
-         clr             %i2                    ! index = 0.
-loop:   flush           %i0 + %i2               ! Flush address + index.
-        cmp             %i1,    %i2             ! Compare len & index .
-        bpos,a,pt       %xcc,   loop            ! If len > index, loop.
-         add            %i2,    8,      %i2     ! Go to next doubleword.
-return: ret                                     ! Restore caller's register
-         restore                                ! window and return.
+       brz,pn          %o1, 2f
+        add            %o0, %o1, %o1
+       add             %o1, 7, %o1
+       andn            %o1, 7, %o1
+       andn            %o0, 7, %o0
+       sub             %o1, %o0, %o1
+1:     subcc           %o1, 8, %o1
+       bne,pt          %icc, 1b
+        flush          %o0 + %o1
+2:     retl
+        nop