shithub: mc

Download patch

ref: 4ba62b6b2635f3acbd88a4ebd029ce83cac2aec7
parent: a95ecb2c29fc0bd5baaef7725b0ee00a9f5a4b03
author: Ori Bernstein <[email protected]>
date: Wed Aug 1 20:58:10 EDT 2012

Use correct syscall names.

--- a/bld.sh
+++ b/bld.sh
@@ -49,7 +49,7 @@
     chartype.myr"
 
 OBJ="$(echo $ASM | sed 's/\.s/.o /g') $(echo $MYR | sed 's/\.myr/.o /g')"
-USE="$(echo $MYR | sed 's/\.myr/.use /g')"
+USE="$(echo $MYR | sed 's/\.myr/.use /g' | sed "s/-$SYS//g")"
 rm $OBJ test libstd.a
 assem $ASM
 use $MYR
@@ -62,7 +62,7 @@
 
 # build test program
 build test.myr
-COMP="$CC -m32 -o test test.o -L. -lstd"
+COMP="$CC -o test test.o -L. -lstd"
 echo $COMP
 $COMP
 
--- a/sys-linux.myr
+++ b/sys-linux.myr
@@ -1,10 +1,10 @@
 use "types.use"
 
 pkg std =
-	type scno = int
-	type fdopt = int
-	type mprot = int
-	type mopt = int
+	type scno = int64
+	type fdopt = int64
+	type mprot = int64
+	type mopt = int64
 	type statbuf = struct
 		 dev     : uint
 		 ino     : uint
@@ -55,298 +55,318 @@
 	const Mapbad	: byte* = -1 castto(byte*)
 
 	/* syscalls */
