X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Farch%2Farm%2Flinux%2Fprocess.cc;h=f177492521292c5605f97a8eac6deffdb814d3a9;hb=42e788885573d2294877c73f83dbf539e4bac10f;hp=c5320c1abe5a345e803adad66f3ffa28c434d013;hpb=99831ed93821ee8efc3e7a4b6671c5b226d245e2;p=gem5.git diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc index c5320c1ab..f17749252 100644 --- a/src/arch/arm/linux/process.cc +++ b/src/arch/arm/linux/process.cc @@ -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. @@ -28,16 +40,15 @@ * * Authors: Korey Sewell * Stephen Hines + * Ali Saidi */ #include "arch/arm/linux/linux.hh" #include "arch/arm/linux/process.hh" #include "arch/arm/isa_traits.hh" - #include "base/trace.hh" #include "cpu/thread_context.hh" #include "kern/linux/linux.hh" - #include "sim/process.hh" #include "sim/syscall_emul.hh" #include "sim/system.hh" @@ -50,13 +61,14 @@ static SyscallReturn unameFunc(SyscallDesc *desc, int callnum, LiveProcess *process, ThreadContext *tc) { - TypedBufferArg name(process->getSyscallArg(tc, 0)); + int index = 0; + TypedBufferArg name(process->getSyscallArg(tc, index)); strcpy(name->sysname, "Linux"); strcpy(name->nodename, "m5.eecs.umich.edu"); - strcpy(name->release, "2.6.16.19"); + strcpy(name->release, "2.6.29"); strcpy(name->version, "#1 Mon Aug 18 11:32:15 EDT 2003"); - strcpy(name->machine, "arm"); + strcpy(name->machine, "armv7l"); name.copyOut(tc->getMemPort()); return 0; @@ -70,18 +82,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), @@ -94,77 +106,77 @@ 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", unimplementedFunc), - /* 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), /* 73 */ SyscallDesc("sigpending", unimplementedFunc), /* 74 */ SyscallDesc("sethostname", ignoreFunc), - /* 75 */ SyscallDesc("setrlimit", unimplementedFunc), + /* 75 */ SyscallDesc("setrlimit", ignoreFunc), /* 76 */ SyscallDesc("getrlimit", unimplementedFunc), - /* 77 */ SyscallDesc("getrusage", unimplementedFunc), - /* 78 */ SyscallDesc("gettimeofday", unimplementedFunc), + /* 77 */ SyscallDesc("getrusage", getrusageFunc), + /* 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), @@ -173,37 +185,37 @@ 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", unimplementedFunc), + /* 116 */ SyscallDesc("sysinfo", sysinfoFunc), /* 117 */ SyscallDesc("ipc", unimplementedFunc), /* 118 */ SyscallDesc("fsync", unimplementedFunc), /* 119 */ SyscallDesc("sigreturn", unimplementedFunc), - /* 120 */ SyscallDesc("clone", unimplementedFunc), + /* 120 */ SyscallDesc("clone", cloneFunc), /* 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), @@ -225,20 +237,20 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 159 */ SyscallDesc("sched_get_priority_max", unimplementedFunc), /* 160 */ SyscallDesc("sched_get_priority_min", unimplementedFunc), /* 161 */ SyscallDesc("sched_rr_get_interval", unimplementedFunc), - /* 162 */ SyscallDesc("nanosleep", unimplementedFunc), - /* 163 */ SyscallDesc("mremap", unimplementedFunc), // ARM-specific + /* 162 */ SyscallDesc("nanosleep", ignoreWarnOnceFunc), + /* 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), /* 171 */ SyscallDesc("getresgid", unimplementedFunc), /* 172 */ SyscallDesc("prctl", unimplementedFunc), /* 173 */ SyscallDesc("rt_sigreturn", unimplementedFunc), - /* 174 */ SyscallDesc("rt_sigaction", unimplementedFunc), - /* 175 */ SyscallDesc("rt_sigprocmask", unimplementedFunc), + /* 174 */ SyscallDesc("rt_sigaction", ignoreWarnOnceFunc), + /* 175 */ SyscallDesc("rt_sigprocmask", ignoreWarnOnceFunc), /* 176 */ SyscallDesc("rt_sigpending", unimplementedFunc), /* 177 */ SyscallDesc("rt_sigtimedwait", unimplementedFunc), /* 178 */ SyscallDesc("rt_sigqueueinfo", ignoreFunc), @@ -246,21 +258,21 @@ 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), + /* 191 */ SyscallDesc("getrlimit", getrlimitFunc), /* 192 */ SyscallDesc("mmap2", mmapFunc), /* 193 */ SyscallDesc("truncate64", unimplementedFunc), - /* 194 */ SyscallDesc("ftruncate64", unimplementedFunc), - /* 195 */ SyscallDesc("stat64", unimplementedFunc), + /* 194 */ SyscallDesc("ftruncate64", ftruncate64Func), + /* 195 */ SyscallDesc("stat64", stat64Func), /* 196 */ SyscallDesc("lstat64", lstat64Func), - /* 197 */ SyscallDesc("fstat64", fstatFunc), + /* 197 */ SyscallDesc("fstat64", fstat64Func), /* 198 */ SyscallDesc("lchown", unimplementedFunc), /* 199 */ SyscallDesc("getuid", getuidFunc), /* 200 */ SyscallDesc("getgid", getgidFunc), @@ -285,7 +297,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), @@ -303,7 +315,7 @@ SyscallDesc ArmLinuxProcess::syscallDescs[] = { /* 237 */ SyscallDesc("fremovexattr", unimplementedFunc), /* 238 */ SyscallDesc("tkill", unimplementedFunc), /* 239 */ SyscallDesc("sendfile64", unimplementedFunc), - /* 240 */ SyscallDesc("futex", unimplementedFunc), + /* 240 */ SyscallDesc("futex", ignoreWarnOnceFunc), /* 241 */ SyscallDesc("sched_setaffinity", unimplementedFunc), /* 242 */ SyscallDesc("sched_getaffinity", unimplementedFunc), /* 243 */ SyscallDesc("io_setup", unimplementedFunc), @@ -311,14 +323,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), @@ -376,7 +388,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), @@ -410,6 +422,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. @@ -417,11 +449,12 @@ static SyscallReturn setTLSFunc(SyscallDesc *desc, int callnum, LiveProcess *process, ThreadContext *tc) { - uint32_t tlsPtr = process->getSyscallArg(tc, 0); - TypedBufferArg name(process->getSyscallArg(tc, 0)); + int index = 0; + uint32_t tlsPtr = process->getSyscallArg(tc, index); tc->getMemPort()->writeBlob(ArmLinuxProcess::commPage + 0x0ff0, (uint8_t *)&tlsPtr, sizeof(tlsPtr)); + tc->setMiscReg(MISCREG_TPIDRURO,tlsPtr); return 0; } @@ -434,8 +467,8 @@ SyscallDesc ArmLinuxProcess::privSyscallDescs[] = { }; ArmLinuxProcess::ArmLinuxProcess(LiveProcessParams * params, - ObjectFile *objFile) - : ArmLiveProcess(params, objFile), + ObjectFile *objFile, ObjectFile::Arch _arch) + : ArmLiveProcess(params, objFile, _arch), Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc)), Num_Priv_Syscall_Descs(sizeof(privSyscallDescs) / sizeof(SyscallDesc)) { } @@ -467,14 +500,14 @@ ArmLinuxProcess::getDesc(int callnum) } void -ArmLinuxProcess::startup() +ArmLinuxProcess::initState() { - ArmLiveProcess::startup(); + ArmLiveProcess::initState(); pTable->allocate(commPage, PageBytes); ThreadContext *tc = system->getThreadContext(contextIds[0]); uint8_t swiNeg1[] = { - 0xff, 0xff, 0xff, 0xef //swi -1 + 0xff, 0xff, 0xff, 0xef // swi -1 }; // Fill this page with swi -1 so we'll no if we land in it somewhere. @@ -483,41 +516,43 @@ ArmLinuxProcess::startup() swiNeg1, sizeof(swiNeg1)); } - // We don't have barriers, so just return. uint8_t memory_barrier[] = { - 0x0e, 0xf0, 0xa0, 0xe1 //usr_ret lr + 0x5f, 0xf0, 0x7f, 0xf5, // dmb + 0x0e, 0xf0, 0xa0, 0xe1 // return }; tc->getMemPort()->writeBlob(commPage + 0x0fa0, memory_barrier, sizeof(memory_barrier)); - // 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. uint8_t cmpxchg[] = { - 0x00, 0x30, 0x92, 0xe5, //ldr r3, [r2] - 0x00, 0x30, 0x53, 0xe0, //subs r3, r3, r0 - 0x00, 0x10, 0x92, 0x05, //streq r1, [r2] - 0x03, 0x00, 0xa0, 0xe1, //mov r0, r3 - 0x0e, 0xf0, 0xa0, 0xe1 //usr_ret lr + 0x9f, 0x3f, 0x92, 0xe1, // ldrex r3, [r2] + 0x00, 0x30, 0x53, 0xe0, // subs r3, r3, r0 + 0x91, 0x3f, 0x82, 0x01, // strexeq r3, r1, [r2] + 0x01, 0x00, 0x33, 0x03, // teqeq r3, #1 + 0xfa, 0xff, 0xff, 0x0a, // beq 1b + 0x00, 0x00, 0x73, 0xe2, // rsbs r0, r3, #0 + 0x5f, 0xf0, 0x7f, 0xf5, // dmb + 0x0e, 0xf0, 0xa0, 0xe1 // return }; tc->getMemPort()->writeBlob(commPage + 0x0fc0, cmpxchg, sizeof(cmpxchg)); uint8_t get_tls[] = { - 0x08, 0x00, 0x9f, 0xe5, //ldr r0, [pc, #(16 - 8)] - 0x0e, 0xf0, 0xa0, 0xe1 //usr_ret lr + // read user read-only thread id register + 0x70, 0x0f, 0x1d, 0xee, // mrc p15, 0, r0, c13, c0, 3 + 0x0e, 0xf0, 0xa0, 0xe1 // return }; tc->getMemPort()->writeBlob(commPage + 0x0fe0, get_tls, sizeof(get_tls)); } ArmISA::IntReg -ArmLinuxProcess::getSyscallArg(ThreadContext *tc, int i) +ArmLinuxProcess::getSyscallArg(ThreadContext *tc, int &i) { // Linux apparently allows more parameter than the ABI says it should. // This limit may need to be increased even further. assert(i < 6); - return tc->readIntReg(ArgumentReg0 + i); + return tc->readIntReg(ArgumentReg0 + i++); } void