Use uint64 registers for unsigned arguments in dispatch

niner · niner · commit 8cb72029f9b0 · 2022-01-15T17:42:36.000+01:00
diff --git a/src/vm/moar/QAST/QASTCompilerMAST.nqp b/src/vm/moar/QAST/QASTCompilerMAST.nqp
@@ -1086,8 +1086,10 @@ my class MASTCompilerInstance {
                     $ins := self.coerce($ins, $MVM_reg_num64);
                 }
                 elsif $ins_result_kind == $MVM_reg_int32 || $ins_result_kind == $MVM_reg_int16 ||
-                        $ins_result_kind == $MVM_reg_int8 || $ins_result_kind == $MVM_reg_uint64 ||
-                        $ins_result_kind == $MVM_reg_uint32 || $ins_result_kind == $MVM_reg_uint16 ||
+                        $ins_result_kind == $MVM_reg_int8 {
+                    $ins := self.coerce($ins, $MVM_reg_int64);
+                }
+                elsif $ins_result_kind == $MVM_reg_uint64 || $ins_result_kind == $MVM_reg_uint32 || $ins_result_kind == $MVM_reg_uint16 ||
                         $ins_result_kind == $MVM_reg_uint8 {
                     $ins := self.coerce($ins, $MVM_reg_int64);
                 }
diff --git a/src/vm/moar/QAST/QASTOperationsMAST.nqp b/src/vm/moar/QAST/QASTOperationsMAST.nqp
@@ -1568,11 +1568,13 @@ my $dispatch_call_gen := -> $qastcomp, $op {
             $arg_mast := $qastcomp.coerce($arg_mast, $MVM_reg_num64);
         }
         elsif $arg_mast_kind == $MVM_reg_int32 || $arg_mast_kind == $MVM_reg_int16 ||
-                $arg_mast_kind == $MVM_reg_int8 || $arg_mast_kind == $MVM_reg_uint64 ||
-                $arg_mast_kind == $MVM_reg_uint32 || $arg_mast_kind == $MVM_reg_uint16 ||
-                $arg_mast_kind == $MVM_reg_uint8 {
+                $arg_mast_kind == $MVM_reg_int8 {
             $arg_mast := $qastcomp.coerce($arg_mast, $MVM_reg_int64);
         }
+        elsif $arg_mast_kind == $MVM_reg_uint32 || $arg_mast_kind == $MVM_reg_uint16 ||
+                $arg_mast_kind == $MVM_reg_uint8 {
+            $arg_mast := $qastcomp.coerce($arg_mast, $MVM_reg_uint64);
+        }
         nqp::push(@dispatch_mast, $arg_mast);
         nqp::push(@dispatch_arg_idxs, $arg_mast.result_reg);
     }
