From 85964916ab34e1f5d4b439b64101cfe3a849a1f3 Mon Sep 17 00:00:00 2001
From: Guille Polito <guillermopolito@gmail.com>
Date: Wed, 11 Dec 2024 15:31:29 +0100
Subject: [PATCH] Fix failing tests. Now ARM and Intel have similar shapes of
 generated code

---
 .../VMMakerTests/VMMachineSimulatorTest.class.st         | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/smalltalksrc/VMMakerTests/VMMachineSimulatorTest.class.st b/smalltalksrc/VMMakerTests/VMMachineSimulatorTest.class.st
index b0cf51c095..aa508e384b 100644
--- a/smalltalksrc/VMMakerTests/VMMachineSimulatorTest.class.st
+++ b/smalltalksrc/VMMakerTests/VMMachineSimulatorTest.class.st
@@ -130,8 +130,7 @@ VMMachineSimulatorTest >> testMemoryAccessExceptionHandledCountIsRespected [
 		timeout: 0
 		count: 10. 
 	
-	"ARM v8 generates two instructions for MoveMbrR, so it will execute and instruction less"
-	expectedAddress := isa = #aarch64 ifTrue: [addInstruction address] ifFalse: [jumpInstruction address].
+	expectedAddress := jumpInstruction address.
 	
 	
 	self 
@@ -376,11 +375,7 @@ VMMachineSimulatorTest >> testMemoryAccessExceptionInstructionPointerInCorrectAd
 		lastInstruction := cogit Call: cogit methodZoneBase + 16rFFFFF0.  ].
 	
 	invalidAddressHandled := false.
-	
-	"In ArmV8 the MoveMbrR are two instructions"
-	isa = #aarch64 
-		ifTrue: [ exptectedAddress := invalidAccessInstruction address + 4 ]
-		ifFalse: [ exptectedAddress := invalidAccessInstruction address ].
+	exptectedAddress := invalidAccessInstruction address.
 	
 	self machineSimulator invalidAccessHandler: [:invalidAccess | 
 		invalidAddressHandled := true.