gas: avoid spurious failures in non-ELF targets in the SPARC testsuite.

[deliverable/binutils-gdb.git] / sim / ppc / hw_init.c

diff --git a/sim/ppc/hw_init.c b/sim/ppc/hw_init.c
index b486f6f78601f7978ec8fd8af6566a19e604fbf8..0e7403bb6c563bccf319af113bac259a43b48f06 100644 (file)
--- a/sim/ppc/hw_init.c
+++ b/sim/ppc/hw_init.c
@@ -1,10 +1,10 @@
 /*  This file is part of the program psim.
     
 /*  This file is part of the program psim.
     

-    Copyright (C) 1994-1997, Andrew Cagney <cagney@highland.com.au>
+    Copyright 1994, 1997, 2003, 2004 Andrew Cagney

     
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation; either version 3 of the License, or

     (at your option) any later version.
     
     This program is distributed in the hope that it will be useful,
     (at your option) any later version.
     
     This program is distributed in the hope that it will be useful,


@@ -13,8 +13,7 @@
     GNU General Public License for more details.
     
     You should have received a copy of the GNU General Public License
     GNU General Public License for more details.
     
     You should have received a copy of the GNU General Public License

-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    along with this program; if not, see <http://www.gnu.org/licenses/>.

     
     */
 
     
     */
 


@@ -47,7 +46,7 @@ dma_file(device *me,
   count = 0;
   while (1) {
     inc = fread(buf, 1, sizeof(buf), image);
   count = 0;
   while (1) {
     inc = fread(buf, 1, sizeof(buf), image);

-    if (feof(image) || ferror(image))
+    if (inc <= 0)

       break;
     if (device_dma_write_buffer(device_parent(me),
                                buf,
       break;
     if (device_dma_write_buffer(device_parent(me),
                                buf,


@@ -329,7 +328,7 @@ update_for_binary_section(bfd *abfd,
     return;
 
   /* check/ignore any sections of size zero */
     return;
 
   /* check/ignore any sections of size zero */

-  section_size = bfd_get_section_size_before_reloc(the_section);
+  section_size = bfd_get_section_size (the_section);

   if (section_size == 0)
     return;
 
   if (section_size == 0)
     return;
 


@@ -405,7 +404,7 @@ update_for_binary_section(bfd *abfd,
                                1 /*violate_read_only*/)
        != section_size)
       device_error(me, "broken transfer\n");
                                1 /*violate_read_only*/)
        != section_size)
       device_error(me, "broken transfer\n");

-    zfree(section_init); /* only free if load */
+    free(section_init); /* only free if load */

   }
 }
 
   }
 }
 


@@ -591,16 +590,16 @@ create_ppc_elf_stack_frame(device *me,
                        start_argv, start_envp);
 
   /* set up the registers */
                        start_argv, start_envp);
 
   /* set up the registers */

-  psim_write_register(device_system(me), -1,
-                     &top_of_stack, "sp", cooked_transfer);
-  psim_write_register(device_system(me), -1,
-                     &argc, "r3", cooked_transfer);
-  psim_write_register(device_system(me), -1,
-                     &start_argv, "r4", cooked_transfer);
-  psim_write_register(device_system(me), -1,
-                     &start_envp, "r5", cooked_transfer);
-  psim_write_register(device_system(me), -1,
-                     &start_aux, "r6", cooked_transfer);
+  ASSERT (psim_write_register(device_system(me), -1,
+                             &top_of_stack, "sp", cooked_transfer) > 0);
+  ASSERT (psim_write_register(device_system(me), -1,
+                             &argc, "r3", cooked_transfer) > 0);
+  ASSERT (psim_write_register(device_system(me), -1,
+                             &start_argv, "r4", cooked_transfer) > 0);
+  ASSERT (psim_write_register(device_system(me), -1,
+                             &start_envp, "r5", cooked_transfer) > 0);
+  ASSERT (psim_write_register(device_system(me), -1,
+                             &start_aux, "r6", cooked_transfer) > 0);

 }
 
 static void
 }
 
 static void


@@ -619,16 +618,16 @@ create_ppc_aix_stack_frame(device *me,
   create_ppc_elf_stack_frame(me, bottom_of_stack, argv, envp);
   
   /* extract argument addresses from registers */
   create_ppc_elf_stack_frame(me, bottom_of_stack, argv, envp);
   
   /* extract argument addresses from registers */

-  psim_read_register(device_system(me), 0,
-                    &top_of_stack, "r1", cooked_transfer);
-  psim_read_register(device_system(me), 0,
-                    &core_argc, "r3", cooked_transfer);
-  psim_read_register(device_system(me), 0,
-                    &core_argv, "r4", cooked_transfer);
-  psim_read_register(device_system(me), 0,
-                    &core_envp, "r5", cooked_transfer);
-  psim_read_register(device_system(me), 0,
-                    &core_aux, "r6", cooked_transfer);
+  ASSERT (psim_read_register(device_system(me), 0,
+                            &top_of_stack, "r1", cooked_transfer) > 0);
+  ASSERT (psim_read_register(device_system(me), 0,
+                            &core_argc, "r3", cooked_transfer) > 0);
+  ASSERT (psim_read_register(device_system(me), 0,
+                            &core_argv, "r4", cooked_transfer) > 0);
+  ASSERT (psim_read_register(device_system(me), 0,
+                            &core_envp, "r5", cooked_transfer) > 0);
+  ASSERT (psim_read_register(device_system(me), 0,
+                            &core_aux, "r6", cooked_transfer) > 0);

 
   /* extract arguments from registers */
   device_error(me, "Unfinished procedure create_ppc_aix_stack_frame\n");
 
   /* extract arguments from registers */
   device_error(me, "Unfinished procedure create_ppc_aix_stack_frame\n");


@@ -718,4 +717,4 @@ const device_descriptor hw_init_device_descriptor[] = {
   { NULL },
 };
 
   { NULL },
 };
 

-#endif _HW_INIT_C_
+#endif /* _HW_INIT_C_ */