Fix previous commit.

zufuliu · Nov 24, 2024 · 21e16e6 · 21e16e6
1 parent 633c1aa
commit 21e16e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/scintilla/src/Document.cxx b/scintilla/src/Document.cxx
@@ -2971,19 +2971,20 @@ Sci::Position Document::BraceMatch(Sci::Position position, Sci::Position /*maxRe
 				const Sci::Position segmentLength = scanFirst ? cbView.length1 : length;
 				const char * const segment = scanFirst ? cbView.segment1 : cbView.segment2;
 				const __m256i *ptr = reinterpret_cast<const __m256i *>(segment + position);
+				Sci::Position index = position;
 				uint32_t mask = 0;
 				do {
 					const __m256i chunk1 = _mm256_loadu_si256(ptr);
 					mask = mm256_movemask_epi8(_mm256_or_si256(_mm256_cmpeq_epi8(chunk1, mmBrace), _mm256_cmpeq_epi8(chunk1, mmSeek)));
 					if (mask != 0) {
+						index = position;
 						break;
 					}
 					ptr++;
 					position += sizeof(mmBrace);
 				} while (position < segmentLength);
-				Sci::Position index = position;
 				position += sizeof(mmBrace);
-				if (position >= segmentLength && index <= segmentLength) {
+				if (position >= segmentLength && index < segmentLength) {
 					position = segmentLength;
 					const uint32_t offset = static_cast<uint32_t>(position - index);
 					mask = bit_zero_high_u32(mask, offset);
@@ -3015,19 +3016,20 @@ Sci::Position Document::BraceMatch(Sci::Position position, Sci::Position /*maxRe
 				const Sci::Position segmentLength = scanFirst ? cbView.length1 : length;
 				const char * const segment = scanFirst ? cbView.segment1 : cbView.segment2;
 				const __m128i *ptr = reinterpret_cast<const __m128i *>(segment + position);
+				Sci::Position index = position;
 				uint32_t mask = 0;
 				do {
 					const __m128i chunk1 = _mm_loadu_si128(ptr);
 					mask = mm_movemask_epi8(_mm_or_si128(_mm_cmpeq_epi8(chunk1, mmBrace), _mm_cmpeq_epi8(chunk1, mmSeek)));
 					if (mask != 0) {
+						index = position;
 						break;
 					}
 					ptr++;
 					position += sizeof(mmBrace);
 				} while (position < segmentLength);
-				Sci::Position index = position;
 				position += sizeof(mmBrace);
-				if (position >= segmentLength && index <= segmentLength) {
+				if (position >= segmentLength && index < segmentLength) {
 					position = segmentLength;
 					const uint32_t offset = static_cast<uint32_t>(position - index);
 					mask = bit_zero_high_u32(mask, offset);

diff --git a/scintilla/test/BraceMatchTest.cpp b/scintilla/test/BraceMatchTest.cpp
@@ -43,19 +43,20 @@ void FindAllBraceForward(const SplitView &cbView, ptrdiff_t position, const ptrd
 		const ptrdiff_t segmentLength = scanFirst ? cbView.length1 : length;
 		const char * const segment = scanFirst ? cbView.segment1 : cbView.segment2;
 		const __m256i *ptr = reinterpret_cast<const __m256i *>(segment + position);
+		ptrdiff_t index = position;
 		uint32_t mask = 0;
 		do {
 			const __m256i chunk1 = _mm256_loadu_si256(ptr);
 			mask = _mm256_movemask_epi8(_mm256_or_si256(_mm256_cmpeq_epi8(chunk1, mmBrace), _mm256_cmpeq_epi8(chunk1, mmSeek)));
 			if (mask != 0) {
+				index = position;
 				break;
 			}
 			ptr++;
 			position += sizeof(__m256i);
 		} while (position < segmentLength);
-		ptrdiff_t index = position;
 		position += sizeof(__m256i);
-		if (position >= segmentLength && index <= segmentLength) {
+		if (position >= segmentLength && index < segmentLength) {
 			position = segmentLength;
 			const uint32_t offset = static_cast<uint32_t>(position - index);
 			mask = bit_zero_high_u32(mask, offset);
@@ -78,19 +79,20 @@ void FindAllBraceForward(const SplitView &cbView, ptrdiff_t position, const ptrd
 		const ptrdiff_t segmentLength = scanFirst ? cbView.length1 : length;
 		const char * const segment = scanFirst ? cbView.segment1 : cbView.segment2;
 		const __m128i *ptr = reinterpret_cast<const __m128i *>(segment + position);
+		ptrdiff_t index = position;
 		uint32_t mask = 0;
 		do {
 			const __m128i chunk1 = _mm_loadu_si128(ptr);
 			mask = _mm_movemask_epi8(_mm_or_si128(_mm_cmpeq_epi8(chunk1, mmBrace), _mm_cmpeq_epi8(chunk1, mmSeek)));
 			if (mask != 0) {
+				index = position;
 				break;
 			}
 			ptr++;
 			position += sizeof(__m128i);
 		} while (position < segmentLength);
-		ptrdiff_t index = position;
 		position += sizeof(__m128i);
-		if (position >= segmentLength && index <= segmentLength) {
+		if (position >= segmentLength && index < segmentLength) {
 			position = segmentLength;
 			const uint32_t offset = static_cast<uint32_t>(position - index);
 			mask = bit_zero_high_u32(mask, offset);