- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Support the ARM64EC code map.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: c722353c87da017df25cc9f42b49f0c9f4ce50fd URL: https://gitlab.winehq.org/wine/wine/-/commit/c722353c87da017df25cc9f42b49f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 12:40:32 2023 +0200 ntdll: Support the ARM64EC code map. --- dlls/ntdll/unix/env.c | 12 +++++- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 86 +++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 2 +- 4 files changed, 97 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 3c178350f2b..8b3b9bcd43f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1857,13 +1857,21 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) peb->ImageSubSystemMinorVersion = main_image_info.MinorSubsystemVersion; #ifdef _WIN64 - if (main_image_info.Machine != current_machine) + switch (main_image_info.Machine) { + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARMNT: NtCurrentTeb()->WowTebOffset = teb_offset; NtCurrentTeb()->Tib.ExceptionList = (void *)((char *)NtCurrentTeb() + teb_offset); wow_peb = (PEB32 *)((char *)peb + page_size); - set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); + set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); ERR( "starting %s in experimental wow64 mode\n", debugstr_us(&params->ImagePathName) ); + break; + case IMAGE_FILE_MACHINE_AMD64: + if (main_image_info.Machine == current_machine) break; + peb->EcCodeBitMap = virtual_alloc_arm64ec_map(); + ERR( "starting %s in experimental ARM64EC mode\n", debugstr_us(&params->ImagePathName) ); + break; } #endif diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index e72b435c65a..d7b591e71f3 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -234,6 +234,7 @@ extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_clear_tls_index( ULONG index ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SIZE_T reserve_size, SIZE_T commit_size, BOOL guard_page ) DECLSPEC_HIDDEN; +extern void *virtual_alloc_arm64ec_map(void) DECLSPEC_HIDDEN; extern void virtual_map_user_shared_data(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) DECLSPEC_HIDDEN; extern unsigned int virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index b048d0f52d2..0908e6b60bd 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -175,6 +175,8 @@ static void *user_space_limit = (void *)0x7fff0000; static void *working_set_limit = (void *)0x7fff0000; #endif +static UINT64 *arm64ec_map; + struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; /* TEB allocation blocks */ @@ -998,6 +1000,52 @@ static BOOL alloc_pages_vprot( const void *addr, size_t size ) } +static inline UINT64 maskbits( size_t idx ) +{ + return ~(UINT64)0 << (idx & 63); +} + +/*********************************************************************** + * set_arm64ec_range + */ +#ifdef __aarch64__ +static void set_arm64ec_range( const void *addr, size_t size ) +{ + size_t idx = (size_t)addr >> page_shift; + size_t end = ((size_t)addr + size + page_mask) >> page_shift; + size_t pos = idx / 64; + size_t end_pos = end / 64; + + if (end_pos > pos) + { + arm64ec_map[pos++] |= maskbits( idx ); + while (pos < end_pos) arm64ec_map[pos++] = ~(UINT64)0; + if (end & 63) arm64ec_map[pos] |= ~maskbits( end ); + } + else arm64ec_map[pos] |= maskbits( idx ) & ~maskbits( end ); +} +#endif + +/*********************************************************************** + * clear_arm64ec_range + */ +static void clear_arm64ec_range( const void *addr, size_t size ) +{ + size_t idx = (size_t)addr >> page_shift; + size_t end = ((size_t)addr + size + page_mask) >> page_shift; + size_t pos = idx / 64; + size_t end_pos = end / 64; + + if (end_pos > pos) + { + arm64ec_map[pos++] &= ~maskbits( idx ); + while (pos < end_pos) arm64ec_map[pos++] = 0; + if (end & 63) arm64ec_map[pos] &= maskbits( end ); + } + else arm64ec_map[pos] &= ~maskbits( idx ) | maskbits( end ); +} + + /*********************************************************************** * compare_view * @@ -1526,6 +1574,7 @@ static void delete_view( struct file_view *view ) /* [in] View */ { if (!(view->protect & VPROT_SYSTEM)) unmap_area( view->base, view->size ); set_page_vprot( view->base, view->size, 0 ); + if (arm64ec_map) clear_arm64ec_range( view->base, view->size ); if (mmap_is_in_reserved_area( view->base, view->size )) free_ranges_remove_view( view ); wine_rb_remove( &views_tree, &view->entry ); @@ -2225,9 +2274,10 @@ static void apply_arm64x_relocations( char *base, const IMAGE_BASE_RELOCATION *r */ static void update_arm64x_mapping( char *base, IMAGE_NT_HEADERS *nt, IMAGE_SECTION_HEADER *sections ) { - ULONG size, sec, offset; + ULONG i, size, sec, offset; const IMAGE_DATA_DIRECTORY *dir; const IMAGE_LOAD_CONFIG_DIRECTORY *cfg; + const IMAGE_ARM64EC_METADATA *metadata; const IMAGE_DYNAMIC_RELOCATION_TABLE *table; const char *ptr, *end; @@ -2239,6 +2289,21 @@ static void update_arm64x_mapping( char *base, IMAGE_NT_HEADERS *nt, IMAGE_SECTI cfg = (void *)(base + dir->VirtualAddress); size = min( dir->Size, cfg->Size ); + /* update code ranges */ + + if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, CHPEMetadataPointer )) return; + metadata = (void *)(base + (cfg->CHPEMetadataPointer - nt->OptionalHeader.ImageBase)); + if (metadata->CodeMap && arm64ec_map) + { + const IMAGE_CHPE_RANGE_ENTRY *map = (void *)(base + metadata->CodeMap); + + for (i = 0; i < metadata->CodeMapCount; i++) + { + if ((map[i].StartOffset & 0x3) != 1 /* arm64ec */) continue; + set_arm64ec_range( base + (map[i].StartOffset & ~3), map[i].Length ); + } + } + /* apply dynamic relocations */ if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, DynamicValueRelocTableSection )) return; @@ -3264,6 +3329,25 @@ done: } +/*********************************************************************** + * virtual_alloc_arm64ec_map + */ +void *virtual_alloc_arm64ec_map(void) +{ +#ifdef __aarch64__ + SIZE_T size = ((ULONG_PTR)user_space_limit + page_size) >> (page_shift + 3); /* one bit per page */ + unsigned int status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&arm64ec_map, 0, &size, + MEM_COMMIT, PAGE_READWRITE ); + if (status) + { + ERR( "failed to allocate ARM64EC map: %08x\n", status ); + exit(1); + } +#endif + return arm64ec_map; +} + + /*********************************************************************** * virtual_map_user_shared_data */ diff --git a/include/winternl.h b/include/winternl.h index 04676fe4b99..5ee05097915 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -394,7 +394,7 @@ typedef struct _PEB ULONG FlsHighIndex; /* 22c/350 */ PVOID WerRegistrationData; /* 230/358 */ PVOID WerShipAssertPtr; /* 234/360 */ - PVOID pUnused; /* 238/368 */ + PVOID EcCodeBitMap; /* 238/368 */ PVOID pImageHeaderHash; /* 23c/370 */ ULONG HeapTracingEnabled : 1; /* 240/378 */ ULONG CritSecTracingEnabled : 1;

