Code clean up

plokhotnyuk · plokhotnyuk · commit dd7f6620be3f · 2024-12-10T14:34:40.000+01:00
diff --git a/jsoniter-scala-core/jvm/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala b/jsoniter-scala-core/jvm/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala
@@ -2840,9 +2840,7 @@ final class JsonReader private[jsoniter_scala](
         i -= 8
         i >= first
       }) {
-        x = (~x & mq) >>> 63
-        x += Math.multiplyHigh(m, q)
-        x += m >> 63 & q
+        x = Math.multiplyHigh(m, q) + (m >> 63 & q) + ((~x & mq) >>> 63) // TODO: when dropping JDK 17 support replace by Math.unsignedMultiplyHigh(m, q) + ((~x & mq) >>> 63)
       }
     }
     var i = 0
diff --git a/jsoniter-scala-core/native/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala b/jsoniter-scala-core/native/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala
@@ -2837,8 +2837,7 @@ final class JsonReader private[jsoniter_scala](
         i -= 8
         i >= first
       }) {
-        x = (~x & mq) >>> 63
-        x += NativeMath.unsignedMultiplyHigh(m, q)
+        x = NativeMath.unsignedMultiplyHigh(m, q) + ((~x & mq) >>> 63)
       }
     }
     var i = 0

Original file line number	Diff line number	Diff line change
`@@ -2840,9 +2840,7 @@ final class JsonReader private[jsoniter_scala](`
`2840`	`2840`	`i -= 8`
`2841`	`2841`	`i >= first`
`2842`	`2842`	`}) {`
`2843`		`- x = (~x & mq) >>> 63`
`2844`		`- x += Math.multiplyHigh(m, q)`
`2845`		`- x += m >> 63 & q`
	`2843`	`+ x = Math.multiplyHigh(m, q) + (m >> 63 & q) + ((~x & mq) >>> 63) // TODO: when dropping JDK 17 support replace by Math.unsignedMultiplyHigh(m, q) + ((~x & mq) >>> 63)`
`2846`	`2844`	`}`
`2847`	`2845`	`}`
`2848`	`2846`	`var i = 0`
Original file line number	Diff line number	Diff line change
`@@ -2837,8 +2837,7 @@ final class JsonReader private[jsoniter_scala](`
`2837`	`2837`	`i -= 8`
`2838`	`2838`	`i >= first`
`2839`	`2839`	`}) {`
`2840`		`- x = (~x & mq) >>> 63`
`2841`		`- x += NativeMath.unsignedMultiplyHigh(m, q)`
	`2840`	`+ x = NativeMath.unsignedMultiplyHigh(m, q) + ((~x & mq) >>> 63)`
`2842`	`2841`	`}`
`2843`	`2842`	`}`
`2844`	`2843`	`var i = 0`