-	const Sysread		: scno = 0
-	const Syswrite		: scno = 1
-	const Sysopen		: scno = 2
-	const Sysclose		: scno = 3
-	const Sysnewstat	: scno = 4
-	const Sysnewfstat	: scno = 5
-	const Sysnewlstat	: scno = 6
-	const Syspoll		: scno = 7
-	const Syslseek		: scno = 8
-	const Sysmmap		: scno = 9
-	const Sysmprotect	: scno = 10
-	const Sysmunmap		: scno = 11
-	const Sysbrk		: scno = 12
-	const Sysrt_sigaction	: scno = 13
-	const Sysrt_sigprocmask	: scno = 14
-	const Sysioctl		: scno = 16
-	const Syspread64	: scno = 17
-	const Syspwrite64	: scno = 18
-	const Sysreadv		: scno = 19
-	const Syswritev		: scno = 20
-	const Sysaccess		: scno = 21
-	const Syspipe		: scno = 22
-	const Sysselect		: scno = 23
-	const Syssched_yield	: scno = 24
-	const Sysmremap		: scno = 25
-	const Sysmsync		: scno = 26
-	const Sysmincore	: scno = 27
-	const Sysmadvise	: scno = 28
-	const Sysshmget		: scno = 29
-	const Sysshmat		: scno = 30
-	const Sysshmctl		: scno = 31
-	const Sysdup		: scno = 32
-	const Sysdup2		: scno = 33
-	const Syspause		: scno = 34
-	const Sysnanosleep	: scno = 35
-	const Sysgetitimer	: scno = 36
-	const Sysalarm		: scno = 37
-	const Syssetitimer	: scno = 38
-	const Sysgetpid		: scno = 39
-	const Syssendfile64	: scno = 40
-	const Syssocket		: scno = 41
-	const Sysconnect	: scno = 42
-	const Sysaccept		: scno = 43
-	const Syssendto		: scno = 44
-	const Sysrecvfrom	: scno = 45
-	const Syssendmsg	: scno = 46
-	const Sysrecvmsg	: scno = 47
-	const Sysshutdown	: scno = 48
-	const Sysbind		: scno = 49
-	const Syslisten		: scno = 50
-	const Sysgetsockname	: scno = 51
-	const Sysgetpeername	: scno = 52
-	const Syssocketpair	: scno = 53
-	const Syssetsockopt	: scno = 54
-	const Sysgetsockopt	: scno = 55
-	const Sysexit		: scno = 60
-	const Syswait4		: scno = 61
-	const Syskill		: scno = 62
-	const Sysuname		: scno = 63
-	const Syssemget		: scno = 64
-	const Syssemop		: scno = 65
-	const Syssemctl		: scno = 66
-	const Sysshmdt		: scno = 67
-	const Sysmsgget		: scno = 68
-	const Sysmsgsnd		: scno = 69
-	const Sysmsgrcv		: scno = 70
-	const Sysmsgctl		: scno = 71
-	const Sysfcntl		: scno = 72
-	const Sysflock		: scno = 73
-	const Sysfsync		: scno = 74
-	const Sysfdatasync	: scno = 75
-	const Systruncate	: scno = 76
-	const Sysftruncate	: scno = 77
-	const Sysgetdents	: scno = 78
-	const Sysgetcwd		: scno = 79
-	const Syschdir		: scno = 80
-	const Sysfchdir		: scno = 81
-	const Sysrename		: scno = 82
-	const Sysmkdir		: scno = 83
-	const Sysrmdir		: scno = 84
-	const Syscreat		: scno = 85
-	const Syslink		: scno = 86
-	const Sysunlink		: scno = 87
-	const Syssymlink	: scno = 88
-	const Sysreadlink	: scno = 89
-	const Syschmod		: scno = 90
-	const Sysfchmod		: scno = 91
-	const Syschown		: scno = 92
-	const Sysfchown		: scno = 93
-	const Syslchown		: scno = 94
-	const Sysumask		: scno = 95
-	const Sysgettimeofday	: scno = 96
-	const Sysgetrlimit	: scno = 97
-	const Sysgetrusage	: scno = 98
-	const Syssysinfo	: scno = 99
-	const Systimes		: scno = 100
-	const Sysptrace		: scno = 101
-	const Sysgetuid		: scno = 102
-	const Syssyslog		: scno = 103
-	const Sysgetgid		: scno = 104
-	const Syssetuid		: scno = 105
-	const Syssetgid		: scno = 106
-	const Sysgeteuid	: scno = 107
-	const Sysgetegid	: scno = 108
-	const Syssetpgid	: scno = 109
-	const Sysgetppid	: scno = 110
-	const Sysgetpgrp	: scno = 111
-	const Syssetsid		: scno = 112
-	const Syssetreuid	: scno = 113
-	const Syssetregid	: scno = 114
-	const Sysgetgroups	: scno = 115
-	const Syssetgroups	: scno = 116
-	const Syssetresuid	: scno = 117
-	const Sysgetresuid	: scno = 118
-	const Syssetresgid	: scno = 119
-	const Sysgetresgid	: scno = 120
-	const Sysgetpgid	: scno = 121
-	const Syssetfsuid	: scno = 122
-	const Syssetfsgid	: scno = 123
-	const Sysgetsid		: scno = 124
-	const Syscapget		: scno = 125
-	const Syscapset		: scno = 126
-	const Sysrt_sigpending	: scno = 127
+	const Sysread			: scno = 0
+	const Syswrite			: scno = 1
+	const Sysopen			: scno = 2
+	const Sysclose			: scno = 3
+	const Sysstat			: scno = 4
+	const Sysfstat			: scno = 5
+	const Syslstat			: scno = 6
+	const Syspoll			: scno = 7
+	const Syslseek			: scno = 8
+	const Sysmmap			: scno = 9
+	const Sysmprotect		: scno = 10
+	const Sysmunmap			: scno = 11
+	const Sysbrk			: scno = 12
+	const Sysrt_sigaction		: scno = 13
+	const Sysrt_sigprocmask		: scno = 14
+	const Sysrt_sigreturn		: scno = 15
+	const Sysioctl			: scno = 16
+	const Syspread64		: scno = 17
+	const Syspwrite64		: scno = 18
+	const Sysreadv			: scno = 19
+	const Syswritev			: scno = 20
+	const Sysaccess			: scno = 21
+	const Syspipe			: scno = 22
+	const Sysselect			: scno = 23
+	const Syssched_yield		: scno = 24
+	const Sysmremap			: scno = 25
+	const Sysmsync			: scno = 26
+	const Sysmincore		: scno = 27
+	const Sysmadvise		: scno = 28
+	const Sysshmget			: scno = 29
+	const Sysshmat			: scno = 30
+	const Sysshmctl			: scno = 31
+	const Sysdup			: scno = 32
+	const Sysdup2			: scno = 33
+	const Syspause			: scno = 34
+	const Sysnanosleep		: scno = 35
+	const Sysgetitimer		: scno = 36
+	const Sysalarm			: scno = 37
+	const Syssetitimer		: scno = 38
+	const Sysgetpid			: scno = 39
+	const Syssendfile		: scno = 40
+	const Syssocket			: scno = 41
+	const Sysconnect		: scno = 42
+	const Sysaccept			: scno = 43
+	const Syssendto			: scno = 44
+	const Sysrecvfrom		: scno = 45
+	const Syssendmsg		: scno = 46
+	const Sysrecvmsg		: scno = 47
+	const Sysshutdown		: scno = 48
+	const Sysbind			: scno = 49
+	const Syslisten			: scno = 50
+	const Sysgetsockname		: scno = 51
+	const Sysgetpeername		: scno = 52
+	const Syssocketpair		: scno = 53
+	const Syssetsockopt		: scno = 54
+	const Sysgetsockopt		: scno = 55
+	const Sysclone			: scno = 56
+	const Sysfork			: scno = 57
+	const Sysvfork			: scno = 58
+	const Sysexecve			: scno = 59
+	const Sysexit			: scno = 60
+	const Syswait4			: scno = 61
+	const Syskill			: scno = 62
+	const Sysuname			: scno = 63
+	const Syssemget			: scno = 64
+	const Syssemop			: scno = 65
+	const Syssemctl			: scno = 66
+	const Sysshmdt			: scno = 67
+	const Sysmsgget			: scno = 68
+	const Sysmsgsnd			: scno = 69
+	const Sysmsgrcv			: scno = 70
+	const Sysmsgctl			: scno = 71
+	const Sysfcntl			: scno = 72
+	const Sysflock			: scno = 73
+	const Sysfsync			: scno = 74
+	const Sysfdatasync		: scno = 75
+	const Systruncate		: scno = 76
+	const Sysftruncate		: scno = 77
+	const Sysgetdents		: scno = 78
+	const Sysgetcwd			: scno = 79
+	const Syschdir			: scno = 80
+	const Sysfchdir			: scno = 81
+	const Sysrename			: scno = 82
+	const Sysmkdir			: scno = 83
+	const Sysrmdir			: scno = 84
+	const Syscreat			: scno = 85
+	const Syslink			: scno = 86
+	const Sysunlink			: scno = 87
+	const Syssymlink		: scno = 88
+	const Sysreadlink		: scno = 89
+	const Syschmod			: scno = 90
+	const Sysfchmod			: scno = 91
+	const Syschown			: scno = 92
+	const Sysfchown			: scno = 93
+	const Syslchown			: scno = 94
+	const Sysumask			: scno = 95
+	const Sysgettimeofday		: scno = 96
+	const Sysgetrlimit		: scno = 97
+	const Sysgetrusage		: scno = 98
+	const Syssysinfo		: scno = 99
+	const Systimes			: scno = 100
+	const Sysptrace			: scno = 101
+	const Sysgetuid			: scno = 102
+	const Syssyslog			: scno = 103
+	const Sysgetgid			: scno = 104
+	const Syssetuid			: scno = 105
+	const Syssetgid			: scno = 106
+	const Sysgeteuid		: scno = 107
+	const Sysgetegid		: scno = 108
+	const Syssetpgid		: scno = 109
+	const Sysgetppid		: scno = 110
+	const Sysgetpgrp		: scno = 111
+	const Syssetsid			: scno = 112
+	const Syssetreuid		: scno = 113
+	const Syssetregid		: scno = 114
+	const Sysgetgroups		: scno = 115
+	const Syssetgroups		: scno = 116
+	const Syssetresuid		: scno = 117
+	const Sysgetresuid		: scno = 118
+	const Syssetresgid		: scno = 119
+	const Sysgetresgid		: scno = 120
+	const Sysgetpgid		: scno = 121
+	const Syssetfsuid		: scno = 122
+	const Syssetfsgid		: scno = 123
+	const Sysgetsid			: scno = 124
+	const Syscapget			: scno = 125
+	const Syscapset			: scno = 126
+	const Sysrt_sigpending		: scno = 127
 	const Sysrt_sigtimedwait	: scno = 128
 	const Sysrt_sigqueueinfo	: scno = 129