1 0

Alexandre Julliard : ntdll: Apply dynamic relocations when mapping an ARM64X binary.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 0a3a1d2b034cbdc0f6d0931bd710e4e461f5149c URL: https://gitlab.winehq.org/wine/wine/-/commit/0a3a1d2b034cbdc0f6d0931bd710e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 12:28:40 2023 +0200 ntdll: Apply dynamic relocations when mapping an ARM64X binary. --- dlls/ntdll/unix/virtual.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 7769d2c31f5..b048d0f52d2 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2177,6 +2177,113 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) return STATUS_SUCCESS; /* page protections will be updated later */ } +#ifdef __aarch64__ + +/*********************************************************************** + * apply_arm64x_relocations + */ +static void apply_arm64x_relocations( char *base, const IMAGE_BASE_RELOCATION *reloc, size_t size ) +{ + const IMAGE_BASE_RELOCATION *reloc_end = (const IMAGE_BASE_RELOCATION *)((const char *)reloc + size); + + while (reloc < reloc_end - 1 && reloc->SizeOfBlock) + { + const USHORT *rel = (const USHORT *)(reloc + 1); + const USHORT *rel_end = (const USHORT *)reloc + reloc->SizeOfBlock / sizeof(USHORT); + char *page = base + reloc->VirtualAddress; + + while (rel < rel_end && *rel) + { + USHORT offset = *rel & 0xfff; + USHORT type = (*rel >> 12) & 3; + USHORT arg = *rel >> 14; + int val; + rel++; + switch (type) + { + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_ZEROFILL: + memset( page + offset, 0, 1 << arg ); + break; + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE: + memcpy( page + offset, rel, 1 << arg ); + rel += (1 << arg) / sizeof(USHORT); + break; + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_DELTA: + val = (unsigned int)*rel++ * ((arg & 2) ? 8 : 4); + if (arg & 1) val = -val; + *(int *)(page + offset) += val; + break; + } + } + reloc = (const IMAGE_BASE_RELOCATION *)rel_end; + } +} + + +/*********************************************************************** + * update_arm64x_mapping + */ +static void update_arm64x_mapping( char *base, IMAGE_NT_HEADERS *nt, IMAGE_SECTION_HEADER *sections ) +{ + ULONG size, sec, offset; + const IMAGE_DATA_DIRECTORY *dir; + const IMAGE_LOAD_CONFIG_DIRECTORY *cfg; + const IMAGE_DYNAMIC_RELOCATION_TABLE *table; + const char *ptr, *end; + + /* retrieve config directory */ + + if (nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) return; + dir = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG; + if (!dir->VirtualAddress || !dir->Size) return; + cfg = (void *)(base + dir->VirtualAddress); + size = min( dir->Size, cfg->Size ); + + /* apply dynamic relocations */ + + if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, DynamicValueRelocTableSection )) return; + offset = cfg->DynamicValueRelocTableOffset; + sec = cfg->DynamicValueRelocTableSection; + if (!sec || sec > nt->FileHeader.NumberOfSections) return; + if (offset >= sections[sec - 1].Misc.VirtualSize) return; + table = (const IMAGE_DYNAMIC_RELOCATION_TABLE *)(base + sections[sec - 1].VirtualAddress + offset); + ptr = (const char *)(table + 1); + end = ptr + table->Size; + switch (table->Version) + { + case 1: + while (ptr < end) + { + const IMAGE_DYNAMIC_RELOCATION64 *dyn = (const IMAGE_DYNAMIC_RELOCATION64 *)ptr; + if (dyn->Symbol == IMAGE_DYNAMIC_RELOCATION_ARM64X) + { + apply_arm64x_relocations( base, (const IMAGE_BASE_RELOCATION *)(dyn + 1), + dyn->BaseRelocSize ); + break; + } + ptr += sizeof(*dyn) + dyn->BaseRelocSize; + } + break; + case 2: + while (ptr < end) + { + const IMAGE_DYNAMIC_RELOCATION64_V2 *dyn = (const IMAGE_DYNAMIC_RELOCATION64_V2 *)ptr; + if (dyn->Symbol == IMAGE_DYNAMIC_RELOCATION_ARM64X) + { + apply_arm64x_relocations( base, (const IMAGE_BASE_RELOCATION *)(dyn + 1), + dyn->FixupInfoSize ); + break; + } + ptr += dyn->HeaderSize + dyn->FixupInfoSize; + } + break; + default: + FIXME( "unsupported version %u\n", table->Version ); + break; + } +} + +#endif /* __aarch64__ */ /*********************************************************************** * map_image_into_view @@ -2342,6 +2449,12 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena } } +#ifdef __aarch64__ + if (main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64 && + nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM64) + update_arm64x_mapping( ptr, nt, sections ); +#endif + /* set the image protections */ set_vprot( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ );

