Use Select in CheckFlagPipeline.

jpd002 · Jan 30, 2025 · db0002c · db0002c
1 parent 27c91c6
commit db0002c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/Source/ee/VUShared.cpp b/Source/ee/VUShared.cpp
@@ -1807,37 +1807,35 @@ void VUShared::CheckFlagPipeline(const FLAG_PIPEINFO& pipeInfo, CMipsJitter* cod
 	//the flag register every time (pipeTimes[i] <= (pipeTime + relativePipeTime))
 	for(unsigned int i = 0; i < FLAG_PIPELINE_SLOTS; i++)
 	{
-		codeGen->PushRelAddrRef(pipeInfo.timeArray);
-
 		//Compute index into array
 		codeGen->PushRel(pipeInfo.index);
 		codeGen->PushCst(i);
 		codeGen->Add();
 		codeGen->PushCst(FLAG_PIPELINE_SLOTS - 1);
 		codeGen->And();
-
+
+		codeGen->PushRelAddrRef(pipeInfo.timeArray);
+		codeGen->PushIdx(1);
 		codeGen->LoadFromRefIdx();
-
+		
 		codeGen->PushRel(offsetof(CMIPS, m_State.pipeTime));
 		codeGen->PushCst(relativePipeTime);
 		codeGen->Add();
+
+		codeGen->Cmp(Jitter::CONDITION_LE);
+
+		//True branch
+		codeGen->PushRelAddrRef(pipeInfo.valueArray);
+		codeGen->PushIdx(2);
+		codeGen->LoadFromRefIdx();
+
+		//False branch
+		codeGen->PushRel(pipeInfo.value);
 
-		codeGen->BeginIf(Jitter::CONDITION_LE);
-		{
-			codeGen->PushRelAddrRef(pipeInfo.valueArray);
-
-			//Compute index into array
-			codeGen->PushRel(pipeInfo.index);
-			codeGen->PushCst(i);
-			codeGen->Add();
-			codeGen->PushCst(FLAG_PIPELINE_SLOTS - 1);
-			codeGen->And();
-
-			codeGen->LoadFromRefIdx();
-
-			codeGen->PullRel(pipeInfo.value);
-		}
-		codeGen->EndIf();
+		codeGen->Select();
+
+		codeGen->PullRel(pipeInfo.value);
+		codeGen->PullTop();
 	}
 }
 

diff --git a/deps/CodeGen b/deps/CodeGen
+2 −0		build_cmake/CMakeLists.txt
+1 −0		include/AArch64Assembler.h
+1 −0		include/Jitter.h
+2 −0		include/Jitter_CodeGen_AArch64.h
+1 −0		include/Jitter_Statement.h
+10 −0		src/AArch64Assembler.cpp
+15 −0		src/Jitter.cpp
+23 −0		src/Jitter_CodeGen_AArch64.cpp
+3 −0		src/Jitter_Optimize.cpp
+2 −0		tests/Main.cpp
+52 −0		tests/SelectTest.cpp
+25 −0		tests/SelectTest.h