-	const Sysrt_sigsuspend	: scno = 130
-	const Sysutime		: scno = 132
-	const Sysmknod		: scno = 133
-	const Sysni_syscall	: scno = 134
-	const Syspersonality	: scno = 135
-	const Sysustat		: scno = 136
-	const Sysstatfs		: scno = 137
-	const Sysfstatfs	: scno = 138
-	const Syssysfs		: scno = 139
-	const Sysgetpriority	: scno = 140
-	const Syssetpriority	: scno = 141
-	const Syssched_setparam	: scno = 142
-	const Syssched_getparam	: scno = 143
+	const Sysrt_sigsuspend		: scno = 130
+	const Syssigaltstack		: scno = 131
+	const Sysutime			: scno = 132
+	const Sysmknod			: scno = 133
+	const Sysuselib			: scno = 134
+	const Syspersonality		: scno = 135
+	const Sysustat			: scno = 136
+	const Sysstatfs			: scno = 137
+	const Sysfstatfs		: scno = 138
+	const Syssysfs			: scno = 139
+	const Sysgetpriority		: scno = 140
+	const Syssetpriority		: scno = 141
+	const Syssched_setparam		: scno = 142
+	const Syssched_getparam		: scno = 143
 	const Syssched_setscheduler	: scno = 144
 	const Syssched_getscheduler	: scno = 145
 	const Syssched_get_priority_max	: scno = 146
 	const Syssched_get_priority_min	: scno = 147
 	const Syssched_rr_get_interval	: scno = 148
