- Timestamp:
- 2012-07-28T09:01:24Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 8847142
- Parents:
- 7df0c2ff (diff), b2ba418 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Location:
- uspace
- Files:
-
- 3 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/arch/ia64/Makefile.common
r7df0c2ff rf9c3ef44 27 27 # 28 28 29 GCC_CFLAGS += -fno-unwind-tables 29 # 30 # FIXME: 31 # 32 # The -fno-selective-scheduling and -fno-selective-scheduling2 options 33 # should be removed as soon as a bug in GCC concerning unchecked 34 # speculative loads is fixed. 35 # 36 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53975 for reference. 37 # 38 39 GCC_CFLAGS += -fno-unwind-tables -fno-selective-scheduling -fno-selective-scheduling2 30 40 31 41 ENDIANESS = LE -
uspace/lib/c/generic/malloc.c
r7df0c2ff rf9c3ef44 110 110 111 111 #define AREA_LAST_BLOCK_HEAD(area) \ 112 ((uintptr_t) BLOCK_HEAD(((heap_block_foot_t *) AREA_LAST_BLOCK_FOOT(area))))112 ((uintptr_t) BLOCK_HEAD(((heap_block_foot_t *) AREA_LAST_BLOCK_FOOT(area)))) 113 113 114 114 /** Get header in heap block. … … 349 349 return false; 350 350 351 heap_block_head_t *last_head = (heap_block_head_t *) AREA_LAST_BLOCK_HEAD(area); 351 heap_block_head_t *last_head = 352 (heap_block_head_t *) AREA_LAST_BLOCK_HEAD(area); 352 353 353 354 if (last_head->free) { … … 651 652 652 653 /** Try to enlarge any of the heap areas. 653 * If successful, allocate block of the given size in the area.654 * 654 * 655 * If successful, allocate block of the given size in the area. 655 656 * Should be called only inside the critical section. 656 657 * 657 * @param size Gross size of item to allocate (bytes).658 * @param size Gross size of item to allocate (bytes). 658 659 * @param align Memory address alignment. 660 * 661 * @return Allocated block. 662 * @return NULL on failure. 659 663 * 660 664 */ … … 663 667 if (size == 0) 664 668 return NULL; 665 669 666 670 /* First try to enlarge some existing area */ 667 671 for (heap_area_t *area = first_heap_area; area != NULL; 668 672 area = area->next) { 669 673 670 674 if (area_grow(area, size + align)) { 671 heap_block_head_t *first = (heap_block_head_t *) AREA_LAST_BLOCK_HEAD(area); 672 673 void *addr = malloc_area(area, first, NULL, size, align); 675 heap_block_head_t *first = 676 (heap_block_head_t *) AREA_LAST_BLOCK_HEAD(area); 677 678 void *addr = 679 malloc_area(area, first, NULL, size, align); 674 680 malloc_assert(addr != NULL); 675 681 return addr; … … 679 685 /* Eventually try to create a new area */ 680 686 if (area_create(AREA_OVERHEAD(size + align))) { 681 heap_block_head_t *first = (heap_block_head_t *) AREA_FIRST_BLOCK_HEAD(last_heap_area); 682 683 void *addr = malloc_area(last_heap_area, first, NULL, size, align); 687 heap_block_head_t *first = 688 (heap_block_head_t *) AREA_FIRST_BLOCK_HEAD(last_heap_area); 689 690 void *addr = 691 malloc_area(last_heap_area, first, NULL, size, align); 684 692 malloc_assert(addr != NULL); 685 693 return addr; … … 707 715 708 716 size_t falign = lcm(align, BASE_ALIGN); 709 717 710 718 /* Check for integer overflow. */ 711 719 if (falign < align) 712 720 return NULL; 713 714 size_t gross_size = GROSS_SIZE(size); 715 716 heap_block_head_t *split; 721 722 /* 723 * The size of the allocated block needs to be naturally 724 * aligned, because the footer structure also needs to reside 725 * on a naturally aligned address in order to avoid unaligned 726 * memory accesses. 727 */ 728 size_t gross_size = GROSS_SIZE(ALIGN_UP(size, BASE_ALIGN)); 717 729 718 730 /* Try the next fit approach */ 719 split = next_fit;731 heap_block_head_t *split = next_fit; 720 732 721 733 if (split != NULL) { … … 754 766 void *calloc(const size_t nmemb, const size_t size) 755 767 { 768 // FIXME: Check for overflow 769 756 770 void *block = malloc(nmemb * size); 757 771 if (block == NULL) … … 893 907 if (addr == NULL) 894 908 return; 895 909 896 910 futex_down(&malloc_futex); 897 911 -
uspace/srv/loader/Makefile
r7df0c2ff rf9c3ef44 44 44 GENERIC_SOURCES = \ 45 45 main.c \ 46 interp. s46 interp.S 47 47 48 48 SOURCES = \ -
uspace/srv/loader/interp.S
r7df0c2ff rf9c3ef44 4 4 # the program loader. 5 5 # 6 .section .interp , "" 6 7 #ifdef UARCH_arm32 8 #define AT_NOTE %note 9 #else 10 #define AT_NOTE @note 11 #endif 12 13 .section .interp, "a", AT_NOTE 7 14 .string "kernel"
Note:
See TracChangeset
for help on using the changeset viewer.