diff --git a/.gitignore b/.gitignore index 3df6cb1..acd4af4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -tools/syntax-highlighting/out -out \ No newline at end of file +tools/syntax-highlighting/out \ No newline at end of file diff --git a/a.out b/a.out new file mode 100755 index 0000000..3da7aa0 Binary files /dev/null and b/a.out differ diff --git a/build.sh b/build.sh index 7008db0..49b69e7 100755 --- a/build.sh +++ b/build.sh @@ -1,18 +1,14 @@ #!/bin/bash set -e -./clean.sh - -mkdir -p out - dotnet build src/lang/Nub.Lang.CLI -nub example > out/out.ssa +nub example | qbe > out.s -nasm -g -felf64 src/runtime/runtime.asm -o out/runtime.o -nasm -g -felf64 src/runtime/core/syscall.asm -o out/syscall.o - -qbe out/out.ssa > out/out.s - -gcc -c -g out/out.s -o out/out.o -gcc -nostartfiles -o out/program out/runtime.o out/syscall.o out/out.o -no-pie \ No newline at end of file +gcc -nostartfiles -no-pie \ + out.s \ + src/runtime/baseline/entry.s \ + src/runtime/baseline/nub_memcpy.s \ + src/runtime/baseline/nub_memset.s \ + src/runtime/baseline/nub_panic.s \ + src/runtime/baseline/nub_strcmp.s \ diff --git a/clean.sh b/clean.sh deleted file mode 100755 index 00ca15f..0000000 --- a/clean.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -set -e -rm -rf out diff --git a/convert.py b/convert.py deleted file mode 100644 index 259fadf..0000000 --- a/convert.py +++ /dev/null @@ -1,556 +0,0 @@ -import csv -import re -from typing import List, Dict, Tuple - -def parse_type_and_name(param_str: str) -> Tuple[str, str]: - """Parse a parameter string like 'const char *filename' or 'const char *const argv[]' into type and name.""" - if not param_str.strip(): - return "", "" - - # Clean up the parameter string - param_str = param_str.strip() - - # Handle array syntax like 'const char *const argv[]' - array_match = re.search(r'\[\]', param_str) - is_array = bool(array_match) - if is_array: - param_str = re.sub(r'\[\]', '', param_str).strip() - - # Remove 'const' qualifiers for type mapping (but keep track of them) - cleaned_param = re.sub(r'\bconst\b\s*', '', param_str).strip() - - # Handle pointer types like 'char *buf' or 'struct stat *statbuf' - if '*' in cleaned_param: - parts = cleaned_param.split('*') - base_type = parts[0].strip() - var_name = parts[1].strip() - - # Handle struct types - if base_type.startswith('struct '): - return '^u8', var_name # Generic pointer for structs - elif base_type.startswith('union '): - return '^u8', var_name # Generic pointer for unions - elif 'void' in base_type: - return '^u8', var_name # void pointer becomes generic pointer - elif 'char' in base_type: - if is_array: - return '^cstring', var_name # Array of strings - else: - return '^u8', var_name # char pointer - else: - # For other pointer types, use the mapped base type with pointer - mapped_base = map_c_type_to_custom(base_type) - return f'^{mapped_base}', var_name - - # Handle regular types like 'unsigned int fd', 'size_t count' - parts = cleaned_param.strip().split() - if len(parts) >= 2: - var_name = parts[-1] - type_parts = parts[:-1] - full_type = ' '.join(type_parts) - mapped_type = map_c_type_to_custom(full_type) - return mapped_type, var_name - elif len(parts) == 1: - # Single word - might be a type without variable name or variable without type - return "", parts[0] - - return "", "" - -def map_c_type_to_custom(c_type: str) -> str: - """Map C types to custom type system.""" - c_type = c_type.strip().lower() - - # Handle common C types - if 'unsigned int' in c_type or c_type == 'int': - return 'u32' - elif 'unsigned long' in c_type or c_type == 'long': - return 'u64' - elif 'size_t' in c_type or 'ssize_t' in c_type: - return 'u64' - elif 'off_t' in c_type or 'loff_t' in c_type: - return 'u64' - elif 'pid_t' in c_type or 'uid_t' in c_type or 'gid_t' in c_type: - return 'u32' - elif 'mode_t' in c_type or 'umode_t' in c_type: - return 'u32' - elif 'time_t' in c_type: - return 'u64' - elif 'key_t' in c_type: - return 'u32' - elif 'mqd_t' in c_type: - return 'u32' - elif 'clockid_t' in c_type: - return 'u32' - elif 'timer_t' in c_type: - return 'u32' - elif 'qid_t' in c_type: - return 'u32' - elif 'aio_context_t' in c_type: - return 'u64' - elif c_type == 'char': - return 'u8' - elif c_type == 'unsigned char': - return 'u8' - elif c_type == 'short' or 'short int' in c_type: - return 'u16' - elif c_type == 'unsigned short': - return 'u16' - elif 'void' in c_type: - return 'u8' # void maps to u8 for generic data - elif c_type.startswith('struct') or c_type.startswith('union'): - return 'u8' # Structs/unions map to u8 for generic handling - elif 'u32' in c_type or 'u64' in c_type: # Already in target format - return c_type - else: - return 'u32' # Default fallback - -def extract_function_name(syscall_name: str) -> str: - """Extract function name from syscall name like 'sys_read' -> 'read'.""" - if syscall_name.startswith('sys_'): - return syscall_name[4:] - elif syscall_name.startswith('stub_'): - return syscall_name[5:] - return syscall_name - -def clean_syscall_name(syscall_name: str) -> str: - """Clean syscall names that might have issues.""" - # Handle special cases - if 'NOT IMPLEMENTED' in syscall_name or 'REMOVED' in syscall_name: - return "" - return syscall_name.strip() - -def convert_csv_to_functions(csv_content: str) -> str: - """Convert CSV content to function definitions.""" - lines = csv_content.strip().split('\n') - - # Parse header to understand column positions - header = [col.strip() for col in lines[0].split(',')] - - # Find the positions of key columns - syscall_num_idx = 0 # %rax - syscall_name_idx = 1 # System call - param_indices = [i for i, col in enumerate(header) if col.startswith('%') and col != '%rax'] - - functions = [] - - for line_num, line in enumerate(lines[1:], 2): # Skip header, start from line 2 - if not line.strip(): - continue - - # Handle CSV parsing more carefully - some lines have trailing commas - cols = [col.strip() for col in line.split(',')] - - # Ensure we have enough columns - while len(cols) < len(header): - cols.append('') - - # Extract syscall number and name - syscall_num = cols[syscall_num_idx] if syscall_num_idx < len(cols) else "" - syscall_name = cols[syscall_name_idx] if syscall_name_idx < len(cols) else "" - - # Clean and validate syscall name - syscall_name = clean_syscall_name(syscall_name) - if not syscall_num or not syscall_name or syscall_name in ['NOT IMPLEMENTED', 'REMOVED IN Linux 2.6']: - continue - - # Extract function name - func_name = extract_function_name(syscall_name) - if not func_name: - continue - - # Parse parameters - params = [] - param_names = [] - - for param_idx in param_indices: - if param_idx < len(cols): - param_str = cols[param_idx] - if param_str.strip(): - param_type, param_name = parse_type_and_name(param_str) - if param_type and param_name: - params.append(f"{param_name}: {param_type}") - param_names.append(param_name) - - # Generate function definition - if params: - param_list = ", ".join(params) - else: - param_list = "" - - call_params = ", ".join([syscall_num] + param_names) - - # function_def = f"func {func_name}({param_list}) {{\n call({call_params})\n}}" - # functions.append(function_def) - functions.append(f"const {func_name}: i64 = {syscall_num}") - - return "\n\n".join(functions) - -# Test with a file if provided -def process_file(filename: str) -> str: - """Process a CSV file and return the converted functions.""" - try: - with open(filename, 'r') as f: - content = f.read() - return convert_csv_to_functions(content) - except FileNotFoundError: - return f"Error: File '{filename}' not found." - except Exception as e: - return f"Error processing file: {str(e)}" - -# Example usage with file reading -def main(): - # If running with the uploaded file - try: - # Try to read from the uploaded file - with open('paste.txt', 'r') as f: - csv_content = f.read() - result = convert_csv_to_functions(csv_content) - print("Generated functions from paste.txt:") - print("=" * 50) - print(result) - except FileNotFoundError: - # Fallback to sample data - sample_csv = """%rax, System call, %rdi, %rsi, %rdx, %r10, %r8, %r9 -0, sys_read, unsigned int fd, char *buf, size_t count, , , -1, sys_write, unsigned int fd, const char *buf, size_t count, , , -2, sys_open, const char *filename, int flags, int mode, , , -3, sys_close, unsigned int fd, , , , , -4, sys_stat, const char *filename, struct stat *statbuf, , , , -5, sys_fstat, unsigned int fd, struct stat *statbuf, , , , -6, sys_lstat, fconst char *filename, struct stat *statbuf, , , , -7, sys_poll, struct poll_fd *ufds, unsigned int nfds, long timeout_msecs, , , -8, sys_lseek, unsigned int fd, off_t offset, unsigned int origin, , , -9, sys_mmap, unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long off -10, sys_mprotect, unsigned long start, size_t len, unsigned long prot, , , -11, sys_munmap, unsigned long addr, size_t len, , , , -12, sys_brk, unsigned long brk, , , , , -13, sys_rt_sigaction, int sig, const struct sigaction *act, struct sigaction *oact, size_t sigsetsize, , -14, sys_rt_sigprocmask, int how, sigset_t *nset, sigset_t *oset, size_t sigsetsize, , -15, sys_rt_sigreturn, unsigned long __unused, , , , , -16, sys_ioctl, unsigned int fd, unsigned int cmd, unsigned long arg, , , -17, sys_pread64, unsigned long fd, char *buf, size_t count, loff_t pos, , -18, sys_pwrite64, unsigned int fd, const char *buf, size_t count, loff_t pos, , -19, sys_readv, unsigned long fd, const struct iovec *vec, unsigned long vlen, , , -20, sys_writev, unsigned long fd, const struct iovec *vec, unsigned long vlen, , , -21, sys_access, const char *filename, int mode, , , , -22, sys_pipe, int *filedes, , , , , -23, sys_select, int n, fd_set *inp, fd_set *outp, fd_set*exp, struct timeval *tvp, -24, sys_sched_yield, , , , , , -25, sys_mremap, unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr, -26, sys_msync, unsigned long start, size_t len, int flags, , , -27, sys_mincore, unsigned long start, size_t len, unsigned char *vec, , , -28, sys_madvise, unsigned long start, size_t len_in, int behavior, , , -29, sys_shmget, key_t key, size_t size, int shmflg, , , -30, sys_shmat, int shmid, char *shmaddr, int shmflg, , , -31, sys_shmctl, int shmid, int cmd, struct shmid_ds *buf, , , -32, sys_dup, unsigned int fildes, , , , , -33, sys_dup2, unsigned int oldfd, unsigned int newfd, , , , -34, sys_pause, , , , , , -35, sys_nanosleep, struct timespec *rqtp, struct timespec *rmtp, , , , -36, sys_getitimer, int which, struct itimerval *value, , , , -37, sys_alarm, unsigned int seconds, , , , , -38, sys_setitimer, int which, struct itimerval *value, struct itimerval *ovalue, , , -39, sys_getpid, , , , , , -40, sys_sendfile, int out_fd, int in_fd, off_t *offset, size_t count, , -41, sys_socket, int family, int type, int protocol, , , -42, sys_connect, int fd, struct sockaddr *uservaddr, int addrlen, , , -43, sys_accept, int fd, struct sockaddr *upeer_sockaddr, int *upeer_addrlen, , , -44, sys_sendto, int fd, void *buff, size_t len, unsigned flags, struct sockaddr *addr, int addr_len -45, sys_recvfrom, int fd, void *ubuf, size_t size, unsigned flags, struct sockaddr *addr, int *addr_len -46, sys_sendmsg, int fd, struct msghdr *msg, unsigned flags, , , -47, sys_recvmsg, int fd, struct msghdr *msg, unsigned int flags, , , -48, sys_shutdown, int fd, int how, , , , -49, sys_bind, int fd, struct sokaddr *umyaddr, int addrlen, , , -50, sys_listen, int fd, int backlog, , , , -51, sys_getsockname, int fd, struct sockaddr *usockaddr, int *usockaddr_len, , , -52, sys_getpeername, int fd, struct sockaddr *usockaddr, int *usockaddr_len, , , -53, sys_socketpair, int family, int type, int protocol, int *usockvec, , -54, sys_setsockopt, int fd, int level, int optname, char *optval, int optlen, -55, sys_getsockopt, int fd, int level, int optname, char *optval, int *optlen, -56, sys_clone, unsigned long clone_flags, unsigned long newsp, void *parent_tid, void *child_tid, unsigned int tid, -57, sys_fork, , , , , , -58, sys_vfork, , , , , , -59, sys_execve, const char *filename, const char *const argv[], const char *const envp[], , , -60, sys_exit, int error_code, , , , , -61, sys_wait4, pid_t upid, int *stat_addr, int options, struct rusage *ru, , -62, sys_kill, pid_t pid, int sig, , , , -63, sys_uname, struct old_utsname *name, , , , , -64, sys_semget, key_t key, int nsems, int semflg, , , -65, sys_semop, int semid, struct sembuf *tsops, unsigned nsops, , , -66, sys_semctl, int semid, int semnum, int cmd, union semun arg, , -67, sys_shmdt, char *shmaddr, , , , , -68, sys_msgget, key_t key, int msgflg, , , , -69, sys_msgsnd, int msqid, struct msgbuf *msgp, size_t msgsz, int msgflg, , -70, sys_msgrcv, int msqid, struct msgbuf *msgp, size_t msgsz, long msgtyp, int msgflg, -71, sys_msgctl, int msqid, int cmd, struct msqid_ds *buf, , , -72, sys_fcntl, unsigned int fd, unsigned int cmd, unsigned long arg, , , -73, sys_flock, unsigned int fd, unsigned int cmd, , , , -74, sys_fsync, unsigned int fd, , , , , -75, sys_fdatasync, unsigned int fd, , , , , -76, sys_truncate, const char *path, long length, , , , -77, sys_ftruncate, unsigned int fd, unsigned long length, , , , -78, sys_getdents, unsigned int fd, struct linux_dirent *dirent, unsigned int count, , , -79, sys_getcwd, char *buf, unsigned long size, , , , -80, sys_chdir, const char *filename, , , , , -81, sys_fchdir, unsigned int fd, , , , , -82, sys_rename, const char *oldname, const char *newname, , , , -83, sys_mkdir, const char *pathname, int mode, , , , -84, sys_rmdir, const char *pathname, , , , , -85, sys_creat, const char *pathname, int mode, , , , -86, sys_link, const char *oldname, const char *newname, , , , -87, sys_unlink, const char *pathname, , , , , -88, sys_symlink, const char *oldname, const char *newname, , , , -89, sys_readlink, const char *path, char *buf, int bufsiz, , , -90, sys_chmod, const char *filename, mode_t mode, , , , -91, sys_fchmod, unsigned int fd, mode_t mode, , , , -92, sys_chown, const char *filename, uid_t user, gid_t group, , , -93, sys_fchown, unsigned int fd, uid_t user, gid_t group, , , -94, sys_lchown, const char *filename, uid_t user, gid_t group, , , -95, sys_umask, int mask, , , , , -96, sys_gettimeofday, struct timeval *tv, struct timezone *tz, , , , -97, sys_getrlimit, unsigned int resource, struct rlimit *rlim, , , , -98, sys_getrusage, int who, struct rusage *ru, , , , -99, sys_sysinfo, struct sysinfo *info, , , , , -100, sys_times, struct tms *tbuf, , , , , -101, sys_ptrace, long request, long pid, unsigned long addr, unsigned long data, , -102, sys_getuid, , , , , , -103, sys_syslog, int type, char *buf, int len, , , -104, sys_getgid, , , , , , -105, sys_setuid, uid_t uid, , , , , -106, sys_setgid, gid_t gid, , , , , -107, sys_geteuid, , , , , , -108, sys_getegid, , , , , , -109, sys_setpgid, pid_t pid, pid_t pgid, , , , -110, sys_getppid, , , , , , -111, sys_getpgrp, , , , , , -112, sys_setsid, , , , , , -113, sys_setreuid, uid_t ruid, uid_t euid, , , , -114, sys_setregid, gid_t rgid, gid_t egid, , , , -115, sys_getgroups, int gidsetsize, gid_t *grouplist, , , , -116, sys_setgroups, int gidsetsize, gid_t *grouplist, , , , -117, sys_setresuid, uid_t *ruid, uid_t *euid, uid_t *suid, , , -118, sys_getresuid, uid_t *ruid, uid_t *euid, uid_t *suid, , , -119, sys_setresgid, gid_t rgid, gid_t egid, gid_t sgid, , , -120, sys_getresgid, gid_t *rgid, gid_t *egid, gid_t *sgid, , , -121, sys_getpgid, pid_t pid, , , , , -122, sys_setfsuid, uid_t uid, , , , , -123, sys_setfsgid, gid_t gid, , , , , -124, sys_getsid, pid_t pid, , , , , -125, sys_capget, cap_user_header_t header, cap_user_data_t dataptr, , , , -126, sys_capset, cap_user_header_t header, const cap_user_data_t data, , , , -127, sys_rt_sigpending, sigset_t *set, size_t sigsetsize, , , , -128, sys_rt_sigtimedwait, const sigset_t *uthese, siginfo_t *uinfo, const struct timespec *uts, size_t sigsetsize, , -129, sys_rt_sigqueueinfo, pid_t pid, int sig, siginfo_t *uinfo, , , -130, sys_rt_sigsuspend, sigset_t *unewset, size_t sigsetsize, , , , -131, sys_sigaltstack, const stack_t *uss, stack_t *uoss, , , , -132, sys_utime, char *filename, struct utimbuf *times, , , , -133, sys_mknod, const char *filename, umode_t mode, unsigned dev, , , -134, sys_uselib, NOT IMPLEMENTED, , , , , -135, sys_personality, unsigned int personality, , , , , -136, sys_ustat, unsigned dev, struct ustat *ubuf, , , , -137, sys_statfs, const char *pathname, struct statfs *buf, , , , -138, sys_fstatfs, unsigned int fd, struct statfs *buf, , , , -139, sys_sysfs, int option, unsigned long arg1, unsigned long arg2, , , -140, sys_getpriority, int which, int who, , , , -141, sys_setpriority, int which, int who, int niceval, , , -142, sys_sched_setparam, pid_t pid, struct sched_param *param, , , , -143, sys_sched_getparam, pid_t pid, struct sched_param *param, , , , -144, sys_sched_setscheduler, pid_t pid, int policy, struct sched_param *param, , , -145, sys_sched_getscheduler, pid_t pid, , , , , -146, sys_sched_get_priority_max, int policy, , , , , -147, sys_sched_get_priority_min, int policy, , , , , -148, sys_sched_rr_get_interval, pid_t pid, struct timespec *interval, , , , -149, sys_mlock, unsigned long start, size_t len, , , , -150, sys_munlock, unsigned long start, size_t len, , , , -151, sys_mlockall, int flags, , , , , -152, sys_munlockall, , , , , , -153, sys_vhangup, , , , , , -154, sys_modify_ldt, int func, void *ptr, unsigned long bytecount, , , -155, sys_pivot_root, const char *new_root, const char *put_old, , , , -156, sys__sysctl, struct __sysctl_args *args, , , , , -157, sys_prctl, int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, , unsigned long arg5 -158, sys_arch_prctl, struct task_struct *task, int code, unsigned long *addr, , , -159, sys_adjtimex, struct timex *txc_p, , , , , -160, sys_setrlimit, unsigned int resource, struct rlimit *rlim, , , , -161, sys_chroot, const char *filename, , , , , -162, sys_sync, , , , , , -163, sys_acct, const char *name, , , , , -164, sys_settimeofday, struct timeval *tv, struct timezone *tz, , , , -165, sys_mount, char *dev_name, char *dir_name, char *type, unsigned long flags, void *data, -166, sys_umount2, const char *target, int flags, , , , -167, sys_swapon, const char *specialfile, int swap_flags, , , , -168, sys_swapoff, const char *specialfile, , , , , -169, sys_reboot, int magic1, int magic2, unsigned int cmd, void *arg, , -170, sys_sethostname, char *name, int len, , , , -171, sys_setdomainname, char *name, int len, , , , -172, sys_iopl, unsigned int level, struct pt_regs *regs, , , , -173, sys_ioperm, unsigned long from, unsigned long num, int turn_on, , , -174, sys_create_module, REMOVED IN Linux 2.6, , , , , -175, sys_init_module, void *umod, unsigned long len, const char *uargs, , , -176, sys_delete_module, const chat *name_user, unsigned int flags, , , , -177, sys_get_kernel_syms, REMOVED IN Linux 2.6, , , , , -178, sys_query_module, REMOVED IN Linux 2.6, , , , , -179, sys_quotactl, unsigned int cmd, const char *special, qid_t id, void *addr, , -180, sys_nfsservctl, NOT IMPLEMENTED, , , , , -181, sys_getpmsg, NOT IMPLEMENTED, , , , , -182, sys_putpmsg, NOT IMPLEMENTED, , , , , -183, sys_afs_syscall, NOT IMPLEMENTED, , , , , -184, sys_tuxcall, NOT IMPLEMENTED, , , , , -185, sys_security, NOT IMPLEMENTED, , , , , -186, sys_gettid, , , , , , -187, sys_readahead, int fd, loff_t offset, size_t count, , , -188, sys_setxattr, const char *pathname, const char *name, const void *value, size_t size, int flags, -189, sys_lsetxattr, const char *pathname, const char *name, const void *value, size_t size, int flags, -190, sys_fsetxattr, int fd, const char *name, const void *value, size_t size, int flags, -191, sys_getxattr, const char *pathname, const char *name, void *value, size_t size, , -192, sys_lgetxattr, const char *pathname, const char *name, void *value, size_t size, , -193, sys_fgetxattr, int fd, const har *name, void *value, size_t size, , -194, sys_listxattr, const char *pathname, char *list, size_t size, , , -195, sys_llistxattr, const char *pathname, char *list, size_t size, , , -196, sys_flistxattr, int fd, char *list, size_t size, , , -197, sys_removexattr, const char *pathname, const char *name, , , , -198, sys_lremovexattr, const char *pathname, const char *name, , , , -199, sys_fremovexattr, int fd, const char *name, , , , -200, sys_tkill, pid_t pid, ing sig, , , , -201, sys_time, time_t *tloc, , , , , -202, sys_futex, u32 *uaddr, int op, u32 val, struct timespec *utime, u32 *uaddr2, u32 val3 -203, sys_sched_setaffinity, pid_t pid, unsigned int len, unsigned long *user_mask_ptr, , , -204, sys_sched_getaffinity, pid_t pid, unsigned int len, unsigned long *user_mask_ptr, , , -205, sys_set_thread_area, NOT IMPLEMENTED. Use arch_prctl, , , , , -206, sys_io_setup, unsigned nr_events, aio_context_t *ctxp, , , , -207, sys_io_destroy, aio_context_t ctx, , , , , -208, sys_io_getevents, aio_context_t ctx_id, long min_nr, long nr, struct io_event *events, , -209, sys_io_submit, aio_context_t ctx_id, long nr, struct iocb **iocbpp, , , -210, sys_io_cancel, aio_context_t ctx_id, struct iocb *iocb, struct io_event *result, , , -211, sys_get_thread_area, NOT IMPLEMENTED. Use arch_prctl, , , , , -212, sys_lookup_dcookie, u64 cookie64, long buf, long len, , , -213, sys_epoll_create, int size, , , , , -214, sys_epoll_ctl_old, NOT IMPLEMENTED, , , , , -215, sys_epoll_wait_old, NOT IMPLEMENTED, , , , , -216, sys_remap_file_pages, unsigned long start, unsigned long size, unsigned long prot, unsigned long pgoff, unsigned long flags, -217, sys_getdents64, unsigned int fd, struct linux_dirent64 *dirent, unsigned int count, , , -218, sys_set_tid_address, int *tidptr, , , , , -219, sys_restart_syscall, , , , , , -220, sys_semtimedop, int semid, struct sembuf *tsops, unsigned nsops, const struct timespec *timeout, , -221, sys_fadvise64, int fd, loff_t offset, size_t len, int advice, , -222, sys_timer_create, const clockid_t which_clock, struct sigevent *timer_event_spec, timer_t *created_timer_id, , , -223, sys_timer_settime, timer_t timer_id, int flags, const struct itimerspec *new_setting, struct itimerspec *old_setting, , -224, sys_timer_gettime, timer_t timer_id, struct itimerspec *setting, , , , -225, sys_timer_getoverrun, timer_t timer_id, , , , , -226, sys_timer_delete, timer_t timer_id, , , , , -227, sys_clock_settime, const clockid_t which_clock, const struct timespec *tp, , , , -228, sys_clock_gettime, const clockid_t which_clock, struct timespec *tp, , , , -229, sys_clock_getres, const clockid_t which_clock, struct timespec *tp, , , , -230, sys_clock_nanosleep, const clockid_t which_clock, int flags, const struct timespec *rqtp, struct timespec *rmtp, , -231, sys_exit_group, int error_code, , , , , -232, sys_epoll_wait, int epfd, struct epoll_event *events, int maxevents, int timeout, , -233, sys_epoll_ctl, int epfd, int op, int fd, struct epoll_event *event, , -234, sys_tgkill, pid_t tgid, pid_t pid, int sig, , , -235, sys_utimes, char *filename, struct timeval *utimes, , , , -236, sys_vserver, NOT IMPLEMENTED, , , , , -237, sys_mbind, unsigned long start, unsigned long len, unsigned long mode, unsigned long *nmask, unsigned long maxnode, unsigned flags -238, sys_set_mempolicy, int mode, unsigned long *nmask, unsigned long maxnode, , , -239, sys_get_mempolicy, int *policy, unsigned long *nmask, unsigned long maxnode, unsigned long addr, unsigned long flags, -240, sys_mq_open, const char *u_name, int oflag, mode_t mode, struct mq_attr *u_attr, , -241, sys_mq_unlink, const char *u_name, , , , , -242, sys_mq_timedsend, mqd_t mqdes, const char *u_msg_ptr, size_t msg_len, unsigned int msg_prio, const stuct timespec *u_abs_timeout, -243, sys_mq_timedreceive, mqd_t mqdes, char *u_msg_ptr, size_t msg_len, unsigned int *u_msg_prio, const struct timespec *u_abs_timeout, -244, sys_mq_notify, mqd_t mqdes, const struct sigevent *u_notification, , , , -245, sys_mq_getsetattr, mqd_t mqdes, const struct mq_attr *u_mqstat, struct mq_attr *u_omqstat, , , -246, sys_kexec_load, unsigned long entry, unsigned long nr_segments, struct kexec_segment *segments, unsigned long flags, , -247, sys_waitid, int which, pid_t upid, struct siginfo *infop, int options, struct rusage *ru, -248, sys_add_key, const char *_type, const char *_description, const void *_payload, size_t plen, , -249, sys_request_key, const char *_type, const char *_description, const char *_callout_info, key_serial_t destringid, , -250, sys_keyctl, int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5, -251, sys_ioprio_set, int which, int who, int ioprio, , , -252, sys_ioprio_get, int which, int who, , , , -253, sys_inotify_init, , , , , , -254, sys_inotify_add_watch, int fd, const char *pathname, u32 mask, , , -255, sys_inotify_rm_watch, int fd, __s32 wd, , , , -256, sys_migrate_pages, pid_t pid, unsigned long maxnode, const unsigned long *old_nodes, const unsigned long *new_nodes, , -257, sys_openat, int dfd, const char *filename, int flags, int mode, , -258, sys_mkdirat, int dfd, const char *pathname, int mode, , , -259, sys_mknodat, int dfd, const char *filename, int mode, unsigned dev, , -260, sys_fchownat, int dfd, const char *filename, uid_t user, gid_t group, int flag, -261, sys_futimesat, int dfd, const char *filename, struct timeval *utimes, , , -262, sys_newfstatat, int dfd, const char *filename, struct stat *statbuf, int flag, , -263, sys_unlinkat, int dfd, const char *pathname, int flag, , , -264, sys_renameat, int oldfd, const char *oldname, int newfd, const char *newname, , -265, sys_linkat, int oldfd, const char *oldname, int newfd, const char *newname, int flags, -266, sys_symlinkat, const char *oldname, int newfd, const char *newname, , , -267, sys_readlinkat, int dfd, const char *pathname, char *buf, int bufsiz, , -268, sys_fchmodat, int dfd, const char *filename, mode_t mode, , , -269, sys_faccessat, int dfd, const char *filename, int mode, , , -270, sys_pselect6, int n, fd_set *inp, fd_set *outp, fd_set *exp, struct timespec *tsp, void *sig -271, sys_ppoll, struct pollfd *ufds, unsigned int nfds, struct timespec *tsp, const sigset_t *sigmask, size_t sigsetsize, -272, sys_unshare, unsigned long unshare_flags, , , , , -273, sys_set_robust_list, struct robust_list_head *head, size_t len, , , , -274, sys_get_robust_list, int pid, struct robust_list_head **head_ptr, size_t *len_ptr, , , -275, sys_splice, int fd_in, loff_t *off_in, int fd_out, loff_t *off_out, size_t len, unsigned int flags -276, sys_tee, int fdin, int fdout, size_t len, unsigned int flags, , -277, sys_sync_file_range, long fd, loff_t offset, loff_t bytes, long flags, , -278, sys_vmsplice, int fd, const struct iovec *iov, unsigned long nr_segs, unsigned int flags, , -279, sys_move_pages, pid_t pid, unsigned long nr_pages, const void **pages, const int *nodes, int *status, int flags -280, sys_utimensat, int dfd, const char *filename, struct timespec *utimes, int flags, , -281, sys_epoll_pwait, int epfd, struct epoll_event *events, int maxevents, int timeout, const sigset_t *sigmask, size_t sigsetsize -282, sys_signalfd, int ufd, sigset_t *user_mask, size_t sizemask, , , -283, sys_timerfd_create, int clockid, int flags, , , , -284, sys_eventfd, unsigned int count, , , , , -285, sys_fallocate, long fd, long mode, loff_t offset, loff_t len, , -286, sys_timerfd_settime, int ufd, int flags, const struct itimerspec *utmr, struct itimerspec *otmr, , -287, sys_timerfd_gettime, int ufd, struct itimerspec *otmr, , , , -288, sys_accept4, int fd, struct sockaddr *upeer_sockaddr, int *upeer_addrlen, int flags, , -289, sys_signalfd4, int ufd, sigset_t *user_mask, size_t sizemask, int flags, , -290, sys_eventfd2, unsigned int count, int flags, , , , -291, sys_epoll_create1, int flags, , , , , -292, sys_dup3, unsigned int oldfd, unsigned int newfd, int flags, , , -293, sys_pipe2, int *filedes, int flags, , , , -294, sys_inotify_init1, int flags, , , , , -295, sys_preadv, unsigned long fd, const struct iovec *vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h, -296, sys_pwritev, unsigned long fd, const struct iovec *vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h, -297, sys_rt_tgsigqueueinfo, pid_t tgid, pid_t pid, int sig, siginfo_t *uinfo, , -298, sys_perf_event_open, struct perf_event_attr *attr_uptr, pid_t pid, int cpu, int group_fd, unsigned long flags, -299, sys_recvmmsg, int fd, struct msghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout, -300, sys_fanotify_init, unsigned int flags, unsigned int event_f_flags, , , , -301, sys_fanotify_mark, long fanotify_fd, long flags, __u64 mask, long dfd, long pathname, -302, sys_prlimit64, pid_t pid, unsigned int resource, const struct rlimit64 *new_rlim, struct rlimit64 *old_rlim, , -303, sys_name_to_handle_at, int dfd, const char *name, struct file_handle *handle, int *mnt_id, int flag, -304, sys_open_by_handle_at, int dfd, const char *name, struct file_handle *handle, int *mnt_id, int flags, -305, sys_clock_adjtime, clockid_t which_clock, struct timex *tx, , , , -306, sys_syncfs, int fd, , , , , -307, sys_sendmmsg, int fd, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, , -308, sys_setns, int fd, int nstype, , , , -309, sys_getcpu, unsigned *cpup, unsigned *nodep, struct getcpu_cache *unused, , , -310, sys_process_vm_readv, pid_t pid, const struct iovec *lvec, unsigned long liovcnt, const struct iovec *rvec, unsigned long riovcnt, unsigned long flags -311, sys_process_vm_writev, pid_t pid, const struct iovec *lvec, unsigned long liovcnt, const struct iovcc *rvec, unsigned long riovcnt, unsigned long flags -312, sys_kcmp, pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2, -313, sys_finit_module, int fd, const char __user *uargs, int flags, , , -314, sys_sched_setattr, pid_t pid, struct sched_attr __user *attr, unsigned int flags, , , -315, sys_sched_getattr, pid_t pid, struct sched_attr __user *attr, unsigned int size, unsigned int flags, , -316, sys_renameat2, int olddfd, const char __user *oldname, int newdfd, const char __user *newname, unsigned int flags, -317, sys_seccomp, unsigned int op, unsigned int flags, const char __user *uargs, , , -318, sys_getrandom, char __user *buf, size_t count, unsigned int flags, , , -319, sys_memfd_create, const char __user *uname_ptr, unsigned int flags, , , , -320, sys_kexec_file_load, int kernel_fd, int initrd_fd, unsigned long cmdline_len, const char __user *cmdline_ptr, unsigned long flags, -321, sys_bpf, int cmd, union bpf_attr *attr, unsigned int size, , , -322, stub_execveat, int dfd, const char __user *filename, const char __user *const __user *argv, const char __user *const __user *envp, int flags, -323, userfaultfd, int flags, , , , , -324, membarrier, int cmd, int flags, , , , -325, mlock2, unsigned long start, size_t len, int flags, , , -326, copy_file_range, int fd_in, loff_t __user *off_in, int fd_out, loff_t __user * off_out, size_t len, unsigned int flags -327, preadv2, unsigned long fd, const struct iovec __user *vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h, int flags -328, pwritev2, unsigned long fd, const struct iovec __user *vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h, int flags -329, pkey_mprotect, , , , , , -330, pkey_alloc, , , , , , -331, pkey_free, , , , , , -332, statx, , , , , , -333, io_pgetevents, , , , , , -334, rseq, , , , , , -335, pkey_mprotect, , , , , , -""" - - result = convert_csv_to_functions(sample_csv) - print(result) - -if __name__ == "__main__": - main() \ No newline at end of file diff --git a/src/runtime/baseline/entry.s b/src/runtime/baseline/entry.s new file mode 100644 index 0000000..48e1b87 --- /dev/null +++ b/src/runtime/baseline/entry.s @@ -0,0 +1,11 @@ +.intel_syntax noprefix +.extern main +.section .text + +.globl _start +_start: + mov rdi, rsp + call main + mov rdi, rax + mov rax, 60 + syscall diff --git a/src/runtime/baseline/nub_memcpy.s b/src/runtime/baseline/nub_memcpy.s new file mode 100644 index 0000000..cfe960d --- /dev/null +++ b/src/runtime/baseline/nub_memcpy.s @@ -0,0 +1,24 @@ +.intel_syntax noprefix +.section .text + +# Memory copy function +# Arguments: rdi = destination, rsi = source, rdx = count +# Returns: rdi (original destination pointer) +.globl nub_memcpy +nub_memcpy: + push rdi # Save original destination for return value + mov rcx, rdx # Load count into counter register + # Handle zero count case + test rcx, rcx + jz .done + # Simple byte-by-byte copy (no overlap handling) +.loop: + mov al, BYTE PTR [rsi] # Load byte from source + mov BYTE PTR [rdi], al # Store byte to destination + inc rsi # Move to next source byte + inc rdi # Move to next destination byte + dec rcx # Decrement counter + jnz .loop # Continue if counter not zero +.done: + pop rax # Return original destination pointer + ret diff --git a/src/runtime/baseline/nub_memset.s b/src/runtime/baseline/nub_memset.s new file mode 100644 index 0000000..18a64c3 --- /dev/null +++ b/src/runtime/baseline/nub_memset.s @@ -0,0 +1,22 @@ +.intel_syntax noprefix +.section .text + +# Memory set function +# Arguments: rdi = destination pointer, rsi = value (byte), rdx = count +# Returns: rdi (original destination pointer) +.globl nub_memset +nub_memset: + push rdi # Save original destination for return value + mov rcx, rdx # Load count into counter register + mov al, sil # Move byte value to al (lower 8 bits of rsi) + # Handle zero count case + test rcx, rcx + jz .done +.loop: + mov BYTE PTR [rdi], al # Store byte at current position + inc rdi # Move to next byte + dec rcx # Decrement counter + jnz .loop # Continue if counter not zero +.done: + pop rax # Return original destination pointer + ret diff --git a/src/runtime/baseline/nub_panic.s b/src/runtime/baseline/nub_panic.s new file mode 100644 index 0000000..97a5d6f --- /dev/null +++ b/src/runtime/baseline/nub_panic.s @@ -0,0 +1,16 @@ +.intel_syntax noprefix +.section .text + +# Panic function with message +# Arguments: rdi = message (*char), rsi = message length (long) +# Remarks: exits the program +.globl nub_panic +nub_panic: + mov rdx, rsi + mov rsi, rdi + mov rax, 1 + mov rdi, 2 + syscall + mov rax, 60 + mov rdi, 101 + syscall diff --git a/src/runtime/baseline/nub_strcmp.s b/src/runtime/baseline/nub_strcmp.s new file mode 100644 index 0000000..6990b1b --- /dev/null +++ b/src/runtime/baseline/nub_strcmp.s @@ -0,0 +1,24 @@ +.intel_syntax noprefix +.section .text + +# String comparison function null-terminated strings +# Arguments: rdi = lhs (*char), rsi = rhs (*char) +# Returns: 1 if equal, else 0 +.globl nub_strcmp +nub_strcmp: + xor rdx, rdx +.loop: + mov al, BYTE PTR [rsi + rdx] + mov bl, BYTE PTR [rdi + rdx] + inc rdx + cmp al, bl + jne .not_equal + cmp al, 0 + je .equal + jmp .loop +.not_equal: + mov rax, 0 + ret +.equal: + mov rax, 1 + ret diff --git a/src/runtime/core/syscall.asm b/src/runtime/core/syscall.asm index 2ae7c93..e4afea3 100644 --- a/src/runtime/core/syscall.asm +++ b/src/runtime/core/syscall.asm @@ -1,9 +1,11 @@ -section .text -global core_syscall +.intel_syntax noprefix +.globl core_syscall +.section .text + core_syscall: - mov rax, rdi - mov rdi, rsi - mov rsi, rdx - mov r10, rcx + movq rax, rdi + movq rdi, rsi + movq rsi, rdx + movq r10, rcx syscall - ret \ No newline at end of file + ret diff --git a/src/runtime/runtime.asm b/src/runtime/runtime.asm deleted file mode 100644 index 748cfc5..0000000 --- a/src/runtime/runtime.asm +++ /dev/null @@ -1,94 +0,0 @@ -global _start -extern main - -section .text -_start: - mov rdi, rsp - call main - mov rdi, rax - mov rax, 60 - syscall - -; String comparison function null-terminated strings -; Arguments: rdi = lhs (*char), rsi = rhs (*char) -; Returns: 1 if equal, else 0 -global nub_strcmp -nub_strcmp: - xor rdx, rdx -.loop: - mov al, [rsi + rdx] - mov bl, [rdi + rdx] - inc rdx - cmp al, bl - jne .not_equal - cmp al, 0 - je .equal - jmp .loop -.not_equal: - mov rax, 0 - ret -.equal: - mov rax, 1 - ret - -; Panic function with message -; Arguments: rdi = message (*char), rsi = message length (long) -; Remarks: exits the program -global nub_panic -nub_panic: - mov rdx, rsi - mov rsi, rdi - mov rax, 1 - mov rdi, 2 - syscall - mov rax, 60 - mov rdi, 101 - syscall - -; Memory set function -; Arguments: rdi = destination pointer, rsi = value (byte), rdx = count -; Returns: rdi (original destination pointer) -global nub_memset -nub_memset: - push rdi ; Save original destination for return value - mov rcx, rdx ; Load count into counter register - mov al, sil ; Move byte value to al (lower 8 bits of rsi) - - ; Handle zero count case - test rcx, rcx - jz .done - -.loop: - mov [rdi], al ; Store byte at current position - inc rdi ; Move to next byte - dec rcx ; Decrement counter - jnz .loop ; Continue if counter not zero - -.done: - pop rax ; Return original destination pointer - ret - -; Memory copy function -; Arguments: rdi = destination, rsi = source, rdx = count -; Returns: rdi (original destination pointer) -global nub_memcpy -nub_memcpy: - push rdi ; Save original destination for return value - mov rcx, rdx ; Load count into counter register - - ; Handle zero count case - test rcx, rcx - jz .done - - ; Simple byte-by-byte copy (no overlap handling) -.loop: - mov al, [rsi] ; Load byte from source - mov [rdi], al ; Store byte to destination - inc rsi ; Move to next source byte - inc rdi ; Move to next destination byte - dec rcx ; Decrement counter - jnz .loop ; Continue if counter not zero - -.done: - pop rax ; Return original destination pointer - ret