sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5

Browse source 
--HG--
extra : convert_revision : a98c2e7e1d61e807e5824dff35b2ff4ee44e4ee8
This commit is contained in:
Erik Hallnor 2003-12-19 12:10:06 -05:00
commit 573236a7fb
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/alpha/alpha_tru64_process.cc
View file

@ -629,7 +629,7 @@ class Tru64 {
// just pass basep through uninterpreted.
TypedBufferArg<int64_t> basep(tgt_basep);
basep.copyIn(xc->mem);
::off_t host_basep = (off_t)*basep;
long host_basep = (off_t)*basep;
int host_result = getdirentries(fd, host_buf, tgt_nbytes, &host_basep);
// check for error

3
base/inifile.cc
View file

@ -35,6 +35,9 @@
#include <sys/types.h>
#include <sys/wait.h>
#if defined(__OpenBSD__)
#include <libgen.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>

4
dev/disk_image.cc
View file

@ -109,7 +109,7 @@ RawDiskImage::read(uint8_t *data, off_t offset) const
if (stream.seekg(offset * SectorSize, ios::beg) < 0)
panic("Could not seek to location in file");
off_t pos = stream.tellg();
streampos pos = stream.tellg();
stream.read((char *)data, SectorSize);
DPRINTF(DiskImageRead, "read: offset=%d\n", (uint64_t)offset);
@ -136,7 +136,7 @@ RawDiskImage::write(const uint8_t *data, off_t offset)
DPRINTF(DiskImageWrite, "write: offset=%d\n", (uint64_t)offset);
DDUMP(DiskImageWrite, data, SectorSize);
off_t pos = stream.tellp();
streampos pos = stream.tellp();
stream.write((const char *)data, SectorSize);
return stream.tellp() - pos;
}