mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 05:57:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Driver: Use ExternDef in .asm

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2022-02-16 12:20:04 +03:00
parent b91dfd498e
commit 0534b1d141
12 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/driver/fortdrv.vcxproj
View File

@ -30,6 +30,7 @@
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<Configuration Condition="'$(Configuration)'==''">Release</Configuration> <Configuration Condition="'$(Configuration)'==''">Release</Configuration>
<Platform Condition="'$(Platform)'==''">Win32</Platform> <Platform Condition="'$(Platform)'==''">Win32</Platform>
<Arch Condition="'$(Arch)'==''">x86</Arch>
<DefineConstants Condition="'$(Configuration)'=='Release'">$(DefineConstants);NDEBUG</DefineConstants> <DefineConstants Condition="'$(Configuration)'=='Release'">$(DefineConstants);NDEBUG</DefineConstants>
<DefineConstants Condition="'$(Config)'=='win7'">$(DefineConstants);FORT_WIN7_COMPAT</DefineConstants> <DefineConstants Condition="'$(Config)'=='win7'">$(DefineConstants);FORT_WIN7_COMPAT</DefineConstants>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
@ -81,7 +82,7 @@
<FilesToPackage Include="$(TargetPath)" /> <FilesToPackage Include="$(TargetPath)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MASM Include="proxycb\fortpcb_dst_x86.asm" /> <MASM Include="proxycb\fortpcb_dst_$(Arch).asm" />
<ClCompile Include="fortdrv_amalg.c" /> <ClCompile Include="fortdrv_amalg.c" />
<ClInclude Include="fortdrv.h" /> <ClInclude Include="fortdrv.h" />
<ResourceCompile Include="fortdrv.rc" /> <ResourceCompile Include="fortdrv.rc" />

3
src/driver/loader/fortdl.vcxproj
View File

@ -30,6 +30,7 @@
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<Configuration Condition="'$(Configuration)'==''">Release</Configuration> <Configuration Condition="'$(Configuration)'==''">Release</Configuration>
<Platform Condition="'$(Platform)'==''">Win32</Platform> <Platform Condition="'$(Platform)'==''">Win32</Platform>
<Arch Condition="'$(Arch)'==''">x86</Arch>
<DefineConstants Condition="'$(Configuration)'=='Release'">$(DefineConstants);NDEBUG</DefineConstants> <DefineConstants Condition="'$(Configuration)'=='Release'">$(DefineConstants);NDEBUG</DefineConstants>
<DefineConstants Condition="'$(Config)'=='win7'">$(DefineConstants);FORT_WIN7_COMPAT</DefineConstants> <DefineConstants Condition="'$(Config)'=='win7'">$(DefineConstants);FORT_WIN7_COMPAT</DefineConstants>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
@ -80,7 +81,7 @@
<FilesToPackage Include="$(TargetPath)" /> <FilesToPackage Include="$(TargetPath)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MASM Include="..\proxycb\fortpcb_src_x86.asm" /> <MASM Include="..\proxycb\fortpcb_src_$(Arch).asm" />
<ClCompile Include="fortdl_amalg.c" /> <ClCompile Include="fortdl_amalg.c" />
<ClInclude Include="fortdl.h" /> <ClInclude Include="fortdl.h" />
<ResourceCompile Include="fortdl.rc" /> <ResourceCompile Include="fortdl.rc" />

2
src/driver/loader/msvcbuild-win10-arm64.bat
View File

@ -1 +1 @@
@%~dp0msvcbuild.bat ARM64 win10 @%~dp0msvcbuild.bat ARM64 win10 arm64

10
src/driver/loader/msvcbuild.bat
View File

@ -6,16 +6,20 @@
@rem PLAT: x64, Win32 @rem PLAT: x64, Win32
@set PLAT=%1 @set PLAT=%1
@if "%PLAT%"=="" PLAT=x64 @if "%PLAT%"=="" @set PLAT=x64
@rem CONFIG: win7, win10 @rem CONFIG: win7, win10
@set CONFIG=%2 @set CONFIG=%2
@if "%CONFIG%"=="" CONFIG=win10 @if "%CONFIG%"=="" @set CONFIG=win10
@rem ARCH: x86, arm64
@set ARCH=%3
@if "%ARCH%"=="" @set ARCH=x86
@set OutDir=..\..\..\build-driver-loader-%CONFIG%\%PLAT% @set OutDir=..\..\..\build-driver-loader-%CONFIG%\%PLAT%
@set IntDir=%OutDir%-obj @set IntDir=%OutDir%-obj
MSBuild fortdl.vcxproj /p:OutDir=%OutDir%\;IntDir=%IntDir%\;Platform=%PLAT%;Config=%CONFIG% MSBuild fortdl.vcxproj /p:OutDir=%OutDir%\;IntDir=%IntDir%\;Platform=%PLAT%;Config=%CONFIG%;Arch=%ARCH%
@rem DumpBin /SYMBOLS "%IntDir%\fortdl.obj" > symbols.txt @rem DumpBin /SYMBOLS "%IntDir%\fortdl.obj" > symbols.txt

