Changeset 1f94ed6b in rtems for c/src/lib

Timestamp:

04/22/96 16:50:17 (28 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

5a36154a

Parents:

34f3d17

Message:

Updates from Tony Bennett.

Location:

c/src/lib

Files:

• include/rtems/libio.h (modified) (1 diff)
• libbsp/unix/posix/startup/bspstart.c (modified) (4 diffs)
• libbsp/unix/posix/startup/rtems-ctor.cc (modified) (2 diffs)
• libbsp/unix/posix/startup/setvec.c (modified) (1 diff)
• libc/libio.c (modified) (1 diff)
• libc/libio.h (modified) (1 diff)
• libc/malloc.c (modified) (4 diffs)
• libc/newlibc.c (modified) (5 diffs)

c/src/lib/include/rtems/libio.h

@@ -1 +1 @@
 /*
- *      @(#)libio.h     1.1 - 95/06/02
- *      
- *
  * General purpose communication channel for RTEMS to allow UNIX/POSIX
  *    system call behavior on top of RTEMS IO devices.

c/src/lib/libbsp/unix/posix/startup/bspstart.c

@@ -1 @@
-/*
- *      @(#)bspstart.c  1.7 - 95/04/07
- *
- */
-
 /*  bsp_start()
  *
@@ -56 +51 @@
 int                          rtems_argc;
 char                       **rtems_argv;
-char                       **rtems_envp;
 
 /*
@@ -167 +161 @@
 #ifdef RTEMS_DEBUG
     rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
+#endif
+
+    /*
+     * Dump malloc stats on exit...
+     */
+#if defined(RTEMS_DEBUG)
+  atexit(malloc_dump);
 #endif
 }
@@ -199 +200 @@
     rtems_fatal_error_occurred( error_code | 'I' << 8 | 'O' );
 #endif
-
-#if defined(MALLOC_STATS)
-  atexit(malloc_dump);
-#endif
-
 }
 

c/src/lib/libbsp/unix/posix/startup/rtems-ctor.cc

@@ -1 @@
-// 
-//      @(#)rtems-ctor.cc       1.6 - 95/04/25
-//
-
 /*
  *  rtems-ctor.cc
@@ -91 +87 @@
         rtems_argc = argc;
         rtems_argv = argv;
-        rtems_envp = environp;
 
         if ((argc > 0) && argv && argv[0])

c/src/lib/libbsp/unix/posix/startup/setvec.c

@@ -32 +32 @@
 )
 {
-    rtems_isr_entry  rtems_isr_ptr;
+    rtems_isr_entry  rtems_isr_ptr = 0;
     proc_ptr         raw_isr_ptr;
 

c/src/lib/libc/libio.c

@@ -1 +1 @@
 /*
- *      @(#)libio.c     1.1 - 95/06/02
- *      
- *
  * Provide UNIX/POSIX-like io system calls for RTEMS using the
  *  RTEMS IO manager

c/src/lib/libc/libio.h

@@ -1 +1 @@
 /*
- *      @(#)libio.h     1.1 - 95/06/02
- *      
- *
  * General purpose communication channel for RTEMS to allow UNIX/POSIX
  *    system call behavior on top of RTEMS IO devices.

c/src/lib/libc/malloc.c

@@ -26 +26 @@
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>    /* sbrk(2) */
 
 rtems_id RTEMS_Malloc_Heap;
@@ -32 +33 @@
 #ifdef RTEMS_DEBUG
 #define MALLOC_STATS
+#define MALLOC_DIRTY
 #endif
 
@@ -203 +205 @@
   }
 #endif
-  
+
+#ifdef MALLOC_DIRTY
+  (void) memset(return_this, 0xCF, size);
+#endif
+
   return return_this;
 }
@@ -221 +227 @@
   if ( cptr )
     memset( cptr, '\0', length );
+
+  MSBUMP(malloc_calls, -1);   /* subtract off the malloc */
 
   return cptr;

c/src/lib/libc/newlibc.c

@@ -1 @@
-/*
- *      @(#)newlibc.c   1.9 - 95/05/16
- *      
- */
-
 #if defined(RTEMS_NEWLIB)
 
 /*
- *  File:       newlibc.c,v
- *  Project:    PixelFlow
- *  Created:    94/12/7
- *  Revision:   1.2
- *  Last Mod:   1995/05/09 20:24:37
- *
  *  COPYRIGHT (c) 1994 by Division Incorporated
  *
@@ -48 +37 @@
 #include <sys/reent.h>          /* for extern of _REENT (aka _impure_ptr) */
 
-#ifdef RTEMS_UNIX
-#include <stdio.h>              /* for setvbuf() */
+/*
+ *  NOTE: When using RTEMS fake stat, fstat, and isatty, all output
+ *        is line buffered so this setvbuf is not necessary.  This
+ *        setvbuf insures that we can redirect the output of a test
+ *        on the UNIX simulator and it is in the same order as for a
+ *        real target.
+ *  NOTE:
+ *        There is some problem with doing this on the hpux version
+ *        of the UNIX simulator (symptom is printf core dumps), so
+ *        we just don't for now.
+ *        Not sure if this is a problem with hpux, newlib, or something else.
+ */
+ 
+#if defined(RTEMS_UNIX) && !defined(hpux)
+#define NEED_SETVBUF
+#endif
+ 
+#ifdef NEED_SETVBUF
+#include <stdio.h>
 #endif
 
@@ -197 +203 @@
     if (current_task == deleted_task)
     {
-        ptr = _REENT;
+      ptr = _REENT;
     }
     else
     {
-        ptr = (struct _reent *) MY_task_get_note(deleted_task, LIBC_NOTEPAD);
+      ptr = (struct _reent *) MY_task_get_note(deleted_task, LIBC_NOTEPAD);
     }
 
@@ -207 +213 @@
     if (ptr && ptr != &libc_global_reent)
     {
-        _wrapup_reent(ptr);
-        _reclaim_reent(ptr);
+      _wrapup_reent(ptr);
+      _reclaim_reent(ptr);
+      free(ptr);
     }
 
@@ -219 +226 @@
     if (current_task == deleted_task)
     {
-        _REENT = 0;
+      _REENT = 0;
     }
 }