1 0

Alexandre Julliard : ntdll: Add a helper function to read a PE image directory.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: f55a5812edb255d0a2f1f15ecc3d8b99df09fe97 URL: https://gitlab.winehq.org/wine/wine/-/commit/f55a5812edb255d0a2f1f15ecc3d8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 11:59:13 2023 +0200 ntdll: Add a helper function to read a PE image directory. --- dlls/ntdll/loader.c | 79 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5a53f4bcb9d..a4f87a3e4c3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2255,43 +2255,73 @@ static BOOL convert_to_pe64( HMODULE module, const SECTION_IMAGE_INFORMATION *in return TRUE; } -/* check COM header for ILONLY flag, ignoring runtime version */ -static BOOL get_cor_header( HANDLE file, const SECTION_IMAGE_INFORMATION *info, IMAGE_COR20_HEADER *cor ) +/* read data out of a PE image directory */ +static ULONG read_image_directory( HANDLE file, const SECTION_IMAGE_INFORMATION *info, + ULONG dir, void *buffer, ULONG maxlen, USHORT *magic ) { IMAGE_DOS_HEADER mz; - IMAGE_NT_HEADERS32 nt; IO_STATUS_BLOCK io; LARGE_INTEGER offset; IMAGE_SECTION_HEADER sec[96]; unsigned int i, count; DWORD va, size; + union + { + IMAGE_NT_HEADERS32 nt32; + IMAGE_NT_HEADERS64 nt64; + } nt; offset.QuadPart = 0; - if (NtReadFile( file, 0, NULL, NULL, &io, &mz, sizeof(mz), &offset, NULL )) return FALSE; - if (io.Information != sizeof(mz)) return FALSE; - if (mz.e_magic != IMAGE_DOS_SIGNATURE) return FALSE; + if (NtReadFile( file, 0, NULL, NULL, &io, &mz, sizeof(mz), &offset, NULL )) return 0; + if (io.Information != sizeof(mz)) return 0; + if (mz.e_magic != IMAGE_DOS_SIGNATURE) return 0; offset.QuadPart = mz.e_lfanew; - if (NtReadFile( file, 0, NULL, NULL, &io, &nt, sizeof(nt), &offset, NULL )) return FALSE; - if (io.Information != sizeof(nt)) return FALSE; - if (nt.Signature != IMAGE_NT_SIGNATURE) return FALSE; - if (nt.OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) return FALSE; - va = nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; - size = nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; - if (!va || size < sizeof(*cor)) return FALSE; - offset.QuadPart += offsetof( IMAGE_NT_HEADERS32, OptionalHeader ) + nt.FileHeader.SizeOfOptionalHeader; - count = min( 96, nt.FileHeader.NumberOfSections ); - if (NtReadFile( file, 0, NULL, NULL, &io, &sec, count * sizeof(*sec), &offset, NULL )) return FALSE; - if (io.Information != count * sizeof(*sec)) return FALSE; + if (NtReadFile( file, 0, NULL, NULL, &io, &nt, sizeof(nt), &offset, NULL )) return 0; + if (io.Information != sizeof(nt)) return 0; + if (nt.nt32.Signature != IMAGE_NT_SIGNATURE) return 0; + *magic = nt.nt32.OptionalHeader.Magic; + switch (nt.nt32.OptionalHeader.Magic) + { + case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + va = nt.nt32.OptionalHeader.DataDirectory[dir].VirtualAddress; + size = nt.nt32.OptionalHeader.DataDirectory[dir].Size; + break; + case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + va = nt.nt64.OptionalHeader.DataDirectory[dir].VirtualAddress; + size = nt.nt64.OptionalHeader.DataDirectory[dir].Size; + break; + default: + return 0; + } + if (!va) return 0; + offset.QuadPart += offsetof( IMAGE_NT_HEADERS32, OptionalHeader ) + nt.nt32.FileHeader.SizeOfOptionalHeader; + count = min( 96, nt.nt32.FileHeader.NumberOfSections ); + if (NtReadFile( file, 0, NULL, NULL, &io, &sec, count * sizeof(*sec), &offset, NULL )) return 0; + if (io.Information != count * sizeof(*sec)) return 0; for (i = 0; i < count; i++) { if (va < sec[i].VirtualAddress) continue; if (sec[i].Misc.VirtualSize && va - sec[i].VirtualAddress >= sec[i].Misc.VirtualSize) continue; offset.QuadPart = sec[i].PointerToRawData + va - sec[i].VirtualAddress; - if (NtReadFile( file, 0, NULL, NULL, &io, cor, sizeof(*cor), &offset, NULL )) return FALSE; - return (io.Information == sizeof(*cor)); + if (NtReadFile( file, 0, NULL, NULL, &io, buffer, min( maxlen, size ), &offset, NULL )) return 0; + return io.Information; } - return FALSE; + return 0; } + +/* check COM header for ILONLY flag, ignoring runtime version */ +static BOOL is_com_ilonly( HANDLE file, const SECTION_IMAGE_INFORMATION *info ) +{ + USHORT magic; + IMAGE_COR20_HEADER cor_header; + ULONG len = read_image_directory( file, info, IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR, + &cor_header, sizeof(cor_header), &magic ); + + if (len != sizeof(cor_header)) return FALSE; + if (magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) return FALSE; + return !!(cor_header.Flags & COMIMAGE_FLAGS_ILONLY); +} + #endif /* On WoW64 setups, an image mapping can also be created for the other 32/64 CPU */ @@ -2312,13 +2342,8 @@ static BOOL is_valid_binary( HANDLE file, const SECTION_IMAGE_INFORMATION *info #endif if (NtCurrentTeb()->WowTebOffset) return TRUE; if (!info->ImageContainsCode) return TRUE; - if (!(info->u.s.ComPlusNativeReady)) - { - IMAGE_COR20_HEADER cor_header; - if (!get_cor_header( file, info, &cor_header )) return FALSE; - if (!(cor_header.Flags & COMIMAGE_FLAGS_ILONLY)) return FALSE; - } - return TRUE; + if (info->u.s.ComPlusNativeReady) return TRUE; + return is_com_ilonly( file, info ); #else return FALSE; /* no wow64 support on other platforms */ #endif

