Changeset df49c60 in rtems for c/src/exec/score/cpu/unix


Ignore:
Timestamp:
Jun 12, 2000, 3:00:15 PM (22 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
edeed26
Parents:
0ab65474
Message:

Merged from 4.5.0-beta3a

Location:
c/src/exec/score/cpu/unix
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/score/cpu/unix/Makefile.am

    r0ab65474 rdf49c60  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
  • c/src/exec/score/cpu/unix/cpu.c

    r0ab65474 rdf49c60  
    4343typedef struct {
    4444  jmp_buf   regs;
    45   int  isr_level;
     45  int       isr_level;
    4646} Context_Control_overlay;
    4747
     
    100100  (void) sigdelset(&_CPU_Signal_mask, SIGTRAP);
    101101  (void) sigdelset(&_CPU_Signal_mask, SIGABRT);
     102#if !defined(__CYGWIN__)
    102103  (void) sigdelset(&_CPU_Signal_mask, SIGIOT);
     104#endif
    103105  (void) sigdelset(&_CPU_Signal_mask, SIGCONT);
    104106  (void) sigdelset(&_CPU_Signal_mask, SIGSEGV);
     
    199201   */
    200202
    201 
     203  if ( sizeof(Context_Control_overlay) < sizeof(Context_Control) )
     204    _CPU_Fatal_halt( 0xdeadfood );
     205 
    202206  (void) memset(
    203207    &_CPU_Context_Default_with_ISRs_enabled,
     
    276280{
    277281  /*
     282   *  If something happened where the public Context_Control is not
     283   *  at least as large as the private Context_Control_overlay, then
     284   *  we are in trouble.
     285   */
     286
     287  if ( sizeof(Context_Control_overlay) > sizeof(Context_Control) )
     288    _CPU_Fatal_error(0x100 + 1);
     289
     290  /*
    278291   *  The thread_dispatch argument is the address of the entry point
    279292   *  for the routine called at the end of an ISR once it has been
     
    483496
    484497  if ( _new_level == 0 )
    485       *_the_context = *(Context_Control *)
    486                          &_CPU_Context_Default_with_ISRs_enabled;
     498      *(Context_Control_overlay *)_the_context =
     499                         _CPU_Context_Default_with_ISRs_enabled;
    487500  else
    488       *_the_context = *(Context_Control *)
    489                          &_CPU_Context_Default_with_ISRs_disabled;
     501      *(Context_Control_overlay *)_the_context =
     502                         _CPU_Context_Default_with_ISRs_disabled;
    490503
    491504  addr = (unsigned32 *)_the_context;
     
    807820      case SIGSEGV:
    808821      case SIGTERM:
     822#if !defined(__CYGWIN__)
    809823      case SIGIOT:
     824#endif
    810825        _CPU_Fatal_error(0x100 + sig_num);
    811826  }
  • c/src/exec/score/cpu/unix/rtems/Makefile.am

    r0ab65474 rdf49c60  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
  • c/src/exec/score/cpu/unix/rtems/score/Makefile.am

    r0ab65474 rdf49c60  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     
    2121CLEANFILES = unixsize.h
    2222
    23 PREINSTALL_FILES = \
    24 $(PROJECT_INCLUDE)/rtems/score \
    25 $(STATIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \
    26 $(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
     23PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     24    $(STATIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \
     25    $(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
    2726
    2827$(PROJECT_INCLUDE)/rtems/score:
  • c/src/exec/score/cpu/unix/rtems/score/cpu.h

    r0ab65474 rdf49c60  
    379379 
    380380/*
    381  *  For Linux 1.1
     381 *  For i386 targets
    382382 */
    383383 
     
    390390#define ESI_OFF    4
    391391#define EDI_OFF    5
     392#elif defined(__CYGWIN__)
     393#define EAX_OFF    0
     394#define EBX_OFF    1
     395#define ECX_OFF    2
     396#define EDX_OFF    3
     397#define ESI_OFF    4
     398#define EDI_OFF    5
     399#define EBP_OFF    6
     400#define ESP_OFF    7
     401#define RET_OFF    8
    392402#else
     403/* Linux */
    393404#define EBX_OFF    0
    394405#define ESI_OFF    1
  • c/src/exec/score/cpu/unix/rtems/score/unix.h

    r0ab65474 rdf49c60  
    3030 */
    3131 
    32 #if defined(hpux)
     32#if defined(rtems_multilib)
     33/*
     34 *  Figure out all CPU Model Feature Flags based upon compiler
     35 *  predefines.
     36 */
     37
     38#define CPU_MODEL_NAME  "rtems_multilib"
     39 
     40#elif defined(hpux)
    3341 
    3442#define CPU_MODEL_NAME  "HP-UX"
     
    3846#define CPU_MODEL_NAME  "Solaris"
    3947 
    40 #elif defined(__linux__)
     48#elif defined(__linux__) || defined(linux)
    4149 
    4250#define CPU_MODEL_NAME  "Linux"
    4351 
    44 #elif defined(linux)
     52#elif defined(__CYGWIN__)
    4553 
    46 #define CPU_MODEL_NAME  "Linux"
     54#define CPU_MODEL_NAME  "Cygwin"
    4755 
    4856#elif defined(__FreeBSD__)
Note: See TracChangeset for help on using the changeset viewer.