From 04dba496a650cbd1c4ee04a12d6afa38210bcc02 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 19 Oct 2006 19:20:10 +0000 Subject: 2006-10-19 Joel Sherrill * configure.ac, itron/Makefile.am, itron/preinstall.am, posix/Makefile.am, posix/preinstall.am, rtems/Makefile.am, rtems/preinstall.am, sapi/Makefile.am, sapi/preinstall.am, score/Makefile.am, score/preinstall.am, score/include/rtems/system.h, score/include/rtems/score/chain.h, score/include/rtems/score/thread.h, score/src/chain.c, score/src/coremutexseize.c, score/src/threadget.c: Remove all macro implementations and use only the static inline. Static inline functions are now well supported so there is no reason for duplicate maintenance. * itron/macros/rtems/itron/eventflags.inl, itron/macros/rtems/itron/fmempool.inl, itron/macros/rtems/itron/intr.inl, itron/macros/rtems/itron/mbox.inl, itron/macros/rtems/itron/msgbuffer.inl, itron/macros/rtems/itron/network.inl, itron/macros/rtems/itron/port.inl, itron/macros/rtems/itron/semaphore.inl, itron/macros/rtems/itron/sysmgmt.inl, itron/macros/rtems/itron/task.inl, itron/macros/rtems/itron/time.inl, itron/macros/rtems/itron/vmempool.inl, posix/macros/rtems/posix/cond.inl, posix/macros/rtems/posix/key.inl, posix/macros/rtems/posix/mqueue.inl, posix/macros/rtems/posix/mutex.inl, posix/macros/rtems/posix/priority.inl, posix/macros/rtems/posix/pthread.inl, posix/macros/rtems/posix/semaphore.inl, posix/macros/rtems/posix/timer.inl, rtems/macros/rtems/rtems/asr.inl, rtems/macros/rtems/rtems/attr.inl, rtems/macros/rtems/rtems/barrier.inl, rtems/macros/rtems/rtems/dpmem.inl, rtems/macros/rtems/rtems/event.inl, rtems/macros/rtems/rtems/eventset.inl, rtems/macros/rtems/rtems/message.inl, rtems/macros/rtems/rtems/modes.inl, rtems/macros/rtems/rtems/options.inl, rtems/macros/rtems/rtems/part.inl, rtems/macros/rtems/rtems/ratemon.inl, rtems/macros/rtems/rtems/region.inl, rtems/macros/rtems/rtems/sem.inl, rtems/macros/rtems/rtems/status.inl, rtems/macros/rtems/rtems/support.inl, rtems/macros/rtems/rtems/tasks.inl, rtems/macros/rtems/rtems/timer.inl, sapi/macros/rtems/extension.inl, score/macros/README, score/macros/rtems/score/address.inl, score/macros/rtems/score/chain.inl, score/macros/rtems/score/corebarrier.inl, score/macros/rtems/score/coremsg.inl, score/macros/rtems/score/coremutex.inl, score/macros/rtems/score/corerwlock.inl, score/macros/rtems/score/coresem.inl, score/macros/rtems/score/corespinlock.inl, score/macros/rtems/score/heap.inl, score/macros/rtems/score/isr.inl, score/macros/rtems/score/mppkt.inl, score/macros/rtems/score/object.inl, score/macros/rtems/score/objectmp.inl, score/macros/rtems/score/priority.inl, score/macros/rtems/score/stack.inl, score/macros/rtems/score/states.inl, score/macros/rtems/score/sysstate.inl, score/macros/rtems/score/thread.inl, score/macros/rtems/score/threadmp.inl, score/macros/rtems/score/tod.inl, score/macros/rtems/score/tqdata.inl, score/macros/rtems/score/userext.inl, score/macros/rtems/score/watchdog.inl, score/macros/rtems/score/wkspace.inl: Removed. --- cpukit/score/macros/rtems/score/heap.inl | 221 ------------------------------- 1 file changed, 221 deletions(-) delete mode 100644 cpukit/score/macros/rtems/score/heap.inl (limited to 'cpukit/score/macros/rtems/score/heap.inl') diff --git a/cpukit/score/macros/rtems/score/heap.inl b/cpukit/score/macros/rtems/score/heap.inl deleted file mode 100644 index 78accba6b1..0000000000 --- a/cpukit/score/macros/rtems/score/heap.inl +++ /dev/null @@ -1,221 +0,0 @@ -/* heap.inl - * - * This file contains the macro implementation of the inlined - * routines from the heap handler. - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_SCORE_HEAP_INL -#define _RTEMS_SCORE_HEAP_INL - -/* - * WARNING: this file is only visually checked against - * '../../../inline/rtems/score/heap.inl'. Use those file for reference - * if you encounter problems. - */ - -#include - -/*PAGE - * - * _Heap_Head - */ - -#define _Heap_Head( _the_heap ) (&(_the_heap)->free_list) - -/*PAGE - * - * _Heap_Tail - */ - -#define _Heap_Tail( _the_heap ) (&(_the_heap)->free_list) - -/*PAGE - * - * _Heap_First - */ - -#define _Heap_First( _the_heap ) (_Heap_Head(_the_heap)->next) - -/*PAGE - * - * _Heap_Last - */ - -#define _Heap_Last( _the_heap ) (_Heap_Tail(_the_heap)->prev) - -/*PAGE - * - * _Heap_Block_remove - * - */ - -#define _Heap_Block_remove( _the_block ) \ - do { \ - Heap_Block *block = (_the_block); \ - Heap_Block *next = block->next; \ - Heap_Block *prev = block->prev; \ - prev->next = next; \ - next->prev = prev; \ - } while(0) - -/*PAGE - * - * _Heap_Block_replace - * - */ - -#define _Heap_Block_replace( _old_block, _new_block ) \ - do { \ - Heap_Block *block = (_old_block); \ - Heap_Block *next = block->next; \ - Heap_Block *prev = block->prev; \ - block = (_new_block); \ - block->next = next; \ - block->prev = prev; \ - next->prev = prev->next = block; \ - } while(0) - -/*PAGE - * - * _Heap_Block_insert_after - * - */ - -#define _Heap_Block_insert_after( _prev_block, _the_block ) \ - do { \ - Heap_Block *prev = (_prev_block); \ - Heap_Block *block = (_the_block); \ - Heap_Block *next = prev->next; \ - block->next = next; \ - block->prev = prev; \ - next->prev = prev->next = block; \ - } while(0) - -/*PAGE - * - * _Heap_Is_aligned - */ - -#define _Heap_Is_aligned( _value, _alignment ) \ - (((_value) % (_alignment)) == 0) - -/*PAGE - * - * _Heap_Align_up - */ - -#define _Heap_Align_up( _value, _alignment ) \ - do { \ - uint32_t v = *(_value); \ - uint32_t a = (_alignment); \ - uint32_t r = v % a; \ - *(_value) = r ? v - r + a : v; \ - } while(0) - -/*PAGE - * - * _Heap_Align_down - */ - -#define _Heap_Align_down( _value, _alignment ) \ - do { \ - uint32_t v = *(_value); \ - *(_value) = v - (v % (_alignment)); \ - } while(0) - -/*PAGE - * - * _Heap_Is_aligned_ptr - */ - -#define _Heap_Is_aligned_ptr( _ptr, _alignment ) \ - ((_H_p2u(_ptr) % (_alignment)) == 0) - -/*PAGE - * - * _Heap_Align_up_uptr - */ - -#define _Heap_Align_up_uptr( _value, _alignment ) \ - do { \ - _H_uptr_t v = *(_value); \ - uint32_t a = (_alignment); \ - _H_uptr_t r = v % a; \ - *(_value) = r ? v - r + a : v; \ - } while(0) - -/*PAGE - * - * _Heap_Align_down_uptr - */ - -#define _Heap_Align_down_uptr( _value, _alignment ) \ - do { \ - _H_uptr_t v = *(_value); \ - *(_value) = v - (v % (_alignment)); \ - } while(0) - -/*PAGE - * - * _Heap_Block_at - */ - -#define _Heap_Block_at( _base, _offset ) \ - ( (Heap_Block *) _Addresses_Add_offset( (_base), (_offset) ) ) - -/*PAGE - * - * _Heap_User_area - */ - -#define _Heap_User_area( _the_block ) \ - ((void *) _Addresses_Add_offset( (_the_block), HEAP_BLOCK_USER_OFFSET )) - -/*PAGE - * - * _Heap_Start_of_block - */ - -#define _Heap_Start_of_block( _the_heap, _base, _the_block_ptr ) \ - do { \ - _H_uptr_t addr = _H_p2u(_base); \ - _Heap_Align_down( &addr, (_the_heap)->page_size ); \ - *(_the_block_ptr) = (Heap_Block *)(addr - HEAP_BLOCK_USER_OFFSET); \ - } while(0) - -/*PAGE - * - * _Heap_Is_prev_used - */ - -#define _Heap_Is_prev_used( _the_block ) \ - ((_the_block)->size & HEAP_PREV_USED) - -/*PAGE - * - * _Heap_Block_size - */ - -#define _Heap_Block_size( _the_block ) \ - ((_the_block)->size & ~HEAP_PREV_USED) - -/*PAGE - * - * _Heap_Is_block_in - */ - -#define _Heap_Is_block_in( _the_heap, _the_block ) \ - ( _Addresses_Is_in_range( (_the_block), \ - (_the_heap)->start, (_the_heap)->final ) ) - -#endif -/* end of include file */ -- cgit v1.2.3