1 0

Alexandre Julliard : ntdll: Allow loading ARM64EC binaries.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 702f9e6bec93df76ea1714619d925153c32eb353 URL: https://gitlab.winehq.org/wine/wine/-/commit/702f9e6bec93df76ea1714619d9251… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 12:10:44 2023 +0200 ntdll: Allow loading ARM64EC binaries. --- dlls/ntdll/loader.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a4f87a3e4c3..0d8d3b16c70 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -53,14 +53,19 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); #ifdef __i386__ static const WCHAR pe_dir[] = L"\\i386-windows"; +static const USHORT current_machine = IMAGE_FILE_MACHINE_I386; #elif defined __x86_64__ static const WCHAR pe_dir[] = L"\\x86_64-windows"; +static const USHORT current_machine = IMAGE_FILE_MACHINE_AMD64; #elif defined __arm__ static const WCHAR pe_dir[] = L"\\arm-windows"; +static const USHORT current_machine = IMAGE_FILE_MACHINE_ARMNT; #elif defined __aarch64__ static const WCHAR pe_dir[] = L"\\aarch64-windows"; +static const USHORT current_machine = IMAGE_FILE_MACHINE_ARM64; #else static const WCHAR pe_dir[] = L""; +static const USHORT current_machine = IMAGE_FILE_MACHINE_UNKNOWN; #endif /* we don't want to include winuser.h */ @@ -2322,33 +2327,44 @@ static BOOL is_com_ilonly( HANDLE file, const SECTION_IMAGE_INFORMATION *info ) return !!(cor_header.Flags & COMIMAGE_FLAGS_ILONLY); } -#endif +/* check LOAD_CONFIG header for CHPE metadata */ +static BOOL has_chpe_metadata( HANDLE file, const SECTION_IMAGE_INFORMATION *info ) +{ + USHORT magic; + IMAGE_LOAD_CONFIG_DIRECTORY64 loadcfg; + ULONG len = read_image_directory( file, info, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, + &loadcfg, sizeof(loadcfg), &magic ); + + if (!len) return FALSE; + if (magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) return FALSE; + len = min( len, loadcfg.Size ); + if (len <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY64, CHPEMetadataPointer )) return FALSE; + return !!loadcfg.CHPEMetadataPointer; +} /* On WoW64 setups, an image mapping can also be created for the other 32/64 CPU */ /* but it cannot necessarily be loaded as a dll, so we need some additional checks */ static BOOL is_valid_binary( HANDLE file, const SECTION_IMAGE_INFORMATION *info ) { -#ifdef __i386__ - return info->Machine == IMAGE_FILE_MACHINE_I386; -#elif defined(__arm__) - return info->Machine == IMAGE_FILE_MACHINE_ARM || - info->Machine == IMAGE_FILE_MACHINE_THUMB || - info->Machine == IMAGE_FILE_MACHINE_ARMNT; -#elif defined(_WIN64) /* support 32-bit IL-only images on 64-bit */ -#ifdef __x86_64__ - if (info->Machine == IMAGE_FILE_MACHINE_AMD64) return TRUE; -#else - if (info->Machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; -#endif + if (info->Machine == current_machine) return TRUE; if (NtCurrentTeb()->WowTebOffset) return TRUE; + /* support ARM64EC binaries on x86-64 */ + if (current_machine == IMAGE_FILE_MACHINE_AMD64 && has_chpe_metadata( file, info )) return TRUE; + /* support 32-bit IL-only images on 64-bit */ if (!info->ImageContainsCode) return TRUE; if (info->u.s.ComPlusNativeReady) return TRUE; return is_com_ilonly( file, info ); -#else - return FALSE; /* no wow64 support on other platforms */ -#endif } +#else /* _WIN64 */ + +static BOOL is_valid_binary( HANDLE file, const SECTION_IMAGE_INFORMATION *info ) +{ + return (info->Machine == current_machine); +} + +#endif /* _WIN64 */ + /****************************************************************** * get_module_path_end

1 0

