Simplify generation of druid conditional jumps

smalltalksrc/VMMaker/Integer.extension.st

@@ -70,7 +70,9 @@ Integer >> asUnsignedInteger [
 	"Since the simulator deals with positive integers most of the time we assert that the receiver is greater than zero.
 	 But one major exception is stack pointers in the StackInterpreterSimulator, which are negative.  So don't fail
 	 if the sender is a StackInterpreter and the receiver could be a stack pointer."
-	^ thisContext sender receiver objectMemory wordSize = 8
+
+	^ (thisContext findMethodContextSuchThat: [ :e |
+		   e receiver respondsTo: #wordSize ]) receiver wordSize = 8
 		  ifTrue: [ self signedIntToLong64 ]
 		  ifFalse: [ self signedIntToLong ]
 ]

smalltalksrc/VMMaker/StackInterpreter.class.st

@@ -7576,6 +7576,18 @@ StackInterpreter >> internalMustBeBoolean [
 	self normalSend
 ]
 
+{ #category : #'return bytecodes' }
+StackInterpreter >> internalMustBeBoolean: aBoolean [
+	<inline: true>
+
+	"Push the boolean to send it the mustBeBoolean message"
+	self push: aBoolean.
+
+	messageSelector := objectMemory splObj: SelectorMustBeBoolean.
+	argumentCount := 0.
+	self normalSend
+]
+
 { #category : #'interpreter shell' }
 StackInterpreter >> interpret [
 	"This is the main interpreter loop. It normally loops forever, fetching and executing bytecodes. When running in the context of a browser plugin VM, however, it must return control to the browser periodically. This should done only when the state of the currently running Squeak thread is safely stored in the object heap. Since this is the case at the moment that a check for interrupts is performed, that is when we return to the browser if it is time to do so. Interrupt checks happen quite frequently."
@@ -8234,30 +8246,26 @@ StackInterpreter >> jumplfFalseBy: offset [
 
 	| boolean |
 	boolean := self stackTop.
+	self pop: 1.
 	boolean = objectMemory falseObject
-		ifTrue: [ 
-			self pop: 1.
-			self jump: offset ]
-		ifFalse: [ 
-			boolean = objectMemory trueObject ifFalse: [ 
-				^ self internalMustBeBoolean ].
-			self pop: 1.
-			self fetchNextBytecode ].
+		ifTrue: [ self jump: offset ]
+		ifFalse: [
+			boolean = objectMemory trueObject ifFalse: [
+				^ self internalMustBeBoolean: boolean ].
+			self fetchNextBytecode ]
 ]
 
 { #category : #'jump bytecodes' }
 StackInterpreter >> jumplfTrueBy: offset [
 
 	| boolean |
 	boolean := self stackTop.
+	self pop: 1.
 	boolean = objectMemory trueObject
-		ifTrue: [ 
-			self pop: 1.
-			self jump: offset ]
-		ifFalse: [ 
-			boolean = objectMemory falseObject ifFalse: [ 
-				^ self internalMustBeBoolean ].
-			self pop: 1.
+		ifTrue: [ self jump: offset ]
+		ifFalse: [
+			boolean = objectMemory falseObject ifFalse: [
+				^ self internalMustBeBoolean: boolean ].
 			self fetchNextBytecode ]
 ]