mirror of
https://github.com/eclipse-threadx/filex.git
synced 2026-09-14 12:36:59 +08:00
Added Win64/VS 2022 port for FileX (#94)
- New port: ports/win64/vs_2022/inc/fx_port.h
- Based on the Win32 port; updated ALIGN_TYPE to ULONG64 for 64-bit
pointers, added FX_REGRESSION_TEST hooks from the Linux port, and
bumped the port name string to Win64/Visual.
- New CMake infrastructure: ports/win64/vs_2022/CMakeLists.txt
- Exposes only the inc/ directory (port is header-only).
- Updated test/cmake/CMakeLists.txt
- Added MSVC guards: skip -m32 / GCC coverage flags; locate VS 2022
toolchain; build ThreadX from source alongside FileX via
THREADX_SOURCE_DIR.
- Updated test/cmake/regression/CMakeLists.txt
- Added MSVC-compatible compile options (/W3 /Zi instead of -Wall
-fprofile-arcs); added win64_compat include path for standalone +
MSVC builds; added per-test TIMEOUT overrides for the two inherently
long-running fault-tolerant tests on Windows.
- Updated test/cmake/samples/CMakeLists.txt
- Added MSVC-compatible flag handling.
- New PowerShell scripts: scripts/build_fx.ps1, scripts/test_fx.ps1,
scripts/fx_windows_common.ps1
- Support all 9 build configurations; -Clean, -Config, -Verbose flags;
modelled on the ThreadX Win64 build/test scripts.
- New Windows compatibility shims for standalone builds:
test/regression_test/win64_compat/pthread.h
test/regression_test/win64_compat/unistd.h
- Minimal pthreads (CreateThread / WaitForSingleObject / TerminateThread)
and usleep (Sleep) shims so standalone test files compile on MSVC.
- Fixed test/regression_test/fx_ram_driver_test.c and .h
- RAM driver: added bounds check so out-of-range sector READs use a
safe scratch buffer instead of segfaulting.
- MSVC: large test buffers (ram_disk_memory_large, large_data_buffer,
and standalone-mode ram_disk_memory / ram_disk_memory1) moved from
BSS to calloc() via a .CRT\ constructor. This avoids the MSVC
PE image 2 GB hard limit (LNK1248) and eliminates demand-zero page-
fault overhead that would otherwise slow the test suite.
- Bulk-fixed 93 fault-tolerant test files
- [FAULT_TOLERANT_SIZE] -> [FAULT_TOLERANT_SIZE > 0 ? FAULT_TOLERANT_SIZE : 1]
so that MSVC C2466 (zero-length array) is not triggered when
FX_ENABLE_FAULT_TOLERANT is not defined.
- Fixed filextestcontrol.c: standalone test runner thread exit
- The Win64 pthread shim makes pthread_exit() a no-op so that
test_control_thread_entry() proceeds to exit(failed_tests),
giving ctest the correct process exit code.
- Fixed common/src/fx_utility_logical_sector_write.c
- Added missing bounds guard to prevent sector-write past end of
RAM disk during fault-tolerant interrupt simulation tests.
All 9 build configurations pass 136/136 regression tests on Win64/VS 2022.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
co-authored by
Copilot
parent
b93ac4ae77
commit
7cbe022bab
@@ -1,4 +1,4 @@
|
||||
/**************************************************************************/
|
||||
/**************************************************************************/
|
||||
/* */
|
||||
/* Copyright (c) 1996-2017 by Express Logic Inc. */
|
||||
/* */
|
||||
@@ -81,6 +81,36 @@ ULONG64 media_size;
|
||||
UCHAR large_file_name_format[];
|
||||
|
||||
/* Define memory for tests to be run in standalone mode (without Azure RTOS: ThreadX) */
|
||||
/* On MSVC, BSS arrays cause demand-zero page faults on first access, which serialises
|
||||
with test execution and makes large-disk tests significantly slower than on Linux.
|
||||
Pre-allocating with calloc commits and zero-fills all pages before any test runs,
|
||||
eliminating page-fault overhead at runtime. This also avoids LNK1248 (PE image > 2 GB)
|
||||
for configurations that would otherwise exceed the hard linker limit.
|
||||
On other compilers keep the BSS arrays as before. */
|
||||
#ifdef _MSC_VER
|
||||
#include <stdlib.h>
|
||||
UCHAR *ram_disk_memory_large = NULL;
|
||||
UCHAR *large_data_buffer = NULL;
|
||||
|
||||
#if defined(FX_STANDALONE_ENABLE) && !defined(SAMPLE_BUILD)
|
||||
UCHAR *ram_disk_memory = NULL;
|
||||
UCHAR *ram_disk_memory1 = NULL;
|
||||
#endif
|
||||
|
||||
static void _fx_alloc_test_buffers(void)
|
||||
{
|
||||
ram_disk_memory_large = (UCHAR *)calloc(900000000UL, 1U);
|
||||
large_data_buffer = (UCHAR *)calloc(900000000UL, 1U);
|
||||
#if defined(FX_STANDALONE_ENABLE) && !defined(SAMPLE_BUILD)
|
||||
ram_disk_memory = (UCHAR *)calloc(300000000UL, 1U);
|
||||
ram_disk_memory1 = (UCHAR *)calloc( 30000000UL, 1U);
|
||||
#endif
|
||||
}
|
||||
#pragma section(".CRT$XCU", read)
|
||||
__declspec(allocate(".CRT$XCU")) static void (*_p_fx_alloc)(void) = _fx_alloc_test_buffers;
|
||||
|
||||
#else /* !_MSC_VER */
|
||||
|
||||
#if defined(FX_STANDALONE_ENABLE) && !defined(SAMPLE_BUILD)
|
||||
UCHAR ram_disk_memory[300000000];
|
||||
UCHAR ram_disk_memory1[30000000];
|
||||
@@ -88,6 +118,7 @@ UCHAR ram_disk_memory1[30000000];
|
||||
|
||||
UCHAR ram_disk_memory_large[900000000];
|
||||
UCHAR large_data_buffer[900000000];
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
|
||||
/* Define the callback function. */
|
||||
@@ -298,8 +329,16 @@ UINT offset;
|
||||
/* Calculate the RAM disk sector offset. Note the RAM disk memory is pointed to by
|
||||
the fx_media_driver_info pointer, which is supplied by the application in the
|
||||
call to fx_media_open. */
|
||||
source_buffer = ((UCHAR *) media_ptr -> fx_media_driver_info) +
|
||||
((media_ptr -> fx_media_driver_logical_sector + media_ptr -> fx_media_hidden_sectors) * media_ptr -> fx_media_bytes_per_sector);
|
||||
{
|
||||
/* Compute effective sector and guard against pointer arithmetic overflow on 64-bit
|
||||
platforms when sector is near ULONG64_MAX. Out-of-range accesses are redirected
|
||||
to large_data_buffer so the test can verify return codes without crashing. */
|
||||
ULONG64 _sector = media_ptr -> fx_media_driver_logical_sector + media_ptr -> fx_media_hidden_sectors;
|
||||
if (media_ptr -> fx_media_total_sectors > 0 && _sector >= media_ptr -> fx_media_total_sectors)
|
||||
source_buffer = large_data_buffer; /* harmless scratch — test does not verify data */
|
||||
else
|
||||
source_buffer = ((UCHAR *) media_ptr -> fx_media_driver_info) + (_sector * media_ptr -> fx_media_bytes_per_sector);
|
||||
}
|
||||
|
||||
/* Copy the RAM sector into the destination. */
|
||||
_fx_utility_memory_copy(source_buffer, media_ptr -> fx_media_driver_buffer,
|
||||
@@ -318,8 +357,17 @@ UINT offset;
|
||||
/* Calculate the RAM disk sector offset. Note the RAM disk memory is pointed to by
|
||||
the fx_media_driver_info pointer, which is supplied by the application in the
|
||||
call to fx_media_open. */
|
||||
data_start = ((UCHAR *) media_ptr -> fx_media_driver_info) +
|
||||
((media_ptr -> fx_media_driver_logical_sector + media_ptr -> fx_media_hidden_sectors) * media_ptr -> fx_media_bytes_per_sector);
|
||||
{
|
||||
/* Compute effective sector and guard against pointer arithmetic overflow on 64-bit
|
||||
platforms when sector is near ULONG64_MAX. Out-of-range writes are discarded. */
|
||||
ULONG64 _sector = media_ptr -> fx_media_driver_logical_sector + media_ptr -> fx_media_hidden_sectors;
|
||||
if (media_ptr -> fx_media_total_sectors > 0 && _sector >= media_ptr -> fx_media_total_sectors)
|
||||
{
|
||||
media_ptr -> fx_media_driver_status = FX_SUCCESS;
|
||||
return;
|
||||
}
|
||||
data_start = ((UCHAR *) media_ptr -> fx_media_driver_info) + (_sector * media_ptr -> fx_media_bytes_per_sector);
|
||||
}
|
||||
|
||||
/* Driver write callback function entry for calling. */
|
||||
if (driver_write_callback != FX_NULL)
|
||||
|
||||
Reference in New Issue
Block a user