Nikolay Sivov : tests: Simplify conditional test.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: a064009d3b3926b66a10a25a635f76e3fbe4ed5e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a064009d3b3926b66a10a25a635f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 7 22:02:03 2023 +0200 tests: Simplify conditional test. --- tests/conditional.shader_test | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/conditional.shader_test b/tests/conditional.shader_test index 42307777..d83596fc 100644 --- a/tests/conditional.shader_test +++ b/tests/conditional.shader_test @@ -1,19 +1,16 @@ -[vertex shader] -void main(out float tex : texcoord, inout float4 pos : sv_position) -{ - tex = pos.x; -} - [pixel shader] -float4 main(float tex : texcoord) : SV_TARGET +float4 main(uniform float4 u) : sv_target { - if (tex > 0.0) + if (u.x > 0.0) return float4(0.1, 0.2, 0.3, 0.4); else return float4(0.9, 0.8, 0.7, 0.6); } [test] +uniform 0 float4 0.0 0.0 0.0 0.0 +draw quad +probe all rgba (0.9, 0.8, 0.7, 0.6) +uniform 0 float4 0.1 0.0 0.0 0.0 draw quad -probe ( 0, 0, 319, 480) rgba (0.9, 0.8, 0.7, 0.6) -probe (321, 0, 640, 480) rgba (0.1, 0.2, 0.3, 0.4) +probe all rgba (0.1, 0.2, 0.3, 0.4)

1 0

