diff options
Diffstat (limited to 'src/pkg/syscall/mksyscall_windows.sh')
| -rwxr-xr-x | src/pkg/syscall/mksyscall_windows.sh | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/src/pkg/syscall/mksyscall_windows.sh b/src/pkg/syscall/mksyscall_windows.sh index f9b4584fc..9695d3f22 100755 --- a/src/pkg/syscall/mksyscall_windows.sh +++ b/src/pkg/syscall/mksyscall_windows.sh @@ -15,13 +15,13 @@ # * If go func name needs to be different from it's winapi dll name, # the winapi name could be specified at the end, after "=" sign, like # //sys LoadLibrary(libname string) (handle uint32, errno int) = LoadLibraryA -# * Each function, that returns errno, needs to supply a number, +# * Each function, that returns errno, needs to supply a condition, # that return value of winapi will be tested against to # detect failure. This would set errno to windows "last-error", # otherwise it will be 0. The value can be provided # at end of //sys declaration, like -# //sys LoadLibrary(libname string) (handle uint32, errno int) [failretval=-1] = LoadLibraryA -# and is 0 by default. +# //sys LoadLibrary(libname string) (handle uint32, errno int) [failretval==-1] = LoadLibraryA +# and is [failretval==0] by default. $cmdline = "mksyscall_windows.sh " . join(' ', @ARGV); $errors = 0; @@ -74,12 +74,12 @@ while(<>) { # Line must be of the form # func Open(path string, mode int, perm int) (fd int, errno int) # Split into name, in params, out params. - if(!/^\/\/sys (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:\[failretval=(.*)\])?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$/) { + if(!/^\/\/sys (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:\[failretval(.*)\])?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$/) { print STDERR "$ARGV:$.: malformed //sys declaration\n"; $errors = 1; next; } - my ($func, $in, $out, $failretval, $modname, $sysname) = ($1, $2, $3, $4, $5, $6); + my ($func, $in, $out, $failcond, $modname, $sysname) = ($1, $2, $3, $4, $5, $6); # Split argument lists on comma. my @in = parseparamlist($in); @@ -104,8 +104,8 @@ while(<>) { $sysvarname = "proc$sysname"; # Returned value when failed - if($failretval eq "") { - $failretval = "0"; + if($failcond eq "") { + $failcond = "==0"; } # Decide which version of api is used: ascii or unicode. @@ -145,6 +145,10 @@ while(<>) { } else { push @args, "uintptr($name)", "uintptr($name >> 32)"; } + } elsif($type eq "bool") { + $text .= "\tvar _p$n uint32;\n"; + $text .= "\tif $name { _p$n = 1; } else { _p$n = 0;}\n"; + push @args, "uintptr(_p$n)"; } else { push @args, "uintptr($name)"; } @@ -167,6 +171,11 @@ while(<>) { while(@args < 9) { push @args, "0"; } + } elsif(@args <= 12) { + $asm = "Syscall12"; + while(@args < 12) { + push @args, "0"; + } } else { print STDERR "$ARGV:$.: too many arguments to system call\n"; } @@ -207,25 +216,34 @@ while(<>) { $ret[$i] = sprintf("r%d", $i); $ret[$i+1] = sprintf("r%d", $i+1); } + my $rettype = $type; + if($type =~ /^\*/) { + $reg = "unsafe.Pointer($reg)"; + $rettype = "($rettype)"; + } if($i == 0) { if($type eq "bool") { $failexpr = "!$name"; } elsif($name eq "errno") { $ret[$i] = "r1"; - $failexpr = "int(r1) == $failretval"; + $failexpr = "int(r1) $failcond"; } else { - $failexpr = "$name == $failretval"; + $failexpr = "$name $failcond"; } } if($name eq "errno") { # Set errno to "last error" only if returned value indicate failure $body .= "\tif $failexpr {\n"; - $body .= "\t\t$name = $type($reg);\n"; + $body .= "\t\tif $reg != 0 {\n"; + $body .= "\t\t\t$name = $type($reg);\n"; + $body .= "\t\t} else {\n"; + $body .= "\t\t\t$name = EINVAL;\n"; + $body .= "\t\t}\n"; $body .= "\t} else {\n"; $body .= "\t\t$name = 0;\n"; $body .= "\t}\n"; } else { - $body .= "\t$name = $type($reg);\n"; + $body .= "\t$name = $rettype($reg);\n"; } push @pout, sprintf "\"%s=\", %s, ", $name, $name; } |