Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failing tests #887

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions smalltalksrc/VMMakerTests/VMMachineSimulatorTest.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down