Conor McCarthy : vkd3d-shader/tpf: Validate input and output index ranges for default control point phases.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: be4a71da7d013a6198614431c906a0cf2a74f828 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/be4a71da7d013a6198614431c906a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 5 00:22:27 2023 +1000 vkd3d-shader/tpf: Validate input and output index ranges for default control point phases. --- libs/vkd3d-shader/tpf.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 795f8980..eadad3b9 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -578,6 +578,7 @@ struct vkd3d_shader_sm4_parser unsigned int output_map[MAX_REG_OUTPUT]; enum vkd3d_shader_opcode phase; + bool has_control_point_phase; unsigned int input_register_masks[MAX_REG_OUTPUT]; unsigned int output_register_masks[MAX_REG_OUTPUT]; unsigned int patch_constant_register_masks[MAX_REG_OUTPUT]; @@ -2185,6 +2186,7 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_sm4_parser *sm4, str if (ins->handler_idx == VKD3DSIH_HS_CONTROL_POINT_PHASE || ins->handler_idx == VKD3DSIH_HS_FORK_PHASE || ins->handler_idx == VKD3DSIH_HS_JOIN_PHASE) sm4->phase = ins->handler_idx; + sm4->has_control_point_phase |= ins->handler_idx == VKD3DSIH_HS_CONTROL_POINT_PHASE; ins->flags = 0; ins->coissue = false; ins->raw = false; @@ -2396,6 +2398,34 @@ static bool shader_sm4_parser_validate_signature(struct vkd3d_shader_sm4_parser return true; } +static int index_range_compare(const void *a, const void *b) +{ + return memcmp(a, b, sizeof(struct sm4_index_range)); +} + +static void shader_sm4_validate_default_phase_index_ranges(struct vkd3d_shader_sm4_parser *sm4) +{ + if (!sm4->input_index_ranges.count || !sm4->output_index_ranges.count) + return; + + if (sm4->input_index_ranges.count == sm4->output_index_ranges.count) + { + qsort(sm4->input_index_ranges.ranges, sm4->input_index_ranges.count, sizeof(sm4->input_index_ranges.ranges[0]), + index_range_compare); + qsort(sm4->output_index_ranges.ranges, sm4->output_index_ranges.count, sizeof(sm4->output_index_ranges.ranges[0]), + index_range_compare); + if (!memcmp(sm4->input_index_ranges.ranges, sm4->output_index_ranges.ranges, + sm4->input_index_ranges.count * sizeof(sm4->input_index_ranges.ranges[0]))) + return; + } + + /* This is very unlikely to occur and would complicate the default control point phase implementation. */ + WARN("Default phase index ranges are not identical.\n"); + vkd3d_shader_parser_error(&sm4->p, VKD3D_SHADER_ERROR_TPF_INVALID_INDEX_RANGE_DCL, + "Default control point phase input and output index range declarations are not identical."); + return; +} + int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser) { @@ -2461,6 +2491,8 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi } ++instructions->count; } + if (sm4->p.shader_version.type == VKD3D_SHADER_TYPE_HULL && !sm4->has_control_point_phase && !sm4->p.failed) + shader_sm4_validate_default_phase_index_ranges(sm4); *parser = &sm4->p;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Convert ternary operator true/false values to a common type.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: dc41444941a633bef522dbcf738d99c8536c6670 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dc41444941a633bef522dbcf738d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 7 23:45:11 2023 +0200 vkd3d-shader/hlsl: Convert ternary operator true/false values to a common type. --- libs/vkd3d-shader/hlsl.y | 29 +++++++++++++++++++++++------ tests/hlsl-ternary.shader_test | 20 +++++++++++++++++++- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 90e2face..86f23665 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1360,20 +1360,27 @@ static struct hlsl_ir_node *add_unary_logical_expr(struct hlsl_ctx *ctx, struct return add_expr(ctx, instrs, op, args, bool_type, loc); } -static struct hlsl_ir_node *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, struct list *instrs, - enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, - const struct vkd3d_shader_location *loc) +static struct hlsl_type *get_common_numeric_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *arg1, + const struct hlsl_ir_node *arg2, const struct vkd3d_shader_location *loc) { - struct hlsl_type *common_type; enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); enum hlsl_type_class type; unsigned int dimx, dimy; - struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) return NULL; - common_type = hlsl_get_numeric_type(ctx, type, base, dimx, dimy); + return hlsl_get_numeric_type(ctx, type, base, dimx, dimy); +} + +static struct hlsl_ir_node *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, + const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; + struct hlsl_type *common_type; + + common_type = get_common_numeric_type(ctx, arg1, arg2, loc); if (!(args[0] = add_implicit_conversion(ctx, instrs, arg1, common_type, loc))) return NULL; @@ -6008,12 +6015,22 @@ conditional_expr: | logicor_expr '?' expr ':' assignment_expr { struct hlsl_ir_node *cond = node_from_list($1), *first = node_from_list($3), *second = node_from_list($5); + struct hlsl_type *common_type; list_move_tail($1, $3); list_move_tail($1, $5); vkd3d_free($3); vkd3d_free($5); + if (!(common_type = get_common_numeric_type(ctx, first, second, &@3))) + YYABORT; + + if (!(first = add_implicit_conversion(ctx, $1, first, common_type, &@3))) + YYABORT; + + if (!(second = add_implicit_conversion(ctx, $1, second, common_type, &@5))) + YYABORT; + if (!hlsl_add_conditional(ctx, $1, cond, first, second)) YYABORT; $$ = $1; diff --git a/tests/hlsl-ternary.shader_test b/tests/hlsl-ternary.shader_test index d6097165..1fc2f070 100644 --- a/tests/hlsl-ternary.shader_test +++ b/tests/hlsl-ternary.shader_test @@ -1,7 +1,7 @@ [pixel shader] uniform float4 x; -float4 main() : SV_TARGET +float4 main() : sv_target { return x.x ? x : x - 1; } @@ -13,3 +13,21 @@ probe all rgba (2.0, 3.0, 4.0, 5.0) uniform 0 float4 0.0 10.0 11.0 12.0 draw quad probe all rgba (-1.0, 9.0, 10.0, 11.0) + +[pixel shader] +uniform float4 x; + +float4 main() : sv_target +{ + float4 ret; + + ret.x = x.x ? x.x : 1; + ret.y = x.y ? 2 : x.y; + ret.z = ret.w = 0.0; + return ret; +} + +[test] +uniform 0 float4 1.1 3.0 4.0 5.0 +draw quad +probe all rgba (1.1, 2.0, 0.0, 0.0)

1 0

Conor McCarthy : vkd3d-shader/tpf: Validate index range declarations.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: 6dd1b012848c9465570b85cd63b3a641f4d54b90 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6dd1b012848c9465570b85cd63b3a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu May 4 16:56:30 2023 +1000 vkd3d-shader/tpf: Validate index range declarations. --- libs/vkd3d-shader/spirv.c | 23 ------ libs/vkd3d-shader/tpf.c | 121 ++++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 3 files changed, 119 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e13ce0a2..fa4d056e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6195,8 +6195,6 @@ static bool spirv_compiler_check_index_range(struct spirv_compiler *compiler, struct vkd3d_shader_register_info reg_info; struct vkd3d_shader_register current_reg; struct vkd3d_symbol reg_symbol; - unsigned int i; - uint32_t id; current_reg = *reg; vkd3d_symbol_make_register(&reg_symbol, &current_reg); @@ -6212,27 +6210,6 @@ static bool spirv_compiler_check_index_range(struct spirv_compiler *compiler, FIXME("Unhandled register %#x.\n", reg->type); return false; } - id = reg_info.id; - - for (i = reg->idx[0].offset; i < reg->idx[0].offset + range->register_count; ++i) - { - current_reg.idx[0].offset = i; - vkd3d_symbol_make_register(&reg_symbol, &current_reg); - - if (range->dst.write_mask != reg_info.write_mask - || vkd3d_write_mask_component_count(reg_info.write_mask) != 1) - { - FIXME("Unhandled index range write mask %#x (%#x).\n", - range->dst.write_mask, reg_info.write_mask); - return false; - } - - if (reg_info.id != id) - { - FIXME("Unhandled index range %#x, %u.\n", reg->type, i); - return false; - } - } return true; } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 74c00b5a..dc4ed790 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -558,6 +558,19 @@ enum vkd3d_sm4_shader_data_type VKD3D_SM4_SHADER_DATA_MESSAGE = 0x4, }; +struct sm4_index_range +{ + unsigned int index; + unsigned int count; + unsigned int mask; +}; + +struct sm4_index_range_array +{ + unsigned int count; + struct sm4_index_range ranges[MAX_REG_OUTPUT * 2]; +}; + struct vkd3d_shader_sm4_parser { const uint32_t *start, *end, *ptr; @@ -569,6 +582,10 @@ struct vkd3d_shader_sm4_parser unsigned int output_register_masks[MAX_REG_OUTPUT]; unsigned int patch_constant_register_masks[MAX_REG_OUTPUT]; + struct sm4_index_range_array input_index_ranges; + struct sm4_index_range_array output_index_ranges; + struct sm4_index_range_array patch_constant_index_ranges; + struct vkd3d_shader_parser p; }; @@ -823,12 +840,109 @@ static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, ui shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.sampler.range.space); } +static bool sm4_parser_is_in_fork_or_join_phase(const struct vkd3d_shader_sm4_parser *sm4) +{ + return sm4->phase == VKD3DSIH_HS_FORK_PHASE || sm4->phase == VKD3DSIH_HS_JOIN_PHASE; +} + static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { + struct vkd3d_shader_index_range *index_range = &ins->declaration.index_range; + unsigned int i, register_idx, register_count, write_mask; + enum vkd3d_shader_register_type type; + struct sm4_index_range_array *ranges; + unsigned int *io_masks; + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_OPAQUE, - &ins->declaration.index_range.dst); - ins->declaration.index_range.register_count = *tokens; + &index_range->dst); + index_range->register_count = *tokens; + + register_idx = index_range->dst.reg.idx[index_range->dst.reg.idx_count - 1].offset; + register_count = index_range->register_count; + write_mask = index_range->dst.write_mask; + + if (vkd3d_write_mask_component_count(write_mask) != 1) + { + WARN("Unhandled write mask %#x.\n", write_mask); + vkd3d_shader_parser_warning(&priv->p, VKD3D_SHADER_WARNING_TPF_UNHANDLED_INDEX_RANGE_MASK, + "Index range mask %#x is not scalar.", write_mask); + } + + switch ((type = index_range->dst.reg.type)) + { + case VKD3DSPR_INPUT: + case VKD3DSPR_INCONTROLPOINT: + io_masks = priv->input_register_masks; + ranges = &priv->input_index_ranges; + break; + case VKD3DSPR_OUTPUT: + if (sm4_parser_is_in_fork_or_join_phase(priv)) + { + io_masks = priv->patch_constant_register_masks; + ranges = &priv->patch_constant_index_ranges; + } + else + { + io_masks = priv->output_register_masks; + ranges = &priv->output_index_ranges; + } + break; + case VKD3DSPR_COLOROUT: + case VKD3DSPR_OUTCONTROLPOINT: + io_masks = priv->output_register_masks; + ranges = &priv->output_index_ranges; + break; + case VKD3DSPR_PATCHCONST: + io_masks = priv->patch_constant_register_masks; + ranges = &priv->patch_constant_index_ranges; + break; + + default: + WARN("Unhandled register type %#x.\n", type); + vkd3d_shader_parser_error(&priv->p, VKD3D_SHADER_ERROR_TPF_INVALID_INDEX_RANGE_DCL, + "Invalid register type %#x for index range base %u, count %u, mask %#x.", + type, register_idx, register_count, write_mask); + return; + } + + for (i = 0; i < ranges->count; ++i) + { + struct sm4_index_range r = ranges->ranges[i]; + + if (!(r.mask & write_mask)) + continue; + /* Ranges with the same base but different lengths are not an issue. */ + if (register_idx == r.index) + continue; + + if ((r.index <= register_idx && register_idx - r.index < r.count) + || (register_idx < r.index && r.index - register_idx < register_count)) + { + WARN("Detected index range collision for base %u, count %u, mask %#x.\n", + register_idx, register_count, write_mask); + vkd3d_shader_parser_error(&priv->p, VKD3D_SHADER_ERROR_TPF_INVALID_INDEX_RANGE_DCL, + "Register index range base %u, count %u, mask %#x collides with a previous declaration.", + register_idx, register_count, write_mask); + return; + } + } + ranges->ranges[ranges->count].index = register_idx; + ranges->ranges[ranges->count].count = register_count; + ranges->ranges[ranges->count++].mask = write_mask; + + for (i = 0; i < register_count; ++i) + { + if ((io_masks[register_idx + i] & write_mask) != write_mask) + { + WARN("No matching declaration for index range base %u, count %u, mask %#x.\n", + register_idx, register_count, write_mask); + vkd3d_shader_parser_error(&priv->p, VKD3D_SHADER_ERROR_TPF_INVALID_INDEX_RANGE_DCL, + "Input/output registers matching index range base %u, count %u, mask %#x were not declared.", + register_idx, register_count, write_mask); + return; + } + } } static void shader_sm4_read_dcl_output_topology(struct vkd3d_shader_instruction *ins, uint32_t opcode, @@ -1805,8 +1919,7 @@ static bool shader_sm4_validate_input_output_register(struct vkd3d_shader_sm4_pa masks = priv->input_register_masks; break; case VKD3DSPR_OUTPUT: - masks = (priv->phase == VKD3DSIH_HS_FORK_PHASE || priv->phase == VKD3DSIH_HS_JOIN_PHASE) - ? priv->patch_constant_register_masks + masks = sm4_parser_is_in_fork_or_join_phase(priv) ? priv->patch_constant_register_masks : priv->output_register_masks; break; case VKD3DSPR_COLOROUT: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 08c5b053..0f294d21 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -77,8 +77,10 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_INDEX_COUNT = 1003, VKD3D_SHADER_ERROR_TPF_TOO_MANY_REGISTERS = 1004, VKD3D_SHADER_ERROR_TPF_INVALID_IO_REGISTER = 1005, + VKD3D_SHADER_ERROR_TPF_INVALID_INDEX_RANGE_DCL = 1006, VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS = 1300, + VKD3D_SHADER_WARNING_TPF_UNHANDLED_INDEX_RANGE_MASK = 1301, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001,

1 0

Conor McCarthy : vkd3d-shader/tpf: Remove an unnecessary carriage return from a parser error message.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: 3e50c4d13b57e73f8586550c54871331c9b7430a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3e50c4d13b57e73f8586550c54871… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu May 4 23:29:59 2023 +1000 vkd3d-shader/tpf: Remove an unnecessary carriage return from a parser error message. --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index dc4ed790..795f8980 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -742,7 +742,7 @@ static void shader_sm4_set_descriptor_register_range(struct vkd3d_shader_sm4_par { FIXME("Invalid register range [%u:%u].\n", range->first, range->last); vkd3d_shader_parser_error(&sm4->p, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE, - "Last register %u must not be less than first register %u in range.\n", range->last, range->first); + "Last register %u must not be less than first register %u in range.", range->last, range->first); } }

1 0

Conor McCarthy : vkd3d-shader/tpf: Validate input/output registers.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: d565fbdcd64722cb66c492156424a9a9e01a5d95 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d565fbdcd64722cb66c492156424a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 3 17:24:24 2023 +1000 vkd3d-shader/tpf: Validate input/output registers. --- libs/vkd3d-shader/tpf.c | 72 ++++++++++++++++++++++++++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 77fea973..74c00b5a 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -565,6 +565,9 @@ struct vkd3d_shader_sm4_parser unsigned int output_map[MAX_REG_OUTPUT]; enum vkd3d_shader_opcode phase; + unsigned int input_register_masks[MAX_REG_OUTPUT]; + unsigned int output_register_masks[MAX_REG_OUTPUT]; + unsigned int patch_constant_register_masks[MAX_REG_OUTPUT]; struct vkd3d_shader_parser p; }; @@ -1427,7 +1430,7 @@ static void map_register(const struct vkd3d_shader_sm4_parser *sm4, struct vkd3d if (reg_idx >= ARRAY_SIZE(sm4->output_map)) { - ERR("Invalid output index %u.\n", reg_idx); + /* Validated later */ break; } @@ -1772,10 +1775,20 @@ static bool register_is_control_point_input(const struct vkd3d_shader_register * || priv->p.shader_version.type == VKD3D_SHADER_TYPE_GEOMETRY)); } +static unsigned int mask_from_swizzle(unsigned int swizzle) +{ + return (1u << vkd3d_swizzle_get_component(swizzle, 0)) + | (1u << vkd3d_swizzle_get_component(swizzle, 1)) + | (1u << vkd3d_swizzle_get_component(swizzle, 2)) + | (1u << vkd3d_swizzle_get_component(swizzle, 3)); +} + static bool shader_sm4_validate_input_output_register(struct vkd3d_shader_sm4_parser *priv, - const struct vkd3d_shader_register *reg) + const struct vkd3d_shader_register *reg, unsigned int mask) { unsigned int idx_count = 1 + register_is_control_point_input(reg, priv); + const unsigned int *masks; + unsigned int register_idx; if (reg->idx_count != idx_count) { @@ -1785,6 +1798,41 @@ static bool shader_sm4_validate_input_output_register(struct vkd3d_shader_sm4_pa return false; } + switch (reg->type) + { + case VKD3DSPR_INPUT: + case VKD3DSPR_INCONTROLPOINT: + masks = priv->input_register_masks; + break; + case VKD3DSPR_OUTPUT: + masks = (priv->phase == VKD3DSIH_HS_FORK_PHASE || priv->phase == VKD3DSIH_HS_JOIN_PHASE) + ? priv->patch_constant_register_masks + : priv->output_register_masks; + break; + case VKD3DSPR_COLOROUT: + case VKD3DSPR_OUTCONTROLPOINT: + masks = priv->output_register_masks; + break; + case VKD3DSPR_PATCHCONST: + masks = priv->patch_constant_register_masks; + break; + + default: + vkd3d_unreachable(); + } + + register_idx = reg->idx[reg->idx_count - 1].offset; + /* The signature element registers have already been checked against MAX_REG_OUTPUT. */ + if (register_idx >= MAX_REG_OUTPUT || (masks[register_idx] & mask) != mask) + { + WARN("Failed to find signature element for register type %#x, index %u and mask %#x.\n", + reg->type, register_idx, mask); + vkd3d_shader_parser_error(&priv->p, VKD3D_SHADER_ERROR_TPF_INVALID_IO_REGISTER, + "Could not find signature element matching register type %#x, index %u and mask %#x.", + reg->type, register_idx, mask); + return false; + } + return true; } @@ -1839,7 +1887,8 @@ static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, cons } } - if (register_is_input_output(&src_param->reg) && !shader_sm4_validate_input_output_register(priv, &src_param->reg)) + if (register_is_input_output(&src_param->reg) && !shader_sm4_validate_input_output_register(priv, + &src_param->reg, mask_from_swizzle(src_param->swizzle))) return false; return true; @@ -1879,7 +1928,8 @@ static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, cons dst_param->modifiers = 0; dst_param->shift = 0; - if (register_is_input_output(&dst_param->reg) && !shader_sm4_validate_input_output_register(priv, &dst_param->reg)) + if (register_is_input_output(&dst_param->reg) && !shader_sm4_validate_input_output_register(priv, + &dst_param->reg, dst_param->write_mask)) return false; return true; @@ -2201,7 +2251,7 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t } static bool shader_sm4_parser_validate_signature(struct vkd3d_shader_sm4_parser *sm4, - const struct shader_signature *signature, const char *name) + const struct shader_signature *signature, unsigned int *masks, const char *name) { unsigned int i, register_idx, register_count, mask; @@ -2225,6 +2275,9 @@ static bool shader_sm4_parser_validate_signature(struct vkd3d_shader_sm4_parser vkd3d_shader_parser_warning(&sm4->p, VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS, "%s signature element %u mask %#x is not contiguous.", name, i, mask); } + + if (register_idx != ~0u) + masks[register_idx] |= mask; } return true; @@ -2263,9 +2316,12 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi return VKD3D_ERROR_INVALID_ARGUMENT; } - if (!shader_sm4_parser_validate_signature(sm4, &shader_desc->input_signature, "Input") - || !shader_sm4_parser_validate_signature(sm4, &shader_desc->output_signature, "Output") - || !shader_sm4_parser_validate_signature(sm4, &shader_desc->patch_constant_signature, "Patch constant")) + if (!shader_sm4_parser_validate_signature(sm4, &shader_desc->input_signature, + sm4->input_register_masks, "Input") + || !shader_sm4_parser_validate_signature(sm4, &shader_desc->output_signature, + sm4->output_register_masks, "Output") + || !shader_sm4_parser_validate_signature(sm4, &shader_desc->patch_constant_signature, + sm4->patch_constant_register_masks, "Patch constant")) { shader_sm4_destroy(&sm4->p); return VKD3D_ERROR_INVALID_SHADER; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6a8881eb..08c5b053 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -76,6 +76,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_TPF_OUT_OF_MEMORY = 1002, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_INDEX_COUNT = 1003, VKD3D_SHADER_ERROR_TPF_TOO_MANY_REGISTERS = 1004, + VKD3D_SHADER_ERROR_TPF_INVALID_IO_REGISTER = 1005, VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS = 1300,

1 0