-	const Sysmlock		: scno = 149
-	const Sysmunlock	: scno = 150
-	const Sysmlockall	: scno = 151
-	const Sysmunlockall	: scno = 152
-	const Sysvhangup	: scno = 153
-	const Sysmodify_ldt	: scno = 154
-	const Syspivot_root	: scno = 155
-	const Syssysctl		: scno = 156
-	const Sysprctl		: scno = 157
-	const Sysarch_prctl	: scno = 158
-	const Sysadjtimex	: scno = 159
-	const Syssetrlimit	: scno = 160
-	const Syschroot		: scno = 161
-	const Syssync		: scno = 162
-	const Sysacct		: scno = 163
-	const Syssettimeofday	: scno = 164
-	const Sysmount		: scno = 165
-	const Sysumount		: scno = 166
-	const Sysswapon		: scno = 167
-	const Sysswapoff	: scno = 168
-	const Sysreboot		: scno = 169
-	const Syssethostname	: scno = 170
-	const Syssetdomainname	: scno = 171
-	const Sysioperm		: scno = 173
-	const Sysni_syscall	: scno = 174
-	const Sysinit_module	: scno = 175
-	const Sysdelete_module	: scno = 176
-	const Sysni_syscall	: scno = 177
-	const Sysni_syscall	: scno = 178
-	const Sysquotactl	: scno = 179
-	const Sysnfsservctl	: scno = 180
-	const Sysni_syscall	: scno = 181
-	const Sysni_syscall	: scno = 182
-	const Sysni_syscall	: scno = 183
-	const Sysni_syscall	: scno = 184
-	const Sysni_syscall	: scno = 185
-	const Sysgettid		: scno = 186
-	const Sysreadahead	: scno = 187
-	const Syssetxattr	: scno = 188
-	const Syslsetxattr	: scno = 189
-	const Sysfsetxattr	: scno = 190
-	const Sysgetxattr	: scno = 191
-	const Syslgetxattr	: scno = 192
-	const Sysfgetxattr	: scno = 193
-	const Syslistxattr	: scno = 194
-	const Sysllistxattr	: scno = 195
-	const Sysflistxattr	: scno = 196
-	const Sysremovexattr	: scno = 197
-	const Syslremovexattr	: scno = 198
-	const Sysfremovexattr	: scno = 199
-	const Systkill		: scno = 200
-	const Systime		: scno = 201
-	const Sysfutex		: scno = 202
+	const Sysmlock			: scno = 149
+	const Sysmunlock		: scno = 150
+	const Sysmlockall		: scno = 151
+	const Sysmunlockall		: scno = 152
+	const Sysvhangup		: scno = 153
+	const Sysmodify_ldt		: scno = 154
+	const Syspivot_root		: scno = 155
+	const Sys_sysctl		: scno = 156
+	const Sysprctl			: scno = 157
+	const Sysarch_prctl		: scno = 158
+	const Sysadjtimex		: scno = 159
+	const Syssetrlimit		: scno = 160
+	const Syschroot			: scno = 161
+	const Syssync			: scno = 162
+	const Sysacct			: scno = 163
+	const Syssettimeofday		: scno = 164
+	const Sysmount			: scno = 165
+	const Sysumount2		: scno = 166
+	const Sysswapon			: scno = 167
+	const Sysswapoff		: scno = 168
+	const Sysreboot			: scno = 169
+	const Syssethostname		: scno = 170
+	const Syssetdomainname		: scno = 171
+	const Sysiopl			: scno = 172
+	const Sysioperm			: scno = 173
+	const Syscreate_module		: scno = 174
+	const Sysinit_module		: scno = 175
+	const Sysdelete_module		: scno = 176
+	const Sysget_kernel_syms	: scno = 177
+	const Sysquery_module		: scno = 178
+	const Sysquotactl		: scno = 179
+	const Sysnfsservctl		: scno = 180
+	const Sysgetpmsg		: scno = 181
+	const Sysputpmsg		: scno = 182
+	const Sysafs_syscall		: scno = 183
+	const Systuxcall		: scno = 184
+	const Syssecurity		: scno = 185
+	const Sysgettid			: scno = 186
+	const Sysreadahead		: scno = 187
+	const Syssetxattr		: scno = 188
+	const Syslsetxattr		: scno = 189
+	const Sysfsetxattr		: scno = 190
+	const Sysgetxattr		: scno = 191
+	const Syslgetxattr		: scno = 192
+	const Sysfgetxattr		: scno = 193
+	const Syslistxattr		: scno = 194
+	const Sysllistxattr		: scno = 195
+	const Sysflistxattr		: scno = 196
+	const Sysremovexattr		: scno = 197
+	const Syslremovexattr		: scno = 198
+	const Sysfremovexattr		: scno = 199
+	const Systkill			: scno = 200
+	const Systime			: scno = 201
+	const Sysfutex			: scno = 202
 	const Syssched_setaffinity	: scno = 203
 	const Syssched_getaffinity	: scno = 204
