Skip to content
This repository has been archived by the owner on Jul 12, 2024. It is now read-only.

Commit

Permalink
style: unittest
Browse files Browse the repository at this point in the history
  • Loading branch information
@MiroKaku
MiroKaku committed Apr 29, 2023
1 parent 60e8eb6 commit 8ec7fe7
Show file tree
Hide file tree
Showing 9 changed files with 273 additions and 302 deletions.
37 changes: 21 additions & 16 deletions msvc/ucxxrt.test.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,75 +46,75 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<TargetVersion>Windows7</TargetVersion>
<TargetVersion>Windows10</TargetVersion>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ConfigurationType>Driver</ConfigurationType>
<DriverType>WDM</DriverType>
<DriverTargetPlatform>Desktop</DriverTargetPlatform>
<DriverTargetPlatform>Universal</DriverTargetPlatform>
<Driver_SpectreMitigation>Spectre</Driver_SpectreMitigation>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<TargetVersion>Windows7</TargetVersion>
<TargetVersion>Windows10</TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ConfigurationType>Driver</ConfigurationType>
<DriverType>WDM</DriverType>
<DriverTargetPlatform>Desktop</DriverTargetPlatform>
<DriverTargetPlatform>Universal</DriverTargetPlatform>
<Driver_SpectreMitigation>Spectre</Driver_SpectreMitigation>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<TargetVersion>Windows7</TargetVersion>
<TargetVersion>Windows10</TargetVersion>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ConfigurationType>Driver</ConfigurationType>
<DriverType>WDM</DriverType>
<DriverTargetPlatform>Desktop</DriverTargetPlatform>
<DriverTargetPlatform>Universal</DriverTargetPlatform>
<Driver_SpectreMitigation>Spectre</Driver_SpectreMitigation>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<TargetVersion>Windows7</TargetVersion>
<TargetVersion>Windows10</TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ConfigurationType>Driver</ConfigurationType>
<DriverType>WDM</DriverType>
<DriverTargetPlatform>Desktop</DriverTargetPlatform>
<DriverTargetPlatform>Universal</DriverTargetPlatform>
<Driver_SpectreMitigation>Spectre</Driver_SpectreMitigation>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<TargetVersion>Windows7</TargetVersion>
<TargetVersion>Windows10</TargetVersion>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ConfigurationType>Driver</ConfigurationType>
<DriverType>WDM</DriverType>
<DriverTargetPlatform>Desktop</DriverTargetPlatform>
<DriverTargetPlatform>Universal</DriverTargetPlatform>
<Driver_SpectreMitigation>Spectre</Driver_SpectreMitigation>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<TargetVersion>Windows7</TargetVersion>
<TargetVersion>Windows10</TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ConfigurationType>Driver</ConfigurationType>
<DriverType>WDM</DriverType>
<DriverTargetPlatform>Desktop</DriverTargetPlatform>
<DriverTargetPlatform>Universal</DriverTargetPlatform>
<Driver_SpectreMitigation>Spectre</Driver_SpectreMitigation>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
<TargetVersion>Windows7</TargetVersion>
<TargetVersion>Windows10</TargetVersion>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ConfigurationType>Driver</ConfigurationType>
<DriverType>WDM</DriverType>
<DriverTargetPlatform>Desktop</DriverTargetPlatform>
<DriverTargetPlatform>Universal</DriverTargetPlatform>
<Driver_SpectreMitigation>Spectre</Driver_SpectreMitigation>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<TargetVersion>Windows7</TargetVersion>
<TargetVersion>Windows10</TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ConfigurationType>Driver</ConfigurationType>
<DriverType>WDM</DriverType>
<DriverTargetPlatform>Desktop</DriverTargetPlatform>
<DriverTargetPlatform>Universal</DriverTargetPlatform>
<Driver_SpectreMitigation>Spectre</Driver_SpectreMitigation>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down Expand Up @@ -261,6 +261,11 @@
<ItemGroup>
<ClCompile Include="..\test\unittest.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="ucxxrt.vcxproj">
<Project>{8d969184-788f-48aa-bf18-2898fc167c91}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
64 changes: 1 addition & 63 deletions msvc/ucxxrt.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,14 +380,7 @@
<ClCompile Include="..\src\ucrt\stdlib\rotl.cpp" />
<ClCompile Include="..\src\ucrt\stdlib\rotr.cpp" />
<ClCompile Include="..\src\ucxxrt.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -787,79 +780,24 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile />
<ClCompile />
<ClCompile />
<ClCompile />
<MASM />
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile />
<ClCompile />
<ClCompile />
<ClCompile />
<MASM />
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile />
<Lib />
<ClCompile />
<ClCompile />
<ClCompile />
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile />
<ClCompile />
<ClCompile />
<ClCompile />
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile />
<ClCompile />
<ClCompile />
<ClCompile>
<WholeProgramOptimization>false</WholeProgramOptimization>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile />
<ClCompile />
<ClCompile />
<ClCompile>
<WholeProgramOptimization>false</WholeProgramOptimization>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile />
<ClCompile />
<ClCompile />
<ClCompile>
<WholeProgramOptimization>false</WholeProgramOptimization>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile />
<ClCompile />
<ClCompile />
<ClCompile>
<WholeProgramOptimization>false</WholeProgramOptimization>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion src/crt/arm64/chkstk.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
;
;--

