From 3dc6a8070ec8cbe9d5764aed9ff4437826183be8 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Wed, 2 Jun 2010 12:58:17 -0500 Subject: ARM: fix sizes of structs for ARM Linux --- configs/common/cpu2000.py | 2 +- src/arch/arm/linux/linux.hh | 70 ++++++++++++++++++++++++- src/arch/arm/linux/process.cc | 115 +++++++++++++++++++++++++----------------- 3 files changed, 139 insertions(+), 48 deletions(-) diff --git a/configs/common/cpu2000.py b/configs/common/cpu2000.py index f6c7a164f..7fcd4bcc3 100644 --- a/configs/common/cpu2000.py +++ b/configs/common/cpu2000.py @@ -663,7 +663,7 @@ class vortex(Benchmark): stdin = None def __init__(self, isa, os, input_set): - if isa == 'alpha': + if (isa == 'alpha' or isa == 'arm'): self.endian = 'lendian' elif (isa == 'sparc' or isa == 'sparc32'): self.endian = 'bendian' diff --git a/src/arch/arm/linux/linux.hh b/src/arch/arm/linux/linux.hh index f829dd7c6..6ad4a862d 100644 --- a/src/arch/arm/linux/linux.hh +++ b/src/arch/arm/linux/linux.hh @@ -1,4 +1,16 @@ /* + * Copyright (c) 2010 ARM Limited + * All rights reserved + * + * The license below extends only to copyright in the software and shall + * not be construed as granting a license to any other intellectual + * property including but not limited to intellectual property relating + * to a hardware implementation of the functionality of the software + * licensed hereunder. You may use the software subject to the license + * terms below provided that you ensure that this notice is replicated + * unmodified and in its entirety in all distributions of the software, + * modified or unmodified, in source code or in binary form. + * * Copyright (c) 2003-2005 The Regents of The University of Michigan * Copyright (c) 2007-2008 The Florida State University * All rights reserved. @@ -26,7 +38,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * Authors: Stephen Hines + * Authors: Ali Saidi + * Stephen Hines */ #ifndef __ARCH_ARM_LINUX_LINUX_HH__ @@ -45,6 +58,14 @@ class ArmLinux : public Linux /// Number of entries in openFlagTable[]. static const int NUM_OPEN_FLAGS; + //@{ + /// Basic ARM Linux types + typedef uint32_t size_t; + typedef uint32_t off_t; + typedef int32_t time_t; + typedef int32_t clock_t; + //@} + //@{ /// open(2) flag values. static const int TGT_O_RDONLY = 00000000; //!< O_RDONLY @@ -107,6 +128,25 @@ class ArmLinux : public Linux TGT_RLIMIT_LOCKS = 10 }; + /// Limit struct for getrlimit/setrlimit. + struct rlimit { + uint32_t rlim_cur; //!< soft limit + uint32_t rlim_max; //!< hard limit + }; + + /// For gettimeofday(). + struct timeval { + int32_t tv_sec; //!< seconds + int32_t tv_usec; //!< microseconds + }; + + // For writev/readv + struct tgt_iovec { + uint32_t iov_base; // void * + uint32_t iov_len; + }; + + typedef struct { uint32_t st_dev; uint32_t st_ino; @@ -163,6 +203,34 @@ class ArmLinux : public Linux uint32_t mem_unit; /* Memory unit size in bytes */ } tgt_sysinfo; + /// For getrusage(). + struct rusage { + struct timeval ru_utime; //!< user time used + struct timeval ru_stime; //!< system time used + int32_t ru_maxrss; //!< max rss + int32_t ru_ixrss; //!< integral shared memory size + int32_t ru_idrss; //!< integral unshared data " + int32_t ru_isrss; //!< integral unshared stack " + int32_t ru_minflt; //!< page reclaims - total vmfaults + int32_t ru_majflt; //!< page faults + int32_t ru_nswap; //!< swaps + int32_t ru_inblock; //!< block input operations + int32_t ru_oublock; //!< block output operations + int32_t ru_msgsnd; //!< messages sent + int32_t ru_msgrcv; //!< messages received + int32_t ru_nsignals; //!< signals received + int32_t ru_nvcsw; //!< voluntary context switches + int32_t ru_nivcsw; //!< involuntary " + }; + + /// For times(). + struct tms { + int32_t tms_utime; //!< user time + int32_t tms_stime; //!< system time + int32_t tms_cutime; //!< user time of children + int32_t tms_cstime; //!< system time of children + }; + }; diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc index 32d900020..66a19a13f 100644 --- a/src/arch/arm/linux/process.cc +++ b/src/arch/arm/linux/process.cc @@ -40,6 +40,7 @@ * * Authors: Korey Sewell * Stephen Hines + * Ali Saidi */ #include "arch/arm/linux/linux.hh" @@ -83,18 +84,18 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 4 */ SyscallDesc("write", writeFunc), /* 5 */ SyscallDesc("open", openFunc), /* 6 */ SyscallDesc("close", closeFunc), - /* 7 */ SyscallDesc("waitpid", unimplementedFunc), //??? + /* 7 */ SyscallDesc("unused#7", unimplementedFunc), /* 8 */ SyscallDesc("creat", unimplementedFunc), /* 9 */ SyscallDesc("link", unimplementedFunc), /* 10 */ SyscallDesc("unlink", unlinkFunc), /* 11 */ SyscallDesc("execve", unimplementedFunc), /* 12 */ SyscallDesc("chdir", unimplementedFunc), - /* 13 */ SyscallDesc("time", unimplementedFunc), + /* 13 */ SyscallDesc("time", timeFunc), /* 14 */ SyscallDesc("mknod", unimplementedFunc), /* 15 */ SyscallDesc("chmod", chmodFunc), /* 16 */ SyscallDesc("lchown", chownFunc), - /* 17 */ SyscallDesc("break", brkFunc), //??? - /* 18 */ SyscallDesc("unused#18", unimplementedFunc), //??? + /* 17 */ SyscallDesc("unused#17", unimplementedFunc), + /* 18 */ SyscallDesc("unused#18", unimplementedFunc), /* 19 */ SyscallDesc("lseek", lseekFunc), /* 20 */ SyscallDesc("getpid", getpidFunc), /* 21 */ SyscallDesc("mount", unimplementedFunc), @@ -107,45 +108,45 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 28 */ SyscallDesc("unused#28", unimplementedFunc), /* 29 */ SyscallDesc("pause", unimplementedFunc), /* 30 */ SyscallDesc("utime", unimplementedFunc), - /* 31 */ SyscallDesc("stty", unimplementedFunc), - /* 32 */ SyscallDesc("gtty", unimplementedFunc), + /* 31 */ SyscallDesc("unused#31", unimplementedFunc), + /* 32 */ SyscallDesc("unused#32", unimplementedFunc), /* 33 */ SyscallDesc("access", unimplementedFunc), /* 34 */ SyscallDesc("nice", unimplementedFunc), - /* 35 */ SyscallDesc("ftime", unimplementedFunc), + /* 35 */ SyscallDesc("unused#35", unimplementedFunc), /* 36 */ SyscallDesc("sync", unimplementedFunc), /* 37 */ SyscallDesc("kill", ignoreFunc), - /* 38 */ SyscallDesc("rename", unimplementedFunc), - /* 39 */ SyscallDesc("mkdir", unimplementedFunc), + /* 38 */ SyscallDesc("rename", renameFunc), + /* 39 */ SyscallDesc("mkdir", mkdirFunc), /* 40 */ SyscallDesc("rmdir", unimplementedFunc), - /* 41 */ SyscallDesc("dup", unimplementedFunc), - /* 42 */ SyscallDesc("pipe", unimplementedFunc), - /* 43 */ SyscallDesc("times", ignoreFunc), - /* 44 */ SyscallDesc("prof", unimplementedFunc), + /* 41 */ SyscallDesc("dup", dupFunc), + /* 42 */ SyscallDesc("pipe", pipePseudoFunc), + /* 43 */ SyscallDesc("times", timesFunc), + /* 44 */ SyscallDesc("unused#44", unimplementedFunc), /* 45 */ SyscallDesc("brk", brkFunc), /* 46 */ SyscallDesc("setgid", unimplementedFunc), /* 47 */ SyscallDesc("getgid", getgidFunc), - /* 48 */ SyscallDesc("signal", ignoreFunc), + /* 48 */ SyscallDesc("unused#48", unimplementedFunc), /* 49 */ SyscallDesc("geteuid", geteuidFunc), /* 50 */ SyscallDesc("getegid", getegidFunc), /* 51 */ SyscallDesc("acct", unimplementedFunc), /* 52 */ SyscallDesc("umount2", unimplementedFunc), - /* 53 */ SyscallDesc("lock", unimplementedFunc), + /* 53 */ SyscallDesc("unused#53", unimplementedFunc), /* 54 */ SyscallDesc("ioctl", ioctlFunc), /* 55 */ SyscallDesc("fcntl", fcntlFunc), - /* 56 */ SyscallDesc("mpx", unimplementedFunc), + /* 56 */ SyscallDesc("unused#56", unimplementedFunc), /* 57 */ SyscallDesc("setpgid", unimplementedFunc), - /* 58 */ SyscallDesc("ulimit", unimplementedFunc), + /* 58 */ SyscallDesc("unused#58", unimplementedFunc), /* 59 */ SyscallDesc("unused#59", unimplementedFunc), /* 60 */ SyscallDesc("umask", unimplementedFunc), /* 61 */ SyscallDesc("chroot", unimplementedFunc), /* 62 */ SyscallDesc("ustat", unimplementedFunc), /* 63 */ SyscallDesc("dup2", unimplementedFunc), - /* 64 */ SyscallDesc("getppid", getpagesizeFunc), + /* 64 */ SyscallDesc("getppid", getppidFunc), /* 65 */ SyscallDesc("getpgrp", unimplementedFunc), /* 66 */ SyscallDesc("setsid", unimplementedFunc), /* 67 */ SyscallDesc("sigaction",unimplementedFunc), - /* 68 */ SyscallDesc("sgetmask", unimplementedFunc), - /* 69 */ SyscallDesc("ssetmask", unimplementedFunc), + /* 68 */ SyscallDesc("unused#68", unimplementedFunc), + /* 69 */ SyscallDesc("unused#69", unimplementedFunc), /* 70 */ SyscallDesc("setreuid", unimplementedFunc), /* 71 */ SyscallDesc("setregid", unimplementedFunc), /* 72 */ SyscallDesc("sigsuspend", unimplementedFunc), @@ -154,30 +155,30 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 75 */ SyscallDesc("setrlimit", unimplementedFunc), /* 76 */ SyscallDesc("getrlimit", unimplementedFunc), /* 77 */ SyscallDesc("getrusage", getrusageFunc), - /* 78 */ SyscallDesc("gettimeofday", unimplementedFunc), + /* 78 */ SyscallDesc("gettimeofday", gettimeofdayFunc), /* 79 */ SyscallDesc("settimeofday", unimplementedFunc), /* 80 */ SyscallDesc("getgroups", unimplementedFunc), /* 81 */ SyscallDesc("setgroups", unimplementedFunc), /* 82 */ SyscallDesc("reserved#82", unimplementedFunc), /* 83 */ SyscallDesc("symlink", unimplementedFunc), /* 84 */ SyscallDesc("unused#84", unimplementedFunc), - /* 85 */ SyscallDesc("readlink", unimplementedFunc), + /* 85 */ SyscallDesc("readlink", readlinkFunc), /* 86 */ SyscallDesc("uselib", unimplementedFunc), - /* 87 */ SyscallDesc("swapon", gethostnameFunc), + /* 87 */ SyscallDesc("swapon", unimplementedFunc), /* 88 */ SyscallDesc("reboot", unimplementedFunc), /* 89 */ SyscallDesc("readdir", unimplementedFunc), /* 90 */ SyscallDesc("mmap", mmapFunc), - /* 91 */ SyscallDesc("munmap",munmapFunc), + /* 91 */ SyscallDesc("munmap", munmapFunc), /* 92 */ SyscallDesc("truncate", truncateFunc), /* 93 */ SyscallDesc("ftruncate", ftruncateFunc), /* 94 */ SyscallDesc("fchmod", unimplementedFunc), /* 95 */ SyscallDesc("fchown", unimplementedFunc), /* 96 */ SyscallDesc("getpriority", unimplementedFunc), /* 97 */ SyscallDesc("setpriority", unimplementedFunc), - /* 98 */ SyscallDesc("profil", unimplementedFunc), + /* 98 */ SyscallDesc("unused#98", unimplementedFunc), /* 99 */ SyscallDesc("statfs", unimplementedFunc), /* 100 */ SyscallDesc("fstatfs", unimplementedFunc), - /* 101 */ SyscallDesc("ioperm", unimplementedFunc), + /* 101 */ SyscallDesc("unused#101", unimplementedFunc), /* 102 */ SyscallDesc("socketcall", unimplementedFunc), /* 103 */ SyscallDesc("syslog", unimplementedFunc), /* 104 */ SyscallDesc("setitimer", unimplementedFunc), @@ -186,10 +187,10 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 107 */ SyscallDesc("lstat", unimplementedFunc), /* 108 */ SyscallDesc("fstat", fstatFunc), /* 109 */ SyscallDesc("unused#109", unimplementedFunc), - /* 110 */ SyscallDesc("iopl", unimplementedFunc), + /* 110 */ SyscallDesc("unused#101", unimplementedFunc), /* 111 */ SyscallDesc("vhangup", unimplementedFunc), - /* 112 */ SyscallDesc("idle", ignoreFunc), - /* 113 */ SyscallDesc("vm86", unimplementedFunc), + /* 112 */ SyscallDesc("unused#112", unimplementedFunc), + /* 113 */ SyscallDesc("syscall", unimplementedFunc), /* 114 */ SyscallDesc("wait4", unimplementedFunc), /* 115 */ SyscallDesc("swapoff", unimplementedFunc), /* 116 */ SyscallDesc("sysinfo", sysinfoFunc), @@ -199,24 +200,24 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 120 */ SyscallDesc("clone", unimplementedFunc), /* 121 */ SyscallDesc("setdomainname", unimplementedFunc), /* 122 */ SyscallDesc("uname", unameFunc), - /* 123 */ SyscallDesc("modify_ldt", unimplementedFunc), + /* 123 */ SyscallDesc("unused#123", unimplementedFunc), /* 124 */ SyscallDesc("adjtimex", unimplementedFunc), /* 125 */ SyscallDesc("mprotect", ignoreFunc), /* 126 */ SyscallDesc("sigprocmask", unimplementedFunc), - /* 127 */ SyscallDesc("create_module", unimplementedFunc), + /* 127 */ SyscallDesc("unused#127", unimplementedFunc), /* 128 */ SyscallDesc("init_module", unimplementedFunc), /* 129 */ SyscallDesc("delete_module", unimplementedFunc), - /* 130 */ SyscallDesc("get_kernel_syms", unimplementedFunc), + /* 130 */ SyscallDesc("unused#130", unimplementedFunc), /* 131 */ SyscallDesc("quotactl", unimplementedFunc), /* 132 */ SyscallDesc("getpgid", unimplementedFunc), /* 133 */ SyscallDesc("fchdir", unimplementedFunc), /* 134 */ SyscallDesc("bdflush", unimplementedFunc), /* 135 */ SyscallDesc("sysfs", unimplementedFunc), /* 136 */ SyscallDesc("personality", unimplementedFunc), - /* 137 */ SyscallDesc("afs_syscall", unimplementedFunc), + /* 137 */ SyscallDesc("reserved#138", unimplementedFunc), /* 138 */ SyscallDesc("setfsuid", unimplementedFunc), /* 139 */ SyscallDesc("setfsgid", unimplementedFunc), - /* 140 */ SyscallDesc("llseek", unimplementedFunc), + /* 140 */ SyscallDesc("llseek", _llseekFunc), /* 141 */ SyscallDesc("getdents", unimplementedFunc), /* 142 */ SyscallDesc("newselect", unimplementedFunc), /* 143 */ SyscallDesc("flock", unimplementedFunc), @@ -239,11 +240,11 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 160 */ SyscallDesc("sched_get_priority_min", unimplementedFunc), /* 161 */ SyscallDesc("sched_rr_get_interval", unimplementedFunc), /* 162 */ SyscallDesc("nanosleep", unimplementedFunc), - /* 163 */ SyscallDesc("mremap", unimplementedFunc), // ARM-specific + /* 163 */ SyscallDesc("mremap", mremapFunc), // ARM-specific /* 164 */ SyscallDesc("setresuid", unimplementedFunc), /* 165 */ SyscallDesc("getresuid", unimplementedFunc), - /* 166 */ SyscallDesc("vm862", unimplementedFunc), - /* 167 */ SyscallDesc("query_module", unimplementedFunc), + /* 166 */ SyscallDesc("unused#166", unimplementedFunc), + /* 167 */ SyscallDesc("unused#167", unimplementedFunc), /* 168 */ SyscallDesc("poll", unimplementedFunc), /* 169 */ SyscallDesc("nfsservctl", unimplementedFunc), /* 170 */ SyscallDesc("setresgid", unimplementedFunc), @@ -259,19 +260,19 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 180 */ SyscallDesc("pread64", unimplementedFunc), /* 181 */ SyscallDesc("pwrite64", unimplementedFunc), /* 182 */ SyscallDesc("chown", unimplementedFunc), - /* 183 */ SyscallDesc("getcwd", unimplementedFunc), + /* 183 */ SyscallDesc("getcwd", getcwdFunc), /* 184 */ SyscallDesc("capget", unimplementedFunc), /* 185 */ SyscallDesc("capset", unimplementedFunc), /* 186 */ SyscallDesc("sigaltstack", unimplementedFunc), /* 187 */ SyscallDesc("sendfile", unimplementedFunc), - /* 188 */ SyscallDesc("getpmsg", unimplementedFunc), - /* 189 */ SyscallDesc("putpmsg", unimplementedFunc), + /* 188 */ SyscallDesc("unused#188", unimplementedFunc), + /* 189 */ SyscallDesc("unused#189", unimplementedFunc), /* 190 */ SyscallDesc("vfork", unimplementedFunc), /* 191 */ SyscallDesc("getrlimit", unimplementedFunc), /* 192 */ SyscallDesc("mmap2", mmapFunc), /* 193 */ SyscallDesc("truncate64", unimplementedFunc), /* 194 */ SyscallDesc("ftruncate64", unimplementedFunc), - /* 195 */ SyscallDesc("stat64", unimplementedFunc), + /* 195 */ SyscallDesc("stat64", stat64Func), /* 196 */ SyscallDesc("lstat64", lstat64Func), /* 197 */ SyscallDesc("fstat64", fstat64Func), /* 198 */ SyscallDesc("lchown", unimplementedFunc), @@ -298,7 +299,7 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 219 */ SyscallDesc("mincore", unimplementedFunc), /* 220 */ SyscallDesc("madvise", unimplementedFunc), /* 221 */ SyscallDesc("fcntl64", fcntl64Func), - /* 222 */ SyscallDesc("tux", unimplementedFunc), + /* 222 */ SyscallDesc("unused#222", unimplementedFunc), /* 223 */ SyscallDesc("unknown#223", unimplementedFunc), /* 224 */ SyscallDesc("gettid", unimplementedFunc), /* 225 */ SyscallDesc("readahead", unimplementedFunc), @@ -324,14 +325,14 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 245 */ SyscallDesc("io_getevents", unimplementedFunc), /* 246 */ SyscallDesc("io_submit", unimplementedFunc), /* 247 */ SyscallDesc("io_cancel", unimplementedFunc), - /* 248 */ SyscallDesc("exit_group", exitFunc), + /* 248 */ SyscallDesc("exit_group", exitGroupFunc), /* 249 */ SyscallDesc("lookup_dcookie", unimplementedFunc), /* 250 */ SyscallDesc("epoll_create", unimplementedFunc), /* 251 */ SyscallDesc("epoll_ctl", unimplementedFunc), /* 252 */ SyscallDesc("epoll_wait", unimplementedFunc), /* 253 */ SyscallDesc("remap_file_pages", unimplementedFunc), - /* 254 */ SyscallDesc("set_thread_area", unimplementedFunc), - /* 255 */ SyscallDesc("get_thread_area", unimplementedFunc), + /* 254 */ SyscallDesc("unused#254", unimplementedFunc), + /* 255 */ SyscallDesc("unused#255", unimplementedFunc), /* 256 */ SyscallDesc("set_tid_address", unimplementedFunc), /* 257 */ SyscallDesc("timer_create", unimplementedFunc), /* 258 */ SyscallDesc("timer_settime", unimplementedFunc), @@ -389,7 +390,7 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 310 */ SyscallDesc("request_key", unimplementedFunc), /* 311 */ SyscallDesc("keyctl", unimplementedFunc), /* 312 */ SyscallDesc("semtimedop", unimplementedFunc), - /* 313 */ SyscallDesc("vserver", unimplementedFunc), + /* 313 */ SyscallDesc("unused#313", unimplementedFunc), /* 314 */ SyscallDesc("ioprio_set", unimplementedFunc), /* 315 */ SyscallDesc("ioprio_get", unimplementedFunc), /* 316 */ SyscallDesc("inotify_init", unimplementedFunc), @@ -423,6 +424,26 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 344 */ SyscallDesc("move_pages", unimplementedFunc), /* 345 */ SyscallDesc("getcpu", unimplementedFunc), /* 346 */ SyscallDesc("epoll_pwait", unimplementedFunc), + /* 347 */ SyscallDesc("sys_kexec_load", unimplementedFunc), + /* 348 */ SyscallDesc("sys_utimensat", unimplementedFunc), + /* 349 */ SyscallDesc("sys_signalfd", unimplementedFunc), + /* 350 */ SyscallDesc("sys_timerfd_create", unimplementedFunc), + /* 351 */ SyscallDesc("sys_eventfd", unimplementedFunc), + /* 352 */ SyscallDesc("sys_fallocate", unimplementedFunc), + /* 353 */ SyscallDesc("sys_timerfd_settime", unimplementedFunc), + /* 354 */ SyscallDesc("sys_timerfd_gettime", unimplementedFunc), + /* 355 */ SyscallDesc("sys_signalfd4", unimplementedFunc), + /* 356 */ SyscallDesc("sys_eventfd2", unimplementedFunc), + /* 357 */ SyscallDesc("sys_epoll_create1", unimplementedFunc), + /* 358 */ SyscallDesc("sys_dup3", unimplementedFunc), + /* 359 */ SyscallDesc("sys_pipe2", unimplementedFunc), + /* 360 */ SyscallDesc("sys_inotify_init1", unimplementedFunc), + /* 361 */ SyscallDesc("sys_preadv", unimplementedFunc), + /* 362 */ SyscallDesc("sys_pwritev", unimplementedFunc), + /* 363 */ SyscallDesc("sys_rt_tgsigqueueinfo", unimplementedFunc), + /* 364 */ SyscallDesc("sys_perf_event_open", unimplementedFunc), + /* 365 */ SyscallDesc("sys_recvmmsg", unimplementedFunc), + }; /// Target set_tls() handler. @@ -497,6 +518,7 @@ ArmLinuxProcess::startup() } // We don't have barriers, so just return. + // @todo Add a barrrier in this code uint8_t memory_barrier[] = { 0x0e, 0xf0, 0xa0, 0xe1 //usr_ret lr @@ -506,6 +528,7 @@ ArmLinuxProcess::startup() // This -should- be atomic, but I don't think all the support that we'd // need is implemented. There should also be memory barriers around it. + // @todo replace this with ldrex/strex and dmb uint8_t cmpxchg[] = { 0x00, 0x30, 0x92, 0xe5, //ldr r3, [r2] -- cgit v1.2.3