diff --git a/StgSharp.C/x64/Debug/StgSharp.C.ilk b/StgSharp.C/x64/Debug/StgSharp.C.ilk index 2d937e51..89ac4bb7 100644 Binary files a/StgSharp.C/x64/Debug/StgSharp.C.ilk and b/StgSharp.C/x64/Debug/StgSharp.C.ilk differ diff --git a/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.command.1.tlog b/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.command.1.tlog index fb20d913..b3d79dd1 100644 Binary files a/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.command.1.tlog and b/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.command.1.tlog differ diff --git a/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.read.1.tlog b/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.read.1.tlog index 1f9640cd..a6770143 100644 Binary files a/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.read.1.tlog and b/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.read.1.tlog differ diff --git a/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.write.1.tlog b/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.write.1.tlog index b74a0232..89cec62f 100644 Binary files a/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.write.1.tlog and b/StgSharp.C/x64/Debug/StgSharp.C.tlog/CL.write.1.tlog differ diff --git a/StgSharp.C/x64/Debug/StgSharpC.log b/StgSharp.C/x64/Debug/StgSharpC.log index d6ef9e93..2b2cef6f 100644 --- a/StgSharp.C/x64/Debug/StgSharpC.log +++ b/StgSharp.C/x64/Debug/StgSharpC.log @@ -1,5 +1,141 @@ C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\v170\Microsoft.CppBuild.targets(517,5): warning MSB8004: Output 目录未以斜杠结尾。 此生成实例将添加斜杠，因为必须有这个斜杠才能正确计算 Output 目录。 - StgSharpC.c -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\StgSharpC.c(14,30): warning C4244: “函数”: 从“uint64_t”转换到“GLuint”，可能丢失数据 -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\StgSharpC.c(16,43): warning C4244: “函数”: 从“uint64_t”转换到“GLuint”，可能丢失数据 + hash.c + intrinsic.c + mat2.c + mat3.c + mat4.c + string.c + vector_dot.c +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(4,50): warning C4028: 形参 1 与声明不同 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\string.c(21,54): warning C4267: “return”: 从“size_t”转换到“int”，可能丢失数据 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(5,49): warning C4028: 形参 1 与声明不同 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(6,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\vector_dot.c(83,23): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\string.c(36,54): warning C4267: “return”: 从“size_t”转换到“int”，可能丢失数据 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(6,62): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(8,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(8,62): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(7,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\vector_dot.c(90,16): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(16,50): warning C4028: 形参 1 与声明不同 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(7,62): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\vector_dot.c(97,33): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\vector_dot.c(97,48): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(9,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(18,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\hash.c(29,43): warning C4244: “函数”: 从“uint64_t”转换到“unsigned char”，可能丢失数据 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(18,62): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\vector_dot.c(114,33): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\vector_dot.c(114,48): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(20,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\hash.c(30,50): warning C4244: “函数”: 从“uint64_t”转换到“unsigned char”，可能丢失数据 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\vector_dot.c(127,23): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(15,49): warning C4028: 形参 1 与声明不同 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(9,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(20,62): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\vector_dot.c(136,16): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\hash.c(7,15): warning C4090: “初始化”: 不同的“const”限定符 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(9,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(17,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(31,35): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\hash.c(7,34): warning C4090: “初始化”: 不同的“const”限定符 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\vector_dot.c(144,33): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(17,62): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(11,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(31,59): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\vector_dot.c(144,48): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(11,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(32,35): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(32,59): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(19,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(20,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(20,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(40,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(19,62): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(22,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(40,64): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(22,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(24,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(46,35): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(21,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(24,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(46,59): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(26,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(47,35): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(26,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(47,59): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(22,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(55,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(36,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat2.c(55,64): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(36,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(38,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(29,49): warning C4028: 形参 1 与声明不同 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(38,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(40,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(40,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(31,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(42,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(42,62): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(31,62): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(51,54): warning C4028: 形参 1 与声明不同 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(51,84): warning C4028: 形参 2 与声明不同 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(33,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(53,22): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(54,22): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(33,62): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(55,22): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(56,22): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(59,28): warning C4013: “det_mat3_internal”未定义；假设外部返回 int +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(35,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(59,28): warning C4244: “函数”: 从“int”转换到“float”，可能丢失数据 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(59,62): warning C4244: “函数”: 从“int”转换到“float”，可能丢失数据 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(60,28): warning C4244: “函数”: 从“int”转换到“float”，可能丢失数据 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(36,36): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(60,62): warning C4244: “函数”: 从“int”转换到“float”，可能丢失数据 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(61,36): warning C4133: “函数”: 从“const __m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(69,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(69,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(70,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(70,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(71,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(80,35): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(71,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(80,59): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(72,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(72,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(81,35): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(81,59): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(77,38): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(82,35): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(77,63): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(82,59): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(78,38): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(91,38): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(78,63): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(91,60): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(92,35): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(92,59): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(88,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(88,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(106,35): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(89,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(106,59): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(89,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(107,35): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(90,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(107,59): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(90,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(108,35): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(91,37): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(108,59): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(91,61): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(117,38): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(96,38): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(117,60): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(96,63): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(97,38): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(118,35): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat4.c(97,63): warning C4133: “函数”: 从“__m256 *”到“const float *”的类型不兼容 +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\StgSharp.C\mat3.c(118,59): warning C4133: “函数”: 从“__m128 *”到“const float *”的类型不兼容 StgSharpC.vcxproj -> D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\内核源代码\build\StgSharp.C.dll diff --git a/StgSharp.C/x64/Debug/hash.obj b/StgSharp.C/x64/Debug/hash.obj index 5fefe104..f4e4a97f 100644 Binary files a/StgSharp.C/x64/Debug/hash.obj and b/StgSharp.C/x64/Debug/hash.obj differ diff --git a/StgSharp.C/x64/Debug/hash.sbr b/StgSharp.C/x64/Debug/hash.sbr index d4812a21..ad2c4963 100644 Binary files a/StgSharp.C/x64/Debug/hash.sbr and b/StgSharp.C/x64/Debug/hash.sbr differ diff --git a/StgSharp.C/x64/Debug/intrinsic.cod b/StgSharp.C/x64/Debug/intrinsic.cod index e41ee02f..5eef317a 100644 --- a/StgSharp.C/x64/Debug/intrinsic.cod +++ b/StgSharp.C/x64/Debug/intrinsic.cod @@ -150,11 +150,13 @@ EXTRN __imp__wassert:PROC EXTRN normalize:PROC EXTRN addmatrix2_sse:PROC EXTRN addmatrix2_avx:PROC +EXTRN submatrix2_sse:PROC EXTRN transpose23:PROC EXTRN transpose24:PROC EXTRN addmatrix3_sse:PROC EXTRN addmatrix3_avx:PROC EXTRN addmatrix3_512:PROC +EXTRN submatrix3_sse:PROC EXTRN transpose32:PROC EXTRN transpose33:PROC EXTRN transpose34:PROC @@ -162,6 +164,7 @@ EXTRN det_mat3:PROC EXTRN addmatrix4_sse:PROC EXTRN addmatrix4_avx:PROC EXTRN addmatrix4_512:PROC +EXTRN submatrix4_sse:PROC EXTRN transpose42:PROC EXTRN transpose43:PROC EXTRN transpose44:PROC @@ -198,19 +201,19 @@ pdata ENDS ; COMDAT pdata pdata SEGMENT $pdata$load_intrinsic_sse DD imagerel load_intrinsic_sse - DD imagerel load_intrinsic_sse+434 + DD imagerel load_intrinsic_sse+497 DD imagerel $unwind$load_intrinsic_sse pdata ENDS ; COMDAT pdata pdata SEGMENT $pdata$load_intrinsic_avx DD imagerel load_intrinsic_avx - DD imagerel load_intrinsic_avx+434 + DD imagerel load_intrinsic_avx+443 DD imagerel $unwind$load_intrinsic_avx pdata ENDS ; COMDAT pdata pdata SEGMENT $pdata$load_intrinsic_512 DD imagerel load_intrinsic_512 - DD imagerel load_intrinsic_512+434 + DD imagerel load_intrinsic_512+443 DD imagerel $unwind$load_intrinsic_512 pdata ENDS ; COMDAT pdata @@ -377,7 +380,7 @@ _TEXT SEGMENT context$ = 224 load_intrinsic_512 PROC ; COMDAT -; 115 : { +; 119 : { 00000 48 89 4c 24 08 mov QWORD PTR [rsp+8], rcx 00005 55 push rbp @@ -390,7 +393,7 @@ load_intrinsic_512 PROC ; COMDAT 0001a e8 00 00 00 00 call __CheckForDebuggerJustMyCode 0001f 90 npad 1 -; 116 : context->add_m2 = addmatrix2_avx; +; 120 : context->add_m2 = addmatrix2_avx; 00020 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] @@ -398,7 +401,7 @@ load_intrinsic_512 PROC ; COMDAT 00 00 lea rcx, OFFSET FLAT:addmatrix2_avx 0002e 48 89 08 mov QWORD PTR [rax], rcx -; 117 : context->add_m3 = addmatrix3_512; +; 121 : context->add_m3 = addmatrix3_512; 00031 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] @@ -406,7 +409,7 @@ load_intrinsic_512 PROC ; COMDAT 00 00 lea rcx, OFFSET FLAT:addmatrix3_512 0003f 48 89 48 08 mov QWORD PTR [rax+8], rcx -; 118 : context->add_m4 = addmatrix4_512; +; 122 : context->add_m4 = addmatrix4_512; 00043 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] @@ -414,162 +417,165 @@ load_intrinsic_512 PROC ; COMDAT 00 00 lea rcx, OFFSET FLAT:addmatrix4_512 00051 48 89 48 10 mov QWORD PTR [rax+16], rcx -; 119 : context->transpose_23 = transpose23; +; 123 : context->transpose_23 = transpose23; 00055 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] 0005c 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:transpose23 - 00063 48 89 48 68 mov QWORD PTR [rax+104], rcx - -; 120 : context->transpose_24 = transpose24; - - 00067 48 8b 85 e0 00 - 00 00 mov rax, QWORD PTR context$[rbp] - 0006e 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose24 - 00075 48 89 48 70 mov QWORD PTR [rax+112], rcx - -; 121 : context->transpose_32 = transpose32; - - 00079 48 8b 85 e0 00 - 00 00 mov rax, QWORD PTR context$[rbp] - 00080 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose32 - 00087 48 89 48 78 mov QWORD PTR [rax+120], rcx - -; 122 : context->transpose_33 = transpose33; - - 0008b 48 8b 85 e0 00 - 00 00 mov rax, QWORD PTR context$[rbp] - 00092 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose33 - 00099 48 89 88 80 00 + 00063 48 89 88 80 00 00 00 mov QWORD PTR [rax+128], rcx -; 123 : context->transpose_34 = transpose34; +; 124 : context->transpose_24 = transpose24; - 000a0 48 8b 85 e0 00 + 0006a 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000a7 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose34 - 000ae 48 89 88 88 00 + 00071 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose24 + 00078 48 89 88 88 00 00 00 mov QWORD PTR [rax+136], rcx -; 124 : context->transpose_42 = transpose42; +; 125 : context->transpose_32 = transpose32; - 000b5 48 8b 85 e0 00 + 0007f 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000bc 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose42 - 000c3 48 89 88 90 00 + 00086 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose32 + 0008d 48 89 88 90 00 00 00 mov QWORD PTR [rax+144], rcx -; 125 : context->transpose_43 = transpose43; +; 126 : context->transpose_33 = transpose33; - 000ca 48 8b 85 e0 00 + 00094 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000d1 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose43 - 000d8 48 89 88 98 00 + 0009b 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose33 + 000a2 48 89 88 98 00 00 00 mov QWORD PTR [rax+152], rcx -; 126 : context->transpose_44 = transpose44; +; 127 : context->transpose_34 = transpose34; - 000df 48 8b 85 e0 00 + 000a9 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000e6 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose44 - 000ed 48 89 88 a0 00 + 000b0 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose34 + 000b7 48 89 88 a0 00 00 00 mov QWORD PTR [rax+160], rcx -; 127 : context->normalize_3 = normalize; +; 128 : context->transpose_42 = transpose42; - 000f4 48 8b 85 e0 00 + 000be 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000fb 48 8d 0d 00 00 + 000c5 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose42 + 000cc 48 89 88 a8 00 + 00 00 mov QWORD PTR [rax+168], rcx + +; 129 : context->transpose_43 = transpose43; + + 000d3 48 8b 85 e0 00 + 00 00 mov rax, QWORD PTR context$[rbp] + 000da 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose43 + 000e1 48 89 88 b0 00 + 00 00 mov QWORD PTR [rax+176], rcx + +; 130 : context->transpose_44 = transpose44; + + 000e8 48 8b 85 e0 00 + 00 00 mov rax, QWORD PTR context$[rbp] + 000ef 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose44 + 000f6 48 89 88 b8 00 + 00 00 mov QWORD PTR [rax+184], rcx + +; 131 : context->normalize_3 = normalize; + + 000fd 48 8b 85 e0 00 + 00 00 mov rax, QWORD PTR context$[rbp] + 00104 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:normalize - 00102 48 89 48 60 mov QWORD PTR [rax+96], rcx + 0010b 48 89 48 60 mov QWORD PTR [rax+96], rcx -; 128 : context->det_matrix33 = det_mat3; +; 132 : context->det_matrix33 = det_mat3; - 00106 48 8b 85 e0 00 + 0010f 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0010d 48 8d 0d 00 00 + 00116 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:det_mat3 - 00114 48 89 48 20 mov QWORD PTR [rax+32], rcx + 0011d 48 89 48 20 mov QWORD PTR [rax+32], rcx -; 129 : context->det_matrix44 = det_mat4; +; 133 : context->det_matrix44 = det_mat4; - 00118 48 8b 85 e0 00 + 00121 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0011f 48 8d 0d 00 00 + 00128 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:det_mat4 - 00126 48 89 48 28 mov QWORD PTR [rax+40], rcx + 0012f 48 89 48 28 mov QWORD PTR [rax+40], rcx -; 130 : context->dot_31 = dot_31_avx; +; 134 : context->dot_31 = dot_31_avx; - 0012a 48 8b 85 e0 00 + 00133 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00131 48 8d 0d 00 00 + 0013a 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_31_avx - 00138 48 89 48 30 mov QWORD PTR [rax+48], rcx + 00141 48 89 48 30 mov QWORD PTR [rax+48], rcx -; 131 : context->dot_32 = dot_32_avx; +; 135 : context->dot_32 = dot_32_avx; - 0013c 48 8b 85 e0 00 + 00145 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00143 48 8d 0d 00 00 + 0014c 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_32_avx - 0014a 48 89 48 38 mov QWORD PTR [rax+56], rcx + 00153 48 89 48 38 mov QWORD PTR [rax+56], rcx -; 132 : context->dot_41 = dot_41_avx; +; 136 : context->dot_41 = dot_41_avx; - 0014e 48 8b 85 e0 00 + 00157 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00155 48 8d 0d 00 00 + 0015e 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_41_avx - 0015c 48 89 48 40 mov QWORD PTR [rax+64], rcx + 00165 48 89 48 40 mov QWORD PTR [rax+64], rcx -; 133 : context->dot_42 = dot_42_avx; +; 137 : context->dot_42 = dot_42_avx; - 00160 48 8b 85 e0 00 + 00169 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00167 48 8d 0d 00 00 + 00170 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_42_avx - 0016e 48 89 48 48 mov QWORD PTR [rax+72], rcx + 00177 48 89 48 48 mov QWORD PTR [rax+72], rcx -; 134 : context->dot_43 = dot_43_avx; +; 138 : context->dot_43 = dot_43_avx; - 00172 48 8b 85 e0 00 + 0017b 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00179 48 8d 0d 00 00 + 00182 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_43_avx - 00180 48 89 48 50 mov QWORD PTR [rax+80], rcx + 00189 48 89 48 50 mov QWORD PTR [rax+80], rcx -; 135 : context->city_hash_simplify = city_hash_simplify_sse; +; 139 : context->city_hash_simplify = city_hash_simplify_sse; - 00184 48 8b 85 e0 00 + 0018d 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0018b 48 8d 0d 00 00 + 00194 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:city_hash_simplify_sse - 00192 48 89 48 18 mov QWORD PTR [rax+24], rcx + 0019b 48 89 48 18 mov QWORD PTR [rax+24], rcx -; 136 : context->index_pair = index_pair_sse; +; 140 : context->index_pair = index_pair_sse; - 00196 48 8b 85 e0 00 + 0019f 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0019d 48 8d 0d 00 00 + 001a6 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:index_pair_sse - 001a4 48 89 48 58 mov QWORD PTR [rax+88], rcx + 001ad 48 89 48 58 mov QWORD PTR [rax+88], rcx -; 137 : } +; 141 : } - 001a8 48 8d a5 c8 00 + 001b1 48 8d a5 c8 00 00 00 lea rsp, QWORD PTR [rbp+200] - 001af 5f pop rdi - 001b0 5d pop rbp - 001b1 c3 ret 0 + 001b8 5f pop rdi + 001b9 5d pop rbp + 001ba c3 ret 0 load_intrinsic_512 ENDP _TEXT ENDS ; Function compile flags: /Odtp /RTCsu /ZI @@ -579,7 +585,7 @@ _TEXT SEGMENT context$ = 224 load_intrinsic_avx PROC ; COMDAT -; 90 : { +; 94 : { 00000 48 89 4c 24 08 mov QWORD PTR [rsp+8], rcx 00005 55 push rbp @@ -592,7 +598,7 @@ load_intrinsic_avx PROC ; COMDAT 0001a e8 00 00 00 00 call __CheckForDebuggerJustMyCode 0001f 90 npad 1 -; 91 : context->add_m2 = addmatrix2_avx; +; 95 : context->add_m2 = addmatrix2_avx; 00020 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] @@ -600,7 +606,7 @@ load_intrinsic_avx PROC ; COMDAT 00 00 lea rcx, OFFSET FLAT:addmatrix2_avx 0002e 48 89 08 mov QWORD PTR [rax], rcx -; 92 : context->add_m3 = addmatrix3_avx; +; 96 : context->add_m3 = addmatrix3_avx; 00031 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] @@ -608,7 +614,7 @@ load_intrinsic_avx PROC ; COMDAT 00 00 lea rcx, OFFSET FLAT:addmatrix3_avx 0003f 48 89 48 08 mov QWORD PTR [rax+8], rcx -; 93 : context->add_m4 = addmatrix4_avx; +; 97 : context->add_m4 = addmatrix4_avx; 00043 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] @@ -616,162 +622,165 @@ load_intrinsic_avx PROC ; COMDAT 00 00 lea rcx, OFFSET FLAT:addmatrix4_avx 00051 48 89 48 10 mov QWORD PTR [rax+16], rcx -; 94 : context->transpose_23 = transpose23; +; 98 : context->transpose_23 = transpose23; 00055 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] 0005c 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:transpose23 - 00063 48 89 48 68 mov QWORD PTR [rax+104], rcx - -; 95 : context->transpose_24 = transpose24; - - 00067 48 8b 85 e0 00 - 00 00 mov rax, QWORD PTR context$[rbp] - 0006e 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose24 - 00075 48 89 48 70 mov QWORD PTR [rax+112], rcx - -; 96 : context->transpose_32 = transpose32; - - 00079 48 8b 85 e0 00 - 00 00 mov rax, QWORD PTR context$[rbp] - 00080 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose32 - 00087 48 89 48 78 mov QWORD PTR [rax+120], rcx - -; 97 : context->transpose_33 = transpose33; - - 0008b 48 8b 85 e0 00 - 00 00 mov rax, QWORD PTR context$[rbp] - 00092 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose33 - 00099 48 89 88 80 00 + 00063 48 89 88 80 00 00 00 mov QWORD PTR [rax+128], rcx -; 98 : context->transpose_34 = transpose34; +; 99 : context->transpose_24 = transpose24; - 000a0 48 8b 85 e0 00 + 0006a 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000a7 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose34 - 000ae 48 89 88 88 00 + 00071 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose24 + 00078 48 89 88 88 00 00 00 mov QWORD PTR [rax+136], rcx -; 99 : context->transpose_42 = transpose42; +; 100 : context->transpose_32 = transpose32; - 000b5 48 8b 85 e0 00 + 0007f 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000bc 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose42 - 000c3 48 89 88 90 00 + 00086 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose32 + 0008d 48 89 88 90 00 00 00 mov QWORD PTR [rax+144], rcx -; 100 : context->transpose_43 = transpose43; +; 101 : context->transpose_33 = transpose33; - 000ca 48 8b 85 e0 00 + 00094 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000d1 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose43 - 000d8 48 89 88 98 00 + 0009b 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose33 + 000a2 48 89 88 98 00 00 00 mov QWORD PTR [rax+152], rcx -; 101 : context->transpose_44 = transpose44; +; 102 : context->transpose_34 = transpose34; - 000df 48 8b 85 e0 00 + 000a9 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000e6 48 8d 0d 00 00 - 00 00 lea rcx, OFFSET FLAT:transpose44 - 000ed 48 89 88 a0 00 + 000b0 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose34 + 000b7 48 89 88 a0 00 00 00 mov QWORD PTR [rax+160], rcx -; 102 : context->normalize_3 = normalize; +; 103 : context->transpose_42 = transpose42; - 000f4 48 8b 85 e0 00 + 000be 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000fb 48 8d 0d 00 00 + 000c5 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose42 + 000cc 48 89 88 a8 00 + 00 00 mov QWORD PTR [rax+168], rcx + +; 104 : context->transpose_43 = transpose43; + + 000d3 48 8b 85 e0 00 + 00 00 mov rax, QWORD PTR context$[rbp] + 000da 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose43 + 000e1 48 89 88 b0 00 + 00 00 mov QWORD PTR [rax+176], rcx + +; 105 : context->transpose_44 = transpose44; + + 000e8 48 8b 85 e0 00 + 00 00 mov rax, QWORD PTR context$[rbp] + 000ef 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:transpose44 + 000f6 48 89 88 b8 00 + 00 00 mov QWORD PTR [rax+184], rcx + +; 106 : context->normalize_3 = normalize; + + 000fd 48 8b 85 e0 00 + 00 00 mov rax, QWORD PTR context$[rbp] + 00104 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:normalize - 00102 48 89 48 60 mov QWORD PTR [rax+96], rcx + 0010b 48 89 48 60 mov QWORD PTR [rax+96], rcx -; 103 : context->det_matrix33 = det_mat3; +; 107 : context->det_matrix33 = det_mat3; - 00106 48 8b 85 e0 00 + 0010f 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0010d 48 8d 0d 00 00 + 00116 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:det_mat3 - 00114 48 89 48 20 mov QWORD PTR [rax+32], rcx + 0011d 48 89 48 20 mov QWORD PTR [rax+32], rcx -; 104 : context->det_matrix44 = det_mat4; +; 108 : context->det_matrix44 = det_mat4; - 00118 48 8b 85 e0 00 + 00121 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0011f 48 8d 0d 00 00 + 00128 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:det_mat4 - 00126 48 89 48 28 mov QWORD PTR [rax+40], rcx + 0012f 48 89 48 28 mov QWORD PTR [rax+40], rcx -; 105 : context->dot_31 = dot_31_avx; +; 109 : context->dot_31 = dot_31_avx; - 0012a 48 8b 85 e0 00 + 00133 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00131 48 8d 0d 00 00 + 0013a 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_31_avx - 00138 48 89 48 30 mov QWORD PTR [rax+48], rcx + 00141 48 89 48 30 mov QWORD PTR [rax+48], rcx -; 106 : context->dot_32 = dot_32_avx; +; 110 : context->dot_32 = dot_32_avx; - 0013c 48 8b 85 e0 00 + 00145 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00143 48 8d 0d 00 00 + 0014c 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_32_avx - 0014a 48 89 48 38 mov QWORD PTR [rax+56], rcx + 00153 48 89 48 38 mov QWORD PTR [rax+56], rcx -; 107 : context->dot_41 = dot_41_avx; +; 111 : context->dot_41 = dot_41_avx; - 0014e 48 8b 85 e0 00 + 00157 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00155 48 8d 0d 00 00 + 0015e 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_41_avx - 0015c 48 89 48 40 mov QWORD PTR [rax+64], rcx + 00165 48 89 48 40 mov QWORD PTR [rax+64], rcx -; 108 : context->dot_42 = dot_42_avx; +; 112 : context->dot_42 = dot_42_avx; - 00160 48 8b 85 e0 00 + 00169 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00167 48 8d 0d 00 00 + 00170 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_42_avx - 0016e 48 89 48 48 mov QWORD PTR [rax+72], rcx + 00177 48 89 48 48 mov QWORD PTR [rax+72], rcx -; 109 : context->dot_43 = dot_43_avx; +; 113 : context->dot_43 = dot_43_avx; - 00172 48 8b 85 e0 00 + 0017b 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00179 48 8d 0d 00 00 + 00182 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_43_avx - 00180 48 89 48 50 mov QWORD PTR [rax+80], rcx + 00189 48 89 48 50 mov QWORD PTR [rax+80], rcx -; 110 : context->city_hash_simplify = city_hash_simplify_sse; +; 114 : context->city_hash_simplify = city_hash_simplify_sse; - 00184 48 8b 85 e0 00 + 0018d 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0018b 48 8d 0d 00 00 + 00194 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:city_hash_simplify_sse - 00192 48 89 48 18 mov QWORD PTR [rax+24], rcx + 0019b 48 89 48 18 mov QWORD PTR [rax+24], rcx -; 111 : context->index_pair = index_pair_sse; +; 115 : context->index_pair = index_pair_sse; - 00196 48 8b 85 e0 00 + 0019f 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0019d 48 8d 0d 00 00 + 001a6 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:index_pair_sse - 001a4 48 89 48 58 mov QWORD PTR [rax+88], rcx + 001ad 48 89 48 58 mov QWORD PTR [rax+88], rcx -; 112 : } +; 116 : } - 001a8 48 8d a5 c8 00 + 001b1 48 8d a5 c8 00 00 00 lea rsp, QWORD PTR [rbp+200] - 001af 5f pop rdi - 001b0 5d pop rbp - 001b1 c3 ret 0 + 001b8 5f pop rdi + 001b9 5d pop rbp + 001ba c3 ret 0 load_intrinsic_avx ENDP _TEXT ENDS ; Function compile flags: /Odtp /RTCsu /ZI @@ -824,156 +833,184 @@ load_intrinsic_sse PROC ; COMDAT 00 00 mov rax, QWORD PTR context$[rbp] 0005c 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:transpose23 - 00063 48 89 48 68 mov QWORD PTR [rax+104], rcx + 00063 48 89 88 80 00 + 00 00 mov QWORD PTR [rax+128], rcx ; 70 : context->transpose_24 = transpose24; - 00067 48 8b 85 e0 00 + 0006a 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0006e 48 8d 0d 00 00 + 00071 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:transpose24 - 00075 48 89 48 70 mov QWORD PTR [rax+112], rcx + 00078 48 89 88 88 00 + 00 00 mov QWORD PTR [rax+136], rcx ; 71 : context->transpose_32 = transpose32; - 00079 48 8b 85 e0 00 + 0007f 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00080 48 8d 0d 00 00 + 00086 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:transpose32 - 00087 48 89 48 78 mov QWORD PTR [rax+120], rcx + 0008d 48 89 88 90 00 + 00 00 mov QWORD PTR [rax+144], rcx ; 72 : context->transpose_33 = transpose33; - 0008b 48 8b 85 e0 00 + 00094 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00092 48 8d 0d 00 00 + 0009b 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:transpose33 - 00099 48 89 88 80 00 - 00 00 mov QWORD PTR [rax+128], rcx + 000a2 48 89 88 98 00 + 00 00 mov QWORD PTR [rax+152], rcx ; 73 : context->transpose_34 = transpose34; - 000a0 48 8b 85 e0 00 + 000a9 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000a7 48 8d 0d 00 00 + 000b0 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:transpose34 - 000ae 48 89 88 88 00 - 00 00 mov QWORD PTR [rax+136], rcx + 000b7 48 89 88 a0 00 + 00 00 mov QWORD PTR [rax+160], rcx ; 74 : context->transpose_42 = transpose42; - 000b5 48 8b 85 e0 00 + 000be 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000bc 48 8d 0d 00 00 + 000c5 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:transpose42 - 000c3 48 89 88 90 00 - 00 00 mov QWORD PTR [rax+144], rcx + 000cc 48 89 88 a8 00 + 00 00 mov QWORD PTR [rax+168], rcx ; 75 : context->transpose_43 = transpose43; - 000ca 48 8b 85 e0 00 + 000d3 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000d1 48 8d 0d 00 00 + 000da 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:transpose43 - 000d8 48 89 88 98 00 - 00 00 mov QWORD PTR [rax+152], rcx + 000e1 48 89 88 b0 00 + 00 00 mov QWORD PTR [rax+176], rcx ; 76 : context->transpose_44 = transpose44; - 000df 48 8b 85 e0 00 + 000e8 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000e6 48 8d 0d 00 00 + 000ef 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:transpose44 - 000ed 48 89 88 a0 00 - 00 00 mov QWORD PTR [rax+160], rcx + 000f6 48 89 88 b8 00 + 00 00 mov QWORD PTR [rax+184], rcx ; 77 : context->normalize_3 = normalize; - 000f4 48 8b 85 e0 00 + 000fd 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 000fb 48 8d 0d 00 00 + 00104 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:normalize - 00102 48 89 48 60 mov QWORD PTR [rax+96], rcx + 0010b 48 89 48 60 mov QWORD PTR [rax+96], rcx ; 78 : context->det_matrix33 = det_mat3; - 00106 48 8b 85 e0 00 + 0010f 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0010d 48 8d 0d 00 00 + 00116 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:det_mat3 - 00114 48 89 48 20 mov QWORD PTR [rax+32], rcx + 0011d 48 89 48 20 mov QWORD PTR [rax+32], rcx ; 79 : context->det_matrix44 = det_mat4; - 00118 48 8b 85 e0 00 + 00121 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0011f 48 8d 0d 00 00 + 00128 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:det_mat4 - 00126 48 89 48 28 mov QWORD PTR [rax+40], rcx + 0012f 48 89 48 28 mov QWORD PTR [rax+40], rcx ; 80 : context->dot_31 = dot_31_sse; - 0012a 48 8b 85 e0 00 + 00133 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00131 48 8d 0d 00 00 + 0013a 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_31_sse - 00138 48 89 48 30 mov QWORD PTR [rax+48], rcx + 00141 48 89 48 30 mov QWORD PTR [rax+48], rcx ; 81 : context->dot_32 = dot_32_sse; - 0013c 48 8b 85 e0 00 + 00145 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00143 48 8d 0d 00 00 + 0014c 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_32_sse - 0014a 48 89 48 38 mov QWORD PTR [rax+56], rcx + 00153 48 89 48 38 mov QWORD PTR [rax+56], rcx ; 82 : context->dot_41 = dot_41_sse; - 0014e 48 8b 85 e0 00 + 00157 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00155 48 8d 0d 00 00 + 0015e 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_41_sse - 0015c 48 89 48 40 mov QWORD PTR [rax+64], rcx + 00165 48 89 48 40 mov QWORD PTR [rax+64], rcx ; 83 : context->dot_42 = dot_42_sse; - 00160 48 8b 85 e0 00 + 00169 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00167 48 8d 0d 00 00 + 00170 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_42_sse - 0016e 48 89 48 48 mov QWORD PTR [rax+72], rcx + 00177 48 89 48 48 mov QWORD PTR [rax+72], rcx ; 84 : context->dot_43 = dot_43_sse; - 00172 48 8b 85 e0 00 + 0017b 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 00179 48 8d 0d 00 00 + 00182 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:dot_43_sse - 00180 48 89 48 50 mov QWORD PTR [rax+80], rcx + 00189 48 89 48 50 mov QWORD PTR [rax+80], rcx ; 85 : context->city_hash_simplify = city_hash_simplify_sse; - 00184 48 8b 85 e0 00 + 0018d 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0018b 48 8d 0d 00 00 + 00194 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:city_hash_simplify_sse - 00192 48 89 48 18 mov QWORD PTR [rax+24], rcx + 0019b 48 89 48 18 mov QWORD PTR [rax+24], rcx ; 86 : context->index_pair = index_pair_sse; - 00196 48 8b 85 e0 00 + 0019f 48 8b 85 e0 00 00 00 mov rax, QWORD PTR context$[rbp] - 0019d 48 8d 0d 00 00 + 001a6 48 8d 0d 00 00 00 00 lea rcx, OFFSET FLAT:index_pair_sse - 001a4 48 89 48 58 mov QWORD PTR [rax+88], rcx + 001ad 48 89 48 58 mov QWORD PTR [rax+88], rcx -; 87 : } +; 87 : context->sub_m2 = submatrix2_sse; - 001a8 48 8d a5 c8 00 + 001b1 48 8b 85 e0 00 + 00 00 mov rax, QWORD PTR context$[rbp] + 001b8 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:submatrix2_sse + 001bf 48 89 48 68 mov QWORD PTR [rax+104], rcx + +; 88 : context->sub_m3 = submatrix3_sse; + + 001c3 48 8b 85 e0 00 + 00 00 mov rax, QWORD PTR context$[rbp] + 001ca 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:submatrix3_sse + 001d1 48 89 48 70 mov QWORD PTR [rax+112], rcx + +; 89 : context->sub_m4 = submatrix4_sse; + + 001d5 48 8b 85 e0 00 + 00 00 mov rax, QWORD PTR context$[rbp] + 001dc 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:submatrix4_sse + 001e3 48 89 48 78 mov QWORD PTR [rax+120], rcx + +; 90 : +; 91 : } + + 001e7 48 8d a5 c8 00 00 00 lea rsp, QWORD PTR [rbp+200] - 001af 5f pop rdi - 001b0 5d pop rbp - 001b1 c3 ret 0 + 001ee 5f pop rdi + 001ef 5d pop rbp + 001f0 c3 ret 0 load_intrinsic_sse ENDP _TEXT ENDS ; Function compile flags: /Odtp /RTCsu /ZI diff --git a/StgSharp.C/x64/Debug/intrinsic.obj b/StgSharp.C/x64/Debug/intrinsic.obj index 4c75db74..41057624 100644 Binary files a/StgSharp.C/x64/Debug/intrinsic.obj and b/StgSharp.C/x64/Debug/intrinsic.obj differ diff --git a/StgSharp.C/x64/Debug/intrinsic.sbr b/StgSharp.C/x64/Debug/intrinsic.sbr index 4b25a191..fa53e6a2 100644 Binary files a/StgSharp.C/x64/Debug/intrinsic.sbr and b/StgSharp.C/x64/Debug/intrinsic.sbr differ diff --git a/StgSharp.C/x64/Debug/mat2.cod b/StgSharp.C/x64/Debug/mat2.cod index 6bec1801..9f0faaea 100644 --- a/StgSharp.C/x64/Debug/mat2.cod +++ b/StgSharp.C/x64/Debug/mat2.cod @@ -143,8 +143,10 @@ __5972891A_mat2@c DB 01H msvcjmc ENDS PUBLIC addmatrix2_sse PUBLIC addmatrix2_avx +PUBLIC submatrix2_sse PUBLIC transpose23 PUBLIC transpose24 +PUBLIC submatrix2_avx PUBLIC __JustMyCode_Default EXTRN _RTC_InitBase:PROC EXTRN _RTC_Shutdown:PROC @@ -163,6 +165,12 @@ $pdata$addmatrix2_avx DD imagerel $LN3 pdata ENDS ; COMDAT pdata pdata SEGMENT +$pdata$submatrix2_sse DD imagerel $LN3 + DD imagerel $LN3+254 + DD imagerel $unwind$submatrix2_sse +pdata ENDS +; COMDAT pdata +pdata SEGMENT $pdata$transpose23 DD imagerel $LN3 DD imagerel $LN3+271 DD imagerel $unwind$transpose23 @@ -173,6 +181,12 @@ $pdata$transpose24 DD imagerel $LN3 DD imagerel $LN3+305 DD imagerel $unwind$transpose24 pdata ENDS +; COMDAT pdata +pdata SEGMENT +$pdata$submatrix2_avx DD imagerel $LN3 + DD imagerel $LN3+169 + DD imagerel $unwind$submatrix2_avx +pdata ENDS ; COMDAT rtc$TMZ rtc$TMZ SEGMENT _RTC_Shutdown.rtc$TMZ DQ FLAT:_RTC_Shutdown @@ -183,6 +197,13 @@ _RTC_InitBase.rtc$IMZ DQ FLAT:_RTC_InitBase rtc$IMZ ENDS ; COMDAT xdata xdata SEGMENT +$unwind$submatrix2_avx DD 02d062801H + DD 011a231fH + DD 07013002aH + DD 0d0115012H +xdata ENDS +; COMDAT xdata +xdata SEGMENT $unwind$transpose24 DD 025051801H DD 01132318H DD 0700c0029H @@ -197,6 +218,13 @@ $unwind$transpose23 DD 025051801H xdata ENDS ; COMDAT xdata xdata SEGMENT +$unwind$submatrix2_sse DD 025051d01H + DD 0118231dH + DD 070110029H + DD 05010H +xdata ENDS +; COMDAT xdata +xdata SEGMENT $unwind$addmatrix2_avx DD 02d062801H DD 011a231fH DD 07013002aH @@ -218,6 +246,78 @@ __JustMyCode_Default ENDP _TEXT ENDS ; Function compile flags: /Odtp /RTCsu /ZI ; File D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\ںԴ\StgSharp.C\mat2.c +; COMDAT submatrix2_avx +_TEXT SEGMENT +temp$ = 32 +left$ = 336 +right$ = 344 +ans$ = 352 +submatrix2_avx PROC ; COMDAT + +; 54 : { + +$LN3: + 00000 4c 89 44 24 18 mov QWORD PTR [rsp+24], r8 + 00005 48 89 54 24 10 mov QWORD PTR [rsp+16], rdx + 0000a 48 89 4c 24 08 mov QWORD PTR [rsp+8], rcx + 0000f 41 55 push r13 + 00011 55 push rbp + 00012 57 push rdi + 00013 48 81 ec 50 01 + 00 00 sub rsp, 336 ; 00000150H + 0001a 4c 8d 6c 24 20 lea r13, QWORD PTR [rsp+32] + 0001f 48 8d 6c 24 40 lea rbp, QWORD PTR [rsp+64] + 00024 48 83 e5 e0 and rbp, -32 ; ffffffffffffffe0H + 00028 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:__5972891A_mat2@c + 0002f e8 00 00 00 00 call __CheckForDebuggerJustMyCode + 00034 90 npad 1 + +; 55 : __m256 temp = _mm256_sub_ps(ALIGN256(left->column[0]), ALIGN256(right->column[0])); + + 00035 b8 10 00 00 00 mov eax, 16 + 0003a 48 6b c0 00 imul rax, rax, 0 + 0003e 49 8b 8d 58 01 + 00 00 mov rcx, QWORD PTR right$[r13] + 00045 48 03 c8 add rcx, rax + 00048 48 8b c1 mov rax, rcx + 0004b c5 fc 10 00 vmovups ymm0, YMMWORD PTR [rax] + 0004f b8 10 00 00 00 mov eax, 16 + 00054 48 6b c0 00 imul rax, rax, 0 + 00058 49 8b 8d 50 01 + 00 00 mov rcx, QWORD PTR left$[r13] + 0005f 48 03 c8 add rcx, rax + 00062 48 8b c1 mov rax, rcx + 00065 c5 fc 10 08 vmovups ymm1, YMMWORD PTR [rax] + 00069 c5 f4 5c c0 vsubps ymm0, ymm1, ymm0 + 0006d c5 fc 11 45 20 vmovups YMMWORD PTR temp$[rbp], ymm0 + +; 56 : _mm256_storeu_ps(&ans->m[0][0], temp); + + 00072 b8 08 00 00 00 mov eax, 8 + 00077 48 6b c0 00 imul rax, rax, 0 + 0007b 49 8b 8d 60 01 + 00 00 mov rcx, QWORD PTR ans$[r13] + 00082 48 03 c8 add rcx, rax + 00085 48 8b c1 mov rax, rcx + 00088 b9 04 00 00 00 mov ecx, 4 + 0008d 48 6b c9 00 imul rcx, rcx, 0 + 00091 48 03 c1 add rax, rcx + 00094 c5 fc 10 45 20 vmovups ymm0, YMMWORD PTR temp$[rbp] + 00099 c5 fc 11 00 vmovups YMMWORD PTR [rax], ymm0 + +; 57 : } + + 0009d 49 8d a5 30 01 + 00 00 lea rsp, QWORD PTR [r13+304] + 000a4 5f pop rdi + 000a5 5d pop rbp + 000a6 41 5d pop r13 + 000a8 c3 ret 0 +submatrix2_avx ENDP +_TEXT ENDS +; Function compile flags: /Odtp /RTCsu /ZI +; File D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\ںԴ\StgSharp.C\mat2.c ; COMDAT transpose24 _TEXT SEGMENT t0$ = 16 @@ -456,6 +556,111 @@ transpose23 ENDP _TEXT ENDS ; Function compile flags: /Odtp /RTCsu /ZI ; File D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\ںԴ\StgSharp.C\mat2.c +; COMDAT submatrix2_sse +_TEXT SEGMENT +temp0$ = 16 +temp1$ = 64 +left$ = 320 +right$ = 328 +ans$ = 336 +submatrix2_sse PROC ; COMDAT + +; 45 : { + +$LN3: + 00000 4c 89 44 24 18 mov QWORD PTR [rsp+24], r8 + 00005 48 89 54 24 10 mov QWORD PTR [rsp+16], rdx + 0000a 48 89 4c 24 08 mov QWORD PTR [rsp+8], rcx + 0000f 55 push rbp + 00010 57 push rdi + 00011 48 81 ec 48 01 + 00 00 sub rsp, 328 ; 00000148H + 00018 48 8d 6c 24 20 lea rbp, QWORD PTR [rsp+32] + 0001d 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:__5972891A_mat2@c + 00024 e8 00 00 00 00 call __CheckForDebuggerJustMyCode + 00029 90 npad 1 + +; 46 : __m128 temp0 = _mm_sub_ps(ALIGN(left->column[0]), ALIGN(right->column[0])); + + 0002a b8 10 00 00 00 mov eax, 16 + 0002f 48 6b c0 00 imul rax, rax, 0 + 00033 48 8b 8d 48 01 + 00 00 mov rcx, QWORD PTR right$[rbp] + 0003a 48 03 c8 add rcx, rax + 0003d 48 8b c1 mov rax, rcx + 00040 0f 10 00 movups xmm0, XMMWORD PTR [rax] + 00043 b8 10 00 00 00 mov eax, 16 + 00048 48 6b c0 00 imul rax, rax, 0 + 0004c 48 8b 8d 40 01 + 00 00 mov rcx, QWORD PTR left$[rbp] + 00053 48 03 c8 add rcx, rax + 00056 48 8b c1 mov rax, rcx + 00059 0f 10 08 movups xmm1, XMMWORD PTR [rax] + 0005c 0f 5c c8 subps xmm1, xmm0 + 0005f 0f 28 c1 movaps xmm0, xmm1 + 00062 0f 29 45 10 movaps XMMWORD PTR temp0$[rbp], xmm0 + +; 47 : __m128 temp1 = _mm_sub_ps(ALIGN(left->column[1]), ALIGN(right->column[1])); + + 00066 b8 10 00 00 00 mov eax, 16 + 0006b 48 6b c0 01 imul rax, rax, 1 + 0006f 48 8b 8d 48 01 + 00 00 mov rcx, QWORD PTR right$[rbp] + 00076 48 03 c8 add rcx, rax + 00079 48 8b c1 mov rax, rcx + 0007c 0f 10 00 movups xmm0, XMMWORD PTR [rax] + 0007f b8 10 00 00 00 mov eax, 16 + 00084 48 6b c0 01 imul rax, rax, 1 + 00088 48 8b 8d 40 01 + 00 00 mov rcx, QWORD PTR left$[rbp] + 0008f 48 03 c8 add rcx, rax + 00092 48 8b c1 mov rax, rcx + 00095 0f 10 08 movups xmm1, XMMWORD PTR [rax] + 00098 0f 5c c8 subps xmm1, xmm0 + 0009b 0f 28 c1 movaps xmm0, xmm1 + 0009e 0f 29 45 40 movaps XMMWORD PTR temp1$[rbp], xmm0 + +; 48 : +; 49 : _mm_storeu_ps(&ans->m[0][0], temp0); + + 000a2 b8 08 00 00 00 mov eax, 8 + 000a7 48 6b c0 00 imul rax, rax, 0 + 000ab 48 8b 8d 50 01 + 00 00 mov rcx, QWORD PTR ans$[rbp] + 000b2 48 03 c8 add rcx, rax + 000b5 48 8b c1 mov rax, rcx + 000b8 b9 04 00 00 00 mov ecx, 4 + 000bd 48 6b c9 00 imul rcx, rcx, 0 + 000c1 48 03 c1 add rax, rcx + 000c4 0f 28 45 10 movaps xmm0, XMMWORD PTR temp0$[rbp] + 000c8 0f 11 00 movups XMMWORD PTR [rax], xmm0 + +; 50 : _mm_storeu_ps(&ans->m[0][1], temp1); + + 000cb b8 08 00 00 00 mov eax, 8 + 000d0 48 6b c0 00 imul rax, rax, 0 + 000d4 48 8b 8d 50 01 + 00 00 mov rcx, QWORD PTR ans$[rbp] + 000db 48 03 c8 add rcx, rax + 000de 48 8b c1 mov rax, rcx + 000e1 b9 04 00 00 00 mov ecx, 4 + 000e6 48 6b c9 01 imul rcx, rcx, 1 + 000ea 48 03 c1 add rax, rcx + 000ed 0f 28 45 40 movaps xmm0, XMMWORD PTR temp1$[rbp] + 000f1 0f 11 00 movups XMMWORD PTR [rax], xmm0 + +; 51 : } + + 000f4 48 8d a5 28 01 + 00 00 lea rsp, QWORD PTR [rbp+296] + 000fb 5f pop rdi + 000fc 5d pop rbp + 000fd c3 ret 0 +submatrix2_sse ENDP +_TEXT ENDS +; Function compile flags: /Odtp /RTCsu /ZI +; File D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\ںԴ\StgSharp.C\mat2.c ; COMDAT addmatrix2_avx _TEXT SEGMENT temp$ = 32 diff --git a/StgSharp.C/x64/Debug/mat2.obj b/StgSharp.C/x64/Debug/mat2.obj index 8e00bbdd..a38e2615 100644 Binary files a/StgSharp.C/x64/Debug/mat2.obj and b/StgSharp.C/x64/Debug/mat2.obj differ diff --git a/StgSharp.C/x64/Debug/mat2.sbr b/StgSharp.C/x64/Debug/mat2.sbr index 8350f66a..78b2bcb8 100644 Binary files a/StgSharp.C/x64/Debug/mat2.sbr and b/StgSharp.C/x64/Debug/mat2.sbr differ diff --git a/StgSharp.C/x64/Debug/mat3.cod b/StgSharp.C/x64/Debug/mat3.cod index 2ce0d7d0..dd9a4665 100644 --- a/StgSharp.C/x64/Debug/mat3.cod +++ b/StgSharp.C/x64/Debug/mat3.cod @@ -144,6 +144,9 @@ msvcjmc ENDS PUBLIC addmatrix3_sse PUBLIC addmatrix3_avx PUBLIC addmatrix3_512 +PUBLIC submatrix3_sse +PUBLIC submatrix3_avx +PUBLIC submatrix3_512 PUBLIC transpose32 PUBLIC transpose33 PUBLIC transpose34 @@ -175,6 +178,24 @@ $pdata$addmatrix3_512 DD imagerel $LN3 pdata ENDS ; COMDAT pdata pdata SEGMENT +$pdata$submatrix3_sse DD imagerel $LN3 + DD imagerel $LN3+355 + DD imagerel $unwind$submatrix3_sse +pdata ENDS +; COMDAT pdata +pdata SEGMENT +$pdata$submatrix3_avx DD imagerel $LN3 + DD imagerel $LN3+240 + DD imagerel $unwind$submatrix3_avx +pdata ENDS +; COMDAT pdata +pdata SEGMENT +$pdata$submatrix3_512 DD imagerel $LN3 + DD imagerel $LN3+133 + DD imagerel $unwind$submatrix3_512 +pdata ENDS +; COMDAT pdata +pdata SEGMENT $pdata$transpose32 DD imagerel $LN3 DD imagerel $LN3+205 DD imagerel $unwind$transpose32 @@ -263,6 +284,27 @@ $unwind$transpose32 DD 025051801H xdata ENDS ; COMDAT xdata xdata SEGMENT +$unwind$submatrix3_512 DD 02d062801H + DD 011a231fH + DD 070130036H + DD 0d0115012H +xdata ENDS +; COMDAT xdata +xdata SEGMENT +$unwind$submatrix3_avx DD 02d062801H + DD 011a231fH + DD 070130030H + DD 0d0115012H +xdata ENDS +; COMDAT xdata +xdata SEGMENT +$unwind$submatrix3_sse DD 025051d01H + DD 0118231dH + DD 07011002fH + DD 05010H +xdata ENDS +; COMDAT xdata +xdata SEGMENT $unwind$addmatrix3_512 DD 02d062801H DD 011a231fH DD 070130036H @@ -912,6 +954,311 @@ transpose32 ENDP _TEXT ENDS ; Function compile flags: /Odtp /RTCsu /ZI ; File D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\ںԴ\StgSharp.C\mat3.c +; COMDAT submatrix3_512 +_TEXT SEGMENT +temp$ = 64 +left$ = 432 +right$ = 440 +ans$ = 448 +submatrix3_512 PROC ; COMDAT + +; 125 : { + +$LN3: + 00000 4c 89 44 24 18 mov QWORD PTR [rsp+24], r8 + 00005 48 89 54 24 10 mov QWORD PTR [rsp+16], rdx + 0000a 48 89 4c 24 08 mov QWORD PTR [rsp+8], rcx + 0000f 41 55 push r13 + 00011 55 push rbp + 00012 57 push rdi + 00013 48 81 ec b0 01 + 00 00 sub rsp, 432 ; 000001b0H + 0001a 4c 8d 6c 24 20 lea r13, QWORD PTR [rsp+32] + 0001f 48 8d 6c 24 60 lea rbp, QWORD PTR [rsp+96] + 00024 48 83 e5 c0 and rbp, -64 ; ffffffffffffffc0H + 00028 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:__58B0E32D_mat3@c + 0002f e8 00 00 00 00 call __CheckForDebuggerJustMyCode + 00034 90 npad 1 + +; 126 : __m512 temp = _mm512_sub_ps(_mm512_loadu_ps(left), _mm512_loadu_ps(right)); + + 00035 49 8b 85 b8 01 + 00 00 mov rax, QWORD PTR right$[r13] + 0003c 62 f1 7c 48 10 + 00 vmovups zmm0, ZMMWORD PTR [rax] + 00042 49 8b 85 b0 01 + 00 00 mov rax, QWORD PTR left$[r13] + 00049 62 f1 7c 48 10 + 08 vmovups zmm1, ZMMWORD PTR [rax] + 0004f 62 f1 74 48 5c + c0 vsubps zmm0, zmm1, zmm0 + 00055 62 f1 7c 48 11 + 45 01 vmovups ZMMWORD PTR temp$[rbp], zmm0 + +; 127 : _mm512_mask_store_ps(ans, 0x0fff, temp); + + 0005c b8 ff 0f 00 00 mov eax, 4095 ; 00000fffH + 00061 c5 f8 92 c8 kmovw k1, ax + 00065 49 8b 85 c0 01 + 00 00 mov rax, QWORD PTR ans$[r13] + 0006c 62 f1 7c 48 10 + 45 01 vmovups zmm0, ZMMWORD PTR temp$[rbp] + 00073 62 f1 7c 49 11 + 00 vmovups ZMMWORD PTR [rax] {k1}, zmm0 + +; 128 : } + + 00079 49 8d a5 90 01 + 00 00 lea rsp, QWORD PTR [r13+400] + 00080 5f pop rdi + 00081 5d pop rbp + 00082 41 5d pop r13 + 00084 c3 ret 0 +submatrix3_512 ENDP +_TEXT ENDS +; Function compile flags: /Odtp /RTCsu /ZI +; File D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\ںԴ\StgSharp.C\mat3.c +; COMDAT submatrix3_avx +_TEXT SEGMENT +temp0$ = 32 +temp1$ = 96 +left$ = 384 +right$ = 392 +ans$ = 400 +submatrix3_avx PROC ; COMDAT + +; 116 : { + +$LN3: + 00000 4c 89 44 24 18 mov QWORD PTR [rsp+24], r8 + 00005 48 89 54 24 10 mov QWORD PTR [rsp+16], rdx + 0000a 48 89 4c 24 08 mov QWORD PTR [rsp+8], rcx + 0000f 41 55 push r13 + 00011 55 push rbp + 00012 57 push rdi + 00013 48 81 ec 80 01 + 00 00 sub rsp, 384 ; 00000180H + 0001a 4c 8d 6c 24 20 lea r13, QWORD PTR [rsp+32] + 0001f 48 8d 6c 24 40 lea rbp, QWORD PTR [rsp+64] + 00024 48 83 e5 e0 and rbp, -32 ; ffffffffffffffe0H + 00028 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:__58B0E32D_mat3@c + 0002f e8 00 00 00 00 call __CheckForDebuggerJustMyCode + 00034 90 npad 1 + +; 117 : __m256 temp0 = _mm256_sub_ps(ALIGN256(left->part), ALIGN256(right->part)); + + 00035 49 8b 85 88 01 + 00 00 mov rax, QWORD PTR right$[r13] + 0003c c5 fc 10 00 vmovups ymm0, YMMWORD PTR [rax] + 00040 49 8b 85 80 01 + 00 00 mov rax, QWORD PTR left$[r13] + 00047 c5 fc 10 08 vmovups ymm1, YMMWORD PTR [rax] + 0004b c5 f4 5c c0 vsubps ymm0, ymm1, ymm0 + 0004f c5 fc 11 45 20 vmovups YMMWORD PTR temp0$[rbp], ymm0 + +; 118 : __m128 temp1 = _mm_sub_ps(ALIGN(left->column[2]), ALIGN(right->column[2])); + + 00054 b8 10 00 00 00 mov eax, 16 + 00059 48 6b c0 02 imul rax, rax, 2 + 0005d 49 8b 8d 88 01 + 00 00 mov rcx, QWORD PTR right$[r13] + 00064 48 03 c8 add rcx, rax + 00067 48 8b c1 mov rax, rcx + 0006a 0f 10 00 movups xmm0, XMMWORD PTR [rax] + 0006d b8 10 00 00 00 mov eax, 16 + 00072 48 6b c0 02 imul rax, rax, 2 + 00076 49 8b 8d 80 01 + 00 00 mov rcx, QWORD PTR left$[r13] + 0007d 48 03 c8 add rcx, rax + 00080 48 8b c1 mov rax, rcx + 00083 0f 10 08 movups xmm1, XMMWORD PTR [rax] + 00086 0f 5c c8 subps xmm1, xmm0 + 00089 0f 28 c1 movaps xmm0, xmm1 + 0008c 0f 29 45 60 movaps XMMWORD PTR temp1$[rbp], xmm0 + +; 119 : +; 120 : _mm256_storeu_ps(&ans->m[0][0], temp0); + + 00090 b8 0c 00 00 00 mov eax, 12 + 00095 48 6b c0 00 imul rax, rax, 0 + 00099 49 8b 8d 90 01 + 00 00 mov rcx, QWORD PTR ans$[r13] + 000a0 48 03 c8 add rcx, rax + 000a3 48 8b c1 mov rax, rcx + 000a6 b9 04 00 00 00 mov ecx, 4 + 000ab 48 6b c9 00 imul rcx, rcx, 0 + 000af 48 03 c1 add rax, rcx + 000b2 c5 fc 10 45 20 vmovups ymm0, YMMWORD PTR temp0$[rbp] + 000b7 c5 fc 11 00 vmovups YMMWORD PTR [rax], ymm0 + +; 121 : _mm_storeu_ps(&ans->m[0][2], temp1); + + 000bb b8 0c 00 00 00 mov eax, 12 + 000c0 48 6b c0 00 imul rax, rax, 0 + 000c4 49 8b 8d 90 01 + 00 00 mov rcx, QWORD PTR ans$[r13] + 000cb 48 03 c8 add rcx, rax + 000ce 48 8b c1 mov rax, rcx + 000d1 b9 04 00 00 00 mov ecx, 4 + 000d6 48 6b c9 02 imul rcx, rcx, 2 + 000da 48 03 c1 add rax, rcx + 000dd 0f 28 45 60 movaps xmm0, XMMWORD PTR temp1$[rbp] + 000e1 0f 11 00 movups XMMWORD PTR [rax], xmm0 + +; 122 : } + + 000e4 49 8d a5 60 01 + 00 00 lea rsp, QWORD PTR [r13+352] + 000eb 5f pop rdi + 000ec 5d pop rbp + 000ed 41 5d pop r13 + 000ef c3 ret 0 +submatrix3_avx ENDP +_TEXT ENDS +; Function compile flags: /Odtp /RTCsu /ZI +; File D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\ںԴ\StgSharp.C\mat3.c +; COMDAT submatrix3_sse +_TEXT SEGMENT +temp0$ = 16 +temp1$ = 64 +temp2$ = 112 +left$ = 368 +right$ = 376 +ans$ = 384 +submatrix3_sse PROC ; COMDAT + +; 105 : { + +$LN3: + 00000 4c 89 44 24 18 mov QWORD PTR [rsp+24], r8 + 00005 48 89 54 24 10 mov QWORD PTR [rsp+16], rdx + 0000a 48 89 4c 24 08 mov QWORD PTR [rsp+8], rcx + 0000f 55 push rbp + 00010 57 push rdi + 00011 48 81 ec 78 01 + 00 00 sub rsp, 376 ; 00000178H + 00018 48 8d 6c 24 20 lea rbp, QWORD PTR [rsp+32] + 0001d 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:__58B0E32D_mat3@c + 00024 e8 00 00 00 00 call __CheckForDebuggerJustMyCode + 00029 90 npad 1 + +; 106 : __m128 temp0 = _mm_sub_ps(ALIGN(left->column[0]), ALIGN(right->column[0])); + + 0002a b8 10 00 00 00 mov eax, 16 + 0002f 48 6b c0 00 imul rax, rax, 0 + 00033 48 8b 8d 78 01 + 00 00 mov rcx, QWORD PTR right$[rbp] + 0003a 48 03 c8 add rcx, rax + 0003d 48 8b c1 mov rax, rcx + 00040 0f 10 00 movups xmm0, XMMWORD PTR [rax] + 00043 b8 10 00 00 00 mov eax, 16 + 00048 48 6b c0 00 imul rax, rax, 0 + 0004c 48 8b 8d 70 01 + 00 00 mov rcx, QWORD PTR left$[rbp] + 00053 48 03 c8 add rcx, rax + 00056 48 8b c1 mov rax, rcx + 00059 0f 10 08 movups xmm1, XMMWORD PTR [rax] + 0005c 0f 5c c8 subps xmm1, xmm0 + 0005f 0f 28 c1 movaps xmm0, xmm1 + 00062 0f 29 45 10 movaps XMMWORD PTR temp0$[rbp], xmm0 + +; 107 : __m128 temp1 = _mm_sub_ps(ALIGN(left->column[1]), ALIGN(right->column[1])); + + 00066 b8 10 00 00 00 mov eax, 16 + 0006b 48 6b c0 01 imul rax, rax, 1 + 0006f 48 8b 8d 78 01 + 00 00 mov rcx, QWORD PTR right$[rbp] + 00076 48 03 c8 add rcx, rax + 00079 48 8b c1 mov rax, rcx + 0007c 0f 10 00 movups xmm0, XMMWORD PTR [rax] + 0007f b8 10 00 00 00 mov eax, 16 + 00084 48 6b c0 01 imul rax, rax, 1 + 00088 48 8b 8d 70 01 + 00 00 mov rcx, QWORD PTR left$[rbp] + 0008f 48 03 c8 add rcx, rax + 00092 48 8b c1 mov rax, rcx + 00095 0f 10 08 movups xmm1, XMMWORD PTR [rax] + 00098 0f 5c c8 subps xmm1, xmm0 + 0009b 0f 28 c1 movaps xmm0, xmm1 + 0009e 0f 29 45 40 movaps XMMWORD PTR temp1$[rbp], xmm0 + +; 108 : __m128 temp2 = _mm_sub_ps(ALIGN(left->column[2]), ALIGN(right->column[2])); + + 000a2 b8 10 00 00 00 mov eax, 16 + 000a7 48 6b c0 02 imul rax, rax, 2 + 000ab 48 8b 8d 78 01 + 00 00 mov rcx, QWORD PTR right$[rbp] + 000b2 48 03 c8 add rcx, rax + 000b5 48 8b c1 mov rax, rcx + 000b8 0f 10 00 movups xmm0, XMMWORD PTR [rax] + 000bb b8 10 00 00 00 mov eax, 16 + 000c0 48 6b c0 02 imul rax, rax, 2 + 000c4 48 8b 8d 70 01 + 00 00 mov rcx, QWORD PTR left$[rbp] + 000cb 48 03 c8 add rcx, rax + 000ce 48 8b c1 mov rax, rcx + 000d1 0f 10 08 movups xmm1, XMMWORD PTR [rax] + 000d4 0f 5c c8 subps xmm1, xmm0 + 000d7 0f 28 c1 movaps xmm0, xmm1 + 000da 0f 29 45 70 movaps XMMWORD PTR temp2$[rbp], xmm0 + +; 109 : +; 110 : _mm_storeu_ps(&ans->m[0][0], temp0); + + 000de b8 0c 00 00 00 mov eax, 12 + 000e3 48 6b c0 00 imul rax, rax, 0 + 000e7 48 8b 8d 80 01 + 00 00 mov rcx, QWORD PTR ans$[rbp] + 000ee 48 03 c8 add rcx, rax + 000f1 48 8b c1 mov rax, rcx + 000f4 b9 04 00 00 00 mov ecx, 4 + 000f9 48 6b c9 00 imul rcx, rcx, 0 + 000fd 48 03 c1 add rax, rcx + 00100 0f 28 45 10 movaps xmm0, XMMWORD PTR temp0$[rbp] + 00104 0f 11 00 movups XMMWORD PTR [rax], xmm0 + +; 111 : _mm_storeu_ps(&ans->m[0][1], temp1); + + 00107 b8 0c 00 00 00 mov eax, 12 + 0010c 48 6b c0 00 imul rax, rax, 0 + 00110 48 8b 8d 80 01 + 00 00 mov rcx, QWORD PTR ans$[rbp] + 00117 48 03 c8 add rcx, rax + 0011a 48 8b c1 mov rax, rcx + 0011d b9 04 00 00 00 mov ecx, 4 + 00122 48 6b c9 01 imul rcx, rcx, 1 + 00126 48 03 c1 add rax, rcx + 00129 0f 28 45 40 movaps xmm0, XMMWORD PTR temp1$[rbp] + 0012d 0f 11 00 movups XMMWORD PTR [rax], xmm0 + +; 112 : _mm_storeu_ps(&ans->m[0][2], temp2); + + 00130 b8 0c 00 00 00 mov eax, 12 + 00135 48 6b c0 00 imul rax, rax, 0 + 00139 48 8b 8d 80 01 + 00 00 mov rcx, QWORD PTR ans$[rbp] + 00140 48 03 c8 add rcx, rax + 00143 48 8b c1 mov rax, rcx + 00146 b9 04 00 00 00 mov ecx, 4 + 0014b 48 6b c9 02 imul rcx, rcx, 2 + 0014f 48 03 c1 add rax, rcx + 00152 0f 28 45 70 movaps xmm0, XMMWORD PTR temp2$[rbp] + 00156 0f 11 00 movups XMMWORD PTR [rax], xmm0 + +; 113 : } + + 00159 48 8d a5 58 01 + 00 00 lea rsp, QWORD PTR [rbp+344] + 00160 5f pop rdi + 00161 5d pop rbp + 00162 c3 ret 0 +submatrix3_sse ENDP +_TEXT ENDS +; Function compile flags: /Odtp /RTCsu /ZI +; File D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\ںԴ\StgSharp.C\mat3.c ; COMDAT addmatrix3_512 _TEXT SEGMENT temp$ = 64 diff --git a/StgSharp.C/x64/Debug/mat3.obj b/StgSharp.C/x64/Debug/mat3.obj index 53bb1a6f..381a9bcd 100644 Binary files a/StgSharp.C/x64/Debug/mat3.obj and b/StgSharp.C/x64/Debug/mat3.obj differ diff --git a/StgSharp.C/x64/Debug/mat3.sbr b/StgSharp.C/x64/Debug/mat3.sbr index 7a18a6b9..ab01fc18 100644 Binary files a/StgSharp.C/x64/Debug/mat3.sbr and b/StgSharp.C/x64/Debug/mat3.sbr differ diff --git a/StgSharp.C/x64/Debug/mat4.cod b/StgSharp.C/x64/Debug/mat4.cod index ea95ee60..054c0071 100644 --- a/StgSharp.C/x64/Debug/mat4.cod +++ b/StgSharp.C/x64/Debug/mat4.cod @@ -144,6 +144,9 @@ msvcjmc ENDS PUBLIC addmatrix4_sse PUBLIC addmatrix4_avx PUBLIC addmatrix4_512 +PUBLIC submatrix4_sse +PUBLIC submatrix4_avx +PUBLIC submatrix4_512 PUBLIC transpose42 PUBLIC transpose43 PUBLIC transpose44 @@ -176,6 +179,24 @@ $pdata$addmatrix4_512 DD imagerel $LN3 pdata ENDS ; COMDAT pdata pdata SEGMENT +$pdata$submatrix4_sse DD imagerel $LN3 + DD imagerel $LN3+356 + DD imagerel $unwind$submatrix4_sse +pdata ENDS +; COMDAT pdata +pdata SEGMENT +$pdata$submatrix4_avx DD imagerel $LN3 + DD imagerel $LN3+206 + DD imagerel $unwind$submatrix4_avx +pdata ENDS +; COMDAT pdata +pdata SEGMENT +$pdata$submatrix4_512 DD imagerel $LN3 + DD imagerel $LN3+97 + DD imagerel $unwind$submatrix4_512 +pdata ENDS +; COMDAT pdata +pdata SEGMENT $pdata$transpose42 DD imagerel $LN3 DD imagerel $LN3+227 DD imagerel $unwind$transpose42 @@ -259,6 +280,27 @@ $unwind$transpose42 DD 025051801H xdata ENDS ; COMDAT xdata xdata SEGMENT +$unwind$submatrix4_512 DD 025051d01H + DD 0118231dH + DD 07011001dH + DD 05010H +xdata ENDS +; COMDAT xdata +xdata SEGMENT +$unwind$submatrix4_avx DD 025051d01H + DD 0118231dH + DD 07011001dH + DD 05010H +xdata ENDS +; COMDAT xdata +xdata SEGMENT +$unwind$submatrix4_sse DD 025051d01H + DD 0118231dH + DD 07011001dH + DD 05010H +xdata ENDS +; COMDAT xdata +xdata SEGMENT $unwind$addmatrix4_512 DD 025051d01H DD 0118231dH DD 07011001dH @@ -949,6 +991,267 @@ transpose42 ENDP _TEXT ENDS ; Function compile flags: /Odtp /RTCsu /ZI ; File D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\ںԴ\StgSharp.C\mat4.c +; COMDAT submatrix4_512 +_TEXT SEGMENT +left$ = 224 +right$ = 232 +ans$ = 240 +submatrix4_512 PROC ; COMDAT + +; 101 : { + +$LN3: + 00000 4c 89 44 24 18 mov QWORD PTR [rsp+24], r8 + 00005 48 89 54 24 10 mov QWORD PTR [rsp+16], rdx + 0000a 48 89 4c 24 08 mov QWORD PTR [rsp+8], rcx + 0000f 55 push rbp + 00010 57 push rdi + 00011 48 81 ec e8 00 + 00 00 sub rsp, 232 ; 000000e8H + 00018 48 8d 6c 24 20 lea rbp, QWORD PTR [rsp+32] + 0001d 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:__5DFFF5A8_mat4@c + 00024 e8 00 00 00 00 call __CheckForDebuggerJustMyCode + 00029 90 npad 1 + +; 102 : ans->stream = _mm512_sub_ps(ALIGN512(left->stream), ALIGN512(right->stream)); + + 0002a 48 8b 85 e8 00 + 00 00 mov rax, QWORD PTR right$[rbp] + 00031 62 f1 7c 48 10 + 00 vmovups zmm0, ZMMWORD PTR [rax] + 00037 48 8b 85 e0 00 + 00 00 mov rax, QWORD PTR left$[rbp] + 0003e 62 f1 7c 48 10 + 08 vmovups zmm1, ZMMWORD PTR [rax] + 00044 62 f1 74 48 5c + c0 vsubps zmm0, zmm1, zmm0 + 0004a 48 8b 85 f0 00 + 00 00 mov rax, QWORD PTR ans$[rbp] + 00051 62 f1 7c 48 11 + 00 vmovups ZMMWORD PTR [rax], zmm0 + +; 103 : } + + 00057 48 8d a5 c8 00 + 00 00 lea rsp, QWORD PTR [rbp+200] + 0005e 5f pop rdi + 0005f 5d pop rbp + 00060 c3 ret 0 +submatrix4_512 ENDP +_TEXT ENDS +; Function compile flags: /Odtp /RTCsu /ZI +; File D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\ںԴ\StgSharp.C\mat4.c +; COMDAT submatrix4_avx +_TEXT SEGMENT +left$ = 224 +right$ = 232 +ans$ = 240 +submatrix4_avx PROC ; COMDAT + +; 95 : { + +$LN3: + 00000 4c 89 44 24 18 mov QWORD PTR [rsp+24], r8 + 00005 48 89 54 24 10 mov QWORD PTR [rsp+16], rdx + 0000a 48 89 4c 24 08 mov QWORD PTR [rsp+8], rcx + 0000f 55 push rbp + 00010 57 push rdi + 00011 48 81 ec e8 00 + 00 00 sub rsp, 232 ; 000000e8H + 00018 48 8d 6c 24 20 lea rbp, QWORD PTR [rsp+32] + 0001d 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:__5DFFF5A8_mat4@c + 00024 e8 00 00 00 00 call __CheckForDebuggerJustMyCode + 00029 90 npad 1 + +; 96 : ans->half[0] = _mm256_sub_ps(ALIGN256(left->half[0]), ALIGN256(right->half[0])); + + 0002a b8 20 00 00 00 mov eax, 32 ; 00000020H + 0002f 48 6b c0 00 imul rax, rax, 0 + 00033 48 8b 8d e8 00 + 00 00 mov rcx, QWORD PTR right$[rbp] + 0003a 48 03 c8 add rcx, rax + 0003d 48 8b c1 mov rax, rcx + 00040 c5 fc 10 00 vmovups ymm0, YMMWORD PTR [rax] + 00044 b8 20 00 00 00 mov eax, 32 ; 00000020H + 00049 48 6b c0 00 imul rax, rax, 0 + 0004d 48 8b 8d e0 00 + 00 00 mov rcx, QWORD PTR left$[rbp] + 00054 48 03 c8 add rcx, rax + 00057 48 8b c1 mov rax, rcx + 0005a c5 fc 10 08 vmovups ymm1, YMMWORD PTR [rax] + 0005e c5 f4 5c c0 vsubps ymm0, ymm1, ymm0 + 00062 b8 20 00 00 00 mov eax, 32 ; 00000020H + 00067 48 6b c0 00 imul rax, rax, 0 + 0006b 48 8b 8d f0 00 + 00 00 mov rcx, QWORD PTR ans$[rbp] + 00072 c5 fc 11 04 01 vmovups YMMWORD PTR [rcx+rax], ymm0 + +; 97 : ans->half[1] = _mm256_sub_ps(ALIGN256(left->half[1]), ALIGN256(right->half[1])); + + 00077 b8 20 00 00 00 mov eax, 32 ; 00000020H + 0007c 48 6b c0 01 imul rax, rax, 1 + 00080 48 8b 8d e8 00 + 00 00 mov rcx, QWORD PTR right$[rbp] + 00087 48 03 c8 add rcx, rax + 0008a 48 8b c1 mov rax, rcx + 0008d c5 fc 10 00 vmovups ymm0, YMMWORD PTR [rax] + 00091 b8 20 00 00 00 mov eax, 32 ; 00000020H + 00096 48 6b c0 01 imul rax, rax, 1 + 0009a 48 8b 8d e0 00 + 00 00 mov rcx, QWORD PTR left$[rbp] + 000a1 48 03 c8 add rcx, rax + 000a4 48 8b c1 mov rax, rcx + 000a7 c5 fc 10 08 vmovups ymm1, YMMWORD PTR [rax] + 000ab c5 f4 5c c0 vsubps ymm0, ymm1, ymm0 + 000af b8 20 00 00 00 mov eax, 32 ; 00000020H + 000b4 48 6b c0 01 imul rax, rax, 1 + 000b8 48 8b 8d f0 00 + 00 00 mov rcx, QWORD PTR ans$[rbp] + 000bf c5 fc 11 04 01 vmovups YMMWORD PTR [rcx+rax], ymm0 + +; 98 : } + + 000c4 48 8d a5 c8 00 + 00 00 lea rsp, QWORD PTR [rbp+200] + 000cb 5f pop rdi + 000cc 5d pop rbp + 000cd c3 ret 0 +submatrix4_avx ENDP +_TEXT ENDS +; Function compile flags: /Odtp /RTCsu /ZI +; File D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\ںԴ\StgSharp.C\mat4.c +; COMDAT submatrix4_sse +_TEXT SEGMENT +left$ = 224 +right$ = 232 +ans$ = 240 +submatrix4_sse PROC ; COMDAT + +; 87 : { + +$LN3: + 00000 4c 89 44 24 18 mov QWORD PTR [rsp+24], r8 + 00005 48 89 54 24 10 mov QWORD PTR [rsp+16], rdx + 0000a 48 89 4c 24 08 mov QWORD PTR [rsp+8], rcx + 0000f 55 push rbp + 00010 57 push rdi + 00011 48 81 ec e8 00 + 00 00 sub rsp, 232 ; 000000e8H + 00018 48 8d 6c 24 20 lea rbp, QWORD PTR [rsp+32] + 0001d 48 8d 0d 00 00 + 00 00 lea rcx, OFFSET FLAT:__5DFFF5A8_mat4@c + 00024 e8 00 00 00 00 call __CheckForDebuggerJustMyCode + 00029 90 npad 1 + +; 88 : ans->column[0] = _mm_sub_ps(ALIGN(left->column[0]), ALIGN(right->column[0])); + + 0002a b8 10 00 00 00 mov eax, 16 + 0002f 48 6b c0 00 imul rax, rax, 0 + 00033 48 8b 8d e8 00 + 00 00 mov rcx, QWORD PTR right$[rbp] + 0003a 48 03 c8 add rcx, rax + 0003d 48 8b c1 mov rax, rcx + 00040 0f 10 00 movups xmm0, XMMWORD PTR [rax] + 00043 b8 10 00 00 00 mov eax, 16 + 00048 48 6b c0 00 imul rax, rax, 0 + 0004c 48 8b 8d e0 00 + 00 00 mov rcx, QWORD PTR left$[rbp] + 00053 48 03 c8 add rcx, rax + 00056 48 8b c1 mov rax, rcx + 00059 0f 10 08 movups xmm1, XMMWORD PTR [rax] + 0005c 0f 5c c8 subps xmm1, xmm0 + 0005f 0f 28 c1 movaps xmm0, xmm1 + 00062 b8 10 00 00 00 mov eax, 16 + 00067 48 6b c0 00 imul rax, rax, 0 + 0006b 48 8b 8d f0 00 + 00 00 mov rcx, QWORD PTR ans$[rbp] + 00072 0f 11 04 01 movups XMMWORD PTR [rcx+rax], xmm0 + +; 89 : ans->column[1] = _mm_sub_ps(ALIGN(left->column[1]), ALIGN(right->column[1])); + + 00076 b8 10 00 00 00 mov eax, 16 + 0007b 48 6b c0 01 imul rax, rax, 1 + 0007f 48 8b 8d e8 00 + 00 00 mov rcx, QWORD PTR right$[rbp] + 00086 48 03 c8 add rcx, rax + 00089 48 8b c1 mov rax, rcx + 0008c 0f 10 00 movups xmm0, XMMWORD PTR [rax] + 0008f b8 10 00 00 00 mov eax, 16 + 00094 48 6b c0 01 imul rax, rax, 1 + 00098 48 8b 8d e0 00 + 00 00 mov rcx, QWORD PTR left$[rbp] + 0009f 48 03 c8 add rcx, rax + 000a2 48 8b c1 mov rax, rcx + 000a5 0f 10 08 movups xmm1, XMMWORD PTR [rax] + 000a8 0f 5c c8 subps xmm1, xmm0 + 000ab 0f 28 c1 movaps xmm0, xmm1 + 000ae b8 10 00 00 00 mov eax, 16 + 000b3 48 6b c0 01 imul rax, rax, 1 + 000b7 48 8b 8d f0 00 + 00 00 mov rcx, QWORD PTR ans$[rbp] + 000be 0f 11 04 01 movups XMMWORD PTR [rcx+rax], xmm0 + +; 90 : ans->column[2] = _mm_sub_ps(ALIGN(left->column[2]), ALIGN(right->column[2])); + + 000c2 b8 10 00 00 00 mov eax, 16 + 000c7 48 6b c0 02 imul rax, rax, 2 + 000cb 48 8b 8d e8 00 + 00 00 mov rcx, QWORD PTR right$[rbp] + 000d2 48 03 c8 add rcx, rax + 000d5 48 8b c1 mov rax, rcx + 000d8 0f 10 00 movups xmm0, XMMWORD PTR [rax] + 000db b8 10 00 00 00 mov eax, 16 + 000e0 48 6b c0 02 imul rax, rax, 2 + 000e4 48 8b 8d e0 00 + 00 00 mov rcx, QWORD PTR left$[rbp] + 000eb 48 03 c8 add rcx, rax + 000ee 48 8b c1 mov rax, rcx + 000f1 0f 10 08 movups xmm1, XMMWORD PTR [rax] + 000f4 0f 5c c8 subps xmm1, xmm0 + 000f7 0f 28 c1 movaps xmm0, xmm1 + 000fa b8 10 00 00 00 mov eax, 16 + 000ff 48 6b c0 02 imul rax, rax, 2 + 00103 48 8b 8d f0 00 + 00 00 mov rcx, QWORD PTR ans$[rbp] + 0010a 0f 11 04 01 movups XMMWORD PTR [rcx+rax], xmm0 + +; 91 : ans->column[3] = _mm_sub_ps(ALIGN(left->column[3]), ALIGN(right->column[3])); + + 0010e b8 10 00 00 00 mov eax, 16 + 00113 48 6b c0 03 imul rax, rax, 3 + 00117 48 8b 8d e8 00 + 00 00 mov rcx, QWORD PTR right$[rbp] + 0011e 48 03 c8 add rcx, rax + 00121 48 8b c1 mov rax, rcx + 00124 0f 10 00 movups xmm0, XMMWORD PTR [rax] + 00127 b8 10 00 00 00 mov eax, 16 + 0012c 48 6b c0 03 imul rax, rax, 3 + 00130 48 8b 8d e0 00 + 00 00 mov rcx, QWORD PTR left$[rbp] + 00137 48 03 c8 add rcx, rax + 0013a 48 8b c1 mov rax, rcx + 0013d 0f 10 08 movups xmm1, XMMWORD PTR [rax] + 00140 0f 5c c8 subps xmm1, xmm0 + 00143 0f 28 c1 movaps xmm0, xmm1 + 00146 b8 10 00 00 00 mov eax, 16 + 0014b 48 6b c0 03 imul rax, rax, 3 + 0014f 48 8b 8d f0 00 + 00 00 mov rcx, QWORD PTR ans$[rbp] + 00156 0f 11 04 01 movups XMMWORD PTR [rcx+rax], xmm0 + +; 92 : } + + 0015a 48 8d a5 c8 00 + 00 00 lea rsp, QWORD PTR [rbp+200] + 00161 5f pop rdi + 00162 5d pop rbp + 00163 c3 ret 0 +submatrix4_sse ENDP +_TEXT ENDS +; Function compile flags: /Odtp /RTCsu /ZI +; File D:\NitloadIndustry\оĿ\1-Flagship\TH2020\ProjectFile\ںԴ\StgSharp.C\mat4.c ; COMDAT addmatrix4_512 _TEXT SEGMENT left$ = 224 diff --git a/StgSharp.C/x64/Debug/mat4.obj b/StgSharp.C/x64/Debug/mat4.obj index c43d9eb1..64267dcf 100644 Binary files a/StgSharp.C/x64/Debug/mat4.obj and b/StgSharp.C/x64/Debug/mat4.obj differ diff --git a/StgSharp.C/x64/Debug/mat4.sbr b/StgSharp.C/x64/Debug/mat4.sbr index 110145a0..ae6409ff 100644 Binary files a/StgSharp.C/x64/Debug/mat4.sbr and b/StgSharp.C/x64/Debug/mat4.sbr differ diff --git a/StgSharp.C/x64/Debug/string.obj b/StgSharp.C/x64/Debug/string.obj index e234fb65..4034acb2 100644 Binary files a/StgSharp.C/x64/Debug/string.obj and b/StgSharp.C/x64/Debug/string.obj differ diff --git a/StgSharp.C/x64/Debug/string.sbr b/StgSharp.C/x64/Debug/string.sbr index 5e86d9ad..b3c221db 100644 Binary files a/StgSharp.C/x64/Debug/string.sbr and b/StgSharp.C/x64/Debug/string.sbr differ diff --git a/StgSharp.C/x64/Debug/vc143.idb b/StgSharp.C/x64/Debug/vc143.idb index c32655b4..bb8d3f0c 100644 Binary files a/StgSharp.C/x64/Debug/vc143.idb and b/StgSharp.C/x64/Debug/vc143.idb differ diff --git a/StgSharp.C/x64/Debug/vc143.pdb b/StgSharp.C/x64/Debug/vc143.pdb index d0b70725..b53a9933 100644 Binary files a/StgSharp.C/x64/Debug/vc143.pdb and b/StgSharp.C/x64/Debug/vc143.pdb differ diff --git a/StgSharp.C/x64/Debug/vector_dot.obj b/StgSharp.C/x64/Debug/vector_dot.obj index e2bb6b52..e202fa54 100644 Binary files a/StgSharp.C/x64/Debug/vector_dot.obj and b/StgSharp.C/x64/Debug/vector_dot.obj differ diff --git a/StgSharp.C/x64/Debug/vector_dot.sbr b/StgSharp.C/x64/Debug/vector_dot.sbr index bc6142b4..90bc5f53 100644 Binary files a/StgSharp.C/x64/Debug/vector_dot.sbr and b/StgSharp.C/x64/Debug/vector_dot.sbr differ diff --git a/StgSharp.Common/Environment/Platform.cs b/StgSharp.Common/Environment/Platform.cs index 1aba30a3..eaf43f71 100644 --- a/StgSharp.Common/Environment/Platform.cs +++ b/StgSharp.Common/Environment/Platform.cs @@ -98,8 +98,7 @@ namespace StgSharp Dialogue.LoadDialogue(); - if (Dialogue.NeedShowWhenStartup) - { + if( Dialogue.NeedShowWhenStartup ) { Dialogue.CreateDialogueProcessIfNotExist(); } @@ -135,19 +134,20 @@ namespace StgSharp } } - public static void Terminate() + public static void Terminate( int exitCode ) { MainTimeProvider.StopProvidingTime(); InternalIO.glfwTerminate(); + Environment.Exit( exitCode ); } public static void Track( - object target, - string message, - bool isConsole, - [CallerFilePath] string filePath = "", - [CallerMemberName] string callerName = "", - [CallerLineNumber] int lineNumber = 0 ) + object target, + string message, + bool isConsole, + [CallerFilePath] string filePath = "", + [CallerMemberName] string callerName = "", + [CallerLineNumber] int lineNumber = 0 ) { Type t = target.GetType(); string log = $"Tracked object: {nameof(target)}\t\tType:{t.Name}\n"; diff --git a/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.AssemblyInfo.cs b/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.AssemblyInfo.cs index 02a664ed..a8930022 100644 --- a/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.AssemblyInfo.cs +++ b/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharp.Common")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+df321a3bae3d97d043473f4595cc8d229d0f2722")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9647c2c68a768a1d0a5a05cc1279d046403c4641")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.sourcelink.json b/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.sourcelink.json index 47034813..fdd23080 100644 --- a/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.sourcelink.json +++ b/StgSharp.Common/obj/x64/Debug/net8.0/StgSharp.Common.sourcelink.json @@ -1 +1 @@ -{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/df321a3bae3d97d043473f4595cc8d229d0f2722/*"}} \ No newline at end of file +{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/9647c2c68a768a1d0a5a05cc1279d046403c4641/*"}} \ No newline at end of file diff --git a/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.AssemblyInfo.cs b/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.AssemblyInfo.cs index 25b83fdf..04c5a305 100644 --- a/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.AssemblyInfo.cs +++ b/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharp.Model")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+825e68853cd1738287eecc8a4390ee9c78550308")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9647c2c68a768a1d0a5a05cc1279d046403c4641")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.sourcelink.json b/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.sourcelink.json index 48222c59..fdd23080 100644 --- a/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.sourcelink.json +++ b/StgSharp.Model/obj/x64/Debug/net8.0/StgSharp.Model.sourcelink.json @@ -1 +1 @@ -{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/825e68853cd1738287eecc8a4390ee9c78550308/*"}} \ No newline at end of file +{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/9647c2c68a768a1d0a5a05cc1279d046403c4641/*"}} \ No newline at end of file diff --git a/StgSharp.Script/Express/Builtin/ExpCollection.cs b/StgSharp.Script/Express/Builtin/ExpCollection.cs index 76f43b2f..8420d265 100644 --- a/StgSharp.Script/Express/Builtin/ExpCollection.cs +++ b/StgSharp.Script/Express/Builtin/ExpCollection.cs @@ -68,6 +68,12 @@ namespace StgSharp.Script.Express public abstract IEnumerator GetEnumerator(); + public override bool TryGetMember( string name, out ExpNode memberNode ) + { + memberNode = ExpNode.Empty; + return false; + } + IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); diff --git a/StgSharp.Script/Express/Element/ExpConst.cs b/StgSharp.Script/Express/Element/ExpConst.cs index f1266505..4235dcae 100644 --- a/StgSharp.Script/Express/Element/ExpConst.cs +++ b/StgSharp.Script/Express/Element/ExpConst.cs @@ -33,6 +33,7 @@ using System.Collections; using System.Collections.Frozen; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Linq.Expressions; using System.Runtime.CompilerServices; using System.Text; @@ -88,6 +89,17 @@ namespace StgSharp.Script.Express return _constants.TryGetValue( name, out instance ); } + public override bool TryGetMember( string name, out ExpNode memberNode ) + { + if( _constants.TryGetValue( name, + out ExpElementInstanceBase? node ) ) { + memberNode = node; + return true; + } + memberNode = ExpNode.Empty; + return false; + } + internal void AddConstant( string name, ExpElementInstanceBase value ) { _constants.Add( name, value ); diff --git a/StgSharp.Script/Express/Element/ExpEntity.cs b/StgSharp.Script/Express/Element/ExpEntity.cs index d9938390..11db5689 100644 --- a/StgSharp.Script/Express/Element/ExpEntity.cs +++ b/StgSharp.Script/Express/Element/ExpEntity.cs @@ -63,5 +63,10 @@ namespace StgSharp.Script.Express throw new NotImplementedException(); } + public override bool TryGetMember( string name, out ExpNode memberNode ) + { + throw new NotImplementedException(); + } + } } diff --git a/StgSharp.Script/Express/Element/ExpFunction.cs b/StgSharp.Script/Express/Element/ExpFunction.cs index 14fc9460..1a9febfe 100644 --- a/StgSharp.Script/Express/Element/ExpFunction.cs +++ b/StgSharp.Script/Express/Element/ExpFunction.cs @@ -75,5 +75,11 @@ namespace StgSharp.Script.Express throw new NotImplementedException(); } + public override bool TryGetMember( string name, out ExpNode memberNode ) + { + memberNode = ExpNode.Empty; + return false; + } + } } diff --git a/StgSharp.Script/Express/Element/ExpRule.cs b/StgSharp.Script/Express/Element/ExpRule.cs index 8981452e..a704e734 100644 --- a/StgSharp.Script/Express/Element/ExpRule.cs +++ b/StgSharp.Script/Express/Element/ExpRule.cs @@ -84,5 +84,11 @@ namespace StgSharp.Script.Express throw new NotImplementedException(); } + public override bool TryGetMember( string name, out ExpNode memberNode ) + { + memberNode = ExpNode.Empty; + return false; + } + } } diff --git a/StgSharp.Script/Express/Element/ExpType.cs b/StgSharp.Script/Express/Element/ExpType.cs index 12aa9f54..7db4f475 100644 --- a/StgSharp.Script/Express/Element/ExpType.cs +++ b/StgSharp.Script/Express/Element/ExpType.cs @@ -77,7 +77,7 @@ namespace StgSharp.Script.Express throw new NotImplementedException(); } - public override ExpNode CreateInstanceNode() + public override ExpElementInstanceNode CreateInstanceNode() { throw new NotImplementedException(); } @@ -87,6 +87,12 @@ namespace StgSharp.Script.Express return type == null || type == ExpVoidType.Only; } + public override bool TryGetMember( string name, out ExpNode memberNode ) + { + memberNode = ExpNode.Empty; + return false; + } + private class ExpVoidType : ExpTypeSource { diff --git a/StgSharp.Script/Express/ExpAstNode/ExpElementMemberNameNode.cs b/StgSharp.Script/Express/ExpAstNode/ExpElementMemberNameNode.cs index 69c8fdb5..2ce463be 100644 --- a/StgSharp.Script/Express/ExpAstNode/ExpElementMemberNameNode.cs +++ b/StgSharp.Script/Express/ExpAstNode/ExpElementMemberNameNode.cs @@ -39,7 +39,12 @@ namespace StgSharp.Script.Express public class ExpElementMemberNameNode : ExpNode { - public ExpElementMemberNameNode( Token source ) : base( source ) { } + public ExpElementMemberNameNode( Token source ) + : base( source ) + { + _nodeFlag = ExpNodeFlag.Name_Operator; + CodeConvertTemplate = source.Value; + } public override ExpNode Left => Empty; diff --git a/StgSharp.Script/Express/ExpAstNode/ExpInstanceMemberNode.cs b/StgSharp.Script/Express/ExpAstNode/ExpInstanceMemberNode.cs new file mode 100644 index 00000000..d971767c --- /dev/null +++ b/StgSharp.Script/Express/ExpAstNode/ExpInstanceMemberNode.cs @@ -0,0 +1,67 @@ +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +// file="ExpInstanceMemberNode.cs" +// Project: StgSharp +// AuthorGroup: Nitload Space +// Copyright (c) Nitload Space. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the “Software”), to deal in the Software without restriction, +// including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, +// and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and +// this permission notice shall be included in all copies +// or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED “AS IS”, +// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH +// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +using CommunityToolkit.HighPerformance.Helpers; + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp.Script.Express +{ + public class ExpInstanceMemberNode : ExpNode + { + + private ExpElementInstanceBase _instance; + private ExpElementMemberNameNode _memberName; + private ExpNode _member; + + public ExpInstanceMemberNode( + Token source, + ExpElementInstanceBase instance, + ExpElementMemberNameNode memberName ) + : base( source ) + { + _instance = instance; + _memberName = memberName; + _instance.TryGetMember( + memberName.CodeConvertTemplate, out _member ); + } + + public override ExpNode Left => _instance; + + public override ExpNode Right => _memberName; + + public override IExpElementSource EqualityTypeConvert => _member.EqualityTypeConvert; + + } +} diff --git a/StgSharp.Script/Express/ExpAstNode/ExpInstanceReferenceNode.cs b/StgSharp.Script/Express/ExpAstNode/ExpInstanceReferenceNode.cs index 63290c5a..e89e08f4 100644 --- a/StgSharp.Script/Express/ExpAstNode/ExpInstanceReferenceNode.cs +++ b/StgSharp.Script/Express/ExpAstNode/ExpInstanceReferenceNode.cs @@ -39,12 +39,22 @@ namespace StgSharp.Script.Express public class ExpInstanceReferenceNode : ExpNode { - public override ExpNode Left => throw new NotImplementedException(); + private ExpElementInstanceBase _instance; - public override ExpNode Right => throw new NotImplementedException(); + public ExpInstanceReferenceNode( + Token source, + ExpElementInstanceBase instance ) + : base( source ) + { + _instance = instance; + _nodeFlag = ( _instance._nodeFlag | ( ExpNodeFlag.Name_Any | ExpNodeFlag.Collection_Any ) ); + } - public override IExpElementSource EqualityTypeConvert => throw new NotImplementedException( - ); + public override ExpNode Left => Empty; + + public override ExpNode Right => Empty; + + public override IExpElementSource EqualityTypeConvert => _instance.EqualityTypeConvert; } } diff --git a/StgSharp.Script/Express/ExpElementInstanceBase.cs b/StgSharp.Script/Express/ExpElementInstanceBase.cs index 2c1486d8..fe21ece8 100644 --- a/StgSharp.Script/Express/ExpElementInstanceBase.cs +++ b/StgSharp.Script/Express/ExpElementInstanceBase.cs @@ -87,5 +87,15 @@ namespace StgSharp.Script.Express } } + public ExpInstanceReferenceNode MakeReference( Token t ) + { + return new ExpInstanceReferenceNode( t, this ); + } + + public bool TryGetMember( string name, out ExpNode node ) + { + return EqualityTypeConvert.TryGetMember( name, out node ); + } + } } diff --git a/StgSharp.Script/Express/ExpElmentSource.cs b/StgSharp.Script/Express/ExpElmentSource.cs index 9198451c..39b91ee0 100644 --- a/StgSharp.Script/Express/ExpElmentSource.cs +++ b/StgSharp.Script/Express/ExpElmentSource.cs @@ -56,6 +56,8 @@ namespace StgSharp.Script.Express public void Analyse(); + public bool TryGetMember( string name, out ExpNode memberNode ); + } public abstract class ExpInstantiableElement : IExpElementSource @@ -102,6 +104,8 @@ namespace StgSharp.Script.Express return element == null || element == ExpVoidElement.Only; } + public abstract bool TryGetMember( string name, out ExpNode memberNode ); + private sealed class ExpVoidElement : ExpInstantiableElement { @@ -125,6 +129,14 @@ namespace StgSharp.Script.Express return default!; } + public override bool TryGetMember( + string name, + out ExpNode memberNode ) + { + memberNode = ExpNode.Empty; + return false; + } + } } @@ -156,5 +168,7 @@ namespace StgSharp.Script.Express public abstract ExpNode MakeReference( params object[] options ); + public abstract bool TryGetMember( string name, out ExpNode memberNode ); + } } diff --git a/StgSharp.Script/Express/ExpNodeGenerator.FunctionCalling.cs b/StgSharp.Script/Express/ExpNodeGenerator.FunctionCalling.cs index bb63cc74..9a1dd5eb 100644 --- a/StgSharp.Script/Express/ExpNodeGenerator.FunctionCalling.cs +++ b/StgSharp.Script/Express/ExpNodeGenerator.FunctionCalling.cs @@ -85,9 +85,9 @@ namespace StgSharp.Script.Express break; case TokenFlag.Member: - // case1: name of a instance, make ref copy + // case1: name of a _instance, make ref copy // case2: name of a function, make a function call - // case3: unknown, make a instance member node, check while link + // case3: unknown, make a _instance member node, check while link break; default: break; diff --git a/StgSharp.Script/Express/ExpNodeGenerator.cs b/StgSharp.Script/Express/ExpNodeGenerator.cs index 8f2dd3f5..92bf56c7 100644 --- a/StgSharp.Script/Express/ExpNodeGenerator.cs +++ b/StgSharp.Script/Express/ExpNodeGenerator.cs @@ -37,6 +37,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using ExpKeyWord = StgSharp.Script.Express.ExpCompile.KeyWord; + namespace StgSharp.Script.Express { public partial class ExpNodeGenerator @@ -58,6 +60,8 @@ namespace StgSharp.Script.Express _cache = new CompileStack(); } + /**/ + /// /// Append a token to top of cache. This method will automatically convert token to node if /// meets separators or operators. @@ -65,6 +69,7 @@ namespace StgSharp.Script.Express public void AppendToken( Token expToken ) { switch( expToken.Flag ) { + // operand, check precedence and push case TokenFlag.Symbol_Unary or TokenFlag.Symbol_Binary: int cmp = -1; processPrecedence: @@ -76,17 +81,37 @@ namespace StgSharp.Script.Express } _cache.PushOperand( expToken ); break; + + // literal, construxt and ppush case TokenFlag.Number or TokenFlag.String: _cache.PushOperand( expToken ); break; + + // instance ref, make ref and push + // function call, push as operator + // keyword, call TryParseKeyWord method to process + // name of member in instance, parse as MemberNameNode case TokenFlag.Member: if( _context.TryGetFunction( expToken.Value, out _ ) ) { _cache.PushOperator( expToken ); - } else { } + } else if( _local.TryGetMember( + expToken.Value, out ExpNode? node ) ) { + if( node is ExpElementInstanceBase instance ) { + _cache.PushOperand( + instance.MakeReference( expToken ) ); + return; // ref of an instance + } + } else if( TryParseKeyWord( expToken ) ) { + return; + } else { + _cache.PushOperand( + new ExpElementMemberNameNode( expToken ) ); + } break; case TokenFlag.Separator_Single: //a , ; found // if operator stack is not empty, convert all operators to node until meet a same separator // or OperandAheadOfSeparator property is less than certain value + _cache.PushOperator( expToken ); break; case TokenFlag.Separator_Left: //a ( [ { found // check if the last token is a function name, loop block or branch @@ -110,6 +135,8 @@ namespace StgSharp.Script.Express if( _cache.PopOperand( out Token t, out ExpNode? n ) ) { return n; } else { } + + throw new NotImplementedException(); } /// @@ -134,5 +161,20 @@ namespace StgSharp.Script.Express } } + private bool TryParseKeyWord( Token t ) + { + if( t.Value == ExpKeyWord.True ) { + _cache.PushOperand( new ExpBoolNode( t, true ) ); + return true; + } else if( t.Value == ExpKeyWord.False ) { + _cache.PushOperand( new ExpBoolNode( t, false ) ); + return true; + } else if( true ) { + throw new NotImplementedException(); + } + return false; + } + + /**/ } } diff --git a/StgSharp.Script/Express/ExpSchemaSource.Compile.cs b/StgSharp.Script/Express/ExpSchemaSource.Compile.cs index bbb4549f..1eb0652a 100644 --- a/StgSharp.Script/Express/ExpSchemaSource.Compile.cs +++ b/StgSharp.Script/Express/ExpSchemaSource.Compile.cs @@ -56,7 +56,7 @@ namespace StgSharp.Script.Express case ExpressCompileOption.Translate: return Compile_Translate( option ); case ExpressCompileOption.Compile: - throw new NotImplementedException(); + throw new NotSupportedException(); default: throw new ArgumentException(); } diff --git a/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.AssemblyInfo.cs b/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.AssemblyInfo.cs index 0e41da8d..551235f5 100644 --- a/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.AssemblyInfo.cs +++ b/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharp.Script")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+16b813646d8a2326551f05c69f727a292a719222")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9647c2c68a768a1d0a5a05cc1279d046403c4641")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp.Script")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp.Script")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.sourcelink.json b/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.sourcelink.json index 45061ece..fdd23080 100644 --- a/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.sourcelink.json +++ b/StgSharp.Script/obj/x64/Debug/net8.0/StgSharp.Script.sourcelink.json @@ -1 +1 @@ -{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/16b813646d8a2326551f05c69f727a292a719222/*"}} \ No newline at end of file +{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/9647c2c68a768a1d0a5a05cc1279d046403c4641/*"}} \ No newline at end of file diff --git a/StgSharpDebug/Program.cs b/StgSharpDebug/Program.cs index b0b3bd5d..bb99008e 100644 --- a/StgSharpDebug/Program.cs +++ b/StgSharpDebug/Program.cs @@ -65,6 +65,8 @@ namespace StgSharp ExpSchemaSource schemaSource = new ExpSchemaSource(); schemaSource.ReadSchema( reader ); + ExpSchema schema = schemaSource.Compile( + ExpressCompileOption.Translate ); /**/ /* @@ -97,16 +99,18 @@ namespace StgSharp return; } catch( Exception ex ) { - Console.WriteLine( ex.Message ); + Console.WriteLine( ex ); /* StgSharp.WriteLog($"{ex}", LogType.Error); if( true ) { } Dialogue.PostError( ex ); /**/ - Environment.Exit( -1 ); + StgSharp.Terminate( -1 ); /**/ } - finally { } + finally { + StgSharp.Terminate( 0 ); + } } } diff --git a/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.AssemblyInfo.cs b/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.AssemblyInfo.cs index f57a0433..f718f56a 100644 --- a/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.AssemblyInfo.cs +++ b/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharpDebug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+825e68853cd1738287eecc8a4390ee9c78550308")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9647c2c68a768a1d0a5a05cc1279d046403c4641")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharpDebug")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharpDebug")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.sourcelink.json b/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.sourcelink.json index 48222c59..fdd23080 100644 --- a/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.sourcelink.json +++ b/StgSharpDebug/obj/x64/Debug/net8.0/StgSharpDebug.sourcelink.json @@ -1 +1 @@ -{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/825e68853cd1738287eecc8a4390ee9c78550308/*"}} \ No newline at end of file +{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\内核源代码\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/9647c2c68a768a1d0a5a05cc1279d046403c4641/*"}} \ No newline at end of file