;#include "arm64/arm64asmsymbolname.h"
#include "arm64/arm64ASMsymbolname.h"
#include "ksarm64.h"

#if !defined(TEBREG)
Expand Down
2 changes: 1 addition & 1 deletion src/crt/arm64/handlers.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
;
;*******************************************************************************

;#include "arm64/arm64asmsymbolname.h"
#include "arm64/arm64ASMsymbolname.h"
#include "ksarm64.h"

; CallSettingFrame
Expand Down
2 changes: 1 addition & 1 deletion src/crt/arm64/secpushpop.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
; with /GS cookies.
;

;#include "arm64/arm64asmsymbolname.h"
#include "arm64/arm64ASMsymbolname.h"
#include "ksarm64.h"

TEXTAREA
Expand Down
2 changes: 2 additions & 0 deletions src/ucrt/inc/arm64/arm64ASMsymbolname.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#define A64NAME(name) name
;
2 changes: 1 addition & 1 deletion src/ucxxrt.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

#ifdef _KERNEL_MODE
# ifndef NTOS_KERNEL_RUNTIME
# define NTOS_KERNEL_RUNTIME __KERNEL_MODE
# define NTOS_KERNEL_RUNTIME _KERNEL_MODE
# endif
#endif

Expand Down
9 changes: 8 additions & 1 deletion src/ucxxrtlib.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,15 @@
<ForcedIncludeFiles>%(PrecompiledHeaderFile);%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ObjectFileName>$(IntDir)anyname\%(RelativeDir)%(FileName).obj</ObjectFileName>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
<MASM>
<IncludePaths>$(SolutionDir)src\ucrt\inc\i386;%(IncludePaths)</IncludePaths>
<UseSafeExceptionHandlers Condition="'$(Platform)'=='Win32'">true</UseSafeExceptionHandlers>
</MASM>
<MARMASM>
<AdditionalIncludeDirectories>$(SolutionDir)src\ucrt\inc\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</MARMASM>
<PostBuildEvent>
<Command>mkdir "$(SolutionDir)ucxxrt"
copy /Y "$(SolutionDir)README.md" "$(SolutionDir)ucxxrt\"
Expand Down Expand Up @@ -64,8 +68,11 @@ xcopy /D /S /Y /V /F "$(SolutionDir)lib" "$(SolutionDir)ucxxrt\lib\" /EXCLUDE:$(

<ItemDefinitionGroup Condition=" ('$(UCXXRT_KernelMode)'=='true') ">
<ClCompile>
<PreprocessorDefinitions>_KERNEL_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_KERNEL_MODE;NTOS_KERNEL_RUNTIME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<MARMASM>
<PreprocessorDefinitions>_KERNEL_MODE;NTOS_KERNEL_RUNTIME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</MARMASM>
</ItemDefinitionGroup>

<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
Expand Down
Loading

0 comments on commit 8ec7fe7

Please sign in to comment.