Don't loose last block during a dma.

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 8fee13a..2b9e666 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  7 10:45:12 HST 2001  Glen Nakamura  <gen@lava.net>
+
+       * hw_init.c (dma_file): Fixed problem with loading last 1KB of
+       file.
+       
 2001-03-04  Andrew Cagney  <ac131313@redhat.com>
 
        * emul_netbsd.c [WITH_NetBSD_HOST]: Include <sys/mount.h> and

diff --git a/sim/ppc/hw_init.c b/sim/ppc/hw_init.c
index b486f6f..86e753c 100644 (file)
--- a/sim/ppc/hw_init.c
+++ b/sim/ppc/hw_init.c
@@ -47,7 +47,7 @@ dma_file(device *me,
   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,