97a98,100
> // Note that in Linux 4.10 the thread_info struct will no longer have a
> // pointer to the task_struct for arm64. See:
> // https://patchwork.kernel.org/patch/9333699/
112,113c115
< curTaskPID(Addr thread_info = 0)
< {
---
> curTaskPIDFromTaskStruct(Addr task_struct) {
119c121
< CopyOut(tc, &pid, curTaskInfo(thread_info) + offset, sizeof(pid));
---
> CopyOut(tc, &pid, task_struct + offset, sizeof(pid));
125c127
< curTaskTGID(Addr thread_info = 0)
---
> curTaskPID(Addr thread_info = 0)
126a129,134
> return curTaskPIDFromTaskStruct(curTaskInfo(thread_info));
> }
>
> int32_t
> curTaskTGIDFromTaskStruct(Addr task_struct)
> {
132c140
< CopyOut(tc, &tgid, curTaskInfo(thread_info) + offset, sizeof(tgid));
---
> CopyOut(tc, &tgid, task_struct + offset, sizeof(tgid));
136a145,150
> int32_t
> curTaskTGID(Addr thread_info = 0)
> {
> return curTaskTGIDFromTaskStruct(curTaskInfo(thread_info));
> }
>
138c152
< curTaskStart(Addr thread_info = 0)
---
> curTaskStartFromTaskStruct(Addr task_struct)
147c161
< CopyOut(tc, &data, curTaskInfo(thread_info) + offset, sizeof(data));
---
> CopyOut(tc, &data, task_struct + offset, sizeof(data));
151a166,171
> int64_t
> curTaskStart(Addr thread_info = 0)
> {
> return curTaskStartFromTaskStruct(curTaskInfo(thread_info));
> }
>
153c173
< curTaskName(Addr thread_info = 0)
---
> curTaskNameFromTaskStruct(Addr task_struct)
165c185
< CopyStringOut(tc, buffer, curTaskInfo(thread_info) + offset, size);
---
> CopyStringOut(tc, buffer, task_struct + offset, size);
169a190,195
> std::string
> curTaskName(Addr thread_info = 0)
> {
> return curTaskNameFromTaskStruct(curTaskInfo(thread_info));
> }
>
171c197
< curTaskMm(Addr thread_info = 0)
---
> curTaskMmFromTaskStruct(Addr task_struct)
178c204
< CopyOut(tc, &mm_ptr, curTaskInfo(thread_info) + offset, sizeof(mm_ptr));
---
> CopyOut(tc, &mm_ptr, task_struct + offset, sizeof(mm_ptr));
181a208,213
>
> int32_t
> curTaskMm(Addr thread_info = 0)
> {
> return curTaskMmFromTaskStruct(curTaskInfo(thread_info));
> }