Ticket #1341: pr1341.diff

File pr1341.diff, 2.6 KB (added by Joel Sherrill, on 11/24/08 at 18:47:30)

Fixes issue

  • cpukit/sapi/include/confdefs.h 

    RCS file: /usr1/CVS/rtems/cpukit/sapi/include/confdefs.h,v
retrieving revision 1.108.2.2
diff -u -r1.108.2.2 confdefs.h
     
    289289#if (CPU_ALLOCATE_INTERRUPT_STACK == 0)
    290290  #define CONFIGURE_INTERRUPT_STACK_MEMORY 0
    291291#else
    292   #define CONFIGURE_INTERRUPT_STACK_MEMORY CONFIGURE_INTERRUPT_STACK_SIZE
     292  #define CONFIGURE_INTERRUPT_STACK_MEMORY \
     293     _Configure_From_workspace( CONFIGURE_INTERRUPT_STACK_SIZE )
    293294#endif
    294295
    295296/**
    … …  
    744745
    745746  #ifndef CONFIGURE_DISABLE_CLASSIC_NOTEPADS
    746747    #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \
    747       sizeof(RTEMS_API_Control)
     748      _Configure_From_workspace( sizeof(RTEMS_API_Control) )
    748749  #else
    749750    #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \
    750       (sizeof(RTEMS_API_Control) - (RTEMS_NUMBER_NOTEPADS * sizeof(uint32_t)))
     751      _Configure_From_workspace( sizeof(RTEMS_API_Control) - \
     752        (RTEMS_NUMBER_NOTEPADS * sizeof(uint32_t)))
    751753  #endif
    752754
    753755  /**
    … …  
    856858    #define CONFIGURE_TICKS_PER_TIMESLICE        50
    857859  #endif
    858860
    859   #ifndef CONFIGURE_DISABLE_CLASSIC_NOTEPADS
    860     #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \
    861       sizeof(RTEMS_API_Control)
    862   #else
    863     #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \
    864       (sizeof(RTEMS_API_Control) - (RTEMS_NUMBER_NOTEPADS * sizeof(uint32_t)))
    865   #endif
    866 
    867861/*
    868862 *  Initial Extension Set
    869863 */
    … …  
    14211415   *  solution.
    14221416   */
    14231417  #if defined(__mips__)
    1424     #define CONFIGURE_INTERRUPT_VECTOR_TABLE (sizeof(ISR_Handler_entry) * 256)
     1418    #define CONFIGURE_INTERRUPT_VECTOR_TABLE \
     1419      _Configure_From_workspace( (sizeof(ISR_Handler_entry) * 256))
    14251420  #else
    14261421    #define CONFIGURE_INTERRUPT_VECTOR_TABLE \
    1427       (sizeof(ISR_Handler_entry) * ISR_NUMBER_OF_VECTORS)
     1422      _Configure_From_workspace( \
     1423        (sizeof(ISR_Handler_entry) * ISR_NUMBER_OF_VECTORS))
    14281424  #endif
    14291425#else
    14301426  #define CONFIGURE_INTERRUPT_VECTOR_TABLE 0
    … …  
    15271523 *  user extensions.
    15281524 */
    15291525#define CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS \
    1530    _Configure_From_workspace( \
    1531      (CONFIGURE_NEWLIB_EXTENSION + CONFIGURE_STACK_CHECKER_EXTENSION) * \
    1532       sizeof(User_extensions_Control) \
    1533    )
     1526     ((CONFIGURE_NEWLIB_EXTENSION * \
     1527        _Configure_From_workspace( sizeof(User_extensions_Control))) + \
     1528      (CONFIGURE_STACK_CHECKER_EXTENSION * \
     1529        _Configure_From_workspace( sizeof(User_extensions_Control))) \
     1530     )
    15341531
    15351532/**
    15361533 *  This macro provides a summation of the memory required by the