@@ -276,6 +276,18 @@ static Dup dup() {
276276 return Dup .INSTANCE ;
277277 }
278278
279+ static ShiftLeft shiftLeft (int shiftAmount ) {
280+ if (shiftAmount <= 0 )
281+ throw new IllegalArgumentException ("shiftAmount must be positive" );
282+ return new ShiftLeft (shiftAmount );
283+ }
284+
285+ static ShiftRight shiftRight (int shiftAmount ) {
286+ if (shiftAmount <= 0 )
287+ throw new IllegalArgumentException ("shiftAmount must be positive" );
288+ return new ShiftRight (shiftAmount );
289+ }
290+
279291 static Binding cast (Class <?> fromType , Class <?> toType ) {
280292 if (fromType == int .class ) {
281293 if (toType == boolean .class ) {
@@ -286,6 +298,8 @@ static Binding cast(Class<?> fromType, Class<?> toType) {
286298 return Cast .INT_TO_SHORT ;
287299 } else if (toType == char .class ) {
288300 return Cast .INT_TO_CHAR ;
301+ } else if (toType == long .class ) {
302+ return Cast .INT_TO_LONG ;
289303 }
290304 } else if (toType == int .class ) {
291305 if (fromType == boolean .class ) {
@@ -296,6 +310,24 @@ static Binding cast(Class<?> fromType, Class<?> toType) {
296310 return Cast .SHORT_TO_INT ;
297311 } else if (fromType == char .class ) {
298312 return Cast .CHAR_TO_INT ;
313+ } else if (fromType == long .class ) {
314+ return Cast .LONG_TO_INT ;
315+ }
316+ } else if (fromType == long .class ) {
317+ if (toType == byte .class ) {
318+ return Cast .LONG_TO_BYTE ;
319+ } else if (toType == short .class ) {
320+ return Cast .LONG_TO_SHORT ;
321+ } else if (toType == char .class ) {
322+ return Cast .LONG_TO_CHAR ;
323+ }
324+ } else if (toType == long .class ) {
325+ if (fromType == byte .class ) {
326+ return Cast .BYTE_TO_LONG ;
327+ } else if (fromType == short .class ) {
328+ return Cast .SHORT_TO_LONG ;
329+ } else if (fromType == char .class ) {
330+ return Cast .CHAR_TO_LONG ;
299331 }
300332 }
301333 throw new IllegalArgumentException ("Unknown conversion: " + fromType + " -> " + toType );
@@ -387,6 +419,24 @@ public Binding.Builder dup() {
387419 return this ;
388420 }
389421
422+ // Converts to long if needed then shifts left by the given number of Bytes.
423+ public Binding .Builder shiftLeft (int shiftAmount , Class <?> type ) {
424+ if (type != long .class ) {
425+ bindings .add (Binding .cast (type , long .class ));
426+ }
427+ bindings .add (Binding .shiftLeft (shiftAmount ));
428+ return this ;
429+ }
430+
431+ // Shifts right by the given number of Bytes then converts from long if needed.
432+ public Binding .Builder shiftRight (int shiftAmount , Class <?> type ) {
433+ bindings .add (Binding .shiftRight (shiftAmount ));
434+ if (type != long .class ) {
435+ bindings .add (Binding .cast (long .class , type ));
436+ }
437+ return this ;
438+ }
439+
390440 public List <Binding > build () {
391441 return List .copyOf (bindings );
392442 }
@@ -670,6 +720,52 @@ public void interpret(Deque<Object> stack, StoreFunc storeFunc,
670720 }
671721 }
672722
723+ /**
724+ * ShiftLeft([shiftAmount])
725+ * Shifts the Bytes on the top of the operand stack (64 bit unsigned).
726+ * Shifts left by the given number of Bytes.
727+ */
728+ record ShiftLeft (int shiftAmount ) implements Binding {
729+
730+ @ Override
731+ public void verify (Deque <Class <?>> stack ) {
732+ Class <?> last = stack .pop ();
733+ SharedUtils .checkType (last , long .class );
734+ stack .push (long .class );
735+ }
736+
737+ @ Override
738+ public void interpret (Deque <Object > stack , StoreFunc storeFunc ,
739+ LoadFunc loadFunc , SegmentAllocator allocator ) {
740+ long l = (long ) stack .pop ();
741+ l <<= (shiftAmount * Byte .SIZE );
742+ stack .push (l );
743+ }
744+ }
745+
746+ /**
747+ * ShiftRight([shiftAmount])
748+ * Shifts the Bytes on the top of the operand stack (64 bit unsigned).
749+ * Shifts right by the given number of Bytes.
750+ */
751+ record ShiftRight (int shiftAmount ) implements Binding {
752+
753+ @ Override
754+ public void verify (Deque <Class <?>> stack ) {
755+ Class <?> last = stack .pop ();
756+ SharedUtils .checkType (last , long .class );
757+ stack .push (long .class );
758+ }
759+
760+ @ Override
761+ public void interpret (Deque <Object > stack , StoreFunc storeFunc ,
762+ LoadFunc loadFunc , SegmentAllocator allocator ) {
763+ long l = (long ) stack .pop ();
764+ l >>>= (shiftAmount * Byte .SIZE );
765+ stack .push (l );
766+ }
767+ }
768+
673769 /**
674770 * CAST([fromType], [toType])
675771 * Pop a [fromType] from the stack, convert it to [toType], and push the resulting
@@ -690,10 +786,21 @@ public void interpret(Deque<Object> stack, StoreFunc storeFunc,
690786 INT_TO_BYTE (int .class , byte .class ),
691787 INT_TO_CHAR (int .class , char .class ),
692788 INT_TO_SHORT (int .class , short .class ),
789+ INT_TO_LONG (int .class , long .class ),
790+
693791 BOOLEAN_TO_INT (boolean .class , int .class ),
694792 BYTE_TO_INT (byte .class , int .class ),
695793 CHAR_TO_INT (char .class , int .class ),
696- SHORT_TO_INT (short .class , int .class );
794+ SHORT_TO_INT (short .class , int .class ),
795+ LONG_TO_INT (long .class , int .class ),
796+
797+ LONG_TO_BYTE (long .class , byte .class ),
798+ LONG_TO_SHORT (long .class , short .class ),
799+ LONG_TO_CHAR (long .class , char .class ),
800+
801+ BYTE_TO_LONG (byte .class , long .class ),
802+ SHORT_TO_LONG (short .class , long .class ),
803+ CHAR_TO_LONG (char .class , long .class );
697804
698805 private final Class <?> fromType ;
699806 private final Class <?> toType ;
0 commit comments