-	const Sysni_syscall	: scno = 205
-	const Sysio_setup	: scno = 206
-	const Sysio_destroy	: scno = 207
-	const Sysio_getevents	: scno = 208
-	const Sysio_submit	: scno = 209
-	const Sysio_cancel	: scno = 210
-	const Sysni_syscall	: scno = 211
-	const Syslookup_dcookie	: scno = 212
-	const Sysepoll_create	: scno = 213
-	const Sysni_syscall	: scno = 214
-	const Sysni_syscall	: scno = 215
+	const Sysset_thread_area	: scno = 205
+	const Sysio_setup		: scno = 206
+	const Sysio_destroy		: scno = 207
+	const Sysio_getevents		: scno = 208
+	const Sysio_submit		: scno = 209
+	const Sysio_cancel		: scno = 210
+	const Sysget_thread_area	: scno = 211
+	const Syslookup_dcookie		: scno = 212
+	const Sysepoll_create		: scno = 213
+	const Sysepoll_ctl_old		: scno = 214
+	const Sysepoll_wait_old		: scno = 215
 	const Sysremap_file_pages	: scno = 216
-	const Sysgetdents64	: scno = 217
+	const Sysgetdents64		: scno = 217
 	const Sysset_tid_address	: scno = 218
 	const Sysrestart_syscall	: scno = 219
-	const Syssemtimedop	: scno = 220
-	const Sysfadvise64	: scno = 221
-	const Systimer_create	: scno = 222
-	const Systimer_settime	: scno = 223
-	const Systimer_gettime	: scno = 224
+	const Syssemtimedop		: scno = 220
+	const Sysfadvise64		: scno = 221
+	const Systimer_create		: scno = 222
+	const Systimer_settime		: scno = 223
+	const Systimer_gettime		: scno = 224
 	const Systimer_getoverrun	: scno = 225
