Ignore:
Timestamp:
Apr 27, 2004, 8:39:34 PM (21 years ago)
Author:
bird
Message:

GCC v3.3.3 sources.

Location:
branches/GNU/src/gcc
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/GNU/src/gcc

    • Property svn:ignore

      •  

        old new  
        2626configure.vr
        2727configure.vrs
         28dir.info
        2829Makefile
        29 dir.info
        3030lost+found
        3131update.out

  • branches/GNU/src/gcc/libobjc/misc.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    11/* GNU Objective C Runtime Miscellaneous
    2    Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
     2   Copyright (C) 1993, 1994, 1995, 1996, 1997, 2002
     3   Free Software Foundation, Inc.
    34   Contributed by Kresten Krab Thorup
    45
    … …  
    3839/* Trigger an objc error */
    3940void
    40 objc_error(id object, int code, const char* fmt, ...)
     41objc_error (id object, int code, const char *fmt, ...)
    4142{
    4243  va_list ap;
    4344
    44   va_start(ap, fmt);
    45   objc_verror(object, code, fmt, ap);
    46   va_end(ap);
     45  va_start (ap, fmt);
     46  objc_verror (object, code, fmt, ap);
     47  va_end (ap);
    4748}
    4849
    4950/* Trigger an objc error */
    5051void
    51 objc_verror(id object, int code, const char* fmt, va_list ap)
     52objc_verror (id object, int code, const char *fmt, va_list ap)
    5253{
    5354  BOOL result = NO;
    … …  
    5657     Otherwise print to stderr */
    5758  if (_objc_error_handler)
    58     result = (*_objc_error_handler)(object, code, fmt, ap);
     59    result = (*_objc_error_handler) (object, code, fmt, ap);
    5960  else
    6061    vfprintf (stderr, fmt, ap);
    … …  
    6566    return;
    6667  else
    67     abort();
     68    abort ();
    6869}
    6970
    7071/* Set the error handler */
    7172objc_error_handler
    72 objc_set_error_handler(objc_error_handler func)
     73objc_set_error_handler (objc_error_handler func)
    7374{
    7475  objc_error_handler temp = _objc_error_handler;
    … …  
    8586
    8687void *
    87 objc_malloc(size_t size)
     88objc_malloc (size_t size)
    8889{
    89   void* res = (void*) (*_objc_malloc)(size);
    90   if(!res)
    91     objc_error(nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
     90  void *res = (void *) (*_objc_malloc) (size);
     91  if (! res)
     92    objc_error (nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
    9293  return res;
    9394}
    9495
    9596void *
    96 objc_atomic_malloc(size_t size)
     97objc_atomic_malloc (size_t size)
    9798{
    98   void* res = (void*) (*_objc_atomic_malloc)(size);
    99   if(!res)
    100     objc_error(nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
     99  void *res = (void *) (*_objc_atomic_malloc) (size);
     100  if (! res)
     101    objc_error (nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
    101102  return res;
    102103}
    103104
    104105void *
    105 objc_valloc(size_t size)
     106objc_valloc (size_t size)
    106107{
    107   void* res = (void*) (*_objc_valloc)(size);
    108   if(!res)
    109     objc_error(nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
     108  void *res = (void *) (*_objc_valloc) (size);
     109  if (! res)
     110    objc_error (nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
    110111  return res;
    111112}
    112113
    113114void *
    114 objc_realloc(void *mem, size_t size)
     115objc_realloc (void *mem, size_t size)
    115116{
    116   void* res = (void*) (*_objc_realloc)(mem, size);
    117   if(!res)
    118     objc_error(nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
     117  void *res = (void *) (*_objc_realloc) (mem, size);
     118  if (! res)
     119    objc_error (nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
    119120  return res;
    120121}
    121122
    122123void *
    123 objc_calloc(size_t nelem, size_t size)
     124objc_calloc (size_t nelem, size_t size)
    124125{
    125   void* res = (void*) (*_objc_calloc)(nelem, size);
    126   if(!res)
    127     objc_error(nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
     126  void *res = (void *) (*_objc_calloc) (nelem, size);
     127  if (! res)
     128    objc_error (nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
    128129  return res;
    129130}
    130131
    131132void
    132 objc_free(void *mem)
     133objc_free (void *mem)
    133134{
    134   (*_objc_free)(mem);
     135  (*_objc_free) (mem);
    135136}
    136137
    … …  
    149150#include <gc.h>
    150151
    151 static void *GC_calloc (size_t nelem, size_t size)
     152static void *
     153GC_calloc (size_t nelem, size_t size)
    152154{
    153   void* p = GC_malloc (nelem * size);
    154   if (!p)
     155  void *p = GC_malloc (nelem * size);
     156  if (! p)
    155157    objc_error (nil, OBJC_ERR_MEMORY, "Virtual memory exhausted!\n");
    156158
    … …  
    159161}
    160162
    161 static void noFree (void* p) {}
     163static void
     164noFree (void *p)
     165{
     166}
    162167
    163 void *(*_objc_malloc)(size_t) = GC_malloc;
    164 void *(*_objc_atomic_malloc)(size_t) = GC_malloc_atomic;
    165 void *(*_objc_valloc)(size_t) = GC_malloc;
    166 void *(*_objc_realloc)(void *, size_t) = GC_realloc;
    167 void *(*_objc_calloc)(size_t, size_t) = GC_calloc;
    168 void (*_objc_free)(void *) = noFree;
     168void *(*_objc_malloc) (size_t) = GC_malloc;
     169void *(*_objc_atomic_malloc) (size_t) = GC_malloc_atomic;
     170void *(*_objc_valloc) (size_t) = GC_malloc;
     171void *(*_objc_realloc) (void *, size_t) = GC_realloc;
     172void *(*_objc_calloc) (size_t, size_t) = GC_calloc;
     173void (*_objc_free) (void *) = noFree;
    169174
    170 #else
     175#else   /* !OBJC_WITH_GC */
    171176
    172 void *(*_objc_malloc)(size_t) = malloc;
    173 void *(*_objc_atomic_malloc)(size_t) = malloc;
    174 void *(*_objc_valloc)(size_t) = malloc;
    175 void *(*_objc_realloc)(void *, size_t) = realloc;
    176 void *(*_objc_calloc)(size_t, size_t) = calloc;
    177 void (*_objc_free)(void *) = free;
     177void *(*_objc_malloc) (size_t) = malloc;
     178void *(*_objc_atomic_malloc) (size_t) = malloc;
     179void *(*_objc_valloc) (size_t) = malloc;
     180void *(*_objc_realloc) (void *, size_t) = realloc;
     181void *(*_objc_calloc) (size_t, size_t) = calloc;
     182void (*_objc_free) (void *) = free;
    178183
    179184
    180 #endif
     185#endif  /* !OBJC_WITH_GC */
Note: See TracChangeset for help on using the changeset viewer.