From ff9d8898e55a1a134c42379ee566d5c11ec5b379 Mon Sep 17 00:00:00 2001 From: Till Straumann Date: Wed, 14 Nov 2007 00:42:18 +0000 Subject: [PATCH] 2007-11-13 Till Straumann * shared/src/cache.c: moved generic operations (flush/invalidate 1 data line, invalidate 1 inst. line) from #ifdef to general section (all CPUs). --- c/src/lib/libcpu/powerpc/ChangeLog | 6 +++ c/src/lib/libcpu/powerpc/shared/src/cache.c | 42 +++++++++++---------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index bb26049e1f..b86396fbdf 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,9 @@ +2007-11-13 Till Straumann + + * shared/src/cache.c: moved generic operations + (flush/invalidate 1 data line, invalidate 1 inst. line) + from #ifdef to general section (all CPUs). + 2007-11-13 Till Straumann * shared/src/cache_.h: include only diff --git a/c/src/lib/libcpu/powerpc/shared/src/cache.c b/c/src/lib/libcpu/powerpc/shared/src/cache.c index 2c35430412..515bc452cf 100644 --- a/c/src/lib/libcpu/powerpc/shared/src/cache.c +++ b/c/src/lib/libcpu/powerpc/shared/src/cache.c @@ -62,13 +62,6 @@ void _CPU_cache_disable_data ( PPC_Set_HID0( value ); } -void _CPU_cache_invalidate_1_data_line( - const void * _address ) -{ - register const void *__address = _address; - asm volatile ( "dcbi 0,%0" :: "r"(__address) : "memory" ); -} - void _CPU_cache_invalidate_entire_data ( void ) { @@ -98,13 +91,6 @@ void _CPU_cache_unfreeze_data ( PPC_Set_HID0( value ); } -void _CPU_cache_flush_1_data_line( - const void * _address ) -{ - register const void *__address = _address; - asm volatile ( "dcbf 0,%0" :: "r" (__address) : "memory" ); -} - void _CPU_cache_flush_entire_data ( void ) { @@ -131,12 +117,6 @@ void _CPU_cache_disable_instruction ( PPC_Set_HID0( value ); } -void _CPU_cache_invalidate_1_instruction_line( - const void * _address ) -{ - register const void *__address = _address; - asm volatile ( "icbi 0,%0" :: "r" (__address) : "memory"); -} void _CPU_cache_invalidate_entire_instruction ( void ) @@ -237,4 +217,26 @@ void _CPU_cache_disable_instruction ( void ) } #endif +void _CPU_cache_invalidate_1_data_line( + const void * _address ) +{ + register const void *__address = _address; + asm volatile ( "dcbi 0,%0" :: "r"(__address) : "memory" ); +} + +void _CPU_cache_flush_1_data_line( + const void * _address ) +{ + register const void *__address = _address; + asm volatile ( "dcbf 0,%0" :: "r" (__address) : "memory" ); +} + + +void _CPU_cache_invalidate_1_instruction_line( + const void * _address ) +{ + register const void *__address = _address; + asm volatile ( "icbi 0,%0" :: "r" (__address) : "memory"); +} + /* end of file */