-	const Systimer_delete	: scno = 226
-	const Sysclock_settime	: scno = 227
-	const Sysclock_gettime	: scno = 228
-	const Sysclock_getres	: scno = 229
+	const Systimer_delete		: scno = 226
+	const Sysclock_settime		: scno = 227
+	const Sysclock_gettime		: scno = 228
+	const Sysclock_getres		: scno = 229
 	const Sysclock_nanosleep	: scno = 230
-	const Sysexit_group	: scno = 231
-	const Sysepoll_wait	: scno = 232
-	const Sysepoll_ctl	: scno = 233
-	const Systgkill		: scno = 234
-	const Sysutimes		: scno = 235
-	const Sysni_syscall	: scno = 236
-	const Sysmbind		: scno = 237
-	const Sysset_mempolicy	: scno = 238
-	const Sysget_mempolicy	: scno = 239
-	const Sysmq_open	: scno = 240
-	const Sysmq_unlink	: scno = 241
-	const Sysmq_timedsend	: scno = 242
+	const Sysexit_group		: scno = 231
+	const Sysepoll_wait		: scno = 232
+	const Sysepoll_ctl		: scno = 233
+	const Systgkill			: scno = 234
+	const Sysutimes			: scno = 235
+	const Sysvserver		: scno = 236
+	const Sysmbind			: scno = 237
+	const Sysset_mempolicy		: scno = 238
+	const Sysget_mempolicy		: scno = 239
+	const Sysmq_open		: scno = 240
+	const Sysmq_unlink		: scno = 241
+	const Sysmq_timedsend		: scno = 242
 	const Sysmq_timedreceive	: scno = 243
-	const Sysmq_notify	: scno = 244
-	const Sysmq_getsetattr	: scno = 245
-	const Syskexec_load	: scno = 246
-	const Syswaitid		: scno = 247
-	const Sysadd_key	: scno = 248
-	const Sysrequest_key	: scno = 249
-	const Syskeyctl		: scno = 250
-	const Sysioprio_set	: scno = 251
-	const Sysioprio_get	: scno = 252
-	const Sysinotify_init	: scno = 253
+	const Sysmq_notify		: scno = 244
+	const Sysmq_getsetattr		: scno = 245
+	const Syskexec_load		: scno = 246
+	const Syswaitid			: scno = 247
+	const Sysadd_key		: scno = 248
+	const Sysrequest_key		: scno = 249
+	const Syskeyctl			: scno = 250
+	const Sysioprio_set		: scno = 251
+	const Sysioprio_get		: scno = 252
+	const Sysinotify_init		: scno = 253
 	const Sysinotify_add_watch	: scno = 254
 	const Sysinotify_rm_watch	: scno = 255
-	const Sysmigrate_pages	: scno = 256
-	const Sysopenat		: scno = 257
-	const Sysmkdirat	: scno = 258
-	const Sysmknodat	: scno = 259
-	const Sysfchownat	: scno = 260
-	const Sysfutimesat	: scno = 261
-	const Sysnewfstatat	: scno = 262
-	const Sysunlinkat	: scno = 263
-	const Sysrenameat	: scno = 264
-	const Syslinkat		: scno = 265
-	const Syssymlinkat	: scno = 266
-	const Sysreadlinkat	: scno = 267
-	const Sysfchmodat	: scno = 268
-	const Sysfaccessat	: scno = 269
-	const Syspselect6	: scno = 270
-	const Sysppoll		: scno = 271
-	const Sysunshare	: scno = 272
+	const Sysmigrate_pages		: scno = 256
+	const Sysopenat			: scno = 257
+	const Sysmkdirat		: scno = 258
+	const Sysmknodat		: scno = 259
+	const Sysfchownat		: scno = 260
+	const Sysfutimesat		: scno = 261
+	const Sysnewfstatat		: scno = 262
+	const Sysunlinkat		: scno = 263
+	const Sysrenameat		: scno = 264
+	const Syslinkat			: scno = 265
+	const Syssymlinkat		: scno = 266
+	const Sysreadlinkat		: scno = 267
+	const Sysfchmodat		: scno = 268
+	const Sysfaccessat		: scno = 269
+	const Syspselect6		: scno = 270
+	const Sysppoll			: scno = 271
+	const Sysunshare		: scno = 272
 	const Sysset_robust_list	: scno = 273
 	const Sysget_robust_list	: scno = 274
