[Refactor] Syscall number unification in glibc #132
Conversation
There was a problem hiding this comment.
I don't think this PR is ready for review. I see you've made some progress I mentioned on #135 . Can you push your changes to here once you finished modifications according to my feedbacks? @bblackheart013
There was a problem hiding this comment.
Unintended modifications to this file should also be reverted
There was a problem hiding this comment.
Unintended modifications to this file should also be reverted
There was a problem hiding this comment.
Unintended modifications to this file should also be reverted
…ble (e.g., ACCESS, DUP, DUP2, EXECVE, SIGPROCMASK, MPROTECT)
|
I’ve finished aligning all syscall numbers in lind_syscall_num.h with the official Linux syscall table (x86_64), based on the latest syscall_64.tbl. I double-checked each value line-by-line. |
|
@bblackheart013 I had a quick look and wasn’t able to locate the commit It also looks like the following files still contain some unintended changes. Could you double-check and clean them up? src/glibc/sysdeps/unix/syscall-template.h
src/glibc/sysdeps/unix/sysv/linux/dup.c
src/glibc/sysdeps/unix/sysv/linux/fcntl.c
src/glibc/sysdeps/unix/sysv/linux/getdents.c
src/glibc/sysdeps/unix/sysv/linux/lseek.c
src/glibc/sysdeps/unix/sysv/linux/pipe.c
src/glibc/sysdeps/unix/sysv/linux/sigprocmask.cAs for modifying libc_sigaction and setitimer, here are the specific steps we agreed on, just re-sharing here to keep things clear: For libc_sigaction: Edit: And for setitimer: Edit: Let me know if anything’s unclear. It’d be great to move these forward this week! |
…age via DUP_SYSCALL macro
|
@bblackheart013 Great start! Changes to |
Yaxuan-w
changed the title
| } | ||
|
|
||
| int | ||
| chdir (const char *__path) | ||
| { | ||
| return MAKE_SYSCALL(130, "syscall|chdir", (uint64_t) __path, NOTUSED, NOTUSED, NOTUSED, NOTUSED, NOTUSED); | ||
| return MAKE_SYSCALL(CHDIR_SYSCALL, "syscall|chdir", (uint64_t) __path, NOTUSED, NOTUSED, NOTUSED, NOTUSED, NOTUSED); |
There was a problem hiding this comment.
let's delete the entire body of chdir and use an alias from __chdir
| } | ||
|
|
||
| int dup (int fd) { | ||
| return MAKE_SYSCALL(24, "syscall|dup", (uint64_t) fd, NOTUSED, NOTUSED, NOTUSED, NOTUSED, NOTUSED); | ||
| return MAKE_SYSCALL(DUP_SYSCALL, "syscall|dup", (uint64_t) fd, NOTUSED, NOTUSED, NOTUSED, NOTUSED, NOTUSED); |
There was a problem hiding this comment.
same for dup here, let's use alias here instead of a duplicated definition
There was a problem hiding this comment.
I wonder what's going on with this file, why an entire file is added for execve
There was a problem hiding this comment.
Should replace this file:
src/glibc/sysdeps/unix/sysv/linux/i386/execve.c| } | ||
|
|
||
| int | ||
| kill (__pid_t a, int b) | ||
| { | ||
| return MAKE_SYSCALL(148, "syscall|kill", (uint64_t) a, (uint64_t) b, NOTUSED, NOTUSED, NOTUSED, NOTUSED); | ||
| return MAKE_SYSCALL(KILL_SYSCALL, "syscall|kill", (uint64_t) a, (uint64_t) b, NOTUSED, NOTUSED, NOTUSED, NOTUSED); |
There was a problem hiding this comment.
same here, replace duplicated definition with alias
| // return 0; | ||
| } | ||
|
|
||
| int munmap (void *addr, size_t len) | ||
| { | ||
| return MAKE_SYSCALL(22, "syscall|munmap", (uint64_t)(uintptr_t) addr, (uint64_t) len, NOTUSED, NOTUSED, NOTUSED, NOTUSED); | ||
| return MAKE_SYSCALL(MUNMAP_SYSCALL, "syscall|munmap", (uint64_t)(uintptr_t) addr, (uint64_t) len, NOTUSED, NOTUSED, NOTUSED, NOTUSED); | ||
| // return 0; | ||
| } | ||
|
|
There was a problem hiding this comment.
Have you confirmed whether glibc can compile correctly with this change? This header file is under the lind_syscall folder, which might not be in the default header search path when building glibc. I might be misremembering, but just want to double-check that this is handled properly. You can verify by checking if, e.g, accept.o is generated correctly after running lindtool make_all.
No description provided.