2
src/driver/msvcbuild-win10-arm64.bat
View File

@ -1 +1 @@
@%~dp0msvcbuild.bat ARM64 win10 @%~dp0msvcbuild.bat ARM64 win10 arm64

10
src/driver/msvcbuild.bat
View File

@ -6,16 +6,20 @@
@rem PLAT: x64, Win32 @rem PLAT: x64, Win32
@set PLAT=%1 @set PLAT=%1
@if "%PLAT%"=="" PLAT=x64 @if "%PLAT%"=="" @set PLAT=x64
@rem CONFIG: win7, win10 @rem CONFIG: win7, win10
@set CONFIG=%2 @set CONFIG=%2
@if "%CONFIG%"=="" CONFIG=win10 @if "%CONFIG%"=="" @set CONFIG=win10
@rem ARCH: x86, arm64
@set ARCH=%3
@if "%ARCH%"=="" @set ARCH=x86
@set OutDir=..\..\build-driver-%CONFIG%\%PLAT% @set OutDir=..\..\build-driver-%CONFIG%\%PLAT%
@set IntDir=%OutDir%-obj @set IntDir=%OutDir%-obj
MSBuild fortdrv.vcxproj /p:OutDir=%OutDir%\;IntDir=%IntDir%\;Platform=%PLAT%;Config=%CONFIG% MSBuild fortdrv.vcxproj /p:OutDir=%OutDir%\;IntDir=%IntDir%\;Platform=%PLAT%;Config=%CONFIG%;Arch=%ARCH%
@rem DumpBin /SYMBOLS "%IntDir%\fortdrv.obj" > symbols.txt @rem DumpBin /SYMBOLS "%IntDir%\fortdrv.obj" > symbols.txt

2
src/driver/proxycb/fortpcb_dst.c
View File

@ -2,6 +2,8 @@
#include "fortpcb_dst.h" #include "fortpcb_dst.h"
ProxyCallbackProc g_proxyCallbacksArray[PROXY_CALLBACKS_COUNT];
#ifdef _WIN64 #ifdef _WIN64
# define ProxyCallbackExtern(i) extern void proxyCallback##i(void) # define ProxyCallbackExtern(i) extern void proxyCallback##i(void)

2
src/driver/proxycb/fortpcb_dst_dummy.c
View File

@ -2,8 +2,6 @@
#include "fortpcb_dst.h" #include "fortpcb_dst.h"
ProxyCallbackProc g_proxyCallbacksArray[PROXY_CALLBACKS_COUNT];
#define ProxyCallbackFunction(i) \ #define ProxyCallbackFunction(i) \
void proxyCallback##i(void) { g_proxyCallbacksArray[i](); } void proxyCallback##i(void) { g_proxyCallbacksArray[i](); }

9
src/driver/proxycb/fortpcb_dst_x86.asm
View File

@ -3,14 +3,7 @@ ELSE
.model flat, stdcall .model flat, stdcall
ENDIF ENDIF
.DATA EXTERNDEF g_proxyCallbacksArray:BYTE
IFDEF RAX
PUBLIC g_proxyCallbacksArray
g_proxyCallbacksArray QWORD 64 DUP(?)
ELSE
PUBLIC g_proxyCallbacksArray
g_proxyCallbacksArray WORD 64 DUP(?)
ENDIF
.CODE .CODE

2
src/driver/proxycb/fortpcb_src.c
View File

@ -2,6 +2,8 @@
#include "fortpcb_src.h" #include "fortpcb_src.h"
ProxyCallbackProc g_proxyDstCallbacksArray[PROXY_CALLBACKS_COUNT];
#define ProxyCallbackExtern(i) extern void WINAPI proxyDstCallback##i(void) #define ProxyCallbackExtern(i) extern void WINAPI proxyDstCallback##i(void)
ProxyCallbackExtern(0); ProxyCallbackExtern(0);

2
src/driver/proxycb/fortpcb_src_dummy.c
View File

@ -2,8 +2,6 @@
#include "fortpcb_src.h" #include "fortpcb_src.h"
ProxyCallbackProc g_proxyDstCallbacksArray[PROXY_CALLBACKS_COUNT];
#define ProxyCallbackFunction(i) \ #define ProxyCallbackFunction(i) \
void proxyDstCallback##i(void) { g_proxyDstCallbacksArray[i](); } void proxyDstCallback##i(void) { g_proxyDstCallbacksArray[i](); }

9
src/driver/proxycb/fortpcb_src_x86.asm
View File

@ -3,14 +3,7 @@ ELSE
.model flat, stdcall .model flat, stdcall
ENDIF ENDIF
.DATA EXTERNDEF g_proxyDstCallbacksArray:BYTE
IFDEF RAX
PUBLIC g_proxyDstCallbacksArray
g_proxyDstCallbacksArray QWORD 64 DUP(?)
ELSE
PUBLIC g_proxyDstCallbacksArray
g_proxyDstCallbacksArray WORD 64 DUP(?)
ENDIF
.CODE .CODE