diff options
| -rw-r--r-- | arch/alpha/alpha_tru64_process.cc | 4 | ||||
| -rw-r--r-- | arch/alpha/pseudo_inst.cc | 7 | ||||
| -rw-r--r-- | base/intmath.hh | 38 | ||||
| -rw-r--r-- | base/socket.cc | 2 | ||||
| -rw-r--r-- | sim/serialize.cc | 19 |
5 files changed, 52 insertions, 18 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; } diff --git a/base/intmath.hh b/base/intmath.hh index 5ffe27103..0cf48b41b 100644 --- a/base/intmath.hh +++ b/base/intmath.hh @@ -73,7 +73,7 @@ IsPowerOf2(T n) } inline int -FloorLog2(uint32_t x) +FloorLog2(unsigned x) { assert(x > 0); @@ -89,7 +89,26 @@ FloorLog2(uint32_t x) } inline int -FloorLog2(uint64_t x) +FloorLog2(unsigned long x) +{ + assert(x > 0); + + int y = 0; + +#if defined(__LP64__) + if (x & ULL(0xffffffff00000000)) { y += 32; x >>= 32; } +#endif + if (x & 0xffff0000) { y += 16; x >>= 16; } + if (x & 0x0000ff00) { y += 8; x >>= 8; } + if (x & 0x000000f0) { y += 4; x >>= 4; } + if (x & 0x0000000c) { y += 2; x >>= 2; } + if (x & 0x00000002) { y += 1; } + + return y; +} + +inline int +FloorLog2(unsigned long long x) { assert(x > 0); @@ -106,17 +125,24 @@ FloorLog2(uint64_t x) } inline int -FloorLog2(int32_t x) +FloorLog2(int x) +{ + assert(x > 0); + return FloorLog2((unsigned)x); +} + +inline int +FloorLog2(long x) { assert(x > 0); - return FloorLog2((uint32_t)x); + return FloorLog2((unsigned long)x); } inline int -FloorLog2(int64_t x) +FloorLog2(long long x) { assert(x > 0); - return FloorLog2((uint64_t)x); + return FloorLog2((unsigned long long)x); } #if defined(__APPLE__) diff --git a/base/socket.cc b/base/socket.cc index ee87dc057..c2e9e70e0 100644 --- a/base/socket.cc +++ b/base/socket.cc @@ -93,7 +93,7 @@ ListenSocket::listen(int port, bool reuse) return true; } -#if !defined(__OpenBSD__) && !defined(linux) +#if defined(__APPLE__) typedef int socklen_t; #endif diff --git a/sim/serialize.cc b/sim/serialize.cc index 52008c394..ca0bc2bb0 100644 --- a/sim/serialize.cc +++ b/sim/serialize.cc @@ -172,15 +172,16 @@ template void \ arrayParamIn(Checkpoint *cp, const std::string §ion, \ const std::string &name, type *param, int size); - -INSTANTIATE_PARAM_TEMPLATES(int8_t) -INSTANTIATE_PARAM_TEMPLATES(uint8_t) -INSTANTIATE_PARAM_TEMPLATES(int16_t) -INSTANTIATE_PARAM_TEMPLATES(uint16_t) -INSTANTIATE_PARAM_TEMPLATES(int32_t) -INSTANTIATE_PARAM_TEMPLATES(uint32_t) -INSTANTIATE_PARAM_TEMPLATES(int64_t) -INSTANTIATE_PARAM_TEMPLATES(uint64_t) +INSTANTIATE_PARAM_TEMPLATES(signed char) +INSTANTIATE_PARAM_TEMPLATES(unsigned char) +INSTANTIATE_PARAM_TEMPLATES(signed short) +INSTANTIATE_PARAM_TEMPLATES(unsigned short) +INSTANTIATE_PARAM_TEMPLATES(signed int) +INSTANTIATE_PARAM_TEMPLATES(unsigned int) +INSTANTIATE_PARAM_TEMPLATES(signed long) +INSTANTIATE_PARAM_TEMPLATES(unsigned long) +INSTANTIATE_PARAM_TEMPLATES(signed long long) +INSTANTIATE_PARAM_TEMPLATES(unsigned long long) INSTANTIATE_PARAM_TEMPLATES(bool) INSTANTIATE_PARAM_TEMPLATES(string) |