-	const Syssplice		: scno = 275
-	const Systee		: scno = 276
+	const Syssplice			: scno = 275
+	const Systee			: scno = 276
 	const Syssync_file_range	: scno = 277
-	const Sysvmsplice	: scno = 278
-	const Sysmove_pages	: scno = 279
-	const Sysutimensat	: scno = 280
-	const Sysepoll_pwait	: scno = 281
-	const Syssignalfd	: scno = 282
-	const Systimerfd_create	: scno = 283
-	const Syseventfd	: scno = 284
-	const Sysfallocate	: scno = 285
+	const Sysvmsplice		: scno = 278
+	const Sysmove_pages		: scno = 279
+	const Sysutimensat		: scno = 280
+	const Sysepoll_pwait		: scno = 281
+	const Syssignalfd		: scno = 282
+	const Systimerfd_create		: scno = 283
+	const Syseventfd		: scno = 284
+	const Sysfallocate		: scno = 285
 	const Systimerfd_settime	: scno = 286
 	const Systimerfd_gettime	: scno = 287
-	const Sysaccept4	: scno = 288
-	const Syssignalfd4	: scno = 289
-	const Syseventfd2	: scno = 290
-	const Sysepoll_create1	: scno = 291
-	const Sysdup3		: scno = 292
-	const Syspipe2		: scno = 293
-	const Sysinotify_init1	: scno = 294
-	const Syspreadv		: scno = 295
-	const Syspwritev	: scno = 296
+	const Sysaccept4		: scno = 288
+	const Syssignalfd4		: scno = 289
+	const Syseventfd2		: scno = 290
+	const Sysepoll_create1		: scno = 291
+	const Sysdup3			: scno = 292
+	const Syspipe2			: scno = 293
+	const Sysinotify_init1		: scno = 294
+	const Syspreadv			: scno = 295
+	const Syspwritev		: scno = 296
 	const Sysrt_tgsigqueueinfo	: scno = 297
 	const Sysperf_event_open	: scno = 298
+	const Sysrecvmmsg		: scno = 299
+	const Sysfanotify_init		: scno = 300
+	const Sysfanotify_mark		: scno = 301
+	const Sysprlimit64		: scno = 302
+	const Sysname_to_handle_at	: scno = 303
+	const Sysopen_by_handle_at	: scno = 304
+	const Sysclock_adjtime		: scno = 305
+	const Syssyncfs			: scno = 306
+	const Syssendmmsg		: scno = 307
+	const Syssetns			: scno = 308
+	const Sysgetcpu			: scno = 309
+	const Sysprocess_vm_readv	: scno = 310
+	const Sysprocess_vm_writev	: scno = 311
 
 	extern const syscall : (sc:scno, args:... -> int)
 
@@ -375,4 +395,4 @@
 const lseek	= {fd, off, whence;	-> syscall(Syslseek, fd, off, whence);}
 const fstat	= {fd, sb;		-> syscall(Sysfstat, fd, sb);}
 const munmap	= {addr, len;		-> syscall(Sysmunmap, addr, len);}
-const mmap	= {addr, len, prot, flags, fd, off;	-> syscall(Sysmmap2, addr, len, prot, flags, fd, off) castto(byte*);}
+const mmap	= {addr, len, prot, flags, fd, off;	-> syscall(Sysmmap, addr, len, prot, flags, fd, off) castto(byte*);}
--- a/test.myr
+++ b/test.myr
@@ -1,6 +1,7 @@
 use std
 
 const main = {
+	/*
 	var x : byte*[1024]
 	var buf : byte[1024]
 	var sz
@@ -23,7 +24,7 @@
 	for i = 0; i < 1024; i++
 		std.free(x[i])
 	;;
-
+	*/
 	std.write(1, "Hello, 世界\n")
 	chartypes()
 }
--- a/types.myr
+++ b/types.myr
@@ -1,5 +1,5 @@
 pkg std =
-	type size	= uint64/* spans entire address space */
-	type off	= uint64/* file offsets */
-	type intptr	= uint64/* can hold any pointer losslessly */
+	type size	= uint64	/* spans entire address space */
+	type off	= uint64	/* file offsets */
+	type intptr	= uint64	/* can hold any pointer losslessly */
 ;;