* doc/tm.texi (defmac SMALL_REGISTER_CLASSES): Remove.

[pf3gnuchains/gcc-fork.git] / libffi / src / debug.c

diff --git a/libffi/src/debug.c b/libffi/src/debug.c
index 099b397..51dcfcf 100644 (file)
--- a/libffi/src/debug.c
+++ b/libffi/src/debug.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------
 /* -----------------------------------------------------------------------

-   debug.c - Copyright (c) 1996 Cygnus Solutions
+   debug.c - Copyright (c) 1996 Red Hat, Inc.

 
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the
 
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the


@@ -12,13 +12,14 @@
    The above copyright notice and this permission notice shall be included
    in all copies or substantial portions of the Software.
 
    The above copyright notice and this permission notice shall be included
    in all copies or substantial portions of the Software.
 

-   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
-   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-   OTHER DEALINGS IN THE SOFTWARE.
+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.

    ----------------------------------------------------------------------- */
 
 #include <ffi.h>
    ----------------------------------------------------------------------- */
 
 #include <ffi.h>


@@ -31,35 +32,28 @@
 void ffi_stop_here(void)
 {
   /* This function is only useful for debugging purposes.
 void ffi_stop_here(void)
 {
   /* This function is only useful for debugging purposes.

-     Place a breakpoint on ffi_stop_here to be notified of 
+     Place a breakpoint on ffi_stop_here to be notified of

      significant events. */
 }
 
 /* This function should only be called via the FFI_ASSERT() macro */
 
      significant events. */
 }
 
 /* This function should only be called via the FFI_ASSERT() macro */
 

-int ffi_assert(char *file, int line)
+void ffi_assert(char *expr, char *file, int line)

 {
 {

-  fprintf(stderr, "ASSERTION FAILURE: %s line %d\n", file, line);
+  fprintf(stderr, "ASSERTION FAILURE: %s at %s:%d\n", expr, file, line);

   ffi_stop_here();
   abort();
   ffi_stop_here();
   abort();

-
-  /* This has to return something for the compiler not to complain */
-  /*@notreached@*/
-  return 0;

 }
 
 /* Perform a sanity check on an ffi_type structure */
 
 }
 
 /* Perform a sanity check on an ffi_type structure */
 

-bool ffi_type_test(ffi_type *a)
+void ffi_type_test(ffi_type *a, char *file, int line)

 {
 {

-  /*@-usedef@*/
-  FFI_ASSERT(a->type <= FFI_TYPE_LAST);
-  FFI_ASSERT(a->type > FFI_TYPE_VOID ? a->size > 0 : 1);
-  FFI_ASSERT(a->type > FFI_TYPE_VOID ? a->alignment > 0 : 1);
-  FFI_ASSERT(a->type == FFI_TYPE_STRUCT ? a->elements != NULL : 1);
-  /*@=usedef@*/
+  FFI_ASSERT_AT(a != NULL, file, line);
+
+  FFI_ASSERT_AT(a->type <= FFI_TYPE_LAST, file, line);
+  FFI_ASSERT_AT(a->type == FFI_TYPE_VOID || a->size > 0, file, line);
+  FFI_ASSERT_AT(a->type == FFI_TYPE_VOID || a->alignment > 0, file, line);
+  FFI_ASSERT_AT(a->type != FFI_TYPE_STRUCT || a->elements != NULL, file, line);

 
 

-  /* This is a silly thing to return, but it keeps the compiler from
-     issuing warnings about "a" not being used in non-debug builds. */
-  return (a != NULL);

 }
 }