Ros-diffs December 2022

ros-diffs@reactos.org

19 participants
98 discussions

[reactos] 03/09: [KERNEL32] Fix a bug in GetVolumeNameForRoot

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb502bbc103f239b3d122… commit eb502bbc103f239b3d12230d7819f9a886a5ff71 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 8 15:44:03 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 20:17:40 2022 +0200 [KERNEL32] Fix a bug in GetVolumeNameForRoot --- dll/win32/kernel32/client/file/mntpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/file/mntpoint.c b/dll/win32/kernel32/client/file/mntpoint.c index badb519112f..362ed15be82 100644 --- a/dll/win32/kernel32/client/file/mntpoint.c +++ b/dll/win32/kernel32/client/file/mntpoint.c @@ -206,7 +206,7 @@ GetVolumeNameForRoot(IN LPCWSTR lpszRootPath, /* Make a string of it, to easy the checks */ SymbolicLink.Length = MountPoints->MountPoints[CurrentMntPt].SymbolicLinkNameLength; SymbolicLink.MaximumLength = SymbolicLink.Length; - SymbolicLink.Buffer = (PVOID)((ULONG_PTR)&MountPoints->MountPoints[CurrentMntPt] + MountPoints->MountPoints[CurrentMntPt].SymbolicLinkNameOffset); + SymbolicLink.Buffer = (PVOID)((ULONG_PTR)MountPoints + MountPoints->MountPoints[CurrentMntPt].SymbolicLinkNameOffset); /* If that's a NT volume name (GUID form), keep it! */ if (MOUNTMGR_IS_NT_VOLUME_NAME(&SymbolicLink)) {

1 year, 9 months

[reactos] 02/09: [WS2_32_APITEST] Fix uninitialized variable

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=866918c7851aa21886f95… commit 866918c7851aa21886f951ebe2d5e80b9b20c1df Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 14 22:40:39 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 20:17:40 2022 +0200 [WS2_32_APITEST] Fix uninitialized variable --- modules/rostests/apitests/ws2_32/bind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ws2_32/bind.c b/modules/rostests/apitests/ws2_32/bind.c index 2ff5524db1e..83538c5ec5f 100644 --- a/modules/rostests/apitests/ws2_32/bind.c +++ b/modules/rostests/apitests/ws2_32/bind.c @@ -133,7 +133,7 @@ START_TEST(bind) int Error; CHAR LocalHostName[128]; struct hostent *Hostent; - IN_ADDR Address; + IN_ADDR Address = { 0 }; SOCKET Socket; struct sockaddr_in Addr = { AF_INET };

1 year, 9 months

[reactos] 01/09: [CRT_APITEST] Restore direction flag to avoid false RTC break

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f71940efb17014a4cb7e5… commit f71940efb17014a4cb7e5c112cf7e7ae5a5f7011 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 8 10:33:02 2022 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 20:17:40 2022 +0200 [CRT_APITEST] Restore direction flag to avoid false RTC break With set direction flag the variables will not be initialized properly. --- modules/rostests/apitests/crt/strlen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/crt/strlen.c b/modules/rostests/apitests/crt/strlen.c index 182dcf68ccf..7f0c9d7e6fe 100644 --- a/modules/rostests/apitests/crt/strlen.c +++ b/modules/rostests/apitests/crt/strlen.c @@ -48,8 +48,8 @@ Test_strlen(PFN_STRLEN pstrlen) eflags = __readeflags(); __writeeflags(eflags | EFLAGS_DF); len = pstrlen(teststr + 4); - eflags = __readeflags(); - ok((eflags & EFLAGS_DF) != 0, "Direction flag in ELFAGS was changed."); + ok((__readeflags() & EFLAGS_DF) != 0, "Direction flag in ELFAGS was changed."); + __writeeflags(eflags); /* Only test this for the exported versions, intrinsics might do it differently. It's up to us to not do fishy stuff! Also crtdll does

1 year, 9 months

[reactos] 15/15: [CRT] Add simplistic fallback implementation of sincos to make GCC 11 happy

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dacbc603b691edf3c5b97… commit dacbc603b691edf3c5b97726e300b79f1ba87859 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jun 25 12:27:39 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [CRT] Add simplistic fallback implementation of sincos to make GCC 11 happy --- sdk/lib/crt/math/math.cmake | 1 + sdk/lib/crt/math/sincos.c | 15 +++++++++++++++ sdk/lib/crt/msvcrtex.cmake | 1 + 3 files changed, 17 insertions(+) diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index b54c21b0a42..a888242644e 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -6,6 +6,7 @@ list(APPEND LIBCNTPR_MATH_SOURCE math/abs.c math/div.c math/labs.c + math/sincos.c ) if(ARCH STREQUAL "i386") diff --git a/sdk/lib/crt/math/sincos.c b/sdk/lib/crt/math/sincos.c new file mode 100644 index 00000000000..6c22e452906 --- /dev/null +++ b/sdk/lib/crt/math/sincos.c @@ -0,0 +1,15 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Fallback implementation of sincos + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <math.h> + +// This is a very simplistic implementation to make GCC 11 happy +void sincos(double x, double *s, double *c) +{ + *s = sin(x); + *c = cos(x); +} diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 272d844252e..d7a513012b4 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -3,6 +3,7 @@ include_directories(include/internal/mingw-w64) list(APPEND MSVCRTEX_SOURCE ${CRT_STARTUP_SOURCE} + math/sincos.c misc/dbgrpt.cpp misc/fltused.c misc/isblank.c

1 year, 9 months

[reactos] 14/15: [CRT] Replace amd64 math functions/stubs with libm

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28c41b7d22130aeac1202… commit 28c41b7d22130aeac1202026e68365a85674587d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Aug 23 17:37:14 2022 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [CRT] Replace amd64 math functions/stubs with libm --- sdk/lib/crt/float/amd64/logb.S | 17 ---- sdk/lib/crt/float/float.cmake | 1 - sdk/lib/crt/math/amd64/acos.S | 21 ----- sdk/lib/crt/math/amd64/acosf.S | 21 ----- sdk/lib/crt/math/amd64/atan.S | 22 ----- sdk/lib/crt/math/amd64/atan2.S | 22 ----- sdk/lib/crt/math/amd64/exp.S | 22 ----- sdk/lib/crt/math/amd64/ldexp.S | 21 ----- sdk/lib/crt/math/amd64/log.S | 21 ----- sdk/lib/crt/math/amd64/log10.S | 21 ----- sdk/lib/crt/math/amd64/pow.S | 22 ----- sdk/lib/crt/math/amd64/tan.S | 22 ----- sdk/lib/crt/math/libm_sse2/fmod.asm | 1 + sdk/lib/crt/math/libm_sse2/fmodf.asm | 1 + sdk/lib/crt/math/math.cmake | 156 +++++++++++++++++++++++++---------- 15 files changed, 115 insertions(+), 276 deletions(-) diff --git a/sdk/lib/crt/float/amd64/logb.S b/sdk/lib/crt/float/amd64/logb.S deleted file mode 100644 index 2cb4bb886ec..00000000000 --- a/sdk/lib/crt/float/amd64/logb.S +++ /dev/null @@ -1,17 +0,0 @@ - - -#include <asm.inc> - -.code64 - -PUBLIC _logb -FUNC _logb - .endprolog - - fld dword ptr [rsp + 8] - fxtract - fstp st - ret -ENDFUNC - -END diff --git a/sdk/lib/crt/float/float.cmake b/sdk/lib/crt/float/float.cmake index e4189362f64..24fe327fbd5 100644 --- a/sdk/lib/crt/float/float.cmake +++ b/sdk/lib/crt/float/float.cmake @@ -32,7 +32,6 @@ elseif(ARCH STREQUAL "amd64") ) list(APPEND CRT_FLOAT_ASM_SOURCE float/amd64/getsetfpcw.S - float/amd64/logb.S ) elseif(ARCH STREQUAL "arm") list(APPEND CRT_FLOAT_SOURCE diff --git a/sdk/lib/crt/math/amd64/acos.S b/sdk/lib/crt/math/amd64/acos.S deleted file mode 100644 index 23a90493d6d..00000000000 --- a/sdk/lib/crt/math/amd64/acos.S +++ /dev/null @@ -1,21 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of acos - * FILE: lib/sdk/crt/math/amd64/acos.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC acos -acos: - UNIMPLEMENTED acos - ret - -END diff --git a/sdk/lib/crt/math/amd64/acosf.S b/sdk/lib/crt/math/amd64/acosf.S deleted file mode 100644 index fab952692bf..00000000000 --- a/sdk/lib/crt/math/amd64/acosf.S +++ /dev/null @@ -1,21 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of acosf - * FILE: lib/sdk/crt/math/amd64/acosf.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC acosf -acosf: - UNIMPLEMENTED acos - ret - -END diff --git a/sdk/lib/crt/math/amd64/atan.S b/sdk/lib/crt/math/amd64/atan.S deleted file mode 100644 index b649ec0398a..00000000000 --- a/sdk/lib/crt/math/amd64/atan.S +++ /dev/null @@ -1,22 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of atan - * FILE: lib/sdk/crt/math/amd64/atan.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> -#include <ksamd64.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC atan -atan: - UNIMPLEMENTED atan - ret - -END diff --git a/sdk/lib/crt/math/amd64/atan2.S b/sdk/lib/crt/math/amd64/atan2.S deleted file mode 100644 index bccaeaf9a3d..00000000000 --- a/sdk/lib/crt/math/amd64/atan2.S +++ /dev/null @@ -1,22 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of atan2 - * FILE: lib/sdk/crt/math/amd64/atan2.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> -#include <ksamd64.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC atan2 -atan2: - UNIMPLEMENTED atan2 - ret - -END diff --git a/sdk/lib/crt/math/amd64/exp.S b/sdk/lib/crt/math/amd64/exp.S deleted file mode 100644 index 8fda82ba07b..00000000000 --- a/sdk/lib/crt/math/amd64/exp.S +++ /dev/null @@ -1,22 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of exp - * FILE: lib/sdk/crt/math/amd64/exp.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> -#include <ksamd64.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC exp -exp: - UNIMPLEMENTED exp - ret - -END diff --git a/sdk/lib/crt/math/amd64/ldexp.S b/sdk/lib/crt/math/amd64/ldexp.S deleted file mode 100644 index 4635d754e27..00000000000 --- a/sdk/lib/crt/math/amd64/ldexp.S +++ /dev/null @@ -1,21 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of ldexp - * FILE: lib/sdk/crt/math/amd64/ldexp.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC ldexp -ldexp: - UNIMPLEMENTED ldexp - ret - -END diff --git a/sdk/lib/crt/math/amd64/log.S b/sdk/lib/crt/math/amd64/log.S deleted file mode 100644 index f7ffc57f612..00000000000 --- a/sdk/lib/crt/math/amd64/log.S +++ /dev/null @@ -1,21 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of log - * FILE: lib/sdk/crt/math/amd64/log.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC log -log: - UNIMPLEMENTED log - ret - -END diff --git a/sdk/lib/crt/math/amd64/log10.S b/sdk/lib/crt/math/amd64/log10.S deleted file mode 100644 index 5038d178530..00000000000 --- a/sdk/lib/crt/math/amd64/log10.S +++ /dev/null @@ -1,21 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of log10 - * FILE: lib/sdk/crt/math/amd64/log10.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC log10 -log10: - UNIMPLEMENTED log10 - ret - -END diff --git a/sdk/lib/crt/math/amd64/pow.S b/sdk/lib/crt/math/amd64/pow.S deleted file mode 100644 index fd8d104ee4e..00000000000 --- a/sdk/lib/crt/math/amd64/pow.S +++ /dev/null @@ -1,22 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of pow - * FILE: lib/sdk/crt/math/amd64/pow.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> -#include <ksamd64.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC pow -pow: - UNIMPLEMENTED pow - ret - -END diff --git a/sdk/lib/crt/math/amd64/tan.S b/sdk/lib/crt/math/amd64/tan.S deleted file mode 100644 index 53d82877e86..00000000000 --- a/sdk/lib/crt/math/amd64/tan.S +++ /dev/null @@ -1,22 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of tan - * FILE: lib/sdk/crt/math/amd64/tan.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> -#include <ksamd64.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC tan -tan: - UNIMPLEMENTED tan - ret - -END diff --git a/sdk/lib/crt/math/libm_sse2/fmod.asm b/sdk/lib/crt/math/libm_sse2/fmod.asm index 7ba554671f8..cc1fb710997 100644 --- a/sdk/lib/crt/math/libm_sse2/fmod.asm +++ b/sdk/lib/crt/math/libm_sse2/fmod.asm @@ -68,6 +68,7 @@ X87XAM_BAD EQU MASK X87SW_E AND NOT 2 ; double fmod [double, double] ---------------------------------- +PUBLIC fmod fmod PROC FRAME sub rsp, 40 + 32 diff --git a/sdk/lib/crt/math/libm_sse2/fmodf.asm b/sdk/lib/crt/math/libm_sse2/fmodf.asm index b5685d7ba0d..5e7aa2578fd 100644 --- a/sdk/lib/crt/math/libm_sse2/fmodf.asm +++ b/sdk/lib/crt/math/libm_sse2/fmodf.asm @@ -68,6 +68,7 @@ X87XAM_BAD EQU MASK X87SW_E AND NOT 2 ; float fmodf [float, float] ------------------------------------ +PUBLIC fmodf fmodf PROC FRAME sub rsp, 40 + 32 diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index 42fbc012bbe..b54c21b0a42 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -1,4 +1,6 @@ +include_directories(libm_sse2) + list(APPEND LIBCNTPR_MATH_SOURCE math/_invoke_matherr.c math/abs.c @@ -54,32 +56,97 @@ if(ARCH STREQUAL "i386") elseif(ARCH STREQUAL "amd64") list(APPEND LIBCNTPR_MATH_SOURCE math/amd64/_set_statfp.c - math/ceil.c - math/cos.c - math/sin.c - math/floor.c + # math/libm_sse2/_chgsign.c + # math/libm_sse2/_chgsignf.c + # math/libm_sse2/_copysign.c + # math/libm_sse2/_copysignf.c + # math/libm_sse2/_finite.c + # math/libm_sse2/_finitef.c + math/libm_sse2/_handle_error.c + math/libm_sse2/acos.c + math/libm_sse2/acosf.c + math/libm_sse2/asin.c + math/libm_sse2/asinf.c + math/libm_sse2/atan.c + math/libm_sse2/atan2.c + math/libm_sse2/atan2f.c + math/libm_sse2/atanf.c + # math/libm_sse2/cabs.c + # math/libm_sse2/cabsf.c + math/libm_sse2/ceil.c + math/libm_sse2/ceilf.c + math/libm_sse2/cosh.c + math/libm_sse2/coshf.c + math/libm_sse2/exp_special.c + math/libm_sse2/exp2.c + math/libm_sse2/floor.c + math/libm_sse2/floorf.c + math/libm_sse2/fma3_available.c + math/libm_sse2/hypot.c + math/libm_sse2/hypotf.c + math/libm_sse2/L2_by_pi_bits.c + math/libm_sse2/ldexp.c + # math/libm_sse2/ldexpf.c + math/libm_sse2/log_128_lead_tail_table.c + math/libm_sse2/log_256_lead_tail_table.c + math/libm_sse2/log_F_inv_dword_table.c + math/libm_sse2/log_F_inv_qword_table.c + math/libm_sse2/log_special.c + math/libm_sse2/log10_128_lead_tail_table.c + math/libm_sse2/log10_256_lead_tail_table.c + math/libm_sse2/logb.c + math/libm_sse2/logbf.c + math/libm_sse2/Lsincos_array.c + math/libm_sse2/Lsincosf_array.c + math/libm_sse2/modf.c + math/libm_sse2/modff.c + math/libm_sse2/pow_special.c + # math/libm_sse2/remainder.c + math/libm_sse2/remainder_piby2.c + # math/libm_sse2/remainder_piby2f.c + # math/libm_sse2/remainderf.c + math/libm_sse2/sincos_special.c + math/libm_sse2/sinh.c + math/libm_sse2/sinhf.c + math/libm_sse2/sqrt.c + math/libm_sse2/sqrtf.c + math/libm_sse2/tan.c + math/libm_sse2/tanf.c + math/libm_sse2/tanh.c + math/libm_sse2/tanhf.c + math/libm_sse2/two_to_jby64_head_tail_table.c + math/libm_sse2/two_to_jby64_table.c ) list(APPEND LIBCNTPR_MATH_ASM_SOURCE - math/amd64/atan.S - math/amd64/atan2.S - math/amd64/exp.S + math/libm_sse2/fm.inc + math/libm_sse2/cos.asm + math/libm_sse2/cosf.asm + math/libm_sse2/exp.asm + math/libm_sse2/expf.asm math/amd64/fabs.S math/amd64/fabsf.S - math/amd64/fmod.S - math/amd64/ldexp.S - math/amd64/log.S - math/amd64/log10.S - math/amd64/pow.S - math/amd64/sqrt.S - math/amd64/tan.S + math/libm_sse2/fmod.asm + math/libm_sse2/fmodf.asm + math/libm_sse2/log.asm + math/libm_sse2/log10.asm + math/libm_sse2/pow.asm + math/libm_sse2/remainder_piby2_forAsm.asm + math/libm_sse2/remainder_piby2_forFMA3.asm + math/libm_sse2/remainder_piby2f_forAsm.asm + math/libm_sse2/remainder_piby2f_forC.asm + math/libm_sse2/sin.asm + math/libm_sse2/sinf.asm ) elseif(ARCH STREQUAL "arm") list(APPEND LIBCNTPR_MATH_SOURCE math/cos.c + math/ceilf.c math/fabs.c math/fabsf.c + math/floorf.c math/sin.c math/sqrt.c + math/sqrtf.c math/arm/__rt_sdiv.c math/arm/__rt_sdiv64_worker.c math/arm/__rt_udiv.c @@ -96,6 +163,22 @@ elseif(ARCH STREQUAL "arm") math/arm/__u64tos.c math/arm/__64tof.h ) + list(APPEND CRT_MATH_SOURCE + math/_hypotf.c + math/acosf.c + math/asinf.c + math/atan2f.c + math/atanf.c + math/coshf.c + math/expf.c + math/fabsf.c + math/fmodf.c + math/modff.c + math/sinf.c + math/sinhf.c + math/tanf.c + math/tanhf.c + ) list(APPEND LIBCNTPR_MATH_ASM_SOURCE math/arm/atan.s math/arm/atan2.s @@ -121,40 +204,32 @@ if(NOT ARCH STREQUAL "i386") list(APPEND CRT_MATH_SOURCE math/_chgsignf.c math/_copysignf.c - math/_hypotf.c - math/acosf.c - math/asinf.c - math/atan2f.c - math/atanf.c - math/ceilf.c - math/cos.c - math/coshf.c - math/expf.c - math/floorf.c - math/fmodf.c math/log10f.c - math/modff.c - math/sin.c - math/sinhf.c - math/sqrtf.c - math/tanf.c - math/tanhf.c math/stubs.c ) endif() +if(NOT ARCH STREQUAL "amd64") + list(APPEND CRT_MATH_SOURCE + math/acos.c + math/asin.c + math/cosh.c + math/cosf.c + math/hypot.c + math/modf.c + math/s_modf.c + math/sinh.c + math/tanh.c + ) +endif() + list(APPEND CRT_MATH_SOURCE ${LIBCNTPR_MATH_SOURCE} - math/acos.c math/adjust.c - math/asin.c math/cabs.c - math/cosf.c - math/cosh.c math/fdivbug.c math/frexp.c math/huge_val.c - math/hypot.c math/ieee754/j0_y0.c math/ieee754/j1_y1.c math/ieee754/jn_yn.c @@ -163,13 +238,8 @@ list(APPEND CRT_MATH_SOURCE math/jn_yn.c math/ldiv.c math/logf.c - math/modf.c math/powf.c math/rand.c - math/s_modf.c - math/sinf.c - math/sinh.c - math/tanh.c ) list(APPEND CRT_MATH_ASM_SOURCE @@ -183,7 +253,7 @@ list(APPEND LIBCNTPR_MATH_SOURCE if(ARCH STREQUAL "i386") list(APPEND ATAN2_ASM_SOURCE math/i386/atan2_asm.s) elseif(ARCH STREQUAL "amd64") - list(APPEND ATAN2_ASM_SOURCE math/amd64/atan2.S) + list(APPEND ATAN2_SOURCE math/_invoke_matherr.c math/amd64/_set_statfp.c math/libm_sse2/_handle_error.c math/libm_sse2/atan2.c) elseif(ARCH STREQUAL "arm") list(APPEND ATAN2_ASM_SOURCE math/arm/atan2.s) elseif(ARCH STREQUAL "arm64") @@ -191,6 +261,6 @@ elseif(ARCH STREQUAL "arm64") endif() add_asm_files(atan2_asm ${ATAN2_ASM_SOURCE}) -add_library(atan2 ${atan2_asm}) +add_library(atan2 ${ATAN2_SOURCE} ${atan2_asm}) set_target_properties(atan2 PROPERTIES LINKER_LANGUAGE "C") add_dependencies(atan2 asm)

1 year, 9 months

[reactos] 13/15: [FREELDR] Add stubs for pow and log to avoid pulling in the data from CRT (maybe fix printf functions instead?)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20e6e17070aee00a80568… commit 20e6e17070aee00a80568345959431cd887063ab Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 10 16:46:04 2022 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [FREELDR] Add stubs for pow and log to avoid pulling in the data from CRT (maybe fix printf functions instead?) --- boot/freeldr/freeldr/freeldr.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/boot/freeldr/freeldr/freeldr.c b/boot/freeldr/freeldr/freeldr.c index c31f5eab3a2..16af2375097 100644 --- a/boot/freeldr/freeldr/freeldr.c +++ b/boot/freeldr/freeldr/freeldr.c @@ -98,3 +98,29 @@ int __cdecl iswctype(wint_t wc, wctype_t wctypeFlags) { return _isctype((char)wc, wctypeFlags); } + +#ifdef _MSC_VER +#pragma warning(disable:4164) +#pragma function(pow) +#pragma function(log) +#pragma function(log10) +#endif + +// Stubs to avoid pulling in data from CRT +double pow(double x, double y) +{ + __debugbreak(); + return 0.0; +} + +double log(double x) +{ + __debugbreak(); + return 0.0; +} + +double log10(double x) +{ + __debugbreak(); + return 0.0; +}

1 year, 9 months

[reactos] 12/15: [CRT] Add basic version of handle_error

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ad4106b84adb448bd95e… commit 1ad4106b84adb448bd95eeb651d8c3dad486e5c4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jun 18 10:19:18 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [CRT] Add basic version of handle_error --- sdk/lib/crt/math/libm_sse2/_handle_error.c | 72 ++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/sdk/lib/crt/math/libm_sse2/_handle_error.c b/sdk/lib/crt/math/libm_sse2/_handle_error.c new file mode 100644 index 00000000000..4d679a292ea --- /dev/null +++ b/sdk/lib/crt/math/libm_sse2/_handle_error.c @@ -0,0 +1,72 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of _handle_error / _handle_errorf for libm + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <math.h> + +int +__cdecl +_invoke_matherr( + int type, + char* name, + double arg1, + double arg2, + double retval); + +/*! + * @brief Handles an error condition. + * @param fname - The name of the function that caused the error. + * @param opcode - Opcode of the function that cause the error (see OP_* consants in fpieee.h). + * @param value - The value to be returned, encoded as uint64_t. + * @param type - The type of error (see _DOMAIN, ... in math.h) + * @param flags - Exception flags (see AMD_F_* constants). + * @param error - Specifies the CRT error code (EDOM, ...). + * @param arg1 - First parameter to the function that cause the error. + * @param arg2 - Second parameter to the function that cause the error. + * @param nargs - Number of parameters to the function that cause the error. + * @return The value to be returned. + */ +double +__cdecl +_handle_error( + char *fname, + int opcode, + unsigned long long value, + int type, + int flags, + int error, + double arg1, + double arg2, + int nargs) +{ + float retval = *(double*)&value; + + _invoke_matherr(type, fname, arg1, arg2, retval); + + return retval; +} + + + +float +__cdecl +_handle_errorf( + char *fname, + int opcode, + unsigned long long value, + int type, + int flags, + int error, + float arg1, + float arg2, + int nargs) +{ + float retval = *(float*)&value; + + _invoke_matherr(type, fname, arg1, arg2, retval); + + return retval; +}

1 year, 9 months

[reactos] 11/15: [CRT] Improve _matherr handling

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d497ca883370811e83f9… commit 3d497ca883370811e83f99d5e6f23782788cc635 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Aug 23 23:36:33 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [CRT] Improve _matherr handling --- sdk/lib/crt/math/{usermatherr.c => _invoke_matherr.c} | 19 ++++++++++++++----- sdk/lib/crt/math/math.cmake | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/sdk/lib/crt/math/usermatherr.c b/sdk/lib/crt/math/_invoke_matherr.c similarity index 59% rename from sdk/lib/crt/math/usermatherr.c rename to sdk/lib/crt/math/_invoke_matherr.c index 283a42cd5d0..e36b349bcdc 100644 --- a/sdk/lib/crt/math/usermatherr.c +++ b/sdk/lib/crt/math/_invoke_matherr.c @@ -1,12 +1,10 @@ /* * PROJECT: ReactOS CRT library * LICENSE: MIT (https://spdx.org/licenses/MIT) - * PURPOSE: Implementation of __setusermatherr and _invoke_user_matherr + * PURPOSE: Implementation of _invoke_matherr and __setusermatherr * COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> */ -// DO NOT SYNC WITH WINE OR MINGW32 - #include <math.h> /* MS headers have this in corecrt_startup.h */ @@ -23,11 +21,22 @@ __setusermatherr(_UserMathErrorFunctionPointer func) int __cdecl -_invoke_user_matherr(struct _exception *e) +_invoke_matherr( + int type, + char* name, + double arg1, + double arg2, + double retval) { if (user_matherr != NULL) { - return user_matherr(e); + struct _exception excpt; + excpt.type = type; + excpt.name = name; + excpt.arg1 = arg1; + excpt.arg2 = arg2; + excpt.retval = retval; + return user_matherr(&excpt); } else { diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index e50d2bfa680..42fbc012bbe 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -1,9 +1,9 @@ list(APPEND LIBCNTPR_MATH_SOURCE + math/_invoke_matherr.c math/abs.c math/div.c math/labs.c - math/usermatherr.c ) if(ARCH STREQUAL "i386")

1 year, 9 months

[reactos] 10/15: [CRT] Implement _set_statfp

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d50f8141925c1fb3cb1c… commit 4d50f8141925c1fb3cb1c37b94fe7c8ddc464dcc Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 12 20:01:53 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [CRT] Implement _set_statfp --- sdk/lib/crt/math/amd64/_set_statfp.c | 15 +++++++++++++++ sdk/lib/crt/math/math.cmake | 1 + 2 files changed, 16 insertions(+) diff --git a/sdk/lib/crt/math/amd64/_set_statfp.c b/sdk/lib/crt/math/amd64/_set_statfp.c new file mode 100644 index 00000000000..0bf0f62973e --- /dev/null +++ b/sdk/lib/crt/math/amd64/_set_statfp.c @@ -0,0 +1,15 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: x64 implementation of _set_statfp + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <xmmintrin.h> + +__ATTRIBUTE_SSE__ +void _set_statfp(uintptr_t mask) +{ + unsigned int csr = _mm_getcsr(); + _mm_setcsr((mask & _MM_EXCEPT_MASK) | csr); +} diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index 7cc7a795447..e50d2bfa680 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -53,6 +53,7 @@ if(ARCH STREQUAL "i386") ) elseif(ARCH STREQUAL "amd64") list(APPEND LIBCNTPR_MATH_SOURCE + math/amd64/_set_statfp.c math/ceil.c math/cos.c math/sin.c

1 year, 9 months

[reactos] 09/15: [ASMPP] Implement asm preprocessor

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61cc62d1b20842b4c612a… commit 61cc62d1b20842b4c612aa0c4a35982dd38ef6cc Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jun 20 18:29:01 2022 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [ASMPP] Implement asm preprocessor This converts ML style assembly to GAS compatible syntax --- CMakeLists.txt | 2 +- sdk/cmake/gcc.cmake | 31 +- sdk/cmake/host-tools.cmake | 2 +- sdk/cmake/msvc.cmake | 35 +- sdk/tools/CMakeLists.txt | 1 + sdk/tools/asmpp/CMakeLists.txt | 8 + sdk/tools/asmpp/asmpp.cpp | 1208 ++++++++++++++++++++++++++++++++++++++++ sdk/tools/asmpp/asmpp.sln | 31 ++ sdk/tools/asmpp/asmpp.vcxproj | 151 +++++ sdk/tools/asmpp/tokenizer.hpp | 249 +++++++++ 10 files changed, 1700 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b6cfae73a5..3a581a80ed2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,7 +153,7 @@ if(NOT CMAKE_CROSSCOMPILING) add_subdirectory(sdk/tools) add_subdirectory(sdk/lib) - set(NATIVE_TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb) + set(NATIVE_TARGETS asmpp bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb) if(NOT MSVC) list(APPEND NATIVE_TARGETS rsym pefixup) endif() diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index bc72c977773..03b481b0140 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -467,8 +467,37 @@ function(allow_warnings __module) #target_compile_options(${__module} PRIVATE "-Wno-error") endfunction() +function(convert_asm_file _source_file _target_file) + get_filename_component(_source_file_base_name ${_source_file} NAME_WE) + get_filename_component(_source_file_full_path ${_source_file} ABSOLUTE) + set(_preprocessed_asm_file ${CMAKE_CURRENT_BINARY_DIR}/${_target_file}) + add_custom_command( + OUTPUT ${_preprocessed_asm_file} + COMMAND native-asmpp ${_source_file_full_path} > ${_preprocessed_asm_file} + DEPENDS native-asmpp ${_source_file_full_path}) + +endfunction() + +function(convert_asm_files) + foreach(_source_file ${ARGN}) + convert_asm_file(${_source_file} ${_source_file}.s) + endforeach() +endfunction() + macro(add_asm_files _target) - list(APPEND ${_target} ${ARGN}) + foreach(_source_file ${ARGN}) + get_filename_component(_extension ${_source_file} EXT) + get_filename_component(_source_file_base_name ${_source_file} NAME_WE) + if (${_extension} STREQUAL ".asm") + convert_asm_file(${_source_file} ${_source_file}.s) + list(APPEND ${_target} ${CMAKE_CURRENT_BINARY_DIR}/${_source_file}.s) + elseif (${_extension} STREQUAL ".inc") + convert_asm_file(${_source_file} ${_source_file}.h) + list(APPEND ${_target} ${CMAKE_CURRENT_BINARY_DIR}/${_source_file}.h) + else() + list(APPEND ${_target} ${_source_file}) + endif() + endforeach() endmacro() function(add_linker_script _target _linker_script_file) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index a3e7947cd82..b7932a82bb8 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -2,7 +2,7 @@ include(ExternalProject) function(setup_host_tools) - list(APPEND HOST_TOOLS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink txt2nls utf16le xml2sdb) + list(APPEND HOST_TOOLS asmpp bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink txt2nls utf16le xml2sdb) if(NOT MSVC) list(APPEND HOST_TOOLS rsym pefixup) endif() diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index e19e8e8b6ff..4e64db9d3aa 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -475,21 +475,26 @@ macro(add_asm_files _target) get_includes(_directory_includes) get_directory_property(_defines COMPILE_DEFINITIONS) foreach(_source_file ${ARGN}) - get_filename_component(_source_file_base_name ${_source_file} NAME_WE) - get_filename_component(_source_file_full_path ${_source_file} ABSOLUTE) - set(_preprocessed_asm_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.asm) - get_source_file_property(_defines_semicolon_list ${_source_file_full_path} COMPILE_DEFINITIONS) - unset(_source_file_defines) - foreach(_define ${_defines_semicolon_list}) - if(NOT ${_define} STREQUAL "NOTFOUND") - list(APPEND _source_file_defines -D${_define}) - endif() - endforeach() - add_custom_command( - OUTPUT ${_preprocessed_asm_file} - COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_source_file_full_path} > ${_preprocessed_asm_file} - DEPENDS ${_source_file_full_path}) - list(APPEND ${_target} ${_preprocessed_asm_file}) + get_filename_component(_extension ${_source_file} EXT) + if (("${_extension}" STREQUAL ".asm") OR ("${_extension}" STREQUAL ".inc")) + list(APPEND ${_target} ${_source_file}) + else() + get_filename_component(_source_file_base_name ${_source_file} NAME_WE) + get_filename_component(_source_file_full_path ${_source_file} ABSOLUTE) + set(_preprocessed_asm_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.asm) + get_source_file_property(_defines_semicolon_list ${_source_file_full_path} COMPILE_DEFINITIONS) + unset(_source_file_defines) + foreach(_define ${_defines_semicolon_list}) + if(NOT ${_define} STREQUAL "NOTFOUND") + list(APPEND _source_file_defines -D${_define}) + endif() + endforeach() + add_custom_command( + OUTPUT ${_preprocessed_asm_file} + COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_source_file_full_path} > ${_preprocessed_asm_file} + DEPENDS ${_source_file_full_path}) + list(APPEND ${_target} ${_preprocessed_asm_file}) + endif() endforeach() endmacro() diff --git a/sdk/tools/CMakeLists.txt b/sdk/tools/CMakeLists.txt index 535712d171d..1df7a8adbcf 100644 --- a/sdk/tools/CMakeLists.txt +++ b/sdk/tools/CMakeLists.txt @@ -27,6 +27,7 @@ target_link_libraries(obj2bin PRIVATE host_includes) add_host_tool(spec2def spec2def/spec2def.c) add_host_tool(utf16le utf16le/utf16le.cpp) +add_subdirectory(asmpp) add_subdirectory(cabman) add_subdirectory(fatten) add_subdirectory(hhpcomp) diff --git a/sdk/tools/asmpp/CMakeLists.txt b/sdk/tools/asmpp/CMakeLists.txt new file mode 100644 index 00000000000..d65a7c4ca28 --- /dev/null +++ b/sdk/tools/asmpp/CMakeLists.txt @@ -0,0 +1,8 @@ + +list(APPEND SOURCE + asmpp.cpp +) + +add_host_tool(asmpp ${SOURCE}) +target_link_libraries(asmpp PRIVATE host_includes) +set_property(TARGET asmpp PROPERTY CXX_STANDARD 11) diff --git a/sdk/tools/asmpp/asmpp.cpp b/sdk/tools/asmpp/asmpp.cpp new file mode 100644 index 00000000000..39f7bdbfc70 --- /dev/null +++ b/sdk/tools/asmpp/asmpp.cpp @@ -0,0 +1,1208 @@ +/* + * PROJECT: ReactOS host tools + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: ASM preprocessor + * COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +// Optimize even on debug builds, because otherwise it's ridiculously slow +#ifdef _MSC_VER +#pragma optimize("gst", on) +#pragma auto_inline(on) +#else +#pragma GCC optimize("O3,inline") +#endif + +#include "tokenizer.hpp" +#include <cstdlib> +#include <cstdio> +#include <sstream> +#include <ctime> + +#define PROFILING_ENABLED 0 + +using namespace std; + +time_t search_time; + +enum TOKEN_TYPE +{ + Invalid = -1, + Eof, + WhiteSpace, + NewLine, + Comment, + DecNumber, + HexNumber, + String, + + BraceOpen, + BraceClose, + MemRefStart, + MemRefEnd, + Colon, + Operator, + StringDef, + + KW_include, + KW_const, + KW_code, + KW_endprolog, + KW_ALIGN, + KW_EXTERN, + KW_PUBLIC, + KW_ENDM, + KW_END, + KW_if, + KW_ifdef, + KW_ifndef, + KW_else, + KW_endif, + + KW_allocstack, + KW_savereg, + KW_savexmm128, + + KW_DB, + KW_DW, + KW_DD, + KW_DQ, + KW_EQU, + KW_TEXTEQU, + KW_MACRO, + KW_PROC, + KW_FRAME, + KW_ENDP, + KW_RECORD, + + KW_MASK, + KW_ERRDEF, + + Filename, + Instruction, + Reg8, + Reg16, + Reg32, + Reg64, + RegXmm, + BYTE_PTR, + WORD_PTR, + DWORD_PTR, + QWORD_PTR, + XMMWORD_PTR, + + LabelName, + Identifier +}; + +int fake_printf(const char* format, ...) +{ + return 0; +} + +//#define printf fake_printf + +// Use a look-ahead for following characters, not included into the match +//#define FOLLOWED_BY(x) R"((?=)" x R"())" +#define FOLLOWED_BY(x) x + +#define ANY_CHAR R"((?:.|\n))" +#define WHITESPACE R"((?:[ \t]++))" +#define NEWLINE R"([\n])" +#define WS_OR_NL R"((?:)" WHITESPACE "|" NEWLINE R"()+)" +#define SEPARATOR R"([\s,\=\+\-\*\/\:\~\[\]])" + +#define INSTRUCTION \ + "AAA|AAD|AAM|AAS|ADC|ADCX|ADD|ADDPD|ADDPS|ADDSD|ADDSS|ADDSUBPD|ADDSUBPS|" \ + "ADOX|AESDEC|AESDECLAST|AESENC|AESENCLAST|AESIMC|AESKEYGENASSIST|AND|ANDN|" \ + "ANDNPD|ANDNPS|ANDPD|ANDPS|ARPL|BEXTR|BLENDPD|BLENDPS|BLENDVPD|BLENDVPS|" \ + "BLSI|BLSMSK|BLSR|BNDCL|BNDCN|BNDCU|BNDLDX|BNDMK|BNDMOV|BNDSTX|BOUND|BSF|" \ + "BSR|BSWAP|BT|BTC|BTR|BTS|BZHI|CALL|CBW|CDQ|CDQE|CLAC|CLC|CLD|CLDEMOTE|" \ + "CLFLUSH|CLFLUSHOPT|CLI|CLTS|CLWB|CMC|CMOVcc|CMP|CMPPD|CMPPS|CMPS|CMPSB|" \ + "CMPSD|CMPSQ|CMPSS|CMPSW|CMPXCHG|CMPXCHG16B|CMPXCHG8B|COMISD|COMISS|CPUID|" \ + "CQO|CRC32|CVTDQ2PD|CVTDQ2PS|CVTPD2DQ|CVTPD2PI|CVTPD2PS|CVTPI2PD|CVTPI2PS|" \ + "CVTPS2DQ|CVTPS2PD|CVTPS2PI|CVTSD2SI|CVTSD2SS|CVTSI2SD|CVTSI2SS|CVTSS2SD|" \ + "CVTSS2SI|CVTTPD2DQ|CVTTPD2PI|CVTTPS2DQ|CVTTPS2PI|CVTTSD2SI|CVTTSS2SI|CWD|" \ + "CWDE|DAA|DAS|DEC|DIV|DIVPD|DIVPS|DIVSD|DIVSS|DPPD|DPPS|EMMS|ENTER|" \ + "EXTRACTPS|F2XM1|FABS|FADD|FADDP|FBLD|FBSTP|FCHS|FCLEX|FCMOVcc|FCOM|FCOMI|" \ + "FCOMIP|FCOMP|FCOMPP|FCOS|FDECSTP|FDIV|FDIVP|FDIVR|FDIVRP|FFREE|FIADD|" \ + "FICOM|FICOMP|FIDIV|FIDIVR|FILD|FIMUL|FINCSTP|FINIT|FIST|FISTP|FISTTP|" \ + "FISUB|FISUBR|FLD|FLD1|FLDCW|FLDENV|FLDL2E|FLDL2T|FLDLG2|FLDLN2|FLDPI|" \ + "FLDZ|FMUL|FMULP|FNCLEX|FNINIT|FNOP|FNSAVE|FNSTCW|FNSTENV|FNSTSW|FPATAN|" \ + "FPREM|FPREM1|FPTAN|FRNDINT|FRSTOR|FSAVE|FSCALE|FSIN|FSINCOS|FSQRT|FST|" \ + "FSTCW|FSTENV|FSTP|FSTSW|FSUB|FSUBP|FSUBR|FSUBRP|FTST|FUCOM|FUCOMI|" \ + "FUCOMIP|FUCOMP|FUCOMPP|FWAIT|FXAM|FXCH|FXRSTOR|FXSAVE|FXTRACT|FYL2X|" \ + "FYL2XP1|GF2P8AFFINEINVQB|GF2P8AFFINEQB|GF2P8MULB|HADDPD|HADDPS|HLT|" \ + "HSUBPD|HSUBPS|IDIV|IMUL|IN|INC|INS|INSB|INSD|INSERTPS|INSW|INT|INT1|INT3|" \ + "INTO|INVD|INVLPG|INVPCID|IRET|IRETD|JMP|Jcc|KADDB|KADDD|KADDQ|KADDW|" \ + "KANDB|KANDD|KANDNB|KANDND|KANDNQ|KANDNW|KANDQ|KANDW|KMOVB|KMOVD|KMOVQ|" \ + "KMOVW|KNOTB|KNOTD|KNOTQ|KNOTW|KORB|KORD|KORQ|KORTESTB|KORTESTD|KORTESTQ|" \ + "KORTESTW|KORW|KSHIFTLB|KSHIFTLD|KSHIFTLQ|KSHIFTLW|KSHIFTRB|KSHIFTRD|" \ + "KSHIFTRQ|KSHIFTRW|KTESTB|KTESTD|KTESTQ|KTESTW|KUNPCKBW|KUNPCKDQ|KUNPCKWD|" \ + "KXNORB|KXNORD|KXNORQ|KXNORW|KXORB|KXORD|KXORQ|KXORW|LAHF|LAR|LDDQU|" \ + "LDMXCSR|LDS|LEA|LEAVE|LES|LFENCE|LFS|LGDT|LGS|LIDT|LLDT|LMSW|LOCK|LODS|" \ + "LODSB|LODSD|LODSQ|LODSW|LOOP|LOOPcc|LSL|LSS|LTR|LZCNT|MASKMOVDQU|MASKMOVQ|" \ + "MAXPD|MAXPS|MAXSD|MAXSS|MFENCE|MINPD|MINPS|MINSD|MINSS|MONITOR|MOV|MOVAPD|" \ + "MOVAPS|MOVBE|MOVD|MOVDDUP|MOVDIR64B|MOVDIRI|MOVDQ2Q|MOVDQA|MOVDQU|MOVHLPS|" \ + "MOVHPD|MOVHPS|MOVLHPS|MOVLPD|MOVLPS|MOVMSKPD|MOVMSKPS|MOVNTDQ|MOVNTDQA|" \ + "MOVNTI|MOVNTPD|MOVNTPS|MOVNTQ|MOVQ|MOVQ2DQ|MOVS|MOVSB|MOVSD|MOVSHDUP|" \ + "MOVSLDUP|MOVSQ|MOVSS|MOVSW|MOVSX|MOVSXD|MOVUPD|MOVUPS|MOVZX|MPSADBW|MUL|" \ + "MULPD|MULPS|MULSD|MULSS|MULX|MWAIT|NEG|NOP|NOT|OR|ORPD|ORPS|OUT|OUTS|" \ + "OUTSB|OUTSD|OUTSW|PABSB|PABSD|PABSQ|PABSW|PACKSSDW|PACKSSWB|PACKUSDW|" \ + "PACKUSWB|PADDB|PADDD|PADDQ|PADDSB|PADDSW|PADDUSB|PADDUSW|PADDW|PALIGNR|" \ + "PAND|PANDN|PAUSE|PAVGB|PAVGW|PBLENDVB|PBLENDW|PCLMULQDQ|PCMPEQB|PCMPEQD|" \ + "PCMPEQQ|PCMPEQW|PCMPESTRI|PCMPESTRM|PCMPGTB|PCMPGTD|PCMPGTQ|PCMPGTW|" \ + "PCMPISTRI|PCMPISTRM|PDEP|PEXT|PEXTRB|PEXTRD|PEXTRQ|PEXTRW|PHADDD|PHADDSW|" \ + "PHADDW|PHMINPOSUW|PHSUBD|PHSUBSW|PHSUBW|PINSRB|PINSRD|PINSRQ|PINSRW|" \ + "PMADDUBSW|PMADDWD|PMAXSB|PMAXSD|PMAXSQ|PMAXSW|PMAXUB|PMAXUD|PMAXUQ|PMAXUW|" \ + "PMINSB|PMINSD|PMINSQ|PMINSW|PMINUB|PMINUD|PMINUQ|PMINUW|PMOVMSKB|PMOVSX|" \ + "PMOVZX|PMULDQ|PMULHRSW|PMULHUW|PMULHW|PMULLD|PMULLQ|PMULLW|PMULUDQ|POP|" \ + "POPA|POPAD|POPCNT|POPF|POPFD|POPFQ|POR|PREFETCHW|PREFETCHh|PSADBW|PSHUFB|" \ + "PSHUFD|PSHUFHW|PSHUFLW|PSHUFW|PSIGNB|PSIGND|PSIGNW|PSLLD|PSLLDQ|PSLLQ|" \ + "PSLLW|PSRAD|PSRAQ|PSRAW|PSRLD|PSRLDQ|PSRLQ|PSRLW|PSUBB|PSUBD|PSUBQ|PSUBSB|" \ + "PSUBSW|PSUBUSB|PSUBUSW|PSUBW|PTEST|PTWRITE|PUNPCKHBW|PUNPCKHDQ|PUNPCKHQDQ|" \ + "PUNPCKHWD|PUNPCKLBW|PUNPCKLDQ|PUNPCKLQDQ|PUNPCKLWD|PUSH|PUSHA|PUSHAD|" \ + "PUSHF|PUSHFD|PUSHFQ|PXOR|RCL|RCPPS|RCPSS|RCR|RDFSBASE|RDGSBASE|RDMSR|" \ + "RDPID|RDPKRU|RDPMC|RDRAND|RDSEED|RDTSC|RDTSCP|REP|REPE|REPNE|REPNZ|REPZ|" \ + "RET|ROL|ROR|RORX|ROUNDPD|ROUNDPS|ROUNDSD|ROUNDSS|RSM|RSQRTPS|RSQRTSS|SAHF|" \ + "SAL|SAR|SARX|SBB|SCAS|SCASB|SCASD|SCASW|SETcc|SFENCE|SGDT|SHA1MSG1|" \ + "SHA1MSG2|SHA1NEXTE|SHA1RNDS4|SHA256MSG1|SHA256MSG2|SHA256RNDS2|SHL|SHLD|" \ + "SHLX|SHR|SHRD|SHRX|SHUFPD|SHUFPS|SIDT|SLDT|SMSW|SQRTPD|SQRTPS|SQRTSD|" \ + "SQRTSS|STAC|STC|STD|STI|STMXCSR|STOS|STOSB|STOSD|STOSQ|STOSW|STR|SUB|" \ + "SUBPD|SUBPS|SUBSD|SUBSS|SWAPGS|SYSCALL|SYSENTER|SYSEXIT|SYSRET|TEST|" \ + "TPAUSE|TZCNT|UCOMISD|UCOMISS|UD|UMONITOR|UMWAIT|UNPCKHPD|UNPCKHPS|" \ + "UNPCKLPD|UNPCKLPS|VALIGND|VALIGNQ|VBLENDMPD|VBLENDMPS|VBROADCAST|" \ + "VCOMPRESSPD|VCOMPRESSPS|VCVTPD2QQ|VCVTPD2UDQ|VCVTPD2UQQ|VCVTPH2PS|" \ + "VCVTPS2PH|VCVTPS2QQ|VCVTPS2UDQ|VCVTPS2UQQ|VCVTQQ2PD|VCVTQQ2PS|VCVTSD2USI|" \ + "VCVTSS2USI|VCVTTPD2QQ|VCVTTPD2UDQ|VCVTTPD2UQQ|VCVTTPS2QQ|VCVTTPS2UDQ|" \ + "VCVTTPS2UQQ|VCVTTSD2USI|VCVTTSS2USI|VCVTUDQ2PD|VCVTUDQ2PS|VCVTUQQ2PD|" \ + "VCVTUQQ2PS|VCVTUSI2SD|VCVTUSI2SS|VDBPSADBW|VERR|VERW|VEXPANDPD|VEXPANDPS|" \ + "VEXTRACTF128|VEXTRACTF32x4|VEXTRACTF32x8|VEXTRACTF64x2|VEXTRACTF64x4|" \ + "VEXTRACTI128|VEXTRACTI32x4|VEXTRACTI32x8|VEXTRACTI64x2|VEXTRACTI64x4|" \ + "VFIXUPIMMPD|VFIXUPIMMPS|VFIXUPIMMSD|VFIXUPIMMSS|VFMADD132PD|VFMADD132PS|" \ + "VFMADD132SD|VFMADD132SS|VFMADD213PD|VFMADD213PS|VFMADD213SD|VFMADD213SS|" \ + "VFMADD231PD|VFMADD231PS|VFMADD231SD|VFMADD231SS|VFMADDSUB132PD|" \ + "VFMADDSUB132PS|VFMADDSUB213PD|VFMADDSUB213PS|VFMADDSUB231PD|" \ + "VFMADDSUB231PS|VFMSUB132PD|VFMSUB132PS|VFMSUB132SD|VFMSUB132SS|" \ + "VFMSUB213PD|VFMSUB213PS|VFMSUB213SD|VFMSUB213SS|VFMSUB231PD|VFMSUB231PS|" \ + "VFMSUB231SD|VFMSUB231SS|VFMSUBADD132PD|VFMSUBADD132PS|VFMSUBADD213PD|" \ + "VFMSUBADD213PS|VFMSUBADD231PD|VFMSUBADD231PS|VFNMADD132PD|VFNMADD132PS|" \ + "VFNMADD132SD|VFNMADD132SS|VFNMADD213PD|VFNMADD213PS|VFNMADD213SD|" \ + "VFNMADD213SS|VFNMADD231PD|VFNMADD231PS|VFNMADD231SD|VFNMADD231SS|" \ + "VFNMSUB132PD|VFNMSUB132PS|VFNMSUB132SD|VFNMSUB132SS|VFNMSUB213PD|" \ + "VFNMSUB213PS|VFNMSUB213SD|VFNMSUB213SS|VFNMSUB231PD|VFNMSUB231PS|" \ + "VFNMSUB231SD|VFNMSUB231SS|VFPCLASSPD|VFPCLASSPS|VFPCLASSSD|VFPCLASSSS|" \ + "VGATHERDPD|VGATHERDPS|VGATHERQPD|VGATHERQPS|VGETEXPPD|VGETEXPPS|VGETEXPSD|" \ + "VGETEXPSS|VGETMANTPD|VGETMANTPS|VGETMANTSD|VGETMANTSS|VINSERTF128|" \ + "VINSERTF32x4|VINSERTF32x8|VINSERTF64x2|VINSERTF64x4|VINSERTI128|" \ + "VINSERTI32x4|VINSERTI32x8|VINSERTI64x2|VINSERTI64x4|VMASKMOV|VMOVDQA32|" \ + "VMOVDQA64|VMOVDQU16|VMOVDQU32|VMOVDQU64|VMOVDQU8|VPBLENDD|VPBLENDMB|" \ + "VPBLENDMD|VPBLENDMQ|VPBLENDMW|VPBROADCAST|VPBROADCASTB|VPBROADCASTD|" \ + "VPBROADCASTM|VPBROADCASTQ|VPBROADCASTW|VPCMPB|VPCMPD|VPCMPQ|VPCMPUB|" \ + "VPCMPUD|VPCMPUQ|VPCMPUW|VPCMPW|VPCOMPRESSD|VPCOMPRESSQ|VPCONFLICTD|" \ + "VPCONFLICTQ|VPERM2F128|VPERM2I128|VPERMB|VPERMD|VPERMI2B|VPERMI2D|" \ + "VPERMI2PD|VPERMI2PS|VPERMI2Q|VPERMI2W|VPERMILPD|VPERMILPS|VPERMPD|VPERMPS|" \ + "VPERMQ|VPERMT2B|VPERMT2D|VPERMT2PD|VPERMT2PS|VPERMT2Q|VPERMT2W|VPERMW|" \ + "VPEXPANDD|VPEXPANDQ|VPGATHERDD|VPGATHERDQ|VPGATHERQD|VPGATHERQQ|VPLZCNTD|" \ + "VPLZCNTQ|VPMADD52HUQ|VPMADD52LUQ|VPMASKMOV|VPMOVB2M|VPMOVD2M|VPMOVDB|" \ + "VPMOVDW|VPMOVM2B|VPMOVM2D|VPMOVM2Q|VPMOVM2W|VPMOVQ2M|VPMOVQB|VPMOVQD|" \ + "VPMOVQW|VPMOVSDB|VPMOVSDW|VPMOVSQB|VPMOVSQD|VPMOVSQW|VPMOVSWB|VPMOVUSDB|" \ + "VPMOVUSDW|VPMOVUSQB|VPMOVUSQD|VPMOVUSQW|VPMOVUSWB|VPMOVW2M|VPMOVWB|" \ + "VPMULTISHIFTQB|VPROLD|VPROLQ|VPROLVD|VPROLVQ|VPRORD|VPRORQ|VPRORVD|" \ + "VPRORVQ|VPSCATTERDD|VPSCATTERDQ|VPSCATTERQD|VPSCATTERQQ|VPSLLVD|VPSLLVQ|" \ + "VPSLLVW|VPSRAVD|VPSRAVQ|VPSRAVW|VPSRLVD|VPSRLVQ|VPSRLVW|VPTERNLOGD|" \ + "VPTERNLOGQ|VPTESTMB|VPTESTMD|VPTESTMQ|VPTESTMW|VPTESTNMB|VPTESTNMD|" \ + "VPTESTNMQ|VPTESTNMW|VRANGEPD|VRANGEPS|VRANGESD|VRANGESS|VRCP14PD|VRCP14PS|" \ + "VRCP14SD|VRCP14SS|VREDUCEPD|VREDUCEPS|VREDUCESD|VREDUCESS|VRNDSCALEPD|" \ + "VRNDSCALEPS|VRNDSCALESD|VRNDSCALESS|VRSQRT14PD|VRSQRT14PS|VRSQRT14SD|" \ + "VRSQRT14SS|VSCALEFPD|VSCALEFPS|VSCALEFSD|VSCALEFSS|VSCATTERDPD|" \ + "VSCATTERDPS|VSCATTERQPD|VSCATTERQPS|VSHUFF32x4|VSHUFF64x2|VSHUFI32x4|" \ + "VSHUFI64x2|VTESTPD|VTESTPS|VZEROALL|VZEROUPPER|WAIT|WBINVD|WRFSBASE|" \ + "WRGSBASE|WRMSR|WRPKRU|XABORT|XACQUIRE|XADD|XBEGIN|XCHG|XEND|XGETBV|XLAT|" \ + "XLATB|XOR|XORPD|XORPS|XRELEASE|XRSTOR|XRSTORS|XSAVE|XSAVEC|XSAVEOPT|" \ + "XSAVES|XSETBV|XTEST" + +vector<TOKEN_DEF> g_TokenList = +{ + //{ TOKEN_TYPE::WhiteSpace, R"((\s+))" }, + { TOKEN_TYPE::WhiteSpace, R"(([ \t]+))" }, + { TOKEN_TYPE::NewLine, R"((\n))" }, + { TOKEN_TYPE::Comment, R"((;.*\n))" }, + { TOKEN_TYPE::HexNumber, R"(([0-9][0-9a-f]*h))" FOLLOWED_BY(R"([\s\n\+\-\*\/,=!\]])") }, + { TOKEN_TYPE::DecNumber, R"(([0-9]+))" FOLLOWED_BY(R"([\s\n\+\-\*\/,=!\]])") }, + { TOKEN_TYPE::String, R"((\".*\"))" }, + + { TOKEN_TYPE::BraceOpen, R"(($))"}, + { TOKEN_TYPE::BraceClose, R"(($))"}, + { TOKEN_TYPE::MemRefStart, R"((\[))"}, + { TOKEN_TYPE::MemRefEnd, R"((\]))"}, + { TOKEN_TYPE::Colon, R"((\:))"}, + { TOKEN_TYPE::Operator, R"(([,\+\-\*\/\:]))"}, + { TOKEN_TYPE::StringDef, R"((<.+>))" }, + + { TOKEN_TYPE::KW_include, R"((include))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_const, R"((\.const))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_code, R"((\.code))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_endprolog, R"((\.endprolog))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_ALIGN, R"((ALIGN))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_EXTERN, R"((EXTERN))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_EXTERN, R"((EXTRN))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_PUBLIC, R"((PUBLIC))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_ENDM, R"((ENDM))" FOLLOWED_BY(R"([\s\;])") }, + { TOKEN_TYPE::KW_END, R"((END))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_if, R"((if))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_ifdef, R"((ifdef))" FOLLOWED_BY(R"([\s])")}, + { TOKEN_TYPE::KW_ifndef, R"((ifndef))" FOLLOWED_BY(R"([\s])")}, + { TOKEN_TYPE::KW_else, R"((else))" FOLLOWED_BY(R"([\s])")}, + { TOKEN_TYPE::KW_endif, R"((endif))" FOLLOWED_BY(R"([\s])")}, + + { TOKEN_TYPE::KW_allocstack, R"((.allocstack))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_savereg, R"((.savereg))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_savexmm128, R"((.savexmm128))" FOLLOWED_BY(R"([\s])") }, + + { TOKEN_TYPE::KW_DB, R"((DB))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_DW, R"((DW))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_DD, R"((DD))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_DQ, R"((DQ))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_EQU, R"((EQU))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_TEXTEQU, R"((TEXTEQU))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::KW_MACRO, R"((MACRO))" FOLLOWED_BY(R"([\s\;])") }, + { TOKEN_TYPE::KW_PROC, R"((PROC))" FOLLOWED_BY(R"([\s\;])") }, + { TOKEN_TYPE::KW_FRAME, R"((FRAME))" FOLLOWED_BY(R"([\s\;])") }, + { TOKEN_TYPE::KW_ENDP, R"((ENDP))" FOLLOWED_BY(R"([\s\;])") }, + { TOKEN_TYPE::KW_RECORD, R"((RECORD))" FOLLOWED_BY(R"([\s\;])") }, + { TOKEN_TYPE::KW_MASK, R"((MASK))" FOLLOWED_BY(R"([\s\;])")}, + { TOKEN_TYPE::KW_ERRDEF, R"((\.ERRDEF))" FOLLOWED_BY(R"([\s\;])")}, + + { TOKEN_TYPE::Filename, R"(([a-z_][a-z0-9_]*\.inc))" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::Instruction, "(" INSTRUCTION ")" FOLLOWED_BY(R"([\s])") }, + { TOKEN_TYPE::Reg8, R"((al|ah|bl|bh|cl|ch|dl|dh|sil|dil|bpl|spl|r8b|r9b|r10b|r11b|r12b|r13b|r14b|r15b))" FOLLOWED_BY(R"([\s\,])") }, + { TOKEN_TYPE::Reg16, R"((ax|bx|cx|dx|si|di|bp|sp|r8w|r9w|r10w|r11w|r12w|r13w|r14w|r15w))" FOLLOWED_BY(R"([\s\,])") }, + { TOKEN_TYPE::Reg32, R"((eax|ebx|ecx|edx|esi|edi|ebp|esp|r8d|r9d|r10d|r11d|r12d|r13d|r14d|r15d))" FOLLOWED_BY(R"([\s\,])") }, + { TOKEN_TYPE::Reg64, R"((rax|rbx|rcx|rdx|rsi|rdi|rbp|rsp|r8|r9|r10|r11|r12|r13|r14|r15))" FOLLOWED_BY(R"([\s\,])") }, + { TOKEN_TYPE::RegXmm, R"((xmm0|xmm1|xmm2|xmm3|xmm4|xmm5|xmm6|xmm7|xmm8|xmm9|xmm10|xmm11|xmm12|xmm13|xmm14|xmm15))" FOLLOWED_BY(R"([\s\,])") }, + { TOKEN_TYPE::BYTE_PTR, R"((BYTE[\s]+PTR))" FOLLOWED_BY(R"([\s\[])") }, + { TOKEN_TYPE::WORD_PTR, R"((WORD[\s]+PTR))" FOLLOWED_BY(R"([\s\[])") }, + { TOKEN_TYPE::DWORD_PTR, R"((DWORD[\s]+PTR))" FOLLOWED_BY(R"([\s\[])") }, + { TOKEN_TYPE::QWORD_PTR, R"((QWORD[\s]+PTR))" FOLLOWED_BY(R"([\s\[])") }, + { TOKEN_TYPE::XMMWORD_PTR, R"((XMMWORD[\s]+PTR))" FOLLOWED_BY(R"([\s\[])") }, + + { TOKEN_TYPE::Identifier, R"((@@))" FOLLOWED_BY(SEPARATOR)}, + { TOKEN_TYPE::Identifier, R"((@[a-z_][a-z0-9_]*))" FOLLOWED_BY(SEPARATOR)}, + { TOKEN_TYPE::Identifier, R"(([a-z_][a-z0-9_]*))" FOLLOWED_BY(SEPARATOR)}, + +}; + +// FIXME: use context? +unsigned int g_label_number = 0; + +vector<string> g_identifiers; + +void +add_mem_id(Token& tok) +{ + g_identifiers.push_back(tok.str()); + //fprintf(stderr, "Added mem id: '%s'\n", tok.str().c_str()); +} + +bool +is_mem_id(Token& tok) +{ + for (auto id : g_identifiers) + { + if (id == tok.str()) + { + return true; + } + } + + return false; +} + +bool +iequals(const string &a, const string &b) +{ + size_t sz = a.size(); + if (b.size() != sz) + return false; + for (unsigned int i = 0; i < sz; ++i) + if (tolower(a[i]) != tolower(b[i])) + return false; + return true; +} + +Token +get_expected_token(Token&& tok, TOKEN_TYPE type) +{ + if (tok.type() != type) + { + throw "Not white space after identifier!\n"; + } + + return tok; +} + +Token get_ws(Token&& tok) +{ + int type = tok.type(); + if (type != TOKEN_TYPE::WhiteSpace) + { + throw "Not white space after identifier!\n"; + } + + return tok; +} + +Token get_ws_or_nl(Token&& tok) +{ + int type = tok.type(); + if ((type != TOKEN_TYPE::WhiteSpace) && + (type != TOKEN_TYPE::NewLine)) + { + throw "Not white space after identifier!\n"; + } + + return tok; +} + +bool is_string_in_list(vector<string> list, string str) +{ + for (string &s : list) + { + if (s == str) + { + return true; + } + } + + return false; +} + +size_t +translate_token(TokenList& tokens, size_t index, const vector<string> &macro_params) +{ + Token tok = tokens[index]; + switch (tok.type()) + { + case TOKEN_TYPE::Comment: + printf("//%s", tok.str().c_str() + 1); + break; + + case TOKEN_TYPE::DecNumber: + { + unsigned long long num = stoull(tok.str(), nullptr, 10); + printf("%llu", num); + break; + } + + case TOKEN_TYPE::HexNumber: + { + string number = tok.str(); + printf("0x%s", number.substr(0, number.size() - 1).c_str()); + break; + } + + case TOKEN_TYPE::Identifier: + if (is_string_in_list(macro_params, tok.str())) + { + printf("\\"); + } + printf("%s", tok.str().c_str()); + break; + + // We migt want to improve these + case TOKEN_TYPE::BYTE_PTR: + case TOKEN_TYPE::WORD_PTR: + case TOKEN_TYPE::DWORD_PTR: + case TOKEN_TYPE::QWORD_PTR: + case TOKEN_TYPE::XMMWORD_PTR: + + // Check these. valid only in instructions? + case TOKEN_TYPE::Reg8: + case TOKEN_TYPE::Reg16: + case TOKEN_TYPE::Reg32: + case TOKEN_TYPE::Reg64: + case TOKEN_TYPE::RegXmm: + case TOKEN_TYPE::Instruction: + + case TOKEN_TYPE::WhiteSpace: + case TOKEN_TYPE::NewLine: + case TOKEN_TYPE::Operator: + printf("%s", tok.str().c_str()); + break; + + default: + printf("%s", tok.str().c_str()); + break; + } + + return index + 1; +} + +size_t complete_line(TokenList &tokens, size_t index, const vector<string> &macro_params) +{ + while (index < tokens.size()) + { + Token tok = tokens[index]; + index = translate_token(tokens, index, macro_params); + if ((tok.type() == TOKEN_TYPE::NewLine) || + (tok.type() == TOKEN_TYPE::Comment)) + { + break; + } + } + + return index; +} + +size_t +translate_expression(TokenList &tokens, size_t index, const vector<string> &macro_params) +{ + while (index < tokens.size()) + { + Token tok = tokens[index]; + switch (tok.type()) + { + case TOKEN_TYPE::NewLine: + case TOKEN_TYPE::Comment: + return index; + + case TOKEN_TYPE::KW_MASK: + printf("MASK_"); + index += 2; + break; + + case TOKEN_TYPE::Instruction: + if (iequals(tok.str(), "and")) + { + printf("&"); + index += 1; + } + else if (iequals(tok.str(), "or")) + { + printf("|"); + index += 1; + } + else if (iequals(tok.str(), "shl")) + { + printf("<<"); + index += 1; + } + else if (iequals(tok.str(), "not")) + { + printf("!"); + index += 1; + } + else + { + throw "Invalid expression"; + } + break; + + case TOKEN_TYPE::Operator: + if (tok.str() == ",") + { + return index; + } + case TOKEN_TYPE::WhiteSpace: + case TOKEN_TYPE::BraceOpen: + case TOKEN_TYPE::BraceClose: + case TOKEN_TYPE::DecNumber: + case TOKEN_TYPE::HexNumber: + case TOKEN_TYPE::Identifier: + index = translate_token(tokens, index, macro_params); + break; + + default: + index = translate_token(tokens, index, macro_params); + } + } + + return index; +} + +size_t translate_mem_ref(TokenList& tokens, size_t index, const vector<string>& macro_params) +{ + unsigned int offset = 0; + + Token tok = tokens[index]; + + if ((tok.type() == TOKEN_TYPE::DecNumber) || + (tok.type() == TOKEN_TYPE::HexNumber)) + { + offset = stoi(tok.str(), nullptr, 0); + index += 2; + } + + index = translate_token(tokens, index, macro_params); + + while (index < tokens.size()) + { + Token tok = tokens[index]; + index = translate_token(tokens, index, macro_params); + if (tok.type() == TOKEN_TYPE::MemRefEnd) + { + if (offset != 0) + { + printf(" + %u", offset); + } + return index; + } + } + + throw "Failed to translate memory ref"; + return index; +} + +size_t translate_instruction_param(TokenList& tokens, size_t index, const vector<string>& macro_params) +{ + switch (tokens[index].type()) + { + case TOKEN_TYPE::BYTE_PTR: + case TOKEN_TYPE::WORD_PTR: + case TOKEN_TYPE::DWORD_PTR: + case TOKEN_TYPE::QWORD_PTR: + case TOKEN_TYPE::XMMWORD_PTR: + index = translate_token(tokens, index, macro_params); + + // Optional whitespace + if (tokens[index].type() == TOKEN_TYPE::WhiteSpace) + { + index = translate_token(tokens, index, macro_params); + } + } + + while (index < tokens.size()) + { + Token tok = tokens[index]; + switch (tok.type()) + { + case TOKEN_TYPE::MemRefStart: + return translate_mem_ref(tokens, index, macro_params); + + case TOKEN_TYPE::NewLine: + case TOKEN_TYPE::Comment: + return index; + + case TOKEN_TYPE::Operator: + if (tok.str() == ",") + return index; + + case TOKEN_TYPE::Identifier: + index = translate_token(tokens, index, macro_params); + if (is_mem_id(tok)) + { + printf("[rip]"); + } + break; + + default: + index = translate_expression(tokens, index, macro_params); + } + } + + return index; +} + +size_t translate_instruction(TokenList& tokens, size_t index, const vector<string>& macro_params) +{ + // Translate the instruction itself + index = translate_token(tokens, index, macro_params); + + // Handle instruction parameters + while (index < tokens.size()) + { + // Optional whitespace + if (tokens[index].type() == TOKEN_TYPE::WhiteSpace) + { + index = translate_token(tokens, index, macro_params); + } + + // Check for parameters + Token tok = tokens[index]; + switch (tok.type()) + { + case TOKEN_TYPE::Comment: + case TOKEN_TYPE::NewLine: + return index; + + case TOKEN_TYPE::WhiteSpace: + case TOKEN_TYPE::Operator: + index = translate_token(tokens, index, macro_params); + break; + + default: + index = translate_instruction_param(tokens, index, macro_params); + break; + } + } + + return index; +} + +size_t translate_item(TokenList& tokens, size_t index, const vector<string> &macro_params) +{ + switch (tokens[index].type()) + { + case TOKEN_TYPE::DecNumber: + case TOKEN_TYPE::HexNumber: + case TOKEN_TYPE::String: + case TOKEN_TYPE::WhiteSpace: + return translate_token(tokens, index, macro_params); + } + + throw "Failed to translate item"; + return -1; +} + +size_t translate_list(TokenList& tokens, size_t index, const vector<string> &macro_params) +{ + while (index < tokens.size()) + { + // The item itself + index = translate_item(tokens, index, macro_params); + + // Optional white space + if (tokens[index].type() == TOKEN_TYPE::WhiteSpace) + { + index = translate_token(tokens, index, macro_params); + } + + // End of list? + if ((tokens[index].type() == TOKEN_TYPE::Comment) || + (tokens[index].type() == TOKEN_TYPE::NewLine)) + { + return index; + } + + // We expect a comma here + if ((tokens[index].type() != TOKEN_TYPE::Operator) || + (tokens[index].str() != ",")) + { + throw "Unexpected end of list"; + } + + index = translate_token(tokens, index, macro_params); + if (tokens[index].type() == TOKEN_TYPE::WhiteSpace) + { + index = translate_token(tokens, index, macro_params); + } + } + + throw "Failed to translate list"; + return -1; +} + +size_t +translate_data_def(TokenList& tokens, size_t index, const vector<string>& macro_params) +{ + Token tok = tokens[index]; + Token tok1 = get_ws(tokens[index + 1]); + string directive, need, have =""; + + switch (tok.type()) + { + case TOKEN_TYPE::KW_DB: + directive = ".byte"; + break; + + case TOKEN_TYPE::KW_DW: + directive = ".short"; + break; + + case TOKEN_TYPE::KW_DD: + directive = ".long"; + break; + + case TOKEN_TYPE::KW_DQ: + directive = ".quad"; + break; + } + + index += 2; + + while (index < tokens.size()) + { + // Check if we need '.ascii' for ASCII strings + if (tokens[index].str()[0] == '\"') + { + need = ".ascii"; + } + else + { + need = directive; + } + + // Output the directive we need (or a comma) + if (have == "") + { + printf("%s ", need.c_str()); + } + else if (have != need) + { + printf("\n%s ", need.c_str()); + } + else + { + printf(", "); + } + + have = need; + + // The item itself + index = translate_item(tokens, index, macro_params); + + // Optional white space + if (tokens[index].type() == TOKEN_TYPE::WhiteSpace) + { + index = translate_token(tokens, index, macro_params); + } + + // End of list? + if ((tokens[index].type() == TOKEN_TYPE::Comment) || + (tokens[index].type() == TOKEN_TYPE::NewLine)) + { + return index; + } + + // We expect a comma here + if ((tokens[index].type() != TOKEN_TYPE::Operator) || + (tokens[index].str() != ",")) + { + throw "Unexpected end of list"; + } + + // Skip comma and optional white-space + index++; + if (tokens[index].type() == TOKEN_TYPE::WhiteSpace) + { + index++; + } + } + + throw "Failed to translate list"; + return -1; +} + +size_t +translate_construct_one_param(string translated, TokenList& tokens, size_t index, const vector<string>& macro_params) +{ + // The next token should be white space + Token tok1 = get_ws(tokens[index + 1]); + + printf("%s%s", translated.c_str(), tok1.str().c_str()); + return translate_expression(tokens, index + 2, macro_params); +} + +size_t +translate_record(TokenList &tokens, size_t index, const vector<string> &macro_params) +{ + unsigned int bits, bitpos = 0; + unsigned long long oldmask = 0, mask = 0; + + Token tok_name = get_expected_token(tokens[index], TOKEN_TYPE::Identifier); + index += 4; + while (index < tokens.size()) + { + Token tok_member = get_expected_token(tokens[index++], TOKEN_TYPE::Identifier); + + if (tokens[index].type() == TOKEN_TYPE::WhiteSpace) + { + index++; + } + + if (tokens[index++].str() != ":") + { + throw "Unexpected token"; + } + + if (tokens[index].type() == TOKEN_TYPE::WhiteSpace) + { + index++; + } + + Token tok_bits = tokens[index++]; + if ((tok_bits.type() != TOKEN_TYPE::DecNumber) && + (tok_bits.type() != TOKEN_TYPE::HexNumber)) + { + throw "Unexpected token"; + } + + bits = stoi(tok_bits.str(), nullptr, 0); + + printf("%s = %u\n", tok_member.str().c_str(), bitpos); + + oldmask = (1ULL << bitpos) - 1; + bitpos += bits; + mask = (1ULL << bitpos) - 1 - oldmask; + printf("MASK_%s = 0x%llx\n", tok_member.str().c_str(), mask); + + if (tokens[index].type() == TOKEN_TYPE::WhiteSpace) + { + index++; + } + + if ((tokens[index].type() == TOKEN_TYPE::NewLine) || + (tokens[index].type() == TOKEN_TYPE::Comment)) + { + break; + } + + if (tokens[index].str() != ",") + { + throw "unexpected token"; + } + + index++; + if (tokens[index].type() == TOKEN_TYPE::WhiteSpace) + { + index++; + } + + if ((tokens[index].type() == TOKEN_TYPE::NewLine) || + (tokens[index].type() == TOKEN_TYPE::Comment)) + { + index++; + } + + if (tokens[index].type() == TOKEN_TYPE::WhiteSpace) + { + index++; + } + } + + return index; +} + +size_t +translate_identifier_construct(TokenList& tokens, size_t index, const vector<string> &macro_params) +{ + Token tok = tokens[index]; + Token tok1 = tokens[index + 1]; + + if (tok1.type() == TOKEN_TYPE::Colon) + { + if (tok.str() == "@@") + { + g_label_number++; + printf("%u:", g_label_number); + } + else + { + printf("%s:", tok.str().c_str()); + } + return index + 2; + } + + Token tok2 = tokens[index + 2]; + + switch (tok2.type()) + { + case TOKEN_TYPE::KW_MACRO: + throw "Cannot have a nested macro!"; + + case TOKEN_TYPE::KW_DB: + case TOKEN_TYPE::KW_DW: + case TOKEN_TYPE::KW_DD: + case TOKEN_TYPE::KW_DQ: + printf("%s:%s", tok.str().c_str(), tok1.str().c_str()); + add_mem_id(tok); + return translate_data_def(tokens, index + 2, macro_params); + + case TOKEN_TYPE::KW_EQU: + //printf("%s%s", tok.str().c_str(), tok1.str().c_str()); + printf("#define %s ", tok.str().c_str()); + return translate_expression(tokens, index + 3, macro_params); + + case TOKEN_TYPE::KW_TEXTEQU: + { + Token tok3 = get_ws(tokens[index + 3]); + Token tok4 = get_expected_token(tokens[index + 4], TOKEN_TYPE::StringDef); + + string textdef = tok4.str(); + printf("#define %s %s", tok.str().c_str(), textdef.substr(1, textdef.size() - 2).c_str()); + return index + 5; + } + + case TOKEN_TYPE::KW_PROC: + { + printf(".func %s\n", tok.str().c_str()); + printf("%s:", tok.str().c_str()); + index += 3; + + if ((tokens[index].type() == TOKEN_TYPE::WhiteSpace) && + (tokens[index + 1].type() == TOKEN_TYPE::KW_FRAME)) + { +#ifdef TARGET_amd64 + printf("\n.seh_proc %s\n", tok.str().c_str()); +#else + printf("\n.cfi_startproc\n"); +#endif + index += 2; + } + break; + } + + case TOKEN_TYPE::KW_ENDP: + { + printf(".seh_endproc\n.endfunc"); + index += 3; + break; + } + + case TOKEN_TYPE::KW_RECORD: + index = translate_record(tokens, index, macro_params); + break; + + default: + // We don't know what it is, assume it's a macro and treat it like an instruction + index = translate_instruction(tokens, index, macro_params); + break; + } + + return index; +} + +size_t +translate_construct(TokenList& tokens, size_t index, const vector<string> &macro_params) +{ + Token tok = tokens[index]; + + switch (tok.type()) + { + case TOKEN_TYPE::WhiteSpace: + case TOKEN_TYPE::NewLine: + case TOKEN_TYPE::Comment: + return translate_token(tokens, index, macro_params); + + case TOKEN_TYPE::Identifier: + return translate_identifier_construct(tokens, index, macro_params); + + case TOKEN_TYPE::KW_ALIGN: + index = translate_construct_one_param(".align", tokens, index, macro_params); + break; + + case TOKEN_TYPE::KW_allocstack: + index = translate_construct_one_param(".seh_stackalloc", tokens, index, macro_params); + break; + + case TOKEN_TYPE::KW_code: +#ifdef TARGET_amd64 + printf(".code64"); +#else + printf(".code"); +#endif + printf(" .intel_syntax noprefix"); + index++; + break; + + case TOKEN_TYPE::KW_const: + printf(".section .rdata"); + index++; + break; + + case TOKEN_TYPE::KW_DB: + case TOKEN_TYPE::KW_DW: + case TOKEN_TYPE::KW_DD: + case TOKEN_TYPE::KW_DQ: + return translate_data_def(tokens, index, macro_params); + + case TOKEN_TYPE::KW_END: + printf("// END\n"); + return tokens.size(); + + case TOKEN_TYPE::KW_endprolog: + printf(".seh_endprologue"); + index++; + break; + + case TOKEN_TYPE::KW_EXTERN: + { + Token tok1 = get_ws_or_nl(tokens[index + 1]); + Token tok2 = get_expected_token(tokens[index + 2], TOKEN_TYPE::Identifier); + add_mem_id(tok2); + printf("//"); + return complete_line(tokens, index, macro_params); + } + + case TOKEN_TYPE::KW_if: + case TOKEN_TYPE::KW_ifdef: + case TOKEN_TYPE::KW_ifndef: + case TOKEN_TYPE::KW_else: + case TOKEN_TYPE::KW_endif: + // TODO: handle parameter differences between "if" and ".if" etc. + printf("."); + return complete_line(tokens, index, macro_params); + + case TOKEN_TYPE::KW_include: + { + // The next token should be white space + Token tok1 = get_ws_or_nl(tokens[index + 1]); + Token tok2 = get_expected_token(tokens[index + 2], TOKEN_TYPE::Filename); + printf("#include \"%s.h\"", tok2.str().c_str()); + index += 3; + break; + } + + case TOKEN_TYPE::KW_PUBLIC: + index = translate_construct_one_param(".global", tokens, index, macro_params); + break; + + case TOKEN_TYPE::KW_savereg: + printf(".seh_savereg"); + return complete_line(tokens, index + 1, macro_params); + + case TOKEN_TYPE::KW_savexmm128: + printf(".seh_savexmm"); + return complete_line(tokens, index + 1, macro_params); + + case TOKEN_TYPE::Instruction: + index = translate_instruction(tokens, index, macro_params); + break; + + case TOKEN_TYPE::KW_ERRDEF: + printf("//"); + return complete_line(tokens, index, macro_params); + + default: + throw "failed to translate construct"; + } + + // Skip optional white-space + if (tokens[index].type() == TOKEN_TYPE::WhiteSpace) + { + index++; + } + + // Line should end here! + Token end = tokens[index]; + if ((end.type() != TOKEN_TYPE::Comment) && + (end.type() != TOKEN_TYPE::NewLine)) + { + throw "unexpected tokens"; + } + + return index; +} + +size_t +translate_macro(TokenList& tokens, size_t index) +{ + vector<string> macro_params; + + printf(".macro %s", tokens[index].str().c_str()); + + // Parse marameters + index += 3; + while (index < tokens.size()) + { + Token tok = tokens[index]; + switch (tok.type()) + { + case TOKEN_TYPE::NewLine: + case TOKEN_TYPE::Comment: + index = translate_token(tokens, index, macro_params); + break; + + case TOKEN_TYPE::Identifier: + macro_params.push_back(tok.str()); + printf("%s", tok.str().c_str()); + index++; + continue; + + case TOKEN_TYPE::WhiteSpace: + case TOKEN_TYPE::Operator: + index = translate_token(tokens, index, macro_params); + continue; + } + + break; + } + + // Parse content + while (index < tokens.size()) + { + Token tok = tokens[index]; + switch (tok.type()) + { + case TOKEN_TYPE::KW_ENDM: + printf(".endm"); + return index + 1; + + default: + index = translate_construct(tokens, index, macro_params); + } + } + + throw "Failed to translate macro"; + return -1; +} + +void +translate(TokenList &tokens) +{ + size_t index = 0; + size_t size = tokens.size(); + vector<string> empty_macro_params; + + while (index < size) + { + // Macros are special + if ((tokens[index].type() == TOKEN_TYPE::Identifier) && + (tokens[index + 1].type() == TOKEN_TYPE::WhiteSpace) && + (tokens[index + 2].type() == TOKEN_TYPE::KW_MACRO)) + { + index = translate_macro(tokens, index); + } + else + { + index = translate_construct(tokens, index, empty_macro_params); + } + } +} + +int main(int argc, char* argv[]) +{ + if (argc < 2) + { + fprintf(stderr, "Invalid parameter!\n"); + return -1; + } + +#if PROFILING_ENABLED + time_t start_time = time(NULL); +#endif + + try + { + // Open and read the input file + string filename(argv[1]); + ifstream file(filename); + stringstream buffer; + buffer << file.rdbuf(); + string text = buffer.str(); + + // Create the tokenizer + Tokenizer tokenizer(g_TokenList); + + // Get a token list + TokenList toklist(tokenizer, text); + + // Now translate the tokens + translate(toklist); + } + catch (const char* message) + { + fprintf(stderr, "Exception caught: '%s'\n", message); + return -2; + } + +#if PROFILING_ENABLED + time_t total_time = time(NULL) + 1 - start_time; + fprintf(stderr, "total_time = %llu\n", total_time); + fprintf(stderr, "search_time = %llu\n", search_time); + fprintf(stderr, "search: %llu %%\n", search_time * 100 / total_time); +#endif + + return 0; +} diff --git a/sdk/tools/asmpp/asmpp.sln b/sdk/tools/asmpp/asmpp.sln new file mode 100644 index 00000000000..2fbcca4af83 --- /dev/null +++ b/sdk/tools/asmpp/asmpp.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.32510.428 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmpp", "asmpp.vcxproj", "{A1F7C9EE-4F70-43CD-A0BE-85D137B80583}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A1F7C9EE-4F70-43CD-A0BE-85D137B80583}.Debug|x64.ActiveCfg = Debug|x64 + {A1F7C9EE-4F70-43CD-A0BE-85D137B80583}.Debug|x64.Build.0 = Debug|x64 + {A1F7C9EE-4F70-43CD-A0BE-85D137B80583}.Debug|x86.ActiveCfg = Debug|Win32 + {A1F7C9EE-4F70-43CD-A0BE-85D137B80583}.Debug|x86.Build.0 = Debug|Win32 + {A1F7C9EE-4F70-43CD-A0BE-85D137B80583}.Release|x64.ActiveCfg = Release|x64 + {A1F7C9EE-4F70-43CD-A0BE-85D137B80583}.Release|x64.Build.0 = Release|x64 + {A1F7C9EE-4F70-43CD-A0BE-85D137B80583}.Release|x86.ActiveCfg = Release|Win32 + {A1F7C9EE-4F70-43CD-A0BE-85D137B80583}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {16936D9E-6E98-4126-8918-03218BC19061} + EndGlobalSection +EndGlobal diff --git a/sdk/tools/asmpp/asmpp.vcxproj b/sdk/tools/asmpp/asmpp.vcxproj new file mode 100644 index 00000000000..6b193af626d --- /dev/null +++ b/sdk/tools/asmpp/asmpp.vcxproj @@ -0,0 +1,151 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>16.0</VCProjectVersion> + <Keyword>Win32Proj</Keyword> + <ProjectGuid>{a1f7c9ee-4f70-43cd-a0be-85d137b80583}</ProjectGuid> + <RootNamespace>asmpp2</RootNamespace> + <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v142</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v142</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v142</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v142</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + <LanguageStandard>stdcpp17</LanguageStandard> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="asmpp.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="tokenizer.hpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file diff --git a/sdk/tools/asmpp/tokenizer.hpp b/sdk/tools/asmpp/tokenizer.hpp new file mode 100644 index 00000000000..d25d5bd9093 --- /dev/null +++ b/sdk/tools/asmpp/tokenizer.hpp @@ -0,0 +1,249 @@ +/* + * PROJECT: ReactOS host tools + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Tokenizer class implementation + * COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <string> +#include <vector> +#include <fstream> +#include <regex> +#include <ctime> + +// Uncomment this for easier debugging +#if 0 +#define throw __debugbreak(); throw +#endif + +extern time_t search_time; + +struct TOKEN_DEF +{ + int Type; + std::string RegExString; +}; + +class Token +{ + const std::string& m_text; + unsigned int m_pos; + unsigned int m_len; +#if _DEBUG + std::string m_dbgstr; +#endif + int m_type; + +public: + + Token(const std::string& text, size_t pos, size_t len, int type) + : m_text(text), + m_pos(static_cast<unsigned int>(pos)), + m_len(static_cast<unsigned int>(len)), + m_type(type) + { +#if _DEBUG + m_dbgstr = str(); +#endif + } + + std::string str() const + { + return m_text.substr(m_pos, m_len); + } + + int type() const + { + return m_type; + } +}; + +struct Tokenizer +{ + const std::vector<TOKEN_DEF> &m_tokendefs; + const std::regex m_re; + + typedef int myint; + + static + unsigned int + count_captures(const std::string& exp) + { + bool in_char_group = false; + unsigned int count = 0; + + for (size_t i = 0; i < exp.size(); i++) + { + char c = exp[i]; + + // Skip escaped characters + if (c == '\\') + { + i++; + continue; + } + + if (in_char_group) + { + if (c == ']') + { + in_char_group = false; + } + continue; + } + + if (c == '[') + { + in_char_group = true; + continue; + } + + if (c == '(') + { + if (exp[i + 1] != '?') + { + count++; + } + } + } + + return count; + } + + static + std::regex + CompileMultiRegex(const std::vector<TOKEN_DEF> &tokendefs) + { + std::string combinedString; + + if (tokendefs.size() == 0) + { + return std::regex(); + } + + // Validate all token definitions + for (auto def : tokendefs) + { + size_t found = -1; + + // Count capture groups + unsigned int count = count_captures(def.RegExString); + if (count != 1) + { + throw "invalid count!\n"; + } + } + + // Combine all expressions into one (one capture group for each) + combinedString = "(?:" + tokendefs[0].RegExString + ")"; + for (size_t i = 1; i < tokendefs.size(); i++) + { + combinedString += "|(?:" + tokendefs[i].RegExString + ")"; + } + + return std::regex(combinedString, std::regex_constants::icase); + } + +public: + + struct TOKEN_REF + { + unsigned int pos; + unsigned int len; + int type; + }; + + Tokenizer(std::vector<TOKEN_DEF> &tokendefs) + : m_tokendefs(tokendefs), + m_re(CompileMultiRegex(tokendefs)) + { + } + + TOKEN_REF match(std::smatch &matches, const std::string& str) const + { + return match(matches, str, 0); + } + + TOKEN_REF match(std::smatch &matches, const std::string &str, size_t startpos) const + { + const std::string::const_iterator first = str.cbegin() + startpos; + const std::string::const_iterator last = str.cend(); + + // If we reached the end, there is nothing more to do + if (first == last) + { + return TOKEN_REF{ static_cast<unsigned int>(startpos), 0, -1 }; + } + + time_t start_time = time(NULL); + + // Try to find a match + if (!std::regex_search(first, last, matches, m_re)) + { + throw "Failed to match\n"; + } + + search_time += time(NULL) - start_time; + + // Validate that it's at the start of the string + if (matches.prefix().matched) + { + throw "Failed to match at current position!\n"; + } + + // We have a match, check which one it is + for (size_t i = 1; i < matches.size(); i++) + { + if (matches[i].matched) + { + unsigned int len = static_cast<unsigned int>(matches.length(i)); + int type = m_tokendefs[i - 1].Type; + return TOKEN_REF{ static_cast<unsigned int>(startpos), len, type}; + } + } + + // We should never get here + throw "Something went wrong!\n"; + } +}; + + +class TokenList +{ + using TOKEN_REF = typename Tokenizer::TOKEN_REF; + + const Tokenizer& m_tokenizer; + const std::string& m_text; + std::vector<TOKEN_REF> m_tokens; + +public: + + TokenList(const Tokenizer& tokenizer, const std::string& text) + : m_tokenizer(tokenizer), + m_text(text) + { + size_t startpos = 0; + size_t len = m_text.size(); + std::smatch matches; + + m_tokens.reserve(len / 5); + + while (startpos < len) + { + TOKEN_REF tref = m_tokenizer.match(matches, m_text, startpos); + m_tokens.push_back(tref); + startpos += tref.len; + }; + } + + size_t size() const + { + return m_tokens.size(); + } + + Token operator[](size_t n) const + { + return Token(m_text, m_tokens[n].pos, m_tokens[n].len, m_tokens[n].type); + } + +};

1 year, 9 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2022