From 4a2233cea14adba7905cd02061b62e7e3a986f68 Mon Sep 17 00:00:00 2001 From: Alex Brainman Date: Thu, 12 Feb 2015 14:25:59 +1100 Subject: [PATCH] runtime: move all stdFunctions into os1_windows.go (no code changes) Change-Id: I40291561a18bed3ca6be9dca12a664bdf28cb2f1 Reviewed-on: https://go-review.googlesource.com/4660 Reviewed-by: Brad Fitzpatrick --- src/runtime/mem_windows.go | 10 ---------- src/runtime/netpoll_windows.go | 10 ---------- src/runtime/os1_windows.go | 12 ++++++++++++ 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/runtime/mem_windows.go b/src/runtime/mem_windows.go index d72d49b975..a800ccae1d 100644 --- a/src/runtime/mem_windows.go +++ b/src/runtime/mem_windows.go @@ -18,16 +18,6 @@ const ( _PAGE_NOACCESS = 0x0001 ) -//go:cgo_import_dynamic runtime._VirtualAlloc VirtualAlloc "kernel32.dll" -//go:cgo_import_dynamic runtime._VirtualFree VirtualFree "kernel32.dll" -//go:cgo_import_dynamic runtime._VirtualProtect VirtualProtect "kernel32.dll" - -var ( - _VirtualAlloc, - _VirtualFree, - _VirtualProtect stdFunction -) - //go:nosplit func sysAlloc(n uintptr, stat *uint64) unsafe.Pointer { xadd64(stat, int64(n)) diff --git a/src/runtime/netpoll_windows.go b/src/runtime/netpoll_windows.go index 8e0750d607..0861e20f0c 100644 --- a/src/runtime/netpoll_windows.go +++ b/src/runtime/netpoll_windows.go @@ -10,16 +10,6 @@ import ( const _DWORD_MAX = 0xffffffff -//go:cgo_import_dynamic runtime._CreateIoCompletionPort CreateIoCompletionPort "kernel32.dll" -//go:cgo_import_dynamic runtime._GetQueuedCompletionStatus GetQueuedCompletionStatus "kernel32.dll" -//go:cgo_import_dynamic runtime._WSAGetOverlappedResult WSAGetOverlappedResult "ws2_32.dll" - -var ( - _CreateIoCompletionPort, - _GetQueuedCompletionStatus, - _WSAGetOverlappedResult stdFunction -) - const _INVALID_HANDLE_VALUE = ^uintptr(0) // net_op must be the same as beginning of net.operation. Keep these in sync. diff --git a/src/runtime/os1_windows.go b/src/runtime/os1_windows.go index 8d469aac6e..2de6b09343 100644 --- a/src/runtime/os1_windows.go +++ b/src/runtime/os1_windows.go @@ -11,6 +11,7 @@ import ( //go:cgo_import_dynamic runtime._AddVectoredExceptionHandler AddVectoredExceptionHandler "kernel32.dll" //go:cgo_import_dynamic runtime._CloseHandle CloseHandle "kernel32.dll" //go:cgo_import_dynamic runtime._CreateEventA CreateEventA "kernel32.dll" +//go:cgo_import_dynamic runtime._CreateIoCompletionPort CreateIoCompletionPort "kernel32.dll" //go:cgo_import_dynamic runtime._CreateThread CreateThread "kernel32.dll" //go:cgo_import_dynamic runtime._CreateWaitableTimerA CreateWaitableTimerA "kernel32.dll" //go:cgo_import_dynamic runtime._CryptAcquireContextW CryptAcquireContextW "advapi32.dll" @@ -21,6 +22,7 @@ import ( //go:cgo_import_dynamic runtime._FreeEnvironmentStringsW FreeEnvironmentStringsW "kernel32.dll" //go:cgo_import_dynamic runtime._GetEnvironmentStringsW GetEnvironmentStringsW "kernel32.dll" //go:cgo_import_dynamic runtime._GetProcAddress GetProcAddress "kernel32.dll" +//go:cgo_import_dynamic runtime._GetQueuedCompletionStatus GetQueuedCompletionStatus "kernel32.dll" //go:cgo_import_dynamic runtime._GetStdHandle GetStdHandle "kernel32.dll" //go:cgo_import_dynamic runtime._GetSystemInfo GetSystemInfo "kernel32.dll" //go:cgo_import_dynamic runtime._GetThreadContext GetThreadContext "kernel32.dll" @@ -37,6 +39,10 @@ import ( //go:cgo_import_dynamic runtime._SetWaitableTimer SetWaitableTimer "kernel32.dll" //go:cgo_import_dynamic runtime._Sleep Sleep "kernel32.dll" //go:cgo_import_dynamic runtime._SuspendThread SuspendThread "kernel32.dll" +//go:cgo_import_dynamic runtime._VirtualAlloc VirtualAlloc "kernel32.dll" +//go:cgo_import_dynamic runtime._VirtualFree VirtualFree "kernel32.dll" +//go:cgo_import_dynamic runtime._VirtualProtect VirtualProtect "kernel32.dll" +//go:cgo_import_dynamic runtime._WSAGetOverlappedResult WSAGetOverlappedResult "ws2_32.dll" //go:cgo_import_dynamic runtime._WaitForSingleObject WaitForSingleObject "kernel32.dll" //go:cgo_import_dynamic runtime._WriteFile WriteFile "kernel32.dll" //go:cgo_import_dynamic runtime._timeBeginPeriod timeBeginPeriod "winmm.dll" @@ -48,6 +54,7 @@ var ( _AddVectoredExceptionHandler, _CloseHandle, _CreateEventA, + _CreateIoCompletionPort, _CreateThread, _CreateWaitableTimerA, _CryptAcquireContextW, @@ -58,6 +65,7 @@ var ( _FreeEnvironmentStringsW, _GetEnvironmentStringsW, _GetProcAddress, + _GetQueuedCompletionStatus, _GetStdHandle, _GetSystemInfo, _GetThreadContext, @@ -74,6 +82,10 @@ var ( _SetWaitableTimer, _Sleep, _SuspendThread, + _VirtualAlloc, + _VirtualFree, + _VirtualProtect, + _WSAGetOverlappedResult, _WaitForSingleObject, _WriteFile, _timeBeginPeriod stdFunction -- 2.50.0