@@ -1803,11 +1805,13 @@ QAST::MASTOperations.add_core_op('callmethod', -> $qastcomp, $op {
             $arg_mast := $qastcomp.coerce($arg_mast, $MVM_reg_num64);
         }
         elsif $arg_mast_kind == $MVM_reg_int32 || $arg_mast_kind == $MVM_reg_int16 ||
-                $arg_mast_kind == $MVM_reg_int8 || $arg_mast_kind == $MVM_reg_uint64 ||
-                $arg_mast_kind == $MVM_reg_uint32 || $arg_mast_kind == $MVM_reg_uint16 ||
-                $arg_mast_kind == $MVM_reg_uint8 {
+                $arg_mast_kind == $MVM_reg_int8 {
             $arg_mast := $qastcomp.coerce($arg_mast, $MVM_reg_int64);
         }
+        elsif $arg_mast_kind == $MVM_reg_uint32 || $arg_mast_kind == $MVM_reg_uint16 ||
+                $arg_mast_kind == $MVM_reg_uint8 {
+            $arg_mast := $qastcomp.coerce($arg_mast, $MVM_reg_uint64);
+        }
         nqp::push(@dispatch_mast, $arg_mast);
         nqp::push(@dispatch_arg_idxs, $arg_mast.result_reg);
     }

Original file line number	Diff line number	Diff line change
`@@ -1086,8 +1086,10 @@ my class MASTCompilerInstance {`
`1086`	`1086`	`$ins := self.coerce($ins, $MVM_reg_num64);`
`1087`	`1087`	`}`
`1088`	`1088`	`elsif $ins_result_kind == $MVM_reg_int32 \|\| $ins_result_kind == $MVM_reg_int16 \|\|`
`1089`		`- $ins_result_kind == $MVM_reg_int8 \|\| $ins_result_kind == $MVM_reg_uint64 \|\|`
`1090`		`- $ins_result_kind == $MVM_reg_uint32 \|\| $ins_result_kind == $MVM_reg_uint16 \|\|`
	`1089`	`+ $ins_result_kind == $MVM_reg_int8 {`
	`1090`	`+ $ins := self.coerce($ins, $MVM_reg_int64);`
	`1091`	`+ }`
	`1092`	`+ elsif $ins_result_kind == $MVM_reg_uint64 \|\| $ins_result_kind == $MVM_reg_uint32 \|\| $ins_result_kind == $MVM_reg_uint16 \|\|`
`1091`	`1093`	`$ins_result_kind == $MVM_reg_uint8 {`
`1092`	`1094`	`$ins := self.coerce($ins, $MVM_reg_int64);`
`1093`	`1095`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1568,11 +1568,13 @@ my $dispatch_call_gen := -> $qastcomp, $op {`
`1568`	`1568`	`$arg_mast := $qastcomp.coerce($arg_mast, $MVM_reg_num64);`
`1569`	`1569`	`}`
`1570`	`1570`	`elsif $arg_mast_kind == $MVM_reg_int32 \|\| $arg_mast_kind == $MVM_reg_int16 \|\|`
`1571`		`- $arg_mast_kind == $MVM_reg_int8 \|\| $arg_mast_kind == $MVM_reg_uint64 \|\|`
`1572`		`- $arg_mast_kind == $MVM_reg_uint32 \|\| $arg_mast_kind == $MVM_reg_uint16 \|\|`
`1573`		`- $arg_mast_kind == $MVM_reg_uint8 {`
	`1571`	`+ $arg_mast_kind == $MVM_reg_int8 {`
`1574`	`1572`	`$arg_mast := $qastcomp.coerce($arg_mast, $MVM_reg_int64);`
`1575`	`1573`	`}`
	`1574`	`+ elsif $arg_mast_kind == $MVM_reg_uint32 \|\| $arg_mast_kind == $MVM_reg_uint16 \|\|`
	`1575`	`+ $arg_mast_kind == $MVM_reg_uint8 {`
	`1576`	`+ $arg_mast := $qastcomp.coerce($arg_mast, $MVM_reg_uint64);`
	`1577`	`+ }`
`1576`	`1578`	`nqp::push(@dispatch_mast, $arg_mast);`
`1577`	`1579`	`nqp::push(@dispatch_arg_idxs, $arg_mast.result_reg);`
`1578`	`1580`	`}`
`@@ -1803,11 +1805,13 @@ QAST::MASTOperations.add_core_op('callmethod', -> $qastcomp, $op {`
`1803`	`1805`	`$arg_mast := $qastcomp.coerce($arg_mast, $MVM_reg_num64);`
`1804`	`1806`	`}`
`1805`	`1807`	`elsif $arg_mast_kind == $MVM_reg_int32 \|\| $arg_mast_kind == $MVM_reg_int16 \|\|`
`1806`		`- $arg_mast_kind == $MVM_reg_int8 \|\| $arg_mast_kind == $MVM_reg_uint64 \|\|`
`1807`		`- $arg_mast_kind == $MVM_reg_uint32 \|\| $arg_mast_kind == $MVM_reg_uint16 \|\|`
`1808`		`- $arg_mast_kind == $MVM_reg_uint8 {`
	`1808`	`+ $arg_mast_kind == $MVM_reg_int8 {`
`1809`	`1809`	`$arg_mast := $qastcomp.coerce($arg_mast, $MVM_reg_int64);`
`1810`	`1810`	`}`
	`1811`	`+ elsif $arg_mast_kind == $MVM_reg_uint32 \|\| $arg_mast_kind == $MVM_reg_uint16 \|\|`
	`1812`	`+ $arg_mast_kind == $MVM_reg_uint8 {`
	`1813`	`+ $arg_mast := $qastcomp.coerce($arg_mast, $MVM_reg_uint64);`
	`1814`	`+ }`
`1811`	`1815`	`nqp::push(@dispatch_mast, $arg_mast);`
`1812`	`1816`	`nqp::push(@dispatch_arg_idxs, $arg_mast.result_reg);`
`1813`	`1817`	`}`