Changeset 0979426 in rtems for cpukit


Ignore:
Timestamp:
Aug 18, 2009, 4:15:16 PM (10 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, master
Children:
3a95c679
Parents:
7ca51e3
Message:

2009-08-18 Sebastian Huber <Sebastian.Huber@…>

  • score/src/heapallocatealigned.c: Change break to continue to fix issue encountered on ARM. Fix indentation.
Location:
cpukit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r7ca51e3 r0979426  
     12009-08-18      Sebastian Huber <Sebastian.Huber@embedded-brains.de>
     2
     3        * score/src/heapallocatealigned.c: Change break to continue to fix
     4        issue encountered on ARM. Fix indentation.
     5
    162009-08-18      Joel Sherrill <joel.sherrill@OARcorp.com>
    27
  • cpukit/score/src/heapallocatealigned.c

    r7ca51e3 r0979426  
    215215            if (aligned_user_addr - user_addr >= page_size) {
    216216              /* No, we can't use the block */
    217               goto exit_point;
     217              continue;
     218            }
    218219          }
    219220        }
    220       }
    221 
    222       /* The block is indeed acceptable: calculate the size of the block
    223          to be allocated and perform allocation. */
    224       uint32_t const alloc_size =
    225           block_end - user_addr + HEAP_BLOCK_USER_OFFSET;
    226 
    227       _HAssert(_Heap_Is_aligned_ptr((void*)aligned_user_addr, alignment));
    228 
    229       the_block = block_allocate(the_heap, the_block, alloc_size);
    230 
    231       stats->searches += search_count + 1;
    232       stats->allocs += 1;
    233 
    234       check_result(the_heap, the_block, user_addr,
     221
     222        /* The block is indeed acceptable: calculate the size of the block
     223           to be allocated and perform allocation. */
     224        uint32_t const alloc_size =
     225            block_end - user_addr + HEAP_BLOCK_USER_OFFSET;
     226
     227        _HAssert(_Heap_Is_aligned_ptr((void*)aligned_user_addr, alignment));
     228
     229        the_block = block_allocate(the_heap, the_block, alloc_size);
     230
     231        stats->searches += search_count + 1;
     232        stats->allocs += 1;
     233
     234        check_result(the_heap, the_block, user_addr,
    235235        aligned_user_addr, size);
    236236
    237237        user_ptr = (void*)aligned_user_addr;
     238
    238239        break;
    239240      }
Note: See TracChangeset for help on using the changeset viewer.