Changeset 3652ad35 in rtems for c/src/exec/score

Timestamp:

09/19/95 14:53:29 (28 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

38ffa0c

Parents:

b3ac6a8d

Message:

Minor bug fixes to get all targets compilable and running. The
single biggest changes were the expansion of the workspace size
macro to include other types of objects and the increase in the
minimum stack size for most CPUs.

Location:

c/src/exec/score

Files:

• cpu/hppa1.1/cpu.c (modified) (2 diffs)
• cpu/hppa1.1/cpu_asm.s (modified) (1 diff)
• cpu/hppa1.1/hppa.h (modified) (1 diff)
• cpu/hppa1.1/rtems.s (modified) (1 diff)
• cpu/i386/cpu.c (modified) (2 diffs)
• cpu/i386/cpu.h (modified) (2 diffs)
• cpu/i386/i386.h (modified) (1 diff)
• cpu/i960/cpu.h (modified) (2 diffs)
• cpu/m68k/cpu.h (modified) (1 diff)
• cpu/unix/cpu.c (modified) (8 diffs)
• headers/coremsg.h (added)
• include/rtems/score/coremsg.h (added)
• inline/coremsg.inl (added)
• inline/rtems/score/coremsg.inl (added)
• macros/coremsg.inl (added)
• macros/rtems/score/coremsg.inl (added)
• src/coremsg.c (added)

c/src/exec/score/cpu/hppa1.1/cpu.c

@@ -194 +194 @@
 hppa_external_interrupt_initialize(void)
 {
-    hppa_rtems_isr_entry ignore;
+    hppa_rtems_isr_entry ignore = 0;
 
     /* mark them all unused */
@@ -202 +202 @@
 
     /* install the external interrupt handler */
-    rtems_interrupt_catch((rtems_isr_entry) hppa_external_interrupt,
-                          HPPA_INTERRUPT_EXTERNAL_INTERRUPT, &ignore) ;
+  _CPU_ISR_install_vector(
+    HPPA_INTERRUPT_EXTERNAL_INTERRUPT,
+    (proc_ptr)hppa_external_interrupt,
+    (proc_ptr *)ignore
+  );
 }
 

c/src/exec/score/cpu/hppa1.1/cpu_asm.s

@@ -25 +25 @@
 #      suitability of this software for any purpose.
 #
- *  $Id$
+#  $Id$
 #
 

c/src/exec/score/cpu/hppa1.1/hppa.h

@@ -637 +637 @@
 
 #define EMIT_SET_CONTROL(name, reg)            \
-static __inline__ unsigned int                 \
+static __inline__ void                         \
 set_ ## name (unsigned int new_value)          \
 {                                              \

c/src/exec/score/cpu/hppa1.1/rtems.s

@@ -15 +15 @@
  */
 
-#include <rtems/hppa.h>
+#include <rtems/core/hppa.h>
 #include <rtems/core/cpu_asm.h>
 

c/src/exec/score/cpu/i386/cpu.c

@@ -35 +35 @@
 {
   register unsigned16  fp_status asm ("ax");
-  register unsigned8  *fp_context;
+  register void       *fp_context;
 
   _CPU_Table = *cpu_table;
@@ -57 +57 @@
   if ( fp_status ==  0 ) {
 
-    fp_context = _CPU_Null_fp_context;
+    fp_context = &_CPU_Null_fp_context;
 
     asm volatile( "fsave (%0)" : "=r" (fp_context)

c/src/exec/score/cpu/i386/cpu.h

@@ -148 +148 @@
 /*
  *  Minimum size of a thread's stack.
- *
- *  NOTE:  256 bytes is probably too low in most cases.
- */
-
-#define CPU_STACK_MINIMUM_SIZE          256
+ */
+
+#define CPU_STACK_MINIMUM_SIZE          1024
 
 /*
@@ -233 +231 @@
 #define _CPU_Context_Initialize_fp( _fp_area ) \
   { \
-    unsigned32 *_source      = (unsigned32 *) _CPU_Null_fp_context; \
-    unsigned32 *_destination = (unsigned32 *) *(_fp_area); \
+    unsigned32 *_source      = (unsigned32 *) &_CPU_Null_fp_context; \
+    unsigned32 *_destination = *(_fp_area); \
     unsigned32  _index; \
     \

c/src/exec/score/cpu/i386/i386.h

@@ -171 +171 @@
     register unsigned32 _eflags = 0; \
     \
-    asm volatile ( "push %0 ; \
-                    popf " \
+    asm volatile ( "pushf ; \
+                    pop %0" \
                     : "=r" ((_eflags)) : "0" ((_eflags)) \
     ); \

c/src/exec/score/cpu/i960/cpu.h

@@ -180 +180 @@
 
 #define CPU_SYSTEM_INITIALIZATION_THREAD_EXTRA_STACK \
-   (4096 - CPU_STACK_MINIMUM_SIZE)
+   (CPU_STACK_MINIMUM_SIZE)
 
 /*
@@ -194 +194 @@
  */
 
-#define CPU_STACK_MINIMUM_SIZE          1024
+#define CPU_STACK_MINIMUM_SIZE          2048
 
 /*

c/src/exec/score/cpu/m68k/cpu.h

@@ -178 +178 @@
 /*
  *  Minimum size of a thread's stack.
- *
- *  NOTE:  256 bytes is probably too low in most cases.
- */
-
-#define CPU_STACK_MINIMUM_SIZE           256
+ */
+
+#define CPU_STACK_MINIMUM_SIZE           1024
 
 /*

c/src/exec/score/cpu/unix/cpu.c

@@ -1 +1 @@
 /*
- *  HP PA-RISC CPU Dependent Source
+ *  UNIX Simulator Dependent Source
  *
  *
@@ -19 +19 @@
 #include <rtems/system.h>
 #include <rtems/core/isr.h>
+#include <rtems/core/interr.h>
 
 #include <stdio.h>
@@ -170 +171 @@
 
   _CPU_ISR_Set_level( 0 );
-  setjmp( _CPU_Context_Default_with_ISRs_enabled.regs );
-  sigprocmask(
-    SIG_SETMASK,    /* ignored when second arg is NULL */
-    0,
-    &_CPU_Context_Default_with_ISRs_enabled.isr_level
+  _CPU_Context_switch(
+    &_CPU_Context_Default_with_ISRs_enabled,
+    &_CPU_Context_Default_with_ISRs_enabled
   );
 
   _CPU_ISR_Set_level( 1 );
-  setjmp( _CPU_Context_Default_with_ISRs_disabled.regs );
-  sigprocmask(
-    SIG_SETMASK,    /* ignored when second arg is NULL */
-    0,
-    &_CPU_Context_Default_with_ISRs_disabled.isr_level
+  _CPU_Context_switch(
+    &_CPU_Context_Default_with_ISRs_disabled,
+    &_CPU_Context_Default_with_ISRs_disabled
   );
-
 }
 
@@ -192 +188 @@
  */
 
+sigset_t GET_old_mask;
+
 unsigned32 _CPU_ISR_Get_level( void )
 {
-  sigset_t sigset;
- 
-  sigprocmask( 0, 0, &sigset ); 
-
-  /*
-   *  This is an educated guess based on ONLY ONE of the signals we
-   *  disable/enable to mask ISRs.
-   */
-
-  if ( sigismember( &sigset, SIGUSR1 ) )
-    return 1;
-  else
-    return 0;
+/*  sigset_t  old_mask; */
+   unsigned32 old_level;
+ 
+  sigprocmask(0, 0, &GET_old_mask);
+ 
+  if (memcmp((void *)&posix_empty_mask, (void *)&GET_old_mask, sizeof(sigset_t)))
+    old_level = 1;
+  else 
+    old_level = 0;
+
+  return old_level;
 }
 
@@ -384 +380 @@
     source = _CPU_Context_Default_with_ISRs_disabled.regs;
       
-  memcpy(_the_context, source, sizeof(jmp_buf));
+  memcpy(_the_context, source, sizeof(Context_Control) ); /* sizeof(jmp_buf)); */
 
   addr = (unsigned32 *)_the_context;
@@ -471 +467 @@
 )
 {
+  int status;
+
   /*
    *  Switch levels in one operation
    */
 
-  sigprocmask( SIG_SETMASK, &next->isr_level, &current->isr_level );
+  status = sigprocmask( SIG_SETMASK, &next->isr_level, &current->isr_level );
+  if ( status )
+    _Internal_error_Occurred(
+      INTERNAL_ERROR_CORE,
+      TRUE,
+      status
+    );
 
   if (setjmp(current->regs) == 0) {    /* Save the current context */
      longjmp(next->regs, 0);           /* Switch to the new context */
-  }
+     if ( status )
+       _Internal_error_Occurred(
+         INTERNAL_ERROR_CORE,
+         TRUE,
+         status
+       );
+  }
+
 }
  
@@ -511 +522 @@
 unsigned32 _CPU_ISR_Disable_support(void)
 {
+  int status;
   sigset_t  old_mask;
 
-  sigprocmask(SIG_BLOCK, &_CPU_Signal_mask, &old_mask);
-
-  if (memcmp((void *)&posix_empty_mask, (void *)&old_mask, sizeof(sigset_t)) != 0)
+  status = sigprocmask(SIG_BLOCK, &_CPU_Signal_mask, &old_mask);
+  if ( status )
+    _Internal_error_Occurred(
+      INTERNAL_ERROR_CORE,
+      TRUE,
+      status
+    );
+
+  if (memcmp((void *)&posix_empty_mask, (void *)&old_mask, sizeof(sigset_t)))
     return 1;
 
@@ -530 +548 @@
 )
 {
+  int status;
+
   if (level == 0)
-    sigprocmask(SIG_UNBLOCK, &_CPU_Signal_mask, 0);
+    status = sigprocmask(SIG_UNBLOCK, &_CPU_Signal_mask, 0);
   else
-    sigprocmask(SIG_BLOCK, &_CPU_Signal_mask, 0);
+    status = sigprocmask(SIG_BLOCK, &_CPU_Signal_mask, 0);
+
+  if ( status )
+    _Internal_error_Occurred(
+      INTERNAL_ERROR_CORE,
+      TRUE,
+      status
+    );
 }