Merge ktlim@zizzer.eecs.umich.edu:/bk/m5

into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : ac0788599c365b2d7fe0870f0fea4b62c3b3ef22

2 files changed, 9 insertions, 2 deletions

diff --git a/arch/alpha/alpha_tru64_process.cc b/arch/alpha/alpha_tru64_process.cc
index 441e7c89f..0910ec552 100644
--- a/arch/alpha/alpha_tru64_process.cc
+++ b/arch/alpha/alpha_tru64_process.cc
@@ -622,6 +622,9 @@ class Tru64 {
     getdirentriesFunc(SyscallDesc *desc, int callnum, Process *process,
                       ExecContext *xc)
     {
+#ifdef __CYGWIN__
+        panic("getdirent not implemented on cygwin!");
+#else
         int fd = process->sim_fd(xc->getSyscallArg(0));
         Addr tgt_buf = xc->getSyscallArg(1);
         int tgt_nbytes = xc->getSyscallArg(2);
@@ -670,6 +673,7 @@ class Tru64 {
         basep.copyOut(xc->mem);
 
         return tgt_buf_ptr - tgt_buf;
+#endif
     }
 
     /// Target sigreturn() handler.
diff --git a/arch/alpha/pseudo_inst.cc b/arch/alpha/pseudo_inst.cc
index 3c3b37928..a4af891af 100644
--- a/arch/alpha/pseudo_inst.cc
+++ b/arch/alpha/pseudo_inst.cc
@@ -26,6 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <cstdio>
@@ -180,15 +181,17 @@ namespace AlphaPseudo
         if (fd < 0)
             panic("could not open file %s\n", file);
 
+        if (::lseek(fd, offset, SEEK_SET) < 0)
+            panic("could not seek: %s", strerror(errno));
+
         char *buf = new char[len];
         char *p = buf;
         while (len > 0) {
-            int bytes = ::pread(fd, p, len, offset);
+            int bytes = ::read(fd, p, len);
             if (bytes <= 0)
                 break;
 
             p += bytes;
-            offset += bytes;
             result += bytes